diff --git a/package-lock.json b/package-lock.json index 8e1a8fc..dc30053 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,6 +18,7 @@ "es-module-lexer": "^1.5.4", "esbuild": "^0.23.0", "requirejs": "^2.3.6", + "resolve": "^1.22.8", "yargs": "^17.7.2" }, "bin": { @@ -30,6 +31,7 @@ "@types/babel__generator": "^7.6.8", "@types/babel__traverse": "^7.20.6", "@types/node": "^20.14.10", + "@types/resolve": "^1.20.6", "@types/yargs": "^17.0.32", "tsup": "^8.1.0", "typescript": "^5.5.3" @@ -1356,6 +1358,12 @@ "undici-types": "~5.26.4" } }, + "node_modules/@types/resolve": { + "version": "1.20.6", + "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.6.tgz", + "integrity": "sha512-A4STmOXPhMUtHH+S6ymgE2GiBSMqf4oTvcQZMcHzokuTLVYzXTB8ttjcgxOVaAp2lGwEdzZ0J+cRbbeevQj1UQ==", + "dev": true + }, "node_modules/@types/yargs": { "version": "17.0.32", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz", @@ -1962,6 +1970,14 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", @@ -2066,6 +2082,17 @@ "node": ">=4" } }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/human-signals": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", @@ -2099,6 +2126,20 @@ "node": ">=8" } }, + "node_modules/is-core-module": { + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz", + "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==", + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -2420,6 +2461,11 @@ "node": ">=8" } }, + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" + }, "node_modules/path-scurry": { "version": "1.11.1", "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", @@ -2585,6 +2631,22 @@ "node": ">=0.4.0" } }, + "node_modules/resolve": { + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/resolve-from": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", @@ -2877,6 +2939,17 @@ "node": ">=4" } }, + "node_modules/supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/thenify": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", diff --git a/package.json b/package.json index ca9281e..7515247 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "es-module-lexer": "^1.5.4", "esbuild": "^0.23.0", "requirejs": "^2.3.6", + "resolve": "^1.22.8", "yargs": "^17.7.2" }, "devDependencies": { @@ -49,6 +50,7 @@ "@types/babel__generator": "^7.6.8", "@types/babel__traverse": "^7.20.6", "@types/node": "^20.14.10", + "@types/resolve": "^1.20.6", "@types/yargs": "^17.0.32", "tsup": "^8.1.0", "typescript": "^5.5.3" diff --git a/src/amd.ts b/src/amd.ts index a5d13c0..1def7dc 100644 --- a/src/amd.ts +++ b/src/amd.ts @@ -1,11 +1,11 @@ -import parser from "@babel/parser"; -import traverseModule from "@babel/traverse"; -import generatorModule from "@babel/generator"; -import t from "@babel/types"; -import type { BundleOptions } from "./bundler.js"; +// import parser from "@babel/parser"; +// import traverseModule from "@babel/traverse"; +// import generatorModule from "@babel/generator"; +// import t from "@babel/types"; +// import type { BundleOptions } from "./bundler.js"; -const traverse = traverseModule.default; -const generator = generatorModule.default; +// const traverse = traverseModule.default; +// const generator = generatorModule.default; /** * Appends the initial argument for the module id in every define call in the @@ -19,26 +19,30 @@ const generator = generatorModule.default; * define("my-module", [ ... ], () => { ... }); * ``` */ -export async function appendAMDModuleId( - text: string, - moduleId: string, - _options: BundleOptions -) { - // Update "define" statements to include module id. - const ast = parser.parse(text, { - sourceType: "module", - }); - traverse(ast, { - CallExpression(path) { - const callee = path.get("callee"); - if (callee.isIdentifier({ name: "define" })) { - const args = path.get("arguments"); - if (!args[0]?.isStringLiteral()) { - // Add the argument. - path.node.arguments.unshift(t.stringLiteral(moduleId)); - } - } - }, - }); - return generator(ast).code; +// export async function appendAMDModuleId( +// text: string, +// moduleId: string, +// _options: BundleOptions +// ) { +// // Update "define" statements to include module id. +// const ast = parser.parse(text, { +// sourceType: "module", +// }); +// traverse(ast, { +// CallExpression(path) { +// const callee = path.get("callee"); +// if (callee.isIdentifier({ name: "define" })) { +// const args = path.get("arguments"); +// if (!args[0]?.isStringLiteral()) { +// // Add the argument. +// path.node.arguments.unshift(t.stringLiteral(moduleId)); +// } +// } +// }, +// }); +// return generator(ast).code; +// } + +export async function transformAMD(text: string, moduleId: string) { + return text.replace(/define\(\s*\[/g, `define(${JSON.stringify(moduleId)}, [`); } diff --git a/src/bundler.ts b/src/bundler.ts index 3655718..6a03efc 100644 --- a/src/bundler.ts +++ b/src/bundler.ts @@ -13,11 +13,12 @@ import { fileURLToPath, pathToFileURL } from "node:url"; import * as esbuild from "esbuild"; import { existsSync } from "node:fs"; import { isESModule, transformESM } from "./esm.js"; -import { appendAMDModuleId as transformAMD } from "./amd.js"; import type { JscTarget } from "@swc/core"; import type * as swc from "@swc/core"; import type { RequireBuildData, RequireLoad, RequirePlugin } from "./plugin.js"; import { normalize } from "./internal.js"; +import nodeResolve from 'resolve' +import { transformAMD } from "./amd.js"; export interface ResolveOptions { /** @@ -114,6 +115,7 @@ async function bundleEntry( createRequirejsPlugin(name, modules, options), ], write: true, + logLevel: 'error', ...options.esbuild, }); } @@ -134,28 +136,45 @@ function createRequirejsPlugin( const moduleMapCache = new Map(); const extensions = options.resolve?.extensions ?? ["js"]; - build.onResolve({ filter: /.?/ }, async (args) => { + build.onResolve({ filter: /^([^_]|_[^_]|__[^s])*$/ }, async (args) => { const parentMap = moduleMapCache.get(args.importer); const map = makeModuleMap(args.path, parentMap, false, false); - const url = getModuleUrl(map.name); - const path = resolveModule(url); - if (!path) { - return null; - } - const name = normalize(map.originalName); const isDependency = !name || !modules.includes(name); const resolveDependants = options.resolve?.dependants ?? false; const isExternal = !resolveDependants && isDependency; - return { - path: path, + const url = getModuleUrl(map.name); + let path = resolveModule(url); + + const common = { external: isExternal, + namespace: 'requirejs', pluginData: { name: map.originalName, parent: parentMap?.originalName, }, + } + + if (!path) { + return await new Promise((resolve, reject) => nodeResolve(args.path, { + basedir: args.resolveDir, + }, (err, resolved) => { + if (err) { + reject(err) + } else { + resolve({ + ...common, + path: resolved!, + }); + } + })) + } + + return { + ...common, + path, }; function getModuleUrl(specifier: string) { @@ -189,9 +208,9 @@ function createRequirejsPlugin( return path; } - }); + }) - build.onLoad({ filter: /.?/ }, async (args) => { + build.onLoad({ filter: /.*/, namespace: 'requirejs' }, async (args) => { const name = args.pluginData.name as string; const parent = args.pluginData.parent as string | undefined; @@ -216,6 +235,7 @@ function createRequirejsPlugin( } let text: string | undefined; + if (plugin?.load) { const module = getModule(map); const context = getContext(); @@ -255,7 +275,7 @@ function createRequirejsPlugin( try { eval(text); - } catch (error) {} + } catch (error) { } module.depMaps.push(map); context.completeLoad(map.name); @@ -266,21 +286,14 @@ function createRequirejsPlugin( plugin.load!(map.name, requirejs, load, config); }); - } else { - text = await readFile(args.path, "utf8"); - } - - // Get module id - const url = pathToFileURL(args.path); - const moduleId = getModuleId(url, baseUrl); - const isModule = extensions.includes(extname(args.path)); - if (moduleId && isModule) { - if (isESModule(text)) { - text = await transformESM(text, moduleId, options); - } else { - text = await transformAMD(text, moduleId, options); + if (!text) { + return { + contents: "" + }; } + } else { + text = await readFile(args.path, "utf8"); } if (plugin?.writeFile || plugin?.write) { @@ -293,7 +306,7 @@ function createRequirejsPlugin( }, { asModule(moduleName: string, text: string) { - transformAMD(text, moduleName, options) + transformAMD(text, moduleName) .then(resolve) .catch(reject); }, @@ -309,6 +322,19 @@ function createRequirejsPlugin( }); } + const url = pathToFileURL(args.path); + const moduleId = getModuleId(url, baseUrl); + const isModule = extensions.includes(extname(args.path)); + + // TODO: hack + if (moduleId && isModule && !args.path.includes("require.js")) { + if (isESModule(text)) { + text = await transformESM(text, moduleId, options); + } else { + text = await transformAMD(text, moduleId); + } + } + return { contents: text, }; @@ -372,12 +398,13 @@ function createFastrjsPlugin( const isEntry = options.entries.includes(name); const text = [ + // All modules to be imported in the bundle. + ...modules, + + // TODO: move to top // Include the "requirejs.config" snippet if is specified as entry // in the options. ...(isEntry ? ["_fastrjs:config"] : []), - - // All modules to be imported in the bundle. - ...modules, ] .map((path) => `import ${JSON.stringify(path)};\n`) .join(""); diff --git a/src/command/default.ts b/src/command/default.ts index 919c418..a522e30 100644 --- a/src/command/default.ts +++ b/src/command/default.ts @@ -35,10 +35,11 @@ const defaultCommand = createCommandModule({ const rejected = results.filter( (result) => result.status === "rejected" - ).length; - if (rejected) { + ); + if (rejected.length > 0) { console.error(`Build failed!`); process.exitCode = 1; + throw rejected[0]!.reason } // Print delta time diff --git a/src/esm.ts b/src/esm.ts index 5dbe4d1..0d5fcfd 100644 --- a/src/esm.ts +++ b/src/esm.ts @@ -6,8 +6,12 @@ import type { BundleOptions } from "./bundler.js"; * Detects if the provided module has any ESM imports or exports. */ export function isESModule(text: string) { - const [imports, exports] = esm.parse(text); - return imports.length + exports.length > 0; + try { + const [imports, exports] = esm.parse(text); + return imports.length + exports.length > 0; + } catch { + return false; + } } /**