Revert "web: Simplify .wasm loading"

This reverts commit 66bfff7.
ruffle-rs · Jul 27, 2021 · 508f541 · 508f541
1 parent 66bfff7
commit 508f541
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/web/packages/core/src/load-ruffle.ts b/web/packages/core/src/load-ruffle.ts
@@ -20,7 +20,13 @@ async function fetchRuffle(): Promise<typeof Ruffle> {
     // libraries, if needed.
     setPolyfillsOnLoad();
 
-    await init();
+    // wasm files are set to be resource assets,
+    // so this import will resolve to the URL of the wasm file.
+    const ruffleWasm = await import(
+        /* webpackMode: "eager" */
+        "../pkg/ruffle_web_bg.wasm"
+    );
+    await init(ruffleWasm.default);
 
     return Ruffle;
 }

diff --git a/web/packages/demo/webpack.config.js b/web/packages/demo/webpack.config.js
@@ -22,6 +22,10 @@ module.exports = (_env, _argv) => {
                     test: /\.css$/i,
                     use: ["style-loader", "css-loader"],
                 },
+                {
+                    test: /\.wasm$/i,
+                    type: "asset/resource",
+                },
             ],
         },
         devtool: "source-map",

diff --git a/web/packages/extension/webpack.config.js b/web/packages/extension/webpack.config.js
@@ -62,6 +62,10 @@ module.exports = (env, _argv) => {
                     test: /\.ts$/i,
                     use: "ts-loader",
                 },
+                {
+                    test: /\.wasm$/i,
+                    type: "asset/resource",
+                },
             ],
         },
         resolve: {

diff --git a/web/packages/selfhosted/webpack.config.js b/web/packages/selfhosted/webpack.config.js
@@ -17,6 +17,14 @@ module.exports = (_env, _argv) => {
             chunkFilename: "core.ruffle.[contenthash].js",
             clean: true,
         },
+        module: {
+            rules: [
+                {
+                    test: /\.wasm$/i,
+                    type: "asset/resource",
+                },
+            ],
+        },
         devtool: "source-map",
         plugins: [
             new CopyPlugin({