From fed49b2c3567be8b9c5e983e2777a07043bf176f Mon Sep 17 00:00:00 2001
From: Guy Bedford <guybedford@gmail.com>
Date: Mon, 18 May 2020 21:42:06 -0700
Subject: [PATCH 1/2] esm: unflag import.meta.resolve

---
 doc/api/cli.md                                  | 10 ----------
 doc/api/esm.md                                  |  3 +--
 doc/node.1                                      |  3 ---
 lib/internal/modules/esm/translators.js         |  6 +-----
 src/node_options.cc                             |  4 ----
 src/node_options.h                              |  1 -
 test/es-module/test-esm-import-meta-resolve.mjs |  1 -
 test/es-module/test-esm-nowarn-exports.mjs      |  1 -
 8 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 82e2f674a8a9ac..4452ca203b555a 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -165,15 +165,6 @@ Enable experimental Source Map V3 support for stack traces.
 Currently, overriding `Error.prepareStackTrace` is ignored when the
 `--enable-source-maps` flag is set.
 
-### `--experimental-import-meta-resolve`
-<!-- YAML
-added:
-  - v13.9.0
-  - v12.16.2
--->
-
-Enable experimental `import.meta.resolve()` support.
-
 ### `--experimental-json-modules`
 <!-- YAML
 added: v12.9.0
@@ -1180,7 +1171,6 @@ Node.js options that are allowed are:
 * `--disable-proto`
 * `--enable-fips`
 * `--enable-source-maps`
-* `--experimental-import-meta-resolve`
 * `--experimental-json-modules`
 * `--experimental-loader`
 * `--experimental-modules`
diff --git a/doc/api/esm.md b/doc/api/esm.md
index e5c957d03ce6a0..cda282d3f4cf9a 100644
--- a/doc/api/esm.md
+++ b/doc/api/esm.md
@@ -894,8 +894,7 @@ const __dirname = dirname(__filename);
 ### No `require.resolve`
 
 Former use cases relying on `require.resolve` to determine the resolved path
-of a module can be supported via `import.meta.resolve`, which is experimental
-and supported via the `--experimental-import-meta-resolve` flag:
+of a module can be supported via `import.meta.resolve`:
 
 ```js
 (async () => {
diff --git a/doc/node.1 b/doc/node.1
index 278061424c07c6..d90eae06705654 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -121,9 +121,6 @@ Requires Node.js to be built with
 .It Fl -enable-source-maps
 Enable experimental Source Map V3 support for stack traces.
 .
-.It Fl -experimental-import-meta-resolve
-Enable experimental ES modules support for import.meta.resolve().
-.
 .It Fl -experimental-json-modules
 Enable experimental JSON interop support for the ES Module loader.
 .
diff --git a/lib/internal/modules/esm/translators.js b/lib/internal/modules/esm/translators.js
index a7252c1c99f954..56f6c045a1ef2c 100644
--- a/lib/internal/modules/esm/translators.js
+++ b/lib/internal/modules/esm/translators.js
@@ -30,9 +30,6 @@ const { ERR_UNKNOWN_BUILTIN_MODULE } = require('internal/errors').codes;
 const { maybeCacheSourceMap } = require('internal/source_map/source_map_cache');
 const moduleWrap = internalBinding('module_wrap');
 const { ModuleWrap } = moduleWrap;
-const { getOptionValue } = require('internal/options');
-const experimentalImportMetaResolve =
-    getOptionValue('--experimental-import-meta-resolve');
 
 const debug = debuglog('esm');
 
@@ -71,8 +68,7 @@ function createImportMetaResolve(defaultParentUrl) {
 
 function initializeImportMeta(meta, { url }) {
   // Alphabetical
-  if (experimentalImportMetaResolve)
-    meta.resolve = createImportMetaResolve(url);
+  meta.resolve = createImportMetaResolve(url);
   meta.url = url;
 }
 
diff --git a/src/node_options.cc b/src/node_options.cc
index 013c3ef825efd6..23daae96fe6100 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -292,10 +292,6 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             "experimental ES Module support for webassembly modules",
             &EnvironmentOptions::experimental_wasm_modules,
             kAllowedInEnvironment);
-  AddOption("--experimental-import-meta-resolve",
-            "experimental ES Module import.meta.resolve() support",
-            &EnvironmentOptions::experimental_import_meta_resolve,
-            kAllowedInEnvironment);
   AddOption("--experimental-policy",
             "use the specified file as a "
             "security policy",
diff --git a/src/node_options.h b/src/node_options.h
index 54710e487701dd..3c4caff935e0c3 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -106,7 +106,6 @@ class EnvironmentOptions : public Options {
   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;
   std::string experimental_policy;
   std::string experimental_policy_integrity;
diff --git a/test/es-module/test-esm-import-meta-resolve.mjs b/test/es-module/test-esm-import-meta-resolve.mjs
index faf9320a82745a..e5a499877e961b 100644
--- a/test/es-module/test-esm-import-meta-resolve.mjs
+++ b/test/es-module/test-esm-import-meta-resolve.mjs
@@ -1,4 +1,3 @@
-// Flags: --experimental-import-meta-resolve
 import '../common/index.mjs';
 import assert from 'assert';
 
diff --git a/test/es-module/test-esm-nowarn-exports.mjs b/test/es-module/test-esm-nowarn-exports.mjs
index 5e0927f4674f84..e8825875251ffe 100644
--- a/test/es-module/test-esm-nowarn-exports.mjs
+++ b/test/es-module/test-esm-nowarn-exports.mjs
@@ -4,7 +4,6 @@ import { strictEqual, ok } from 'assert';
 import { spawn } from 'child_process';
 
 const child = spawn(process.execPath, [
-  '--experimental-import-meta-resolve',
   path('/es-modules/import-resolve-exports.mjs')
 ]);
 

From 98d8b07352c7e7d4c526cebcb4acfb1e97191540 Mon Sep 17 00:00:00 2001
From: Guy Bedford <guybedford@gmail.com>
Date: Mon, 18 May 2020 22:01:00 -0700
Subject: [PATCH 2/2] fixup: import.meta test

---
 test/es-module/test-esm-import-meta.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/es-module/test-esm-import-meta.mjs b/test/es-module/test-esm-import-meta.mjs
index 0151177b21c302..4c5aa902d4a970 100644
--- a/test/es-module/test-esm-import-meta.mjs
+++ b/test/es-module/test-esm-import-meta.mjs
@@ -3,7 +3,7 @@ import assert from 'assert';
 
 assert.strictEqual(Object.getPrototypeOf(import.meta), null);
 
-const keys = ['url'];
+const keys = ['resolve', 'url'];
 assert.deepStrictEqual(Reflect.ownKeys(import.meta), keys);
 
 const descriptors = Object.getOwnPropertyDescriptors(import.meta);