From 34310f21969d0dbb980190820bc8ea4fcd595f74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gunnlaugur=20=C3=9E=C3=B3r=20Briem?= <gunnlaugur@gmail.com>
Date: Sat, 12 Mar 2022 11:02:45 +0000
Subject: [PATCH] module: unflag WASM modules
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

WebAssembly has been unflagged in V8 for years, and is presented on
equal footing with Javascript in [how V8 describes itself][v8.dev] for
years now ("Google’s open source high-performance JavaScript and
WebAssembly engine").

I can't find any specified reasons to keep it flagged and called
experimental in Node (though maybe this PR will draw those out?).

Following https://github.com/nodejs/node/pull/41736 as a model, this PR
leaves the flag present as a no-op and removes it from documentation,
but keeps the "Stability: 1 - Experimental" in esm.md and the runtime
warning message.  I want to remove those too (or else draw out some
specified reasons not to :) ) but there appears to be a convention of
decoupling unflagging from stabilizing:
https://github.com/nodejs/node/pull/41736#discussion_r794963854, so,
like JSON modules, maybe drop the warning in 18.0.0?

[v8.dev]: https://v8.dev/
---
 doc/api/cli.md                      | 14 ++------------
 doc/api/esm.md                      | 11 ++---------
 doc/node.1                          |  3 ---
 lib/internal/modules/esm/formats.js | 12 +++---------
 src/node_options.cc                 |  5 +----
 src/node_options.h                  |  1 -
 test/es-module/test-esm-wasm.mjs    |  2 --
 7 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index 8bfb1e9792ace5..9533c7f0d9cd4e 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -44,9 +44,8 @@ Otherwise, the file is loaded using the CommonJS module loader. See
 ### ECMAScript modules loader entry point caveat
 
 When loading [ECMAScript module loader][] loads the program entry point, the `node`
-command will only accept as input only files with `.js`, `.mjs`, or `.cjs`
-extensions; and with `.wasm` extensions when
-[`--experimental-wasm-modules`][] is enabled.
+command will only accept as input only files with `.js`, `.mjs`, `.cjs`, or
+`.wasm` extensions.
 
 ## Options
 
@@ -381,14 +380,6 @@ changes:
 
 Enable experimental WebAssembly System Interface (WASI) support.
 
-### `--experimental-wasm-modules`
-
-<!-- YAML
-added: v12.3.0
--->
-
-Enable experimental WebAssembly module support.
-
 ### `--force-context-aware`
 
 <!-- YAML
@@ -1995,7 +1986,6 @@ $ node --max-old-space-size=1536 index.js
 [`"type"`]: packages.md#type
 [`--cpu-prof-dir`]: #--cpu-prof-dir
 [`--diagnostic-dir`]: #--diagnostic-dirdirectory
-[`--experimental-wasm-modules`]: #--experimental-wasm-modules
 [`--heap-prof-dir`]: #--heap-prof-dir
 [`--openssl-config`]: #--openssl-configfile
 [`--redirect-warnings`]: #--redirect-warningsfile
diff --git a/doc/api/esm.md b/doc/api/esm.md
index 85cf281370dcc0..20fcdc1f30eee6 100644
--- a/doc/api/esm.md
+++ b/doc/api/esm.md
@@ -537,9 +537,8 @@ imported from the same path.
 
 > Stability: 1 - Experimental
 
-Importing WebAssembly modules is supported under the
-`--experimental-wasm-modules` flag, allowing any `.wasm` files to be
-imported as normal modules while also supporting their module imports.
+WebAssembly modules can be imported as normal modules while also supporting
+their module imports.
 
 This integration is in line with the
 [ES Module Integration Proposal for WebAssembly][].
