From b90489eead514a433b3b33b0a4181d8a51ba7541 Mon Sep 17 00:00:00 2001
From: Michael Dawson <mdawson@devrus.com>
Date: Tue, 28 Mar 2023 15:28:41 -0400
Subject: [PATCH 1/6] wasi: no longer require flag to enable wasi

- no longer require flag to enable experimental wasi feature
- wasi is still documented as experimental

Signed-off-by: Michael Dawson <mdawson@devrus.com>
---
 doc/api/cli.md                               |  4 ++
 doc/api/wasi.md                              |  3 --
 lib/internal/process/pre_execution.js        |  2 -
 src/node_options.cc                          |  5 +-
 src/node_options.h                           |  1 -
 test/parallel/test-repl-built-in-modules.js  | 48 --------------------
 test/wasi/test-return-on-exit.js             |  1 -
 test/wasi/test-wasi-initialize-validation.js |  1 -
 test/wasi/test-wasi-not-started.js           |  1 -
 test/wasi/test-wasi-options-validation.js    |  2 -
 test/wasi/test-wasi-require-flag.js          |  9 ----
 test/wasi/test-wasi-start-validation.js      |  1 -
 test/wasi/test-wasi-stdio.js                 |  1 -
 test/wasi/test-wasi-symlinks.js              |  1 -
 test/wasi/test-wasi-worker-terminate.js      |  1 -
 test/wasi/test-wasi.js                       |  1 -
 16 files changed, 5 insertions(+), 77 deletions(-)
 delete mode 100644 test/parallel/test-repl-built-in-modules.js
 delete mode 100644 test/wasi/test-wasi-require-flag.js

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 6fe2ce6b2be5e7..94116a08fd5dc3 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -626,6 +626,10 @@ added:
   - v13.3.0
   - v12.16.0
 changes:
+  - version: REPLACEME
+    pr-url: https://github.com/nodejs/node/pull/47286
+    description: This option is no longer required as wasi is
+                 enabled by default, but can still be passed.
   - version: v13.6.0
     pr-url: https://github.com/nodejs/node/pull/30980
     description: changed from `--experimental-wasi-unstable-preview0` to
