module: fix extension lookups for top-level main

guybedford · Qard · commit af2b416ccd11 · 2017-11-01T20:49:31.000-07:00
The reason is that absolute URLs do not go through extension and index checks. By switching to an absolute path, the resolver still applies extensions properly to the top-level main. PR-URL: nodejs/node#16526 Fixes: nodejs/node#16476 Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
diff --git a/lib/module.js b/lib/module.js
@@ -436,7 +436,7 @@ Module._load = function(request, parent, isMain) {
           ESMLoader.hook(hooks);
         }
       }
-      await ESMLoader.import(getURLFromFilePath(request).href);
+      await ESMLoader.import(getURLFromFilePath(request).pathname);
     })()
     .catch((e) => {
       console.error(e);
diff --git a/test/parallel/test-module-main-extension-lookup.js b/test/parallel/test-module-main-extension-lookup.js
@@ -0,0 +1,7 @@
+'use strict';
+require('../common');
+const { execFileSync } = require('child_process');
+
+const node = process.argv[0];
+
+execFileSync(node, ['--experimental-modules', 'test/es-module/test-esm-ok']);

Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@ Module._load = function(request, parent, isMain) {`
`436`	`436`	`ESMLoader.hook(hooks);`
`437`	`437`	`}`
`438`	`438`	`}`
`439`		`- await ESMLoader.import(getURLFromFilePath(request).href);`
	`439`	`+ await ESMLoader.import(getURLFromFilePath(request).pathname);`
`440`	`440`	`})()`
`441`	`441`	`.catch((e) => {`
`442`	`442`	`console.error(e);`