From ac17562ce776e2ec60cf035503018a2cfce4178f Mon Sep 17 00:00:00 2001
From: Filip Skokan <panva.ip@gmail.com>
Date: Sat, 20 Apr 2024 17:21:42 +0200
Subject: [PATCH] cli: remove --no-experimental-fetch flag

---
 doc/api/cli.md                                      | 10 ----------
 doc/node.1                                          |  3 ---
 lib/internal/process/pre_execution.js               | 13 ++-----------
 src/node_options.cc                                 |  6 +-----
 test/parallel/test-fetch-disabled.mjs               | 13 -------------
 ...test-process-env-allowed-flags-are-documented.js |  1 +
 6 files changed, 4 insertions(+), 42 deletions(-)
 delete mode 100644 test/parallel/test-fetch-disabled.mjs

diff --git a/doc/api/cli.md b/doc/api/cli.md
index bc5113f0a2b0ff..0870b748102ee1 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -1362,14 +1362,6 @@ added: v0.8.0
 
 Silence deprecation warnings.
 
-### `--no-experimental-fetch`
-
-<!-- YAML
-added: v18.0.0
--->
-
-Disable exposition of [Fetch API][] on the global scope.
-
 ### `--no-experimental-global-customevent`
 
 <!-- YAML
@@ -2688,7 +2680,6 @@ one is included in the list below.
 * `--network-family-autoselection-attempt-timeout`
 * `--no-addons`
 * `--no-deprecation`
-* `--no-experimental-fetch`
 * `--no-experimental-global-customevent`
 * `--no-experimental-global-navigator`
 * `--no-experimental-repl-await`
@@ -3164,7 +3155,6 @@ node --stack-trace-limit=12 -p -e "Error.stackTraceLimit" # prints 12
 [DEP0025 warning]: deprecations.md#dep0025-requirenodesys
 [ECMAScript module]: esm.md#modules-ecmascript-modules
 [ExperimentalWarning: `vm.measureMemory` is an experimental feature]: vm.md#vmmeasurememoryoptions
-[Fetch API]: https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API
 [File System Permissions]: permissions.md#file-system-permissions
 [Loading ECMAScript modules using `require()`]: modules.md#loading-ecmascript-modules-using-require
 [Module customization hooks]: module.md#customization-hooks
diff --git a/doc/node.1 b/doc/node.1
index 6637012d0a399f..d3c9ce8981d886 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -183,9 +183,6 @@ Use this flag to enable ShadowRealm support.
 .It Fl -experimental-test-coverage
 Enable code coverage in the test runner.
 .
-.It Fl -no-experimental-fetch
-Disable experimental support for the Fetch API.
-.
 .It Fl -no-experimental-websocket
 Disable experimental support for the WebSocket API.
 .
diff --git a/lib/internal/process/pre_execution.js b/lib/internal/process/pre_execution.js
index 2c7d9114f1a7e9..bb197a33e2c7ec 100644
--- a/lib/internal/process/pre_execution.js
+++ b/lib/internal/process/pre_execution.js
@@ -103,7 +103,7 @@ function prepareExecution(options) {
   setupInspectorHooks();
   setupNavigator();
   setupWarningHandler();
-  setupUndici();
+  setupWebsocket();
   setupCustomEvent();
   setupCodeCoverage();
   setupDebugEnv();
@@ -308,17 +308,8 @@ function setupWarningHandler() {
   }
 }
 
-// https://fetch.spec.whatwg.org/
 // https://websockets.spec.whatwg.org/
-function setupUndici() {
-  if (getOptionValue('--no-experimental-fetch')) {
-    delete globalThis.fetch;
-    delete globalThis.FormData;
-    delete globalThis.Headers;
-    delete globalThis.Request;
-    delete globalThis.Response;
-  }
-
+function setupWebsocket() {
   if (getOptionValue('--no-experimental-websocket')) {
     delete globalThis.WebSocket;
   }
diff --git a/src/node_options.cc b/src/node_options.cc
index ba347328efc5e9..146812c89c74c2 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -396,11 +396,7 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             &EnvironmentOptions::enable_source_maps,
             kAllowedInEnvvar);
   AddOption("--experimental-abortcontroller", "", NoOp{}, kAllowedInEnvvar);
-  AddOption("--experimental-fetch",
-            "experimental Fetch API",
-            &EnvironmentOptions::experimental_fetch,
-            kAllowedInEnvvar,
-            true);
+  AddOption("--experimental-fetch", "", NoOp{}, kAllowedInEnvvar);
   AddOption("--experimental-websocket",
             "experimental WebSocket API",
             &EnvironmentOptions::experimental_websocket,
diff --git a/test/parallel/test-fetch-disabled.mjs b/test/parallel/test-fetch-disabled.mjs
deleted file mode 100644
index ea6b6807d8dbb5..00000000000000
--- a/test/parallel/test-fetch-disabled.mjs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Flags: --no-experimental-fetch
-import '../common/index.mjs';
-
-import assert from 'assert';
-
-assert.strictEqual(typeof globalThis.fetch, 'undefined');
-assert.strictEqual(typeof globalThis.FormData, 'undefined');
-assert.strictEqual(typeof globalThis.Headers, 'undefined');
-assert.strictEqual(typeof globalThis.Request, 'undefined');
-assert.strictEqual(typeof globalThis.Response, 'undefined');
-
-assert.strictEqual(typeof WebAssembly.compileStreaming, 'undefined');
-assert.strictEqual(typeof WebAssembly.instantiateStreaming, 'undefined');
diff --git a/test/parallel/test-process-env-allowed-flags-are-documented.js b/test/parallel/test-process-env-allowed-flags-are-documented.js
index 3a40e30aa0f305..0953617e20861d 100644
--- a/test/parallel/test-process-env-allowed-flags-are-documented.js
+++ b/test/parallel/test-process-env-allowed-flags-are-documented.js
@@ -99,6 +99,7 @@ const undocumented = difference(process.allowedNodeEnvironmentFlags,
 assert(undocumented.delete('--debug-arraybuffer-allocations'));
 assert(undocumented.delete('--no-debug-arraybuffer-allocations'));
 assert(undocumented.delete('--es-module-specifier-resolution'));
+assert(undocumented.delete('--experimental-fetch'));
 assert(undocumented.delete('--experimental-global-webcrypto'));
 assert(undocumented.delete('--experimental-report'));
 assert(undocumented.delete('--experimental-worker'));