refactor: simplify build helpers

Author: kpal81xd

build.mjs

@@ -127,8 +127,6 @@ const fail = (msg) => {
     process.exit(1);
 };
 
-const bin = name => path.join(BIN_DIR, process.platform === 'win32' ? `${name}.cmd` : name);
-
 const getTreeBuild = () => {
     const buildType = type ?? 'rel';
 
@@ -151,14 +149,8 @@ const getTreeBuild = () => {
     return `build:${format}:${buildType}`;
 };
 
-const runTreeBuild = (items) => {
-    const env = items ? [...items] : [];
-    if (!items) {
-        const build = getTreeBuild();
-        if (build) {
-            env.push(build);
-        }
-    }
+const runTreeBuild = () => {
+    const env = [getTreeBuild()];
     env.push(...trees);
 
     const args = ['-c'];
@@ -172,7 +164,7 @@ const runTreeBuild = (items) => {
         args.push('-w', '--no-watch.clearScreen');
     }
 
-    return run(bin('rollup'), args);
+    return run(path.join(BIN_DIR, process.platform === 'win32' ? 'rollup.cmd' : 'rollup'), args);
 };
 
 const ms = (value) => {
@@ -183,12 +175,9 @@ const bold = (value) => {
     return COLORS ? `${BOLD}${value}${REGULAR}` : value;
 };
 
-const color = (code, value) => {
-    return COLORS ? `${code}${value}${RESET}` : value;
-};
-
 const writeLog = (stream, code, value) => {
-    stream.write(`${color(code, value)}\n`);
+    const text = COLORS ? `${code}${value}${RESET}` : value;
+    stream.write(`${text}\n`);
 };
 
 const startLog = (input, output) => writeLog(process.stderr, CYAN, `${bold(input)} → ${bold(output)}...`);
@@ -207,14 +196,6 @@ const targetOutput = (buildType, moduleFormat) => {
     return moduleFormat === 'esm' && buildType !== 'min' ? `${file}, build/${prefix}/` : file;
 };
 
-const includeJSTarget = (buildType, moduleFormat) => {
-    if (type === 'types' || trees.length) {
-        return false;
-    }
-
-    return buildType === type && moduleFormat === format;
-};
-
 const getJSTargets = () => {
     if (!hasType) {
         fail('--type is required');
@@ -240,7 +221,7 @@ const getJSTargets = () => {
     const targets = [];
     JS_TYPES.forEach((buildType) => {
         MODULE_FORMATS.forEach((moduleFormat) => {
-            if (includeJSTarget(buildType, moduleFormat)) {
+            if (type !== 'types' && !trees.length && buildType === type && moduleFormat === format) {
                 targets.push({ buildType, moduleFormat });
             }
         });

utils/esbuild-build-target.mjs

@@ -5,7 +5,11 @@ import { parse } from 'acorn';
 import { fileURLToPath } from 'node:url';
 
 import { importValidationPlugin } from './plugins/esbuild-import-validation.mjs';
-import { applyTransforms, createStripTransform, transformPipelinePlugin } from './plugins/esbuild-transform-pipeline.mjs';
+import {
+    applyTransforms,
+    createStripTransform,
+    transformPipelinePlugin
+} from './plugins/esbuild-transform-pipeline.mjs';
 import { getBanner } from './rollup-get-banner.mjs';
 import { revision, version } from './rollup-version-revision.mjs';
 
@@ -69,8 +73,6 @@ const PRUNABLE_IMPORTS = new Set([
     'validateUserChunks'
 ]);
 
-const toPosix = value => value.split(path.sep).join('/');
-
 const compactIndent = code => code.replace(/^ +/gm, spaces => spaces.replace(/ {2}/g, '\t'));
 
 const shouldCompactIndent = ({ buildType, sourcemaps }) => {
@@ -116,22 +118,18 @@ const getImportMetaUrl = (file) => {
 };
 
 const getUmdBanner = (banner) => {
-    return [
-        banner,
-        '(function (global, factory) {',
-        '\ttypeof exports === \'object\' && typeof module !== \'undefined\' ? factory(exports) :',
-        '\ttypeof define === \'function\' && define.amd ? define([\'exports\'], factory) :',
-        '\t(global = typeof globalThis !== \'undefined\' ? globalThis : global || self, factory(global.pc = {}));',
-        '})(this, (function (exports) { \'use strict\';',
-        '\tvar _documentCurrentScript = typeof document !== \'undefined\' ? document.currentScript : null;'
-    ].join('\n');
+    return `${banner}
+(function (global, factory) {
+\ttypeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+\ttypeof define === 'function' && define.amd ? define(['exports'], factory) :
+\t(global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.pc = {}));
+})(this, (function (exports) { 'use strict';
+\tvar _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;`;
 };
 
 const getUmdFooter = () => {
-    return [
-        'Object.assign(exports, pc);',
-        '}));'
-    ].join('\n');
+    return `Object.assign(exports, pc);
+}));`;
 };
 
 const getPlugins = ({
@@ -257,15 +255,6 @@ const watchBundled = async (options, startLog, log) => {
     return ctx;
 };
 
-const resolveSource = (source, importer) => {
-    if (!source.startsWith('.')) {
-        return null;
-    }
-
-    const resolved = path.resolve(path.dirname(importer), source);
-    return path.extname(resolved) ? resolved : `${resolved}.js`;
-};
-
 const collectIdentifiers = (node, used) => {
     if (!node || typeof node !== 'object' || node.type === 'ImportDeclaration') {
         return;
@@ -328,26 +317,22 @@ const collectImports = (source, file) => {
             continue;
         }
 
-        const resolved = resolveSource(name, file);
-        if (resolved) {
-            imports.push(resolved);
+        if (name.startsWith('.')) {
+            const resolved = path.resolve(path.dirname(file), name);
+            imports.push(path.extname(resolved) ? resolved : `${resolved}.js`);
         }
     }
 
     return imports.sort();
 };
 
-const sameImports = (a, b) => {
-    return a.length === b.length && a.every((value, i) => value === b[i]);
-};
-
 const rewriteFflate = (source, file, input) => {
     if (!source.includes(`from '${FFLATE}'`) && !source.includes(`from "${FFLATE}"`)) {
         return source;
     }
 
     const root = path.dirname(path.resolve(input));
-    const rel = toPosix(path.relative(path.dirname(file), root));
+    const rel = path.relative(path.dirname(file), root).split(path.sep).join('/');
     const modulePath = path.posix.join(rel, '..', 'modules', FFLATE, 'esm', 'browser.js');
 
     return source.replace(/from ['"]fflate['"]/g, `from '${modulePath}'`);
@@ -551,7 +536,10 @@ const watchUnbundled = async (options, startLog, log) => {
 
         const next = await transformFile(file, ctx);
         const prev = graph.get(file);
-        if (!sameImports(prev.imports, next.imports)) {
+        if (
+            prev.imports.length !== next.imports.length ||
+            !prev.imports.every((value, i) => value === next.imports[i])
+        ) {
             await fullBuild();
             return;
         }

utils/plugins/esbuild-dynamic.mjs

@@ -1,10 +1,32 @@
 import fs from 'node:fs';
+import jscc from 'jscc';
 
-import { applyDynamicImportLegacy, applyDynamicImportSuppress } from './esbuild-dynamic.mjs';
-import { processJSCC } from './esbuild-jscc.mjs';
-import { processShaderChunks } from './esbuild-shader-chunks.mjs';
 import { createStripTransform } from './esbuild-strip.mjs';
 
+const processJSCC = (source, values, keepLines) => {
+    const result = jscc(source, null, {
+        values,
+        keepLines,
+        sourceMap: false,
+        prefixes: ['// ']
+    });
+
+    return result.code;
+};
+
+const processShaderChunks = (source) => {
+    return source.replace(/\/\* *(glsl|wgsl) *\*\/\s*(`.*?`)/gs, (match, type, code) => {
+        return code
+        .trim()
+        .replace(/\r/g, '')
+        .replace(/ {4}/g, '\t')
+        .replace(/[ \t]*\/\/.*/g, '')
+        .replace(/[ \t]*\/\*[\s\S]*?\*\//g, '')
+        .concat('\n')
+        .replace(/\n{2,}/g, '\n');
+    });
+};
+
 /**
  * @param {string} source - The source code.
  * @param {object} options - The transform options.
@@ -43,10 +65,10 @@ const applyTransforms = (source, {
         source = source.replace(/import\.meta\.url/g, importMetaUrl);
     }
     if (dynamicImportLegacy) {
-        source = applyDynamicImportLegacy(source);
+        source = source.replace(/(\W)import\(/g, '$1new Function("modulePath", "return import(modulePath)")(');
     }
     if (dynamicImportSuppress) {
-        source = applyDynamicImportSuppress(source);
+        source = source.replace(/import\(([^'])/g, 'import(/* @vite-ignore */ /* webpackIgnore: true */ $1');
     }
 
     return source;

utils/plugins/esbuild-jscc.mjs

@@ -20,8 +20,6 @@ const REQUIRED_TYPES = [
     'build/playcanvas/src/framework/script/script-type.d.ts'
 ];
 
-const bin = name => path.join(BIN_DIR, process.platform === 'win32' ? `${name}.cmd` : name);
-
 const exists = (file) => {
     return fs.promises.stat(file).then(() => true, () => false);
 };
@@ -45,7 +43,8 @@ const latestTypesMtime = async (dir) => {
 
 const runTsc = (root) => {
     return new Promise((resolve, reject) => {
-        const child = spawn(bin('tsc'), ['--project', path.join(root, TSC_CONFIG)], {
+        const cmd = path.join(BIN_DIR, process.platform === 'win32' ? 'tsc.cmd' : 'tsc');
+        const child = spawn(cmd, ['--project', path.join(root, TSC_CONFIG)], {
             shell: process.platform === 'win32',
             stdio: 'inherit'
         });
@@ -60,16 +59,11 @@ const runTsc = (root) => {
     });
 };
 
-const missingTypes = async (root) => {
+const emitTypes = async (root) => {
     const found = await Promise.all(REQUIRED_TYPES.map((file) => {
         return exists(path.join(root, file));
     }));
-
-    return found.some(value => !value);
-};
-
-const emitTypes = async (root) => {
-    if (await missingTypes(root)) {
+    if (found.some(value => !value)) {
         await fs.promises.rm(path.join(root, TSC_INFO), { force: true });
     }
     await runTsc(root);