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

guybedford · Trott · commit c42ab995c16a · 2019-09-29T20:12:24.000-07:00
PR-URL: #29736 Reviewed-By: Bradley Farias <bradley.meck@gmail.com> Reviewed-By: David Carlier <devnexen@gmail.com>
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -1002,7 +1002,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);

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,11 @@ export function resolve(specifier, parentModuleURL = baseURL /*, defaultResolve`
`15`	`15`	`format: 'builtin'`
`16`	`16`	`};`
`17`	`17`	`}`
`18`		`- if (/^\.{0,2}[/]/.test(specifier) !== true && !specifier.startsWith('file:')) {`
	`18`	`+ if (/^\.{1,2}[/]/.test(specifier) !== true && !specifier.startsWith('file:')) {`
`19`	`19`	`// For node_modules support:`
`20`	`20`	`// return defaultResolve(specifier, parentModuleURL);`
`21`	`21`	`throw new Error(`
`22`		- `imports must begin with '/', './', or '../'; '${specifier}' does not`);
	`22`	+ `imports must be URLs or begin with './', or '../'; '${specifier}' does not`);
`23`	`23`	`}`
`24`	`24`	`const resolved = new url.URL(specifier, parentModuleURL);`
`25`	`25`	`const ext = path.extname(resolved.pathname);`