diff options
| author |  Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
| 2022-09-06 03:31:29 -0700 |
|---|---|---|
| committer | Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
| 2022-09-06 03:37:58 -0700 |
| commit | e9cc9ae81654fecc6cbe9d78346d2c037e9c7027 (patch) | |
| tree | f7aceb53090e64621f55076efed9092e66478119 /src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp | |
| parent | ba2a7d72e789b9d58d95d1c596117a48692b2432 (diff) | |
| download | bun-e9cc9ae81654fecc6cbe9d78346d2c037e9c7027.tar.gz bun-e9cc9ae81654fecc6cbe9d78346d2c037e9c7027.tar.zst bun-e9cc9ae81654fecc6cbe9d78346d2c037e9c7027.zip | |
Make the plugins a little more resilient
Diffstat (limited to 'src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp')
| -rw-r--r-- | src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp b/src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp index eb3f0e1f9..0afe19141 100644 --- a/src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp +++ b/src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp @@ -168,7 +168,7 @@ const char* const s_importMetaObjectLoadCJS2ESMCode = const JSC::ConstructAbility s_importMetaObjectRequireESMCodeConstructAbility = JSC::ConstructAbility::CannotConstruct; const JSC::ConstructorKind s_importMetaObjectRequireESMCodeConstructorKind = JSC::ConstructorKind::None; const JSC::ImplementationVisibility s_importMetaObjectRequireESMCodeImplementationVisibility = JSC::ImplementationVisibility::Public; -const int s_importMetaObjectRequireESMCodeLength = 559; +const int s_importMetaObjectRequireESMCodeLength = 561; static const JSC::Intrinsic s_importMetaObjectRequireESMCodeIntrinsic = JSC::NoIntrinsic; const char* const s_importMetaObjectRequireESMCode = "(function (resolved) {\n" \ @@ -184,7 +184,7 @@ const char* const s_importMetaObjectRequireESMCode = " }\n" \ " var exports = @Loader.getModuleNamespaceObject(entry.module);\n" \ " var commonJS = exports.default;\n" \ - " if (commonJS && @isObject(commonJS) && @commonJSSymbol in commonJS) {\n" \ + " if (commonJS && @isCallable(commonJS) && @commonJSSymbol in commonJS) {\n" \ " return commonJS();\n" \ " }\n" \ " return exports;\n" \ @@ -212,7 +212,6 @@ const char* const s_importMetaObjectRequireCode = "\n" \ " return cached;\n" \ " }\n" \ - "\n" \ " \n" \ " //\n" \ " if (last5 === \".json\") {\n" \ @@ -227,7 +226,7 @@ const char* const s_importMetaObjectRequireCode = " return module.exports;\n" \ " } else if (last5 === \".toml\") {\n" \ " var fs = (globalThis[Symbol.for(\"_fs\")] ||= @Bun.fs());\n" \ - " var exports = Bun.TOML.parse(fs.readFileSync(resolved, \"utf8\"));\n" \ + " var exports = @Bun.TOML.parse(fs.readFileSync(resolved, \"utf8\"));\n" \ " @requireMap.@set(resolved, exports);\n" \ " return exports;\n" \ " } else {\n" \ |