From 66262dc2d65fa9eae766317738cdf6a297215fb8 Mon Sep 17 00:00:00 2001
From: jedel1043 <jedel0124@gmail.com>
Date: Wed, 6 Dec 2023 04:14:24 -0600
Subject: [PATCH] Fix CI

---
 .github/workflows/webassembly.yml |  4 +++-
 webpack.config.js                 | 21 ++++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/webassembly.yml b/.github/workflows/webassembly.yml
index f3b29fccbf2..c3cca6d2ece 100644
--- a/.github/workflows/webassembly.yml
+++ b/.github/workflows/webassembly.yml
@@ -52,7 +52,9 @@ jobs:
           node-version: "16"
       - run: npm ci
       - name: Build Playground
-        run: npm run build
+        run: |
+          wasm-pack build --verbose ./ffi/wasm
+          npm run build
       - name: Install Playwright Browsers
         run: npx playwright install --with-deps
       - name: Run Playwright test
diff --git a/webpack.config.js b/webpack.config.js
index 338c0eedbce..0bbe5df3e3b 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -45,14 +45,17 @@ module.exports = {
     }),
     new CleanWebpackPlugin(),
     new HtmlWebpackPlugin({ template: "index.html" }),
-    // WasmPackPlugin can not work in CI environment
-    !process.env.CI
-      ? new WasmPackPlugin({
-          crateDirectory: path.resolve(__dirname, "./ffi/wasm/"),
-          outDir: path.resolve(__dirname, "./ffi/wasm/pkg/"),
-          forceMode: "production",
-        })
-      : undefined,
+    // WasmPackPlugin doesn't work in CI environment
+    // thanks to https://github.com/wasm-tool/wasm-pack-plugin/issues/90
+    ...(!process.env.CI
+      ? [
+          new WasmPackPlugin({
+            crateDirectory: path.resolve(__dirname, "./ffi/wasm/"),
+            outDir: path.resolve(__dirname, "./ffi/wasm/pkg/"),
+            forceMode: "production",
+          }),
+        ]
+      : []),
     new CopyWebpackPlugin({
       patterns: [
         {
@@ -65,7 +68,7 @@ module.exports = {
         },
       ],
     }),
-  ].filter(Boolean),
+  ],
   module: {
     rules: [
       {