lib: always initialize esm loader callbackMap

nodejs · Jul 1, 2020 · 35ea6de · 35ea6de
1 parent c23d2fd
commit 35ea6de
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 16 deletions.
diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
@@ -59,10 +59,7 @@ function prepareMainThreadExecution(expandArgv1 = false) {
   initializeDeprecations();
   initializeWASI();
   initializeCJSLoader();
-
-  if (!shouldNotRegisterESMLoader) {
-    initializeESMLoader();
-  }
+  initializeESMLoader();
 
   const CJSLoader = require('internal/modules/cjs/loader');
   assert(!CJSLoader.hasLoadedAnyUserCJSModule);
@@ -406,6 +403,8 @@ function initializeESMLoader() {
   // Create this WeakMap in js-land because V8 has no C++ API for WeakMap.
   internalBinding('module_wrap').callbackMap = new SafeWeakMap();
 
+  if (shouldNotRegisterESMLoader) return;
+
   const {
     setImportModuleDynamicallyCallback,
     setInitializeImportMetaObjectCallback

diff --git a/test/cctest/test_environment.cc b/test/cctest/test_environment.cc
@@ -49,12 +49,21 @@ TEST_F(EnvironmentTest, EnvironmentWithESMLoader) {
   node::LoadEnvironment(
       *env,
       "const { SourceTextModule } = require('vm');"
-      "try {"
-        "new SourceTextModule('export const a = 1;');"
+      "(async () => {"
+        "const stmString = 'globalThis.importResult = import(\"\")';"
+        "const m = new SourceTextModule(stmString, {"
+          "importModuleDynamically: (async () => {"
+            "const m = new SourceTextModule('');"
+            "await m.link(() => 0);"
+            "await m.evaluate();"
+            "return m.namespace;"
+          "}),"
+        "});"
+        "await m.link(() => 0);"
+        "await m.evaluate();"
+        "delete globalThis.importResult;"
         "process.exit(0);"
-      "} catch {"
-        "process.exit(42);"
-      "}");
+      "})()");
 }
 
 TEST_F(EnvironmentTest, EnvironmentWithNoESMLoader) {
@@ -67,19 +76,27 @@ TEST_F(EnvironmentTest, EnvironmentWithNoESMLoader) {
 
   SetProcessExitHandler(*env, [&](node::Environment* env_, int exit_code) {
     EXPECT_EQ(*env, env_);
-    EXPECT_EQ(exit_code, 42);
+    EXPECT_EQ(exit_code, 1);
     node::Stop(*env);
   });
 
   node::LoadEnvironment(
       *env,
       "const { SourceTextModule } = require('vm');"
-      "try {"
-        "new SourceTextModule('export const a = 1;');"
-        "process.exit(0);"
-      "} catch {"
-        "process.exit(42);"
-      "}");
+      "(async () => {"
+        "const stmString = 'globalThis.importResult = import(\"\")';"
+        "const m = new SourceTextModule(stmString, {"
+          "importModuleDynamically: (async () => {"
+            "const m = new SourceTextModule('');"
+            "await m.link(() => 0);"
+            "await m.evaluate();"
+            "return m.namespace;"
+          "}),"
+        "});"
+        "await m.link(() => 0);"
+        "await m.evaluate();"
+        "delete globalThis.importResult;"
+      "})()");
 }
 
 TEST_F(EnvironmentTest, PreExecutionPreparation) {