web: Don't unnecessarily duplicate the module for single WASM builds

ruffle-rs · Jan 13, 2025 · 23ed90e · 23ed90e
1 parent 8bb90c0
commit 23ed90e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/web/packages/core/src/load-ruffle.ts b/web/packages/core/src/load-ruffle.ts
@@ -63,11 +63,12 @@ async function fetchRuffle(
         ZipWriter,
     } = await (extensionsSupported
         ? import("../dist/ruffle_web-wasm_extensions")
-        : import("../dist/ruffle_web"));
+        : // @ts-expect-error TypeScript compiler is trying to do the import
+          import("../dist/%WASM_MVP%"));
     let response;
     const wasmUrl = extensionsSupported
         ? new URL("../dist/ruffle_web-wasm_extensions_bg.wasm", import.meta.url)
-        : new URL("../dist/ruffle_web_bg.wasm", import.meta.url);
+        : new URL("../dist/%WASM_MVP%_bg.wasm", import.meta.url);
     const wasmResponse = await fetch(wasmUrl);
     // The Pale Moon browser lacks full support for ReadableStream.
     // However, ReadableStream itself is defined.

diff --git a/web/packages/core/tools/set_version.ts b/web/packages/core/tools/set_version.ts
@@ -64,6 +64,11 @@ if (process.env["ENABLE_VERSION_SEAL"] === "true") {
     }
 }
 
+const wasmMvpName =
+    process.env["BUILD_WASM_MVP"] === "true"
+        ? "ruffle_web"
+        : "ruffle_web-wasm_extensions";
+
 const options = {
     files: "dist/**",
     from: [
@@ -72,8 +77,16 @@ const options = {
         /%VERSION_CHANNEL%/g,
         /%BUILD_DATE%/g,
         /%COMMIT_HASH%/g,
+        /%WASM_MVP%/g,
+    ],
+    to: [
+        versionNumber,
+        versionName,
+        versionChannel,
+        buildDate,
+        commitHash,
+        wasmMvpName,
     ],
-    to: [versionNumber, versionName, versionChannel, buildDate, commitHash],
 };
 
 replaceInFileSync(options);