module: fix specifier resolution algorithm

Fixes: #30520 PR-URL: #30574 Reviewed-By: Guy Bedford <[email protected]> Reviewed-By: Myles Borins <[email protected]>
nodejs · Nov 30, 2019 · 2cf8a7f · 2cf8a7f
1 parent 6c249c0
commit 2cf8a7f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/lib/internal/modules/run_main.js b/lib/internal/modules/run_main.js
@@ -24,6 +24,10 @@ function shouldUseESMLoader(mainPath) {
   const userLoader = getOptionValue('--experimental-loader');
   if (userLoader)
     return true;
+  const esModuleSpecifierResolution =
+    getOptionValue('--es-module-specifier-resolution');
+  if (esModuleSpecifierResolution === 'node')
+    return true;
   // Determine the module format of the main
   if (mainPath && mainPath.endsWith('.mjs'))
     return true;

diff --git a/test/es-module/test-esm-specifiers.mjs b/test/es-module/test-esm-specifiers.mjs
@@ -1,6 +1,9 @@
 // Flags: --es-module-specifier-resolution=node
 import { mustNotCall } from '../common/index.mjs';
 import assert from 'assert';
+import path from 'path';
+import { spawn } from 'child_process';
+import { fileURLToPath } from 'url';
 
 // commonJS index.js
 import commonjs from '../fixtures/es-module-specifiers/package-type-commonjs';
@@ -33,3 +36,22 @@ async function main() {
 }
 
 main().catch(mustNotCall);
+
+// Test path from command line arguments
+[
+  'package-type-commonjs',
+  'package-type-module',
+  '/',
+  '/index',
+].forEach((item) => {
+  const modulePath = path.join(
+    fileURLToPath(import.meta.url),
+    '../../fixtures/es-module-specifiers',
+    item,
+  );
+  spawn(process.execPath,
+        ['--es-module-specifier-resolution=node', modulePath],
+        { stdio: 'inherit' }).on('exit', (code) => {
+    assert.strictEqual(code, 0);
+  });
+});