From 8a0152e1290658d8167609cb23a7d19817ad4285 Mon Sep 17 00:00:00 2001 From: dave caruso Date: Mon, 24 Jul 2023 19:32:04 -0700 Subject: Merge import.meta.require and require to be the same thing (#3732) * Merge import.meta.require and require to be the same thing * support `require` and BunPlugin (runtime plugin) * plugins * unused code * revert launch.json --- src/bun.js/modules/NodeModuleModule.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/bun.js/modules/NodeModuleModule.cpp') diff --git a/src/bun.js/modules/NodeModuleModule.cpp b/src/bun.js/modules/NodeModuleModule.cpp index 57fc1834d..476ee95dc 100644 --- a/src/bun.js/modules/NodeModuleModule.cpp +++ b/src/bun.js/modules/NodeModuleModule.cpp @@ -2,6 +2,7 @@ #include "./NodeModuleModule.h" +#include "CommonJSModuleRecord.h" #include "ImportMetaObject.h" #include "JavaScriptCore/JSBoundFunction.h" #include "JavaScriptCore/ObjectConstructor.h" @@ -126,14 +127,13 @@ JSC_DEFINE_HOST_FUNCTION(jsFunctionNodeModuleCreateRequire, if (callFrame->argumentCount() < 1) { throwTypeError(globalObject, scope, "createRequire() requires at least one argument"_s); - return JSC::JSValue::encode(JSC::jsUndefined()); + RELEASE_AND_RETURN(scope, JSC::JSValue::encode(JSC::jsUndefined())); } auto val = callFrame->uncheckedArgument(0).toWTFString(globalObject); RETURN_IF_EXCEPTION(scope, JSC::JSValue::encode(JSC::jsUndefined())); - auto clientData = WebCore::clientData(vm); RELEASE_AND_RETURN( - scope, JSValue::encode(Zig::ImportMetaObject::createRequireFunction( + scope, JSValue::encode(Bun::JSCommonJSModule::createBoundRequireFunction( vm, globalObject, val))); } extern "C" EncodedJSValue Resolver__nodeModulePathsForJS(JSGlobalObject *, -- cgit v1.2.3