CR

nodejs · Jul 24, 2022 · dfad8f5 · dfad8f5
1 parent 5a15e7a
commit dfad8f5
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/lib/internal/process/esm_loader.js b/lib/internal/process/esm_loader.js
@@ -58,23 +58,23 @@ async function initializeLoader() {
   const { getOptionValue } = require('internal/options');
   const customLoaders = getOptionValue('--experimental-loader');
   const preloadModules = getOptionValue('--experimental-import');
-  const keyedExportsList = await loadInternalModules(customLoaders);
+  const keyedExportsList = await loadModulesInIsolation(customLoaders);
 
   // Hooks must then be added to external/public loader
   // (so they're triggered in userland)
+  // TODO(@JakobJingleheimer) this should be synchronous
   await esmLoader.addCustomLoaders(keyedExportsList);
 
   // Preload after loaders are added so they can be used
   if (preloadModules?.length) {
-    await loadInternalModules(preloadModules);
+    await loadModulesInIsolation(preloadModules);
   }
 
   isESMInitialized = true;
 }
 
-async function loadInternalModules(requests) {
-  if (!ArrayIsArray(requests) || requests.length === 0)
-    return;
+async function loadModulesInIsolation(specifiers) {
+  if (!ArrayIsArray(specifiers) || specifiers.length === 0) return;
 
   let cwd;
   try {
@@ -90,7 +90,7 @@ async function loadInternalModules(requests) {
 
   // Importation must be handled by internal loader to avoid poluting userland
   return internalEsmLoader.import(
-    requests,
+    specifiers,
     pathToFileURL(cwd).href,
     ObjectCreate(null),
   );