From 3d0e33eb944370e174d64a7b0cdca880f11db9f5 Mon Sep 17 00:00:00 2001
From: Guy Bedford <guybedford@gmail.com>
Date: Tue, 17 Dec 2019 01:16:39 -0500
Subject: [PATCH] module: unflag resolve self

PR-URL: https://github.com/nodejs/node/pull/31002
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Jan Krems <jan.krems@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
---
 doc/api/cli.md                      | 9 ---------
 doc/node.1                          | 3 ---
 lib/internal/modules/cjs/loader.js  | 4 +---
 src/module_wrap.cc                  | 3 ---
 src/node_options.cc                 | 4 ----
 src/node_options.h                  | 1 -
 test/es-module/test-esm-exports.mjs | 9 ++-------
 7 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 42517b8b172eb6..20aa501f896985 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -200,14 +200,6 @@ added: v11.8.0
 
 Enable experimental diagnostic report feature.
 
-### `--experimental-resolve-self`
-<!-- YAML
-added: REPLACEME
--->
-
-Enable experimental support for a package using `require` or `import` to load
-itself.
-
 ### `--experimental-specifier-resolution=mode`
 <!-- YAML
 added: REPLACEME
@@ -1079,7 +1071,6 @@ Node.js options that are allowed are:
 * `--experimental-policy`
 * `--experimental-repl-await`
 * `--experimental-report`
-* `--experimental-resolve-self`
 * `--experimental-specifier-resolution`
 * `--experimental-vm-modules`
 * `--experimental-wasm-modules`
diff --git a/doc/node.1 b/doc/node.1
index f07ab3f432ec64..04cc9c57cc9937 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -135,9 +135,6 @@ Enable experimental
 .Sy diagnostic report
 feature.
 .
-.It Fl -experimental-resolve-self
-Enable experimental support for a package to load itself.
-.
 .It Fl -experimental-vm-modules
 Enable experimental ES module support in VM module.
 .
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
index 4c2921e7f957b9..b9587851272b84 100644
--- a/lib/internal/modules/cjs/loader.js
+++ b/lib/internal/modules/cjs/loader.js
@@ -58,7 +58,6 @@ const enableSourceMaps = getOptionValue('--enable-source-maps');
 const preserveSymlinks = getOptionValue('--preserve-symlinks');
 const preserveSymlinksMain = getOptionValue('--preserve-symlinks-main');
 const experimentalModules = getOptionValue('--experimental-modules');
-const experimentalSelf = getOptionValue('--experimental-resolve-self');
 const experimentalConditionalExports =
     getOptionValue('--experimental-conditional-exports');
 const manifest = getOptionValue('--experimental-policy') ?
@@ -421,10 +420,9 @@ function resolveBasePath(basePath, exts, isMain, trailingSlash, request) {
 }
 
 function trySelf(parentPath, isMain, request) {
-  if (!experimentalSelf) {
+  if (!experimentalConditionalExports) {
     return false;
   }
-
   const { data: pkg, path: basePath } = readPackageScope(parentPath) || {};
   if (!pkg || 'exports' in pkg === false) return false;
   if (typeof pkg.name !== 'string') return false;
diff --git a/src/module_wrap.cc b/src/module_wrap.cc
index 454476a1e97815..74eacf198f7b84 100644
--- a/src/module_wrap.cc
+++ b/src/module_wrap.cc
@@ -1153,9 +1153,6 @@ Maybe<URL> ResolveSelf(Environment* env,
                        const std::string& pkg_name,
                        const std::string& pkg_subpath,
                        const URL& base) {
-  if (!env->options()->experimental_resolve_self) {
-    return Nothing<URL>();
-  }
   const PackageConfig* pcfg;
   if (GetPackageScopeConfig(env, base, base).To(&pcfg) &&
       pcfg->exists == Exists::Yes) {
diff --git a/src/node_options.cc b/src/node_options.cc
index 719dabab4600bc..e4e7e4a4c098bb 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -362,10 +362,6 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             "experimental support for conditional exports targets",
             &EnvironmentOptions::experimental_conditional_exports,
             kAllowedInEnvironment);
-  AddOption("--experimental-resolve-self",
-            "experimental support for require/import of the current package",
-            &EnvironmentOptions::experimental_resolve_self,
-            kAllowedInEnvironment);
   AddOption("--experimental-wasm-modules",
             "experimental ES Module support for webassembly modules",
             &EnvironmentOptions::experimental_wasm_modules,
diff --git a/src/node_options.h b/src/node_options.h
index bcc7cc2daee62f..2ea12aa4faf36b 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -104,7 +104,6 @@ class EnvironmentOptions : public Options {
   bool experimental_conditional_exports = false;
   bool experimental_json_modules = false;
   bool experimental_modules = false;
-  bool experimental_resolve_self = false;
   std::string experimental_specifier_resolution;
   std::string es_module_specifier_resolution;
   bool experimental_wasm_modules = false;
diff --git a/test/es-module/test-esm-exports.mjs b/test/es-module/test-esm-exports.mjs
index c37a64bf10cea2..425f9581b586bc 100644
--- a/test/es-module/test-esm-exports.mjs
+++ b/test/es-module/test-esm-exports.mjs
@@ -1,4 +1,4 @@
-// Flags: --experimental-modules --experimental-resolve-self --experimental-conditional-exports
+// Flags: --experimental-modules --experimental-conditional-exports
 
 import { mustCall } from '../common/index.mjs';
 import { path } from '../common/fixtures.mjs';
@@ -171,12 +171,7 @@ function assertIncludes(actual, expected) {
     '--experimental-conditional-exports',
     '/es-modules/conditional-exports.js',
     'Conditional exports',
-  ],
-  [
-    '--experimental-resolve-self',
-    '/node_modules/pkgexports/resolve-self.js',
-    'Package name self resolution',
-  ],
+  ]
 ].forEach(([flag, file, message]) => {
   const child = spawn(process.execPath, [
     '--experimental-modules',