diff --git a/doc/api/wasi.md b/doc/api/wasi.md
index ac395b70894c99..f70470d8dc0732 100644
--- a/doc/api/wasi.md
+++ b/doc/api/wasi.md
@@ -97,9 +97,6 @@ Use [wabt](https://github.com/WebAssembly/wabt) to compile `.wat` to `.wasm`
 $ wat2wasm demo.wat
 ```
 
-The `--experimental-wasi-unstable-preview1` CLI argument is needed for this
-example to run.
-
 ## Class: `WASI`
 
 <!-- YAML
diff --git a/lib/internal/process/pre_execution.js b/lib/internal/process/pre_execution.js
index c7d0def209762f..f70a55e38bfd4a 100644
--- a/lib/internal/process/pre_execution.js
+++ b/lib/internal/process/pre_execution.js
@@ -599,8 +599,6 @@ function readPolicyFromDisk() {
 function initializeWASI() {
   const { BuiltinModule } = require('internal/bootstrap/loaders');
   const mod = BuiltinModule.map.get('wasi');
-  mod.canBeRequiredByUsers =
-    getOptionValue('--experimental-wasi-unstable-preview1');
 }
 
 function initializeCJSLoader() {
diff --git a/src/node_options.cc b/src/node_options.cc
index 648488f5b3f5ea..160909468deb35 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -447,10 +447,7 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             kAllowedInEnvvar);
   AddOption("--experimental-worker", "", NoOp{}, kAllowedInEnvvar);
   AddOption("--experimental-report", "", NoOp{}, kAllowedInEnvvar);
-  AddOption("--experimental-wasi-unstable-preview1",
-            "experimental WASI support",
-            &EnvironmentOptions::experimental_wasi,
-            kAllowedInEnvvar);
+  AddOption("--experimental-wasi-unstable-preview1", "", NoOp{}, kAllowedInEnvvar);
   AddOption("--expose-internals", "", &EnvironmentOptions::expose_internals);
   AddOption("--frozen-intrinsics",
             "experimental frozen intrinsics support",
diff --git a/src/node_options.h b/src/node_options.h
index b5a3505402809d..543ff419db82df 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -190,7 +190,6 @@ class EnvironmentOptions : public Options {
 
   bool syntax_check_only = false;
   bool has_eval_string = false;
-  bool experimental_wasi = false;
   std::string eval_string;
   bool print_eval = false;
   bool force_repl = false;
diff --git a/test/parallel/test-repl-built-in-modules.js b/test/parallel/test-repl-built-in-modules.js
deleted file mode 100644
index 6273367e65a2a7..00000000000000
--- a/test/parallel/test-repl-built-in-modules.js
+++ /dev/null
@@ -1,48 +0,0 @@
-'use strict';
-
-require('../common');
-const assert = require('assert');
-const cp = require('child_process');
-
-function runREPLWithAdditionalFlags(flags) {
-  // Use -i to force node into interactive mode, despite stdout not being a TTY
-  const args = ['-i'].concat(flags);
-  const ret = cp.execFileSync(process.execPath, args, {
-    input: 'require(\'events\');\nrequire(\'wasi\');',
-    encoding: 'utf8',
-  });
-  return ret;
-}
-
-// Run REPL in normal mode.
-let stdout = runREPLWithAdditionalFlags([]);
-assert.match(stdout, /\[Function: EventEmitter\] {/);
-assert.match(
-  stdout,
-  /Uncaught Error: Cannot find module 'wasi'[\w\W]+- <repl>\n/);
-
-// Run REPL with '--experimental-wasi-unstable-preview1'
-stdout = runREPLWithAdditionalFlags([
-  '--experimental-wasi-unstable-preview1',
-]);
-assert.match(stdout, /\[Function: EventEmitter\] {/);
-assert.doesNotMatch(
-  stdout,
-  /Uncaught Error: Cannot find module 'wasi'[\w\W]+- <repl>\n/);
-assert.match(stdout, /{ WASI: \[class WASI\] }/);
-
-{
-  const res = cp.execFileSync(process.execPath, ['-i'], {
-    input: "'wasi' in global",
-    encoding: 'utf8',
-  });
-  // `wasi` shouldn't be defined on global when the flag is not set
-  assert.match(res, /false\n/);
-}
-{
-  const res = cp.execFileSync(process.execPath, ['-i', '--experimental-wasi-unstable-preview1'], {
-    input: "'wasi' in global",
-    encoding: 'utf8',
-  });
-  assert.match(res, /true\n/);
-}
diff --git a/test/wasi/test-return-on-exit.js b/test/wasi/test-return-on-exit.js
index e61f4174c3d4ee..3956ee02066f27 100644
--- a/test/wasi/test-return-on-exit.js
+++ b/test/wasi/test-return-on-exit.js
@@ -1,4 +1,3 @@
-// Flags: --experimental-wasi-unstable-preview1
 'use strict';
 const common = require('../common');
 const assert = require('assert');
diff --git a/test/wasi/test-wasi-initialize-validation.js b/test/wasi/test-wasi-initialize-validation.js
index f1279a6009433d..11464dcf35229d 100644
--- a/test/wasi/test-wasi-initialize-validation.js
+++ b/test/wasi/test-wasi-initialize-validation.js
@@ -1,4 +1,3 @@
-// Flags: --experimental-wasi-unstable-preview1
 'use strict';
 
 const common = require('../common');
diff --git a/test/wasi/test-wasi-not-started.js b/test/wasi/test-wasi-not-started.js
index 28da4fa41b657f..fac42ae193deee 100644
--- a/test/wasi/test-wasi-not-started.js
+++ b/test/wasi/test-wasi-not-started.js
@@ -28,7 +28,6 @@ if (process.argv[2] === 'wasi-child') {
   const cp = require('child_process');
 
   const child = cp.spawnSync(process.execPath, [
-    '--experimental-wasi-unstable-preview1',
     __filename,
     'wasi-child',
   ], {
diff --git a/test/wasi/test-wasi-options-validation.js b/test/wasi/test-wasi-options-validation.js
index 20d7663c0d0c5f..4beb5e8f52a4fb 100644
--- a/test/wasi/test-wasi-options-validation.js
+++ b/test/wasi/test-wasi-options-validation.js
@@ -1,7 +1,5 @@
 'use strict';
 
-// Flags: --experimental-wasi-unstable-preview1
-
 require('../common');
 const assert = require('assert');
 const { WASI } = require('wasi');
diff --git a/test/wasi/test-wasi-require-flag.js b/test/wasi/test-wasi-require-flag.js
deleted file mode 100644
index 0a52ea952d2785..00000000000000
--- a/test/wasi/test-wasi-require-flag.js
+++ /dev/null
@@ -1,9 +0,0 @@
-'use strict';
-// This test verifies that the WASI module cannot be require()'ed without a
-// CLI flag while it is still experimental.
-require('../common');
-const assert = require('assert');
-
-assert.throws(() => {
-  require('wasi');
-}, /^Error: Cannot find module 'wasi'/);
diff --git a/test/wasi/test-wasi-start-validation.js b/test/wasi/test-wasi-start-validation.js
index 01bd1a2bb63624..d856c5c0b8f19c 100644
--- a/test/wasi/test-wasi-start-validation.js
+++ b/test/wasi/test-wasi-start-validation.js
@@ -1,4 +1,3 @@
-// Flags: --experimental-wasi-unstable-preview1
 'use strict';
 
 const common = require('../common');
diff --git a/test/wasi/test-wasi-stdio.js b/test/wasi/test-wasi-stdio.js
index 90ab7caa831c1e..83b9beff8dcfe7 100644
--- a/test/wasi/test-wasi-stdio.js
+++ b/test/wasi/test-wasi-stdio.js
@@ -1,4 +1,3 @@
-// Flags: --experimental-wasi-unstable-preview1
 'use strict';
 const common = require('../common');
 const tmpdir = require('../common/tmpdir');
diff --git a/test/wasi/test-wasi-symlinks.js b/test/wasi/test-wasi-symlinks.js
index 7f6d9302dedf0a..339c33db22b068 100644
--- a/test/wasi/test-wasi-symlinks.js
+++ b/test/wasi/test-wasi-symlinks.js
@@ -63,7 +63,6 @@ if (process.argv[2] === 'wasi-child') {
     console.log('executing', options.test);
     const opts = { env: { ...process.env, NODE_DEBUG_NATIVE: 'wasi' } };
     const child = cp.spawnSync(process.execPath, [
-      '--experimental-wasi-unstable-preview1',
       __filename,
       'wasi-child',
       options.test,
diff --git a/test/wasi/test-wasi-worker-terminate.js b/test/wasi/test-wasi-worker-terminate.js
index a0851e14ad6b62..29657f003ba62c 100644
--- a/test/wasi/test-wasi-worker-terminate.js
+++ b/test/wasi/test-wasi-worker-terminate.js
@@ -1,4 +1,3 @@
-// Flags: --experimental-wasi-unstable-preview1
 'use strict';
 
 const common = require('../common');
diff --git a/test/wasi/test-wasi.js b/test/wasi/test-wasi.js
index b9f7cb9be7b2c6..2ddc4290352a20 100644
--- a/test/wasi/test-wasi.js
+++ b/test/wasi/test-wasi.js
@@ -88,7 +88,6 @@ if (process.argv[2] === 'wasi-child-default') {
 
     const child = cp.spawnSync(process.execPath, [
       ...args,
-      '--experimental-wasi-unstable-preview1',
       __filename,
       'wasi-child-' + flavor,
       options.test,

From cee1f1f6647c0bdd5eabbae4f56030eec266e473 Mon Sep 17 00:00:00 2001
From: Michael Dawson <mdawson@devrus.com>
Date: Tue, 28 Mar 2023 17:08:17 -0400
Subject: [PATCH 2/6] squash: address linter errors

Signed-off-by: Michael Dawson <mdawson@devrus.com>
---
 lib/internal/process/pre_execution.js | 1 -
 src/node_options.cc                   | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/internal/process/pre_execution.js b/lib/internal/process/pre_execution.js
index f70a55e38bfd4a..e4cab79f92474a 100644
--- a/lib/internal/process/pre_execution.js
+++ b/lib/internal/process/pre_execution.js
@@ -598,7 +598,6 @@ function readPolicyFromDisk() {
 
 function initializeWASI() {
   const { BuiltinModule } = require('internal/bootstrap/loaders');
-  const mod = BuiltinModule.map.get('wasi');
 }
 
 function initializeCJSLoader() {
diff --git a/src/node_options.cc b/src/node_options.cc
index 160909468deb35..2a9d4deafa5dd9 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -447,7 +447,8 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             kAllowedInEnvvar);
   AddOption("--experimental-worker", "", NoOp{}, kAllowedInEnvvar);
   AddOption("--experimental-report", "", NoOp{}, kAllowedInEnvvar);
-  AddOption("--experimental-wasi-unstable-preview1", "", NoOp{}, kAllowedInEnvvar);
+  AddOption(
+      "--experimental-wasi-unstable-preview1", "", NoOp{}, kAllowedInEnvvar);
   AddOption("--expose-internals", "", &EnvironmentOptions::expose_internals);
   AddOption("--frozen-intrinsics",
             "experimental frozen intrinsics support",

From c88fccc2d68cc5574a509f2d07abc0c89c2aa145 Mon Sep 17 00:00:00 2001
From: Michael Dawson <mdawson@devrus.com>
Date: Wed, 29 Mar 2023 08:56:12 -0400
Subject: [PATCH 3/6] Update doc/api/cli.md

Co-authored-by: Colin Ihrig <cjihrig@gmail.com>
---
 doc/api/cli.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 94116a08fd5dc3..cda8232ac91d9f 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -628,7 +628,7 @@ added:
 changes:
   - version: REPLACEME
     pr-url: https://github.com/nodejs/node/pull/47286
-    description: This option is no longer required as wasi is
+    description: This option is no longer required as WASI is
                  enabled by default, but can still be passed.
   - version: v13.6.0
     pr-url: https://github.com/nodejs/node/pull/30980

From 2cb55242b7327ace9b4b198a6129dda3a41a60f9 Mon Sep 17 00:00:00 2001
From: Michael Dawson <mdawson@devrus.com>
Date: Wed, 29 Mar 2023 09:07:20 -0400
Subject: [PATCH 4/6] squash: linter fixup

Signed-off-by: Michael Dawson <mdawson@devrus.com>
---
 lib/internal/process/pre_execution.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/internal/process/pre_execution.js b/lib/internal/process/pre_execution.js
index e4cab79f92474a..e292710567b0dc 100644
--- a/lib/internal/process/pre_execution.js
+++ b/lib/internal/process/pre_execution.js
@@ -79,7 +79,6 @@ function prepareExecution(options) {
 
   initializeSourceMapsHandlers();
   initializeDeprecations();
-  initializeWASI();
 
   require('internal/dns/utils').initializeDns();
 
@@ -596,10 +595,6 @@ function readPolicyFromDisk() {
   }
 }
 
-function initializeWASI() {
-  const { BuiltinModule } = require('internal/bootstrap/loaders');
-}
-
 function initializeCJSLoader() {
   const { initializeCJS } = require('internal/modules/cjs/loader');
   initializeCJS();

From 83335184f85a8d5c60bf625944be1db3585299a3 Mon Sep 17 00:00:00 2001
From: Michael Dawson <mdawson@devrus.com>
Date: Wed, 29 Mar 2023 09:10:47 -0400
Subject: [PATCH 5/6] squash: address reveiew comments

Signed-off-by: Michael Dawson <mdawson@devrus.com>
---
 doc/node.1 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/node.1 b/doc/node.1
index a429aa8fec028e..56cb93357f0ee3 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -194,7 +194,9 @@ Disable top-level await keyword support in REPL.
 Enable experimental ES module support in VM module.
 .
 .It Fl -experimental-wasi-unstable-preview1
-Enable experimental WebAssembly System Interface support.
+Enable experimental WebAssembly System Interface support. This
+flag is no longer required as wasi is enabled by default but
+may still be specified.
 .
 .It Fl -experimental-wasm-modules
 Enable experimental WebAssembly module support.

From a317aaa49936ac822d1b105ff09d23e34dc45c71 Mon Sep 17 00:00:00 2001
From: Michael Dawson <mdawson@devrus.com>
Date: Wed, 29 Mar 2023 14:01:57 -0400
Subject: [PATCH 6/6] Update doc/node.1

Co-authored-by: Colin Ihrig <cjihrig@gmail.com>
---
 doc/node.1 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/node.1 b/doc/node.1
index 56cb93357f0ee3..90d0e42e90deb4 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -195,8 +195,7 @@ Enable experimental ES module support in VM module.
 .
 .It Fl -experimental-wasi-unstable-preview1
 Enable experimental WebAssembly System Interface support. This
-flag is no longer required as wasi is enabled by default but
-may still be specified.
+flag is no longer required as WASI is enabled by default.
 .
 .It Fl -experimental-wasm-modules
 Enable experimental WebAssembly module support.