Skip to content

Commit 3115041

Browse files
authoredApr 22, 2024··
cli: remove --no-experimental-fetch flag
PR-URL: #52611 Reviewed-By: Yagiz Nizipli <yagiz.nizipli@sentry.io> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Matthew Aitken <maitken033380023@gmail.com> Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Moshe Atlow <moshe@atlow.co.il> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
1 parent 01c281f commit 3115041

File tree

6 files changed

+4
-42
lines changed

6 files changed

+4
-42
lines changed
 

Diff for: ‎doc/api/cli.md

-10
Original file line numberDiff line numberDiff line change
@@ -1364,14 +1364,6 @@ added: v0.8.0
13641364

13651365
Silence deprecation warnings.
13661366

1367-
### `--no-experimental-fetch`
1368-
1369-
<!-- YAML
1370-
added: v18.0.0
1371-
-->
1372-
1373-
Disable exposition of [Fetch API][] on the global scope.
1374-
13751367
### `--no-experimental-global-customevent`
13761368

13771369
<!-- YAML
@@ -2690,7 +2682,6 @@ one is included in the list below.
26902682
* `--network-family-autoselection-attempt-timeout`
26912683
* `--no-addons`
26922684
* `--no-deprecation`
2693-
* `--no-experimental-fetch`
26942685
* `--no-experimental-global-customevent`
26952686
* `--no-experimental-global-navigator`
26962687
* `--no-experimental-repl-await`
@@ -3166,7 +3157,6 @@ node --stack-trace-limit=12 -p -e "Error.stackTraceLimit" # prints 12
31663157
[DEP0025 warning]: deprecations.md#dep0025-requirenodesys
31673158
[ECMAScript module]: esm.md#modules-ecmascript-modules
31683159
[ExperimentalWarning: `vm.measureMemory` is an experimental feature]: vm.md#vmmeasurememoryoptions
3169-
[Fetch API]: https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API
31703160
[File System Permissions]: permissions.md#file-system-permissions
31713161
[Loading ECMAScript modules using `require()`]: modules.md#loading-ecmascript-modules-using-require
31723162
[Module customization hooks]: module.md#customization-hooks

Diff for: ‎doc/node.1

-3
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,6 @@ Use this flag to enable ShadowRealm support.
183183
.It Fl -experimental-test-coverage
184184
Enable code coverage in the test runner.
185185
.
186-
.It Fl -no-experimental-fetch
187-
Disable experimental support for the Fetch API.
188-
.
189186
.It Fl -no-experimental-websocket
190187
Disable experimental support for the WebSocket API.
191188
.

Diff for: ‎lib/internal/process/pre_execution.js

+2-11
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ function prepareExecution(options) {
103103
setupInspectorHooks();
104104
setupNavigator();
105105
setupWarningHandler();
106-
setupUndici();
106+
setupWebsocket();
107107
setupCustomEvent();
108108
setupCodeCoverage();
109109
setupDebugEnv();
@@ -308,17 +308,8 @@ function setupWarningHandler() {
308308
}
309309
}
310310

311-
// https://fetch.spec.whatwg.org/
312311
// https://websockets.spec.whatwg.org/
313-
function setupUndici() {
314-
if (getOptionValue('--no-experimental-fetch')) {
315-
delete globalThis.fetch;
316-
delete globalThis.FormData;
317-
delete globalThis.Headers;
318-
delete globalThis.Request;
319-
delete globalThis.Response;
320-
}
321-
312+
function setupWebsocket() {
322313
if (getOptionValue('--no-experimental-websocket')) {
323314
delete globalThis.WebSocket;
324315
}

Diff for: ‎src/node_options.cc

+1-5
Original file line numberDiff line numberDiff line change
@@ -396,11 +396,7 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
396396
&EnvironmentOptions::enable_source_maps,
397397
kAllowedInEnvvar);
398398
AddOption("--experimental-abortcontroller", "", NoOp{}, kAllowedInEnvvar);
399-
AddOption("--experimental-fetch",
400-
"experimental Fetch API",
401-
&EnvironmentOptions::experimental_fetch,
402-
kAllowedInEnvvar,
403-
true);
399+
AddOption("--experimental-fetch", "", NoOp{}, kAllowedInEnvvar);
404400
AddOption("--experimental-websocket",
405401
"experimental WebSocket API",
406402
&EnvironmentOptions::experimental_websocket,

Diff for: ‎test/parallel/test-fetch-disabled.mjs

-13
This file was deleted.

Diff for: ‎test/parallel/test-process-env-allowed-flags-are-documented.js

+1
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ const undocumented = difference(process.allowedNodeEnvironmentFlags,
9999
assert(undocumented.delete('--debug-arraybuffer-allocations'));
100100
assert(undocumented.delete('--no-debug-arraybuffer-allocations'));
101101
assert(undocumented.delete('--es-module-specifier-resolution'));
102+
assert(undocumented.delete('--experimental-fetch'));
102103
assert(undocumented.delete('--experimental-global-webcrypto'));
103104
assert(undocumented.delete('--experimental-report'));
104105
assert(undocumented.delete('--experimental-worker'));

0 commit comments

Comments
 (0)
Please sign in to comment.