Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 3d0e33e

Browse filesBrowse files
guybedfordMylesBorins
guybedford
authored and
MylesBorins
committed
module: unflag resolve self
PR-URL: #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>
1 parent 801ea12 commit 3d0e33e
Copy full SHA for 3d0e33e

File tree

Expand file treeCollapse file tree

7 files changed

+3
-30
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

7 files changed

+3
-30
lines changed
Open diff view settings
Collapse file

‎doc/api/cli.md‎

Copy file name to clipboardExpand all lines: doc/api/cli.md
-9Lines changed: 0 additions & 9 deletions
  • Display the source diff
  • Display the rich diff
Original file line numberDiff line numberDiff line change
@@ -200,14 +200,6 @@ added: v11.8.0
200200

201201
Enable experimental diagnostic report feature.
202202

203-
### `--experimental-resolve-self`
204-
<!-- YAML
205-
added: REPLACEME
206-
-->
207-
208-
Enable experimental support for a package using `require` or `import` to load
209-
itself.
210-
211203
### `--experimental-specifier-resolution=mode`
212204
<!-- YAML
213205
added: REPLACEME
@@ -1079,7 +1071,6 @@ Node.js options that are allowed are:
10791071
* `--experimental-policy`
10801072
* `--experimental-repl-await`
10811073
* `--experimental-report`
1082-
* `--experimental-resolve-self`
10831074
* `--experimental-specifier-resolution`
10841075
* `--experimental-vm-modules`
10851076
* `--experimental-wasm-modules`
Collapse file

‎doc/node.1‎

Copy file name to clipboardExpand all lines: doc/node.1
-3Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,6 @@ Enable experimental
135135
.Sy diagnostic report
136136
feature.
137137
.
138-
.It Fl -experimental-resolve-self
139-
Enable experimental support for a package to load itself.
140-
.
141138
.It Fl -experimental-vm-modules
142139
Enable experimental ES module support in VM module.
143140
.
Collapse file

‎lib/internal/modules/cjs/loader.js‎

Copy file name to clipboardExpand all lines: lib/internal/modules/cjs/loader.js
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ const enableSourceMaps = getOptionValue('--enable-source-maps');
5858
const preserveSymlinks = getOptionValue('--preserve-symlinks');
5959
const preserveSymlinksMain = getOptionValue('--preserve-symlinks-main');
6060
const experimentalModules = getOptionValue('--experimental-modules');
61-
const experimentalSelf = getOptionValue('--experimental-resolve-self');
6261
const experimentalConditionalExports =
6362
getOptionValue('--experimental-conditional-exports');
6463
const manifest = getOptionValue('--experimental-policy') ?
@@ -421,10 +420,9 @@ function resolveBasePath(basePath, exts, isMain, trailingSlash, request) {
421420
}
422421

423422
function trySelf(parentPath, isMain, request) {
424-
if (!experimentalSelf) {
423+
if (!experimentalConditionalExports) {
425424
return false;
426425
}
427-
428426
const { data: pkg, path: basePath } = readPackageScope(parentPath) || {};
429427
if (!pkg || 'exports' in pkg === false) return false;
430428
if (typeof pkg.name !== 'string') return false;
Collapse file

‎src/module_wrap.cc‎

Copy file name to clipboardExpand all lines: src/module_wrap.cc
-3Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,9 +1153,6 @@ Maybe<URL> ResolveSelf(Environment* env,
11531153
const std::string& pkg_name,
11541154
const std::string& pkg_subpath,
11551155
const URL& base) {
1156-
if (!env->options()->experimental_resolve_self) {
1157-
return Nothing<URL>();
1158-
}
11591156
const PackageConfig* pcfg;
11601157
if (GetPackageScopeConfig(env, base, base).To(&pcfg) &&
11611158
pcfg->exists == Exists::Yes) {
Collapse file

‎src/node_options.cc‎

Copy file name to clipboardExpand all lines: src/node_options.cc
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -362,10 +362,6 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
362362
"experimental support for conditional exports targets",
363363
&EnvironmentOptions::experimental_conditional_exports,
364364
kAllowedInEnvironment);
365-
AddOption("--experimental-resolve-self",
366-
"experimental support for require/import of the current package",
367-
&EnvironmentOptions::experimental_resolve_self,
368-
kAllowedInEnvironment);
369365
AddOption("--experimental-wasm-modules",
370366
"experimental ES Module support for webassembly modules",
371367
&EnvironmentOptions::experimental_wasm_modules,
Collapse file

‎src/node_options.h‎

Copy file name to clipboardExpand all lines: src/node_options.h
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ class EnvironmentOptions : public Options {
104104
bool experimental_conditional_exports = false;
105105
bool experimental_json_modules = false;
106106
bool experimental_modules = false;
107-
bool experimental_resolve_self = false;
108107
std::string experimental_specifier_resolution;
109108
std::string es_module_specifier_resolution;
110109
bool experimental_wasm_modules = false;
Collapse file

‎test/es-module/test-esm-exports.mjs‎

Copy file name to clipboardExpand all lines: test/es-module/test-esm-exports.mjs
+2-7Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Flags: --experimental-modules --experimental-resolve-self --experimental-conditional-exports
1+
// Flags: --experimental-modules --experimental-conditional-exports
22

33
import { mustCall } from '../common/index.mjs';
44
import { path } from '../common/fixtures.mjs';
@@ -171,12 +171,7 @@ function assertIncludes(actual, expected) {
171171
'--experimental-conditional-exports',
172172
'/es-modules/conditional-exports.js',
173173
'Conditional exports',
174-
],
175-
[
176-
'--experimental-resolve-self',
177-
'/node_modules/pkgexports/resolve-self.js',
178-
'Package name self resolution',
179-
],
174+
]
180175
].forEach(([flag, file, message]) => {
181176
const child = spawn(process.execPath, [
182177
'--experimental-modules',

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.