module: fix specifier resolution option value

Fixes: #35095 PR-URL: #35098 Reviewed-By: Geoffrey Booth <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Myles Borins <[email protected]> Reviewed-By: Rich Trott <[email protected]>
nodejs · Sep 17, 2020 · 314483c · 314483c
1 parent 379c5ce
commit 314483c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 38 deletions.
diff --git a/lib/internal/modules/run_main.js b/lib/internal/modules/run_main.js
@@ -25,7 +25,7 @@ function shouldUseESMLoader(mainPath) {
   if (userLoader)
     return true;
   const esModuleSpecifierResolution =
-    getOptionValue('--es-module-specifier-resolution');
+    getOptionValue('--experimental-specifier-resolution');
   if (esModuleSpecifierResolution === 'node')
     return true;
   // Determine the module format of the main

diff --git a/src/node_options.cc b/src/node_options.cc
@@ -92,20 +92,7 @@ void EnvironmentOptions::CheckOptions(std::vector<std::string>* errors) {
     }
   }
 
-  if (!es_module_specifier_resolution.empty()) {
-    if (!experimental_specifier_resolution.empty()) {
-      errors->push_back(
-        "bad option: cannot use --es-module-specifier-resolution"
-        " and --experimental-specifier-resolution at the same time");
-    } else {
-      experimental_specifier_resolution = es_module_specifier_resolution;
-      if (experimental_specifier_resolution != "node" &&
-          experimental_specifier_resolution != "explicit") {
-        errors->push_back(
-          "invalid value for --es-module-specifier-resolution");
-      }
-    }
-  } else if (!experimental_specifier_resolution.empty()) {
+  if (!experimental_specifier_resolution.empty()) {
     if (experimental_specifier_resolution != "node" &&
         experimental_specifier_resolution != "explicit") {
       errors->push_back(
@@ -366,10 +353,8 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             "either 'explicit' (default) or 'node'",
             &EnvironmentOptions::experimental_specifier_resolution,
             kAllowedInEnvironment);
-  AddOption("--es-module-specifier-resolution",
-            "",
-            &EnvironmentOptions::es_module_specifier_resolution,
-            kAllowedInEnvironment);
+  AddAlias("--es-module-specifier-resolution",
+           "--experimental-specifier-resolution");
   AddOption("--no-deprecation",
             "silence deprecation warnings",
             &EnvironmentOptions::no_deprecation,

diff --git a/src/node_options.h b/src/node_options.h
@@ -105,7 +105,6 @@ class EnvironmentOptions : public Options {
   bool experimental_json_modules = false;
   bool experimental_modules = false;
   std::string experimental_specifier_resolution;
-  std::string es_module_specifier_resolution;
   bool experimental_wasm_modules = false;
   bool experimental_import_meta_resolve = false;
   std::string module_type;

diff --git a/test/es-module/test-esm-specifiers-both-flags.mjs b/test/es-module/test-esm-specifiers-both-flags.mjs
diff --git a/test/es-module/test-esm-specifiers.mjs b/test/es-module/test-esm-specifiers.mjs
@@ -49,9 +49,14 @@ main().catch(mustNotCall);
     '../../fixtures/es-module-specifiers',
     item,
   );
-  spawn(process.execPath,
-        ['--es-module-specifier-resolution=node', modulePath],
-        { stdio: 'inherit' }).on('exit', (code) => {
-    assert.strictEqual(code, 0);
+  [
+    '--experimental-specifier-resolution',
+    '--es-module-specifier-resolution'
+  ].forEach((option) => {
+    spawn(process.execPath,
+          [`${option}=node`, modulePath],
+          { stdio: 'inherit' }).on('exit', (code) => {
+      assert.strictEqual(code, 0);
+    });
   });
 });