mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-11 11:29:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert #18562 #18478 (#18610)

Browse Source
This commit is contained in:
Jarred Sumner
2025-03-28 20:23:49 -07:00
committed by GitHub
parent f0dfa109bb
commit f38d35f7c9
56 changed files with 191 additions and 1011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/bun.js/bindings/ModuleLoader.cpp
View File

@@ -37,8 +37,6 @@
#include "JSCommonJSModule.h"
#include "../modules/_NativeModule.h"
#include "JSCommonJSExtensions.h"
namespace Bun {
using namespace JSC;
using namespace Zig;
@@ -569,39 +567,11 @@ JSValue resolveAndFetchBuiltinModule(
return {};
}
void evaluateCommonJSCustomExtension(
Zig::GlobalObject* globalObject,
JSCommonJSModule* target,
String filename,
JSValue filenameValue,
uint32_t extensionIndex)
{
auto& vm = globalObject->vm();
auto scope = DECLARE_THROW_SCOPE(vm);
Bun::JSCommonJSExtensions* extensions = globalObject->lazyRequireExtensionsObject();
JSValue extension = extensions->m_registeredFunctions[extensionIndex].get();
if (!extension || !extension.isCallable()) {
throwTypeError(globalObject, scope, makeString("require.extension is not a function"_s));
return;
}
JSC::CallData callData = JSC::getCallData(extension.asCell());
if (callData.type == JSC::CallData::Type::None) {
throwTypeError(globalObject, scope, makeString("require.extension is not a function"_s));
return;
}
MarkedArgumentBuffer arguments;
arguments.append(target);
arguments.append(filenameValue);
JSC::profiledCall(globalObject, ProfilingReason::API, extension, callData, target, arguments);
RETURN_IF_EXCEPTION(scope, );
}
JSValue fetchCommonJSModule(
Zig::GlobalObject* globalObject,
JSCommonJSModule* target,
JSValue specifierValue,
String specifierWtfString,
BunString* specifier,
BunString* referrer,
BunString* typeAttribute)
{
@@ -614,15 +584,13 @@ JSValue fetchCommonJSModule(
ErrorableResolvedSource* res = &resValue;
ResolvedSourceCodeHolder sourceCodeHolder(res);
BunString specifier = Bun::toString(specifierWtfString);
bool wasModuleMock = false;
// When "bun test" is enabled, allow users to override builtin modules
// This is important for being able to trivially mock things like the filesystem.
if (isBunTest) {
if (JSC::JSValue virtualModuleResult = Bun::runVirtualModule(globalObject, &specifier, wasModuleMock)) {
JSValue promiseOrCommonJSModule = handleVirtualModuleResult<true>(globalObject, virtualModuleResult, res, &specifier, referrer, wasModuleMock, target);
if (JSC::JSValue virtualModuleResult = Bun::runVirtualModule(globalObject, specifier, wasModuleMock)) {
JSValue promiseOrCommonJSModule = handleVirtualModuleResult<true>(globalObject, virtualModuleResult, res, specifier, referrer, wasModuleMock, target);
RETURN_IF_EXCEPTION(scope, {});
// If we assigned module.exports to the virtual module, we're done here.
@@ -638,7 +606,7 @@ JSValue fetchCommonJSModule(
RELEASE_AND_RETURN(scope, JSValue {});
}
case JSPromise::Status::Pending: {
JSC::throwTypeError(globalObject, scope, makeString("require() async module \""_s, specifierWtfString, "\" is unsupported. use \"await import()\" instead."_s));
JSC::throwTypeError(globalObject, scope, makeString("require() async module \""_s, specifier->toWTFString(BunString::ZeroCopy), "\" is unsupported. use \"await import()\" instead."_s));
RELEASE_AND_RETURN(scope, JSValue {});
}
case JSPromise::Status::Fulfilled: {
@@ -657,7 +625,7 @@ JSValue fetchCommonJSModule(
}
}
if (auto builtin = fetchBuiltinModuleWithoutResolution(globalObject, &specifier, res)) {
if (auto builtin = fetchBuiltinModuleWithoutResolution(globalObject, specifier, res)) {
if (!res->success) {
RELEASE_AND_RETURN(scope, builtin);
}
@@ -668,8 +636,8 @@ JSValue fetchCommonJSModule(
// When "bun test" is NOT enabled, disable users from overriding builtin modules
if (!isBunTest) {
if (JSC::JSValue virtualModuleResult = Bun::runVirtualModule(globalObject, &specifier, wasModuleMock)) {
JSValue promiseOrCommonJSModule = handleVirtualModuleResult<true>(globalObject, virtualModuleResult, res, &specifier, referrer, wasModuleMock, target);
if (JSC::JSValue virtualModuleResult = Bun::runVirtualModule(globalObject, specifier, wasModuleMock)) {
JSValue promiseOrCommonJSModule = handleVirtualModuleResult<true>(globalObject, virtualModuleResult, res, specifier, referrer, wasModuleMock, target);
RETURN_IF_EXCEPTION(scope, {});
// If we assigned module.exports to the virtual module, we're done here.
@@ -685,7 +653,7 @@ JSValue fetchCommonJSModule(
RELEASE_AND_RETURN(scope, JSValue {});
}
case JSPromise::Status::Pending: {
JSC::throwTypeError(globalObject, scope, makeString("require() async module \""_s, specifierWtfString, "\" is unsupported. use \"await import()\" instead."_s));
JSC::throwTypeError(globalObject, scope, makeString("require() async module \""_s, specifier->toWTFString(BunString::ZeroCopy), "\" is unsupported. use \"await import()\" instead."_s));
RELEASE_AND_RETURN(scope, JSValue {});
}
case JSPromise::Status::Fulfilled: {
@@ -721,9 +689,9 @@ JSValue fetchCommonJSModule(
RELEASE_AND_RETURN(scope, jsNumber(-1));
}
Bun__transpileFile(bunVM, globalObject, &specifier, referrer, typeAttribute, res, false, true);
Bun__transpileFile(bunVM, globalObject, specifier, referrer, typeAttribute, res, false);
if (res->success && res->result.value.isCommonJSModule) {
target->evaluate(globalObject, specifierWtfString, res->result.value);
target->evaluate(globalObject, specifier->toWTFString(BunString::ZeroCopy), res->result.value);
RETURN_IF_EXCEPTION(scope, {});
RELEASE_AND_RETURN(scope, target);
}
@@ -765,10 +733,6 @@ JSValue fetchCommonJSModule(
target->putDirect(vm, WebCore::clientData(vm)->builtinNames().exportsPublicName(), value, 0);
target->hasEvaluated = true;
RELEASE_AND_RETURN(scope, target);
} else if (res->result.value.tag == SyntheticModuleType::CommonJSCustomExtension) {
evaluateCommonJSCustomExtension(globalObject, target, specifierWtfString, specifierValue, res->result.value.cjsCustomExtensionIndex);
RETURN_IF_EXCEPTION(scope, {});
RELEASE_AND_RETURN(scope, target);
}
auto&& provider = Zig::SourceProvider::create(globalObject, res->result.value);
@@ -896,12 +860,12 @@ static JSValue fetchESMSourceCode(
}
if constexpr (allowPromise) {
auto* pendingCtx = Bun__transpileFile(bunVM, globalObject, specifier, referrer, typeAttribute, res, true, false);
auto* pendingCtx = Bun__transpileFile(bunVM, globalObject, specifier, referrer, typeAttribute, res, true);
if (pendingCtx) {
return pendingCtx;
}
} else {
Bun__transpileFile(bunVM, globalObject, specifier, referrer, typeAttribute, res, false, false);
Bun__transpileFile(bunVM, globalObject, specifier, referrer, typeAttribute, res, false);
}
if (res->success && res->result.value.isCommonJSModule) {