Refactor build platforms

darkreader · May 17, 2024 · 6e49d9b · 6e49d9b
1 parent 3e4f757
commit 6e49d9b
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 34 deletions.
diff --git a/tasks/bundle-api.js b/tasks/bundle-api.js
@@ -8,8 +8,7 @@ import typescript from 'typescript';
 import fs from 'node:fs';
 import os from 'node:os';
 import {createTask} from './task.js';
-import paths from './paths.js';
-const {rootDir, rootPath} = paths;
+import {rootDir, rootPath} from './paths.js';
 
 async function getVersion() {
  const file = await fs.promises.readFile(new URL('../package.json', import.meta.url), 'utf8');

diff --git a/tasks/bundle-css.js b/tasks/bundle-css.js
@@ -1,11 +1,11 @@
 // @ts-check
 import less from 'less';
 import path from 'node:path';
-import paths from './paths.js';
+import {getDestDir, rootPath} from './paths.js';
+import {PLATFORM} from './platform.js';
 import * as reload from './reload.js';
 import {createTask} from './task.js';
 import {readFile, writeFile} from './utils.js';
-const {getDestDir, PLATFORM, rootPath} = paths;
 
 /** @typedef {import('./types').CSSEntry} CSSEntry */
 

diff --git a/tasks/bundle-html.js b/tasks/bundle-html.js
@@ -1,9 +1,9 @@
 // @ts-check
-import paths_ from './paths.js';
+import {getDestDir} from './paths.js';
+import {PLATFORM} from './platform.js';
 import * as reload from './reload.js';
 import {createTask} from './task.js';
 import {writeFile} from './utils.js';
-const {getDestDir, PLATFORM} = paths_;
 
 /** @typedef {import('./types').HTMLEntry} HTMLEntry */
 

diff --git a/tasks/bundle-js.js b/tasks/bundle-js.js
@@ -7,12 +7,11 @@ import rollupPluginReplace from '@rollup/plugin-replace';
 /** @type {any} */
 import rollupPluginTypescript from '@rollup/plugin-typescript';
 import typescript from 'typescript';
-import paths from './paths.js';
+import {getDestDir, rootDir, rootPath} from './paths.js';
 import {PLATFORM} from './platform.js';
 import * as reload from './reload.js';
 const {PORT} = reload;
 import {createTask} from './task.js';
-const {getDestDir, rootDir, rootPath} = paths;
 
 /** @typedef {import('./types').JSEntry} JSEntry */
 

diff --git a/tasks/bundle-locales.js b/tasks/bundle-locales.js
@@ -1,11 +1,11 @@
 // @ts-check
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import paths from './paths.js';
+import {getDestDir, rootPath} from './paths.js';
+import {PLATFORM} from './platform.js';
 import * as reload from './reload.js';
 import {createTask} from './task.js';
 import {readFile, writeFile} from './utils.js';
-const {getDestDir, PLATFORM, rootPath} = paths;
 
 async function bundleLocale(/** @type {string} */filePath) {
  let file = await readFile(filePath);

diff --git a/tasks/bundle-manifest.js b/tasks/bundle-manifest.js
@@ -1,9 +1,9 @@
 // @ts-check
-import path from './paths.js';
+import {getDestDir, rootPath} from './paths.js';
+import {PLATFORM} from './platform.js';
 import * as reload from './reload.js';
 import {createTask} from './task.js';
 import {readJSON, writeJSON} from './utils.js';
-const {PLATFORM, getDestDir, rootPath} = path;
 
 async function patchManifest(platform, debug, watch, test) {
  const manifest = await readJSON(rootPath('src/manifest.json'));

diff --git a/tasks/bundle-signature.js b/tasks/bundle-signature.js
@@ -1,9 +1,10 @@
 // @ts-check
-import paths from './paths.js';
+import {readFile} from 'node:fs/promises';
+import {getDestDir} from './paths.js';
+import {PLATFORM} from './platform.js';
 import {createTask} from './task.js';
-import {copyFile, getPaths, readJSON, readFile, writeFile, fileExists} from './utils.js';
+import {copyFile, getPaths, readJSON, writeFile, fileExists} from './utils.js';
 import {createHash} from 'node:crypto';
-const {getDestDir, PLATFORM} = paths;
 
 function serializeHashManifest(entries) {
  const lines = [];

diff --git a/tasks/clean.js b/tasks/clean.js
@@ -1,8 +1,8 @@
 // @ts-check
-import paths from './paths.js';
+import {getDestDir} from './paths.js';
+import {PLATFORM} from './platform.js';
 import {createTask} from './task.js';
 import {removeFolder} from './utils.js';
-const {getDestDir, PLATFORM} = paths;
 
 async function clean({platforms, debug}) {
  const enabledPlatforms = Object.values(PLATFORM).filter((platform) => platform !== PLATFORM.API && platforms[platform]);

diff --git a/tasks/cli.js b/tasks/cli.js
@@ -18,8 +18,7 @@ import {runTasks} from './task.js';
 import zip from './zip.js';
 import signature from './bundle-signature.js';
 
-import paths from './paths.js';
-const {PLATFORM} = paths;
+import {PLATFORM} from './platform.js';
 
 const __filename = join(fileURLToPath(import.meta.url), '../build.js');
 

diff --git a/tasks/code-style.js b/tasks/code-style.js
@@ -1,9 +1,9 @@
 // @ts-check
 import prettier from 'prettier';
-import paths from './paths.js';
+import {getDestDir} from './paths.js';
+import {PLATFORM} from './platform.js';
 import {createTask} from './task.js';
 import {readFile, writeFile, getPaths} from './utils.js';
-const {getDestDir, PLATFORM} = paths;
 
 /** @type {import('prettier').Options} */
 const options = {

diff --git a/tasks/copy.js b/tasks/copy.js
@@ -1,9 +1,9 @@
 // @ts-check
-import paths_ from './paths.js';
+import {getDestDir} from './paths.js';
+import {PLATFORM} from './platform.js';
 import * as reload from './reload.js';
 import {createTask} from './task.js';
 import {pathExists, copyFile, getPaths} from './utils.js';
-const {getDestDir, PLATFORM} = paths_;
 
 const srcDir = 'src';
 

diff --git a/tasks/paths.js b/tasks/paths.js
@@ -1,14 +1,16 @@
 import {dirname, join} from 'node:path';
 import {createRequire} from 'node:module';
-const rootDir = dirname(createRequire(import.meta.url).resolve('../package.json'));
-const rootPath = (...paths) => join(rootDir, ...paths);
 
-export default {
- getDestDir: function ({debug, platform}) {
- const buildTypeDir = `build/${debug ? 'debug' : 'release'}`;
- return `${buildTypeDir}/${platform}`;
- },
+export const rootDir = dirname(createRequire(import.meta.url).resolve('../package.json'));
+export const rootPath = (...paths) => join(rootDir, ...paths);
+
+export function getDestDir({debug, platform}) {
+ const buildTypeDir = `build/${debug ? 'debug' : 'release'}`;
+ return `${buildTypeDir}/${platform}`;
+}
 
+export default {
+ getDestDir,
  rootDir,
  rootPath,
 };
diff --git a/tasks/zip.js b/tasks/zip.js
@@ -2,10 +2,10 @@
 import fs from 'node:fs';
 import {exec} from 'node:child_process';
 import yazl from 'yazl';
-import paths from './paths.js';
+import {getDestDir} from './paths.js';
+import {PLATFORM} from './platform.js';
 import {createTask} from './task.js';
 import {getPaths} from './utils.js';
-const {getDestDir, PLATFORM} = paths;
 
 /**
  * @param {object} details

diff --git a/tests/inject/karma.conf.js b/tests/inject/karma.conf.js
@@ -9,8 +9,7 @@ import rollupPluginTypescript from '@rollup/plugin-typescript';
 import typescript from 'typescript';
 
 import {createEchoServer} from './support/echo-server.js';
-import paths from '../../tasks/paths.js';
-const {rootPath} = paths;
+import {rootPath} from '../../tasks/paths.js';
 
 /**
  * @param {Partial<LocalConfig>} config