@@ -551,12 +550,6 @@ import * as M from './module.wasm';
 console.log(M);
 ```
 
-executed under:
-
-```bash
-node --experimental-wasm-modules index.mjs
-```
-
 would provide the exports interface for the instantiation of `module.wasm`.
 
 <i id="esm_experimental_top_level_await"></i>
diff --git a/doc/node.1 b/doc/node.1
index 27b3365140cc57..241b24181f4038 100644
--- a/doc/node.1
+++ b/doc/node.1
@@ -171,9 +171,6 @@ Enable experimental ES module support in VM module.
 .It Fl -experimental-wasi-unstable-preview1
 Enable experimental WebAssembly System Interface support.
 .
-.It Fl -experimental-wasm-modules
-Enable experimental WebAssembly module support.
-.
 .It Fl -force-context-aware
 Disable loading native addons that are not context-aware.
 .
diff --git a/lib/internal/modules/esm/formats.js b/lib/internal/modules/esm/formats.js
index 6f145931a1eed4..2c9bd5bf9491c7 100644
--- a/lib/internal/modules/esm/formats.js
+++ b/lib/internal/modules/esm/formats.js
@@ -3,10 +3,6 @@
 const {
   RegExpPrototypeTest,
 } = primordials;
-const { getOptionValue } = require('internal/options');
-
-
-const experimentalWasmModules = getOptionValue('--experimental-wasm-modules');
 
 const extensionFormatMap = {
   '__proto__': null,
@@ -14,6 +10,7 @@ const extensionFormatMap = {
   '.js': 'module',
   '.json': 'json',
   '.mjs': 'module',
+  '.wasm': 'wasm',
 };
 
 const legacyExtensionFormatMap = {
@@ -23,12 +20,9 @@ const legacyExtensionFormatMap = {
   '.json': 'commonjs',
   '.mjs': 'module',
   '.node': 'commonjs',
+  '.wasm': 'wasm',
 };
 
-if (experimentalWasmModules) {
-  extensionFormatMap['.wasm'] = legacyExtensionFormatMap['.wasm'] = 'wasm';
-}
-
 function mimeToFormat(mime) {
   if (
     RegExpPrototypeTest(
@@ -37,7 +31,7 @@ function mimeToFormat(mime) {
     )
   ) return 'module';
   if (mime === 'application/json') return 'json';
-  if (experimentalWasmModules && mime === 'application/wasm') return 'wasm';
+  if (mime === 'application/wasm') return 'wasm';
   return null;
 }
 
diff --git a/src/node_options.cc b/src/node_options.cc
index 35ee54d223176a..c27bdecacdaa13 100644
--- a/src/node_options.cc
+++ b/src/node_options.cc
@@ -336,10 +336,7 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
             "experimental https: support for the ES Module loader",
             &EnvironmentOptions::experimental_https_modules,
             kAllowedInEnvironment);
-  AddOption("--experimental-wasm-modules",
-            "experimental ES Module support for webassembly modules",
-            &EnvironmentOptions::experimental_wasm_modules,
-            kAllowedInEnvironment);
+  AddOption("--experimental-wasm-modules", "", NoOp{}, kAllowedInEnvironment);
   AddOption("--experimental-import-meta-resolve",
             "experimental ES Module import.meta.resolve() support",
             &EnvironmentOptions::experimental_import_meta_resolve,
diff --git a/src/node_options.h b/src/node_options.h
index 3335c12b8cdcf7..35a08702aa9e7d 100644
--- a/src/node_options.h
+++ b/src/node_options.h
@@ -111,7 +111,6 @@ class EnvironmentOptions : public Options {
   bool experimental_global_web_crypto = false;
   bool experimental_https_modules = false;
   std::string experimental_specifier_resolution;
-  bool experimental_wasm_modules = false;
   bool experimental_import_meta_resolve = false;
   std::string module_type;
   std::string experimental_policy;
diff --git a/test/es-module/test-esm-wasm.mjs b/test/es-module/test-esm-wasm.mjs
index 01717c47714f6a..d38103e2807f8c 100644
--- a/test/es-module/test-esm-wasm.mjs
+++ b/test/es-module/test-esm-wasm.mjs
@@ -1,4 +1,3 @@
-// Flags: --experimental-wasm-modules
 import '../common/index.mjs';
 import { path } from '../common/fixtures.mjs';
 import { add, addImported } from '../fixtures/es-modules/simple.wasm';
@@ -18,7 +17,6 @@ strictEqual(addImported(1), 43);
 
 // Test warning message
 const child = spawn(process.execPath, [
-  '--experimental-wasm-modules',
   path('/es-modules/wasm-modules.mjs'),
 ]);