module: pass full URL to loader for top-level load

PR-URL: #29736 Reviewed-By: Bradley Farias <[email protected]> Reviewed-By: David Carlier <[email protected]>
nodejs · Oct 1, 2019 · d1f4bef · d1f4bef
1 parent 69f2634
commit d1f4bef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -1001,7 +1001,7 @@ Module.runMain = function() {
   // Load the main module--the command line argument.
   if (experimentalModules) {
     asyncESM.loaderPromise.then((loader) => {
-      return loader.import(pathToFileURL(process.argv[1]).pathname);
+      return loader.import(pathToFileURL(process.argv[1]).href);
     })
     .catch((e) => {
       internalBinding('errors').triggerUncaughtException(

diff --git a/test/fixtures/es-module-loaders/example-loader.mjs b/test/fixtures/es-module-loaders/example-loader.mjs
@@ -15,11 +15,11 @@ export function resolve(specifier, parentModuleURL = baseURL /*, defaultResolve
       format: 'builtin'
     };
   }
-  if (/^\.{0,2}[/]/.test(specifier) !== true && !specifier.startsWith('file:')) {
+  if (/^\.{1,2}[/]/.test(specifier) !== true && !specifier.startsWith('file:')) {
     // For node_modules support:
     // return defaultResolve(specifier, parentModuleURL);
     throw new Error(
-      `imports must begin with '/', './', or '../'; '${specifier}' does not`);
+      `imports must be URLs or begin with './', or '../'; '${specifier}' does not`);
   }
   const resolved = new url.URL(specifier, parentModuleURL);
   const ext = path.extname(resolved.pathname);