diff options
Diffstat (limited to 'src/js')
-rw-r--r-- | src/js/_codegen/build-modules.ts | 2 | ||||
-rw-r--r-- | src/js/builtins/Module.ts | 2 | ||||
-rw-r--r-- | src/js/out/ResolvedSourceTag.zig | 1 | ||||
-rw-r--r-- | src/js/out/SyntheticModuleType.h | 1 | ||||
-rw-r--r-- | src/js/out/WebCoreJSBuiltins.cpp | 4 |
5 files changed, 7 insertions, 3 deletions
diff --git a/src/js/_codegen/build-modules.ts b/src/js/_codegen/build-modules.ts index 5068748f7..3443db6f6 100644 --- a/src/js/_codegen/build-modules.ts +++ b/src/js/_codegen/build-modules.ts @@ -381,6 +381,7 @@ fs.writeFileSync( object = 3, file = 4, esm = 5, + json_for_object_loader = 6, // Built in modules are loaded through InternalModuleRegistry by numerical ID. // In this enum are represented as \`(1 << 9) & id\` @@ -403,6 +404,7 @@ fs.writeFileSync( ObjectModule = 3, File = 4, ESM = 5, + JSONForObjectLoader = 6, // Built in modules are loaded through InternalModuleRegistry by numerical ID. // In this enum are represented as \`(1 << 9) & id\` diff --git a/src/js/builtins/Module.ts b/src/js/builtins/Module.ts index dfaf7acf2..aa08bc728 100644 --- a/src/js/builtins/Module.ts +++ b/src/js/builtins/Module.ts @@ -39,7 +39,7 @@ export function require(this: CommonJSModuleRecord, id: string) { return existing.exports; } - if (id.endsWith(".json") || id.endsWith(".toml") || id.endsWith(".node")) { + if (id.endsWith(".node")) { return $internalRequire(id); } diff --git a/src/js/out/ResolvedSourceTag.zig b/src/js/out/ResolvedSourceTag.zig index 5bc228988..4d53d92cd 100644 --- a/src/js/out/ResolvedSourceTag.zig +++ b/src/js/out/ResolvedSourceTag.zig @@ -6,6 +6,7 @@ pub const ResolvedSourceTag = enum(u32) { object = 3, file = 4, esm = 5, + json_for_object_loader = 6, // Built in modules are loaded through InternalModuleRegistry by numerical ID. // In this enum are represented as `(1 << 9) & id` diff --git a/src/js/out/SyntheticModuleType.h b/src/js/out/SyntheticModuleType.h index a3f850549..7338aec5f 100644 --- a/src/js/out/SyntheticModuleType.h +++ b/src/js/out/SyntheticModuleType.h @@ -5,6 +5,7 @@ enum SyntheticModuleType : uint32_t { ObjectModule = 3, File = 4, ESM = 5, + JSONForObjectLoader = 6, // Built in modules are loaded through InternalModuleRegistry by numerical ID. // In this enum are represented as `(1 << 9) & id` diff --git a/src/js/out/WebCoreJSBuiltins.cpp b/src/js/out/WebCoreJSBuiltins.cpp index d767a3c39..a83ce2bd6 100644 --- a/src/js/out/WebCoreJSBuiltins.cpp +++ b/src/js/out/WebCoreJSBuiltins.cpp @@ -722,9 +722,9 @@ const char* const s_moduleMainCode = "(function (){\"use strict\";return @requir const JSC::ConstructAbility s_moduleRequireCodeConstructAbility = JSC::ConstructAbility::CannotConstruct; const JSC::ConstructorKind s_moduleRequireCodeConstructorKind = JSC::ConstructorKind::None; const JSC::ImplementationVisibility s_moduleRequireCodeImplementationVisibility = JSC::ImplementationVisibility::Public; -const int s_moduleRequireCodeLength = 769; +const int s_moduleRequireCodeLength = 725; static const JSC::Intrinsic s_moduleRequireCodeIntrinsic = JSC::NoIntrinsic; -const char* const s_moduleRequireCode = "(function (id){\"use strict\";const existing=@requireMap.@get(id)||@requireMap.@get(id=@resolveSync(id,this.path,!1));if(existing)return @evaluateCommonJSModule(existing),existing.exports;if(id.endsWith(\".json\")||id.endsWith(\".toml\")||id.endsWith(\".node\"))return @internalRequire(id);const mod=@createCommonJSModule(id,{},!1);@requireMap.@set(id,mod);var out=this.@require(id,mod);if(out===-1){try{out=@requireESM(id)}catch(exception){throw @requireMap.@delete(id),exception}const esm=@Loader.registry.@get(id);if(esm\?.evaluated&&(esm.state\?\?0)>=@ModuleReady){const namespace=@Loader.getModuleNamespaceObject(esm.module);return mod.exports=namespace.__esModule\?namespace:Object.create(namespace,{__esModule:{value:!0}})}}return @evaluateCommonJSModule(mod),mod.exports})\n"; +const char* const s_moduleRequireCode = "(function (id){\"use strict\";const existing=@requireMap.@get(id)||@requireMap.@get(id=@resolveSync(id,this.path,!1));if(existing)return @evaluateCommonJSModule(existing),existing.exports;if(id.endsWith(\".node\"))return @internalRequire(id);const mod=@createCommonJSModule(id,{},!1);@requireMap.@set(id,mod);var out=this.@require(id,mod);if(out===-1){try{out=@requireESM(id)}catch(exception){throw @requireMap.@delete(id),exception}const esm=@Loader.registry.@get(id);if(esm\?.evaluated&&(esm.state\?\?0)>=@ModuleReady){const namespace=@Loader.getModuleNamespaceObject(esm.module);return mod.exports=namespace.__esModule\?namespace:Object.create(namespace,{__esModule:{value:!0}})}}return @evaluateCommonJSModule(mod),mod.exports})\n"; // requireResolve const JSC::ConstructAbility s_moduleRequireResolveCodeConstructAbility = JSC::ConstructAbility::CannotConstruct; |