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 <[email protected]> PR-URL: #47286 Reviewed-By: Guy Bedford <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
nodejs · Mar 30, 2023 · 978b57d · 978b57d
1 parent dad0b07
commit 978b57d
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 84 deletions.
diff --git 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
@@ -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/doc/node.1 b/doc/node.1
@@ -194,7 +194,8 @@ 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.
 .
 .It Fl -experimental-wasm-modules
 Enable experimental WebAssembly module support.

diff --git 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,13 +595,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() {
   const { initializeCJS } = require('internal/modules/cjs/loader');
   initializeCJS();

diff --git a/src/node_options.cc b/src/node_options.cc
@@ -447,10 +447,8 @@ 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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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,