web: Make the default WASM module for npm run build be with extensions

Author: danielhjacobs

.github/workflows/test_web.yml

@@ -52,7 +52,6 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
         with:
           targets: wasm32-unknown-unknown
-          components: rust-src
 
       - name: Cache Cargo output
         uses: Swatinem/rust-cache@v2
@@ -118,7 +117,6 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
         with:
           targets: wasm32-unknown-unknown
-          components: rust-src
 
       - name: Cache Cargo output
         uses: Swatinem/rust-cache@v2

web/README.md

@@ -45,7 +45,6 @@ to update to the latest stable version of rust. You may run `rustup update` to d
 rust using the above instructions).
 
 For the compiler to be able to output WebAssembly, an additional target has to be added to it: `rustup target add wasm32-unknown-unknown`
-Because we use `RUSTC_BOOTSTRAP` in order to use certain Nightly flags with stable Rust you will also need to run `rustup component add rust-src`.
 
 #### Java
 
@@ -104,8 +103,8 @@ In this project, you may run the following commands to build all packages:
     -   This will build the wasm binary and every node package (notably selfhosted and extension).
     -   Output will be available in the `dist/` folder of each package (for example, `./packages/selfhosted/dist`).
     -   You may also use `npm run build:debug` to disable Webpack optimizations and activate the (extremely verbose) ActionScript debugging output.
-    -   There is `npm run build:dual-wasm` as well, to build a second WebAssembly module that makes use of some WebAssembly extensions,
-        potentially resulting in better performance in browsers that support them, at the expense of longer build time.
+    -   There is `npm run build:dual-wasm` as well, to build a second WebAssembly module that disables all supported WebAssembly extensions,
+        potentially resulting in support for more browsers, at the expense of longer build time.
     -   `npm run build:repro` enables reproducible builds. Note that this also requires a `version_seal.json`, which is not provided in the normal Git repository - only specially-marked reproducible source archives. Running this without a version seal will generate one based on the current state of your environment.
     -   You will also need to run `rustup component add rust-src` with either of the previous two commands since we rebuild std for the vanilla WASM module.
 

web/package.json

@@ -45,8 +45,8 @@
     "scripts": {
         "build": "npm run build --workspace=ruffle-core && npm run build --workspace=ruffle-demo --workspace=ruffle-extension --workspace=ruffle-selfhosted",
         "build:debug": "cross-env NODE_ENV=development CARGO_FEATURES=avm_debug npm run build",
-        "build:dual-wasm": "cross-env ENABLE_WASM_EXTENSIONS=true npm run build",
-        "build:repro": "cross-env ENABLE_WASM_EXTENSIONS=true ENABLE_VERSION_SEAL=true npm run build",
+        "build:dual-wasm": "cross-env BUILD_WASM_MVP=true npm run build",
+        "build:repro": "cross-env BUILD_WASM_MVP=true ENABLE_VERSION_SEAL=true npm run build",
         "demo": "npm run preview --workspace ruffle-demo",
         "test": "npm test --workspaces --if-present",
         "wdio": "npm run wdio --workspaces --if-present --",

web/packages/core/tools/build_wasm.ts

@@ -155,7 +155,7 @@ function detectWasmOpt() {
         return false;
     }
 }
-const buildExtensions = !!process.env["ENABLE_WASM_EXTENSIONS"];
+const buildWasmMvp = !!process.env["BUILD_WASM_MVP"];
 const wasmSource = process.env["WASM_SOURCE"] || "cargo";
 const hasWasmOpt = detectWasmOpt();
 if (!hasWasmOpt) {
@@ -167,15 +167,15 @@ if (wasmSource === "cargo_and_store") {
     rmSync("../../dist", { recursive: true, force: true });
     mkdirSync("../../dist");
 }
-buildWasm("web-vanilla-wasm", "ruffle_web", hasWasmOpt, false, wasmSource);
-if (buildExtensions) {
-    buildWasm(
-        "web-wasm-extensions",
-        "ruffle_web-wasm_extensions",
-        hasWasmOpt,
-        true,
-        wasmSource,
-    );
+buildWasm(
+    "web-wasm-extensions",
+    "ruffle_web-wasm_extensions",
+    hasWasmOpt,
+    true,
+    wasmSource,
+);
+if (buildWasmMvp) {
+    buildWasm("web-vanilla-wasm", "ruffle_web", hasWasmOpt, false, wasmSource);
 } else {
-    copyStandIn("ruffle_web", "ruffle_web-wasm_extensions");
+    copyStandIn("ruffle_web-wasm_extensions", "ruffle_web");
 }