aboutsummaryrefslogtreecommitdiff
path: root/src/js/builtins
diff options
context:
space:
mode:
Diffstat (limited to 'src/js/builtins')
-rw-r--r--src/js/builtins/ImportMetaObject.ts10
-rw-r--r--src/js/builtins/Module.ts14
2 files changed, 6 insertions, 18 deletions
diff --git a/src/js/builtins/ImportMetaObject.ts b/src/js/builtins/ImportMetaObject.ts
index 2fd4880a6..17eb274cd 100644
--- a/src/js/builtins/ImportMetaObject.ts
+++ b/src/js/builtins/ImportMetaObject.ts
@@ -118,17 +118,17 @@ export function internalRequire(this: ImportMetaObject, id) {
if (last5 === ".json") {
var fs = (globalThis[Symbol.for("_fs")] ||= Bun.fs());
var exports = JSON.parse(fs.readFileSync(id, "utf8"));
- $requireMap.$set(id, $createCommonJSModule(id, exports, true));
+ $requireMap.$set(id, $createCommonJSModule(id, exports, true, undefined));
return exports;
} else if (last5 === ".node") {
- const module = $createCommonJSModule(id, {}, true);
+ const module = $createCommonJSModule(id, {}, true, undefined);
process.dlopen(module, id);
$requireMap.$set(id, module);
return module.exports;
} else if (last5 === ".toml") {
var fs = (globalThis[Symbol.for("_fs")] ||= Bun.fs());
var exports = Bun.TOML.parse(fs.readFileSync(id, "utf8"));
- $requireMap.$set(id, $createCommonJSModule(id, exports, true));
+ $requireMap.$set(id, $createCommonJSModule(id, exports, true, undefined));
return exports;
} else {
var exports = $requireESM(id);
@@ -136,7 +136,7 @@ export function internalRequire(this: ImportMetaObject, id) {
if (cachedModule) {
return cachedModule.exports;
}
- $requireMap.$set(id, $createCommonJSModule(id, exports, true));
+ $requireMap.$set(id, $createCommonJSModule(id, exports, true, undefined));
return exports;
}
}
@@ -152,7 +152,7 @@ export function createRequireCache() {
const esm = Loader.registry.$get(key);
if (esm?.evaluated) {
const namespace = Loader.getModuleNamespaceObject(esm.module);
- const mod = $createCommonJSModule(key, namespace, true);
+ const mod = $createCommonJSModule(key, namespace, true, undefined);
$requireMap.$set(key, mod);
return mod;
}
diff --git a/src/js/builtins/Module.ts b/src/js/builtins/Module.ts
index aa08bc728..3d88f2484 100644
--- a/src/js/builtins/Module.ts
+++ b/src/js/builtins/Module.ts
@@ -1,15 +1,3 @@
-interface CommonJSModuleRecord {
- $require(id: string, mod: any): any;
- children: CommonJSModuleRecord[];
- exports: any;
- id: string;
- loaded: boolean;
- parent: undefined;
- path: string;
- paths: string[];
- require: typeof require;
-}
-
$getter;
export function main() {
return $requireMap.$get(Bun.main);
@@ -45,7 +33,7 @@ export function require(this: CommonJSModuleRecord, id: string) {
// To handle import/export cycles, we need to create a module object and put
// it into the map before we import it.
- const mod = $createCommonJSModule(id, {}, false);
+ const mod = $createCommonJSModule(id, {}, false, this);
$requireMap.$set(id, mod);
// This is where we load the module. We will see if Module._load and