diff options
author | 2023-10-02 12:31:07 -0700 | |
---|---|---|
committer | 2023-10-02 12:31:07 -0700 | |
commit | abbe3916ed5d7b6adb5a4b376e5c563d36e07d31 (patch) | |
tree | 2dba62d3d15c0842eb70067f67bd81d95a4abdad /src/bun.js/bindings/ModuleLoader.cpp | |
parent | 4073539837e2fc60860ddb231a71c9a34c388afd (diff) | |
parent | 0a2d490bf8cb0dbfe3ccfc936d71b33fb9c59899 (diff) | |
download | bun-abbe3916ed5d7b6adb5a4b376e5c563d36e07d31.tar.gz bun-abbe3916ed5d7b6adb5a4b376e5c563d36e07d31.tar.zst bun-abbe3916ed5d7b6adb5a4b376e5c563d36e07d31.zip |
Merge remote-tracking branch 'origin/main' into dave/nodemodule-preloadmodules
Diffstat (limited to 'src/bun.js/bindings/ModuleLoader.cpp')
-rw-r--r-- | src/bun.js/bindings/ModuleLoader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bun.js/bindings/ModuleLoader.cpp b/src/bun.js/bindings/ModuleLoader.cpp index acda70e0a..127fb6965 100644 --- a/src/bun.js/bindings/ModuleLoader.cpp +++ b/src/bun.js/bindings/ModuleLoader.cpp @@ -458,7 +458,7 @@ JSValue fetchCommonJSModule( } } - if (JSC::JSValue virtualModuleResult = JSValue::decode(Bun__runVirtualModule(globalObject, specifier))) { + if (JSC::JSValue virtualModuleResult = Bun::runVirtualModule(globalObject, specifier)) { JSPromise* promise = jsCast<JSPromise*>(handleVirtualModuleResult<true>(globalObject, virtualModuleResult, res, specifier, referrer)); switch (promise->status(vm)) { case JSPromise::Status::Rejected: { @@ -633,7 +633,7 @@ static JSValue fetchESMSourceCode( } } - if (JSC::JSValue virtualModuleResult = JSValue::decode(Bun__runVirtualModule(globalObject, specifier))) { + if (JSC::JSValue virtualModuleResult = Bun::runVirtualModule(globalObject, specifier)) { return handleVirtualModuleResult<allowPromise>(globalObject, virtualModuleResult, res, specifier, referrer); } |