diff options
| author |  Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
| 2022-07-04 17:17:29 -0700 |
|---|---|---|
| committer | Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
| 2022-07-04 17:17:29 -0700 |
| commit | 41f4302d394a6d2696a2f7b3a6ab98474270bfa5 (patch) | |
| tree | ca0c9c4d90ceaf9fcfc0f93db44a539e27ea99b4 /src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp | |
| parent | 91cada219bb9283189e71072cfa0ce4f6f30bc5b (diff) | |
| download | bun-41f4302d394a6d2696a2f7b3a6ab98474270bfa5.tar.gz bun-41f4302d394a6d2696a2f7b3a6ab98474270bfa5.tar.zst bun-41f4302d394a6d2696a2f7b3a6ab98474270bfa5.zip | |
Handle global require("string")
Diffstat (limited to 'src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp')
| -rw-r--r-- | src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp b/src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp index c1b62429b..c24d67a81 100644 --- a/src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp +++ b/src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp @@ -96,19 +96,25 @@ const char* const s_importMetaObjectRequireCode = const JSC::ConstructAbility s_importMetaObjectLoadModuleCodeConstructAbility = JSC::ConstructAbility::CannotConstruct; const JSC::ConstructorKind s_importMetaObjectLoadModuleCodeConstructorKind = JSC::ConstructorKind::None; -const int s_importMetaObjectLoadModuleCodeLength = 2750; +const int s_importMetaObjectLoadModuleCodeLength = 2818; static const JSC::Intrinsic s_importMetaObjectLoadModuleCodeIntrinsic = JSC::NoIntrinsic; const char* const s_importMetaObjectLoadModuleCode = "(function (meta, resolvedSpecifier) {\n" \ " \"use strict\";\n" \ - " var Loader = globalThis.Loader;\n" \ "\n" \ " var queue = @createFIFO();\n" \ " var key = resolvedSpecifier;\n" \ - " var registry = Loader.registry;\n" \ " while (key) {\n" \ - " @fulfillModuleSync(key);\n" \ - " var entry = registry.@get(key);\n" \ + " //\n" \ + " //\n" \ + " //\n" \ + " var entry = Loader.registry.@get(key);\n" \ + "\n" \ + " if (!entry || entry.state <= @ModuleFetch) {\n" \ + " @fulfillModuleSync(key);\n" \ + " entry = Loader.registry.@get(key);\n" \ + " }\n" \ + "\n" \ "\n" \ " //\n" \ " //\n" \ @@ -182,9 +188,10 @@ const char* const s_importMetaObjectLoadModuleCode = "\n" \ " entry.dependencies = dependencies;\n" \ " key = queue.shift();\n" \ - " while (key && (registry.@get(key)?.state ?? @ModuleFetch) >= @ModuleLink) {\n" \ + " while (key && (Loader.registry.@get(key)?.state ?? @ModuleFetch) >= @ModuleLink) {\n" \ " key = queue.shift();\n" \ " }\n" \ + "\n" \ " }\n" \ "\n" \ " var linkAndEvaluateResult = Loader.linkAndEvaluateModule(\n" \ |