From 5bc8b594d1deebb62bbde4af589afff39982aad3 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Thu, 26 Oct 2023 18:35:13 +0200
Subject: [PATCH 1/3] lib: hide `navigator` behind a flag

---
 doc/api/cli.md                                     | 12 ++++++++++++
 .../bootstrap/web/exposed-window-or-worker.js      |  4 ----
 lib/internal/process/pre_execution.js              | 14 ++++++++++++++
 src/node_options.cc                                |  4 ++++
 src/node_options.h                                 |  1 +
 5 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 3cb36818ae4997..023dfd103112c5 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -646,6 +646,16 @@ CommonJS. This includes `import` and `export` statements and `import.meta`
 references. It does _not_ include `import()` expressions, which are valid in
 CommonJS.
 
+### `--experimental-global-navigator`
+
+<!-- YAML
+added: REPLACEME
+-->
+
+> Stability: 1 - Experimental
+
+Enable exposition of [Navigator API][] on the global scope.
+
 ### `--experimental-import-meta-resolve`
 
 <!-- YAML
@@ -2313,6 +2323,7 @@ Node.js options that are allowed are:
 * `--experimental-abortcontroller`
 * `--experimental-default-type`
 * `--experimental-detect-module`
+* `--experimental-global-navigator`
 * `--experimental-import-meta-resolve`
 * `--experimental-json-modules`
 * `--experimental-loader`
@@ -2763,6 +2774,7 @@ done
 [Module customization hooks]: module.md#customization-hooks
 [Module customization hooks: enabling]: module.md#enabling
 [Modules loaders]: packages.md#modules-loaders
+[Navigator API]: globals.md#navigator
 [Node.js issue tracker]: https://github.com/nodejs/node/issues
 [OSSL_PROVIDER-legacy]: https://www.openssl.org/docs/man3.0/man7/OSSL_PROVIDER-legacy.html
 [Permission Model]: permissions.md#permission-model
diff --git a/lib/internal/bootstrap/web/exposed-window-or-worker.js b/lib/internal/bootstrap/web/exposed-window-or-worker.js
index f7298a9a9028df..37e4518a5400b5 100644
--- a/lib/internal/bootstrap/web/exposed-window-or-worker.js
+++ b/lib/internal/bootstrap/web/exposed-window-or-worker.js
@@ -52,10 +52,6 @@ exposeLazyInterfaces(globalThis, 'perf_hooks', [
 
 defineReplaceableLazyAttribute(globalThis, 'perf_hooks', ['performance']);
 
-// https://html.spec.whatwg.org/multipage/system-state.html#the-navigator-object
-exposeLazyInterfaces(globalThis, 'internal/navigator', ['Navigator']);
-defineReplaceableLazyAttribute(globalThis, 'internal/navigator', ['navigator'], false);
-
 // https://w3c.github.io/FileAPI/#creating-revoking
 const { installObjectURLMethods } = require('internal/url');
 installObjectURLMethods();
diff --git a/lib/internal/process/pre_execution.js b/lib/internal/process/pre_execution.js
index 917ba90a1c8bbb..c535f8e8ed8a5d 100644
--- a/lib/internal/process/pre_execution.js
+++ b/lib/internal/process/pre_execution.js
@@ -77,6 +77,7 @@ function prepareExecution(options) {
   const mainEntry = patchProcessObject(expandArgv1);
   setupTraceCategoryState();
   setupInspectorHooks();
+  setupNavigator();
   setupWarningHandler();
   setupUndici();
   setupWebCrypto();
@@ -336,6 +337,19 @@ function setupUndici() {
   }
 }
 
+// TODO(aduh95): move this to internal/bootstrap/web/* when the CLI flag is
+//               removed.
+function setupNavigator() {
+  if (getEmbedderOptions().noBrowserGlobals ||
+      getOptionValue('--no-experimental-global-navigator')) {
+    return;
+  }
+
+  // https://html.spec.whatwg.org/multipage/system-state.html#the-navigator-object
+  exposeLazyInterfaces(globalThis, 'internal/navigator', ['Navigator']);
+  defineReplaceableLazyAttribute(globalThis, 'internal/navigator', ['navigator'], false);
+}
+
 // TODO(aduh95): move this to internal/bootstrap/web/* when the CLI flag is
 //               removed.
 function setupWebCrypto() {
diff --git a/src/node_options.cc b/src/node_options.cc
index 29cb7fc6b29b89..a85015fca4294e 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -391,6 +391,10 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             &EnvironmentOptions::experimental_global_customevent,
             kAllowedInEnvvar,
             true);
+  AddOption("--experimental-global-navigator",
+            "expose experimental Navigator API on the global scope",
+            &EnvironmentOptions::experimental_global_navigator,
+            kAllowedInEnvvar);
   AddOption("--experimental-global-webcrypto",
             "expose experimental Web Crypto API on the global scope",
             &EnvironmentOptions::experimental_global_web_crypto,
diff --git a/src/node_options.h b/src/node_options.h
index 30955c779714ce..4c5f0ad6a77ae6 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -110,6 +110,7 @@ class EnvironmentOptions : public Options {
   bool experimental_fetch = true;
   bool experimental_websocket = false;
   bool experimental_global_customevent = true;
+  bool experimental_global_navigator = false;
   bool experimental_global_web_crypto = true;
   bool experimental_https_modules = false;
   bool experimental_wasm_modules = false;

From 87f7a412a016f3f48c4cddc98f771d1bb136af15 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Thu, 26 Oct 2023 19:51:11 +0200
Subject: [PATCH 2/3] fixup! lib: hide `navigator` behind a flag

---
 doc/api/globals.md              | 22 ++++++++++++----------
 test/parallel/test-global.js    |  1 -
 test/parallel/test-navigator.js |  1 +
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/doc/api/globals.md b/doc/api/globals.md
index ebaaf2a6e0012e..8319166a05bc7d 100644
--- a/doc/api/globals.md
+++ b/doc/api/globals.md
@@ -598,9 +598,14 @@ This variable may appear to be global but is not. See [`module`][].
 
 <!-- YAML
 added: v21.0.0
+changes:
+  version: REPLACEME
+  pr-url: https://github.com/nodejs/node/pull/50412
+  description: The API is behind the CLI flag `--experimental-global-navigator`.
 -->
 
-> Stability: 1.1 - Active development
+> Stability: 1.1 - Active development. Use `--experimental-global-navigator` to
+> enable this feature.
 
 A partial implementation of the [Navigator API][].
 
@@ -608,20 +613,17 @@ A partial implementation of the [Navigator API][].
 
 <!-- YAML
 added: v21.0.0
+changes:
+  version: REPLACEME
+  pr-url: https://github.com/nodejs/node/pull/50412
+  description: The API is behind the CLI flag `--experimental-global-navigator`.
 -->
 
-> Stability: 1.1 - Active development
+> Stability: 1.1 - Active development. Use `--experimental-global-navigator` to
+> enable this feature.
 
 A partial implementation of [`window.navigator`][].
 
-If your app or a dependency uses a check for `navigator` to determine whether it
-is running in a browser, the following can be used to delete the `navigator`
-global before app code runs:
-
-```bash
-node --import 'data:text/javascript,delete globalThis.navigator' app.js
-```
-
 ### `navigator.hardwareConcurrency`
 
 <!-- YAML
diff --git a/test/parallel/test-global.js b/test/parallel/test-global.js
index 0a8fecd240c8a1..9ac9b4f7287327 100644
--- a/test/parallel/test-global.js
+++ b/test/parallel/test-global.js
@@ -58,7 +58,6 @@ builtinModules.forEach((moduleName) => {
     'structuredClone',
     'fetch',
     'crypto',
-    'navigator',
   ];
   assert.deepStrictEqual(new Set(Object.keys(global)), new Set(expected));
 }
diff --git a/test/parallel/test-navigator.js b/test/parallel/test-navigator.js
index 24839301478a74..d8b302f1818b8c 100644
--- a/test/parallel/test-navigator.js
+++ b/test/parallel/test-navigator.js
@@ -1,3 +1,4 @@
+// Flags: --experimental-global-navigator
 'use strict';
 
 require('../common');

From 60460446e61564ed4517eec3045c4f2a1f9ce029 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Thu, 26 Oct 2023 20:42:31 +0200
Subject: [PATCH 3/3] fixup! fixup! lib: hide `navigator` behind a flag

---
 doc/api/globals.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/api/globals.md b/doc/api/globals.md
index 8319166a05bc7d..5299cc401fc923 100644
--- a/doc/api/globals.md
+++ b/doc/api/globals.md
@@ -599,9 +599,9 @@ This variable may appear to be global but is not. See [`module`][].
 <!-- YAML
 added: v21.0.0
 changes:
-  version: REPLACEME
-  pr-url: https://github.com/nodejs/node/pull/50412
-  description: The API is behind the CLI flag `--experimental-global-navigator`.
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/50412
+    description: The API is behind the CLI flag `--experimental-global-navigator`.
 -->
 
 > Stability: 1.1 - Active development. Use `--experimental-global-navigator` to
@@ -614,9 +614,9 @@ A partial implementation of the [Navigator API][].
 <!-- YAML
 added: v21.0.0
 changes:
-  version: REPLACEME
-  pr-url: https://github.com/nodejs/node/pull/50412
-  description: The API is behind the CLI flag `--experimental-global-navigator`.
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/50412
+    description: The API is behind the CLI flag `--experimental-global-navigator`.
 -->
 
 > Stability: 1.1 - Active development. Use `--experimental-global-navigator` to