mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(codegen): better error messages for internals using module.exports (#15687)

Browse Source
This commit is contained in:
Don Isaac
2024-12-10 15:10:21 -08:00
committed by GitHub
parent b39632c921
commit 2d5ea4993f
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/codegen/bundle-modules.ts
View File

@@ -81,6 +81,16 @@ for (let i = 0; i < moduleList.length; i++) {
try {
let input = fs.readFileSync(path.join(BASE, moduleList[i]), "utf8");
// NOTE: internal modules are parsed as functions. They must use ESM to export and require to import.
// TODO: Bother @paperdave and have him check for module.exports, and create/return a module object if detected.
if (!/\bexport\s+(?:function|class|const|default|{)/.test(input)) {
if (input.includes("module.exports")) {
throw new Error("Cannot use CommonJS module.exports in ESM modules. Use `export default { ... }` instead.");
} else {
throw new Error("Internal modules must have an `export default` statement.");
}
}
const scannedImports = t.scanImports(input);
for (const imp of scannedImports) {
if (imp.kind === "import-statement") {
@@ -407,7 +417,7 @@ writeIfNotChanged(
// In this enum are represented as \`(1 << 9) & id\`
InternalModuleRegistryFlag = 1 << 9,
${moduleList.map((id, n) => ` ${idToEnumName(id)} = ${(1 << 9) | n},`).join("\n")}
// Native modules run through the same system, but with different underlying initializers.
// They also have bit 10 set to differentiate them from JS builtins.
NativeModuleFlag = (1 << 10) | (1 << 9),

2
src/codegen/internal-module-registry-scanner.ts
View File

@@ -74,7 +74,7 @@ export function createInternalModuleRegistry(basedir: string) {
const found = moduleList.indexOf(path.relative(basedir, relativeMatch).replaceAll("\\", "/"));
if (found === -1) {
throw new Error(
`Builtin Bundler: "${specifier}" cannot be imported here because it doesn't get a module ID. Only files in "src/js" besides "src/js/builtins" can be used here. Note that the 'node:' or 'bun:' prefix is required here. `,
`Builtin Bundler: "${specifier}" cannot be imported from "${from}" because it doesn't get a module ID. Only files in "src/js" besides "src/js/builtins" can be used here. Note that the 'node:' or 'bun:' prefix is required here. `,
);
}
return codegenRequireId(`${found}/*${path.relative(basedir, relativeMatch)}*/`);