[wasm] prepare web bundle data separately from build

.github/workflows/emscripten.yml

@@ -45,9 +45,6 @@ jobs:
 
     - uses: mymindstorm/setup-emsdk@v14
 
-    - name: Prepare web data
-      run: ./build-scripts/prepare-web-data.sh
-
     - name: Install ccache
       run: |
         emsdk install ccache-git-emscripten-64bit

.github/workflows/release.yml

@@ -266,7 +266,6 @@ jobs:
       - name: Build CDDA (WebAssembly)
         if: matrix.wasm
         run: |
-          ./build-scripts/prepare-web-data.sh
           ./build-scripts/build-emscripten.sh
           ./build-scripts/prepare-web.sh
           (cd build && zip ../cdda-${{ matrix.artifact }}-${{ needs.release.outputs.timestamp }}.${{ matrix.ext }} *)

Makefile

@@ -650,7 +650,7 @@ ifeq ($(NATIVE), emscripten)
   CXXFLAGS += $(EMCC_COMMON_FLAGS)
   LDFLAGS += $(EMCC_COMMON_FLAGS)
 
-  LDFLAGS += --preload-file web_bundle@/
+  LDFLAGS += -sFORCE_FILESYSTEM
   LDFLAGS += -sEXPORTED_RUNTIME_METHODS=['FS','stackTrace','jsStackTrace']
   LDFLAGS += -sINITIAL_MEMORY=512MB
   LDFLAGS += -sMAXIMUM_MEMORY=4GB

build-data/web/index.html

@@ -298,6 +298,7 @@
           e.preventDefault();
       }
     </script>
+    <script async type="text/javascript" src="cataclysm-tiles.data.js"></script>
     <script async type="text/javascript" src="cataclysm-tiles.js"></script>
   </body>
 </html>

build-scripts/prepare-web.sh

@@ -1,10 +1,32 @@
 #!/bin/bash
 set -exo pipefail
 
+rm -rf web_bundle
+
+BUNDLE_DIR=web_bundle
+DATA_DIR=$BUNDLE_DIR/data
+mkdir -p $DATA_DIR
+cp -R data/{core,font,fontdata.json,json,mods,names,raw,motd,credits,title,help} $DATA_DIR/
+cp -R gfx $BUNDLE_DIR/
+
+# Remove .DS_Store files.
+find web_bundle -name ".DS_Store" -type f -exec rm {} \;
+
+# Remove obsolete mods.
+echo "Removing obsolete mods..."
+for MOD_DIR in $DATA_DIR/mods/*/ ; do
+    if jq -e '.[] | select(.type == "MOD_INFO") | .obsolete' "$MOD_DIR/modinfo.json" >/dev/null; then
+        echo "$MOD_DIR is obsolete, excluding from web_bundle..."
+        rm -rf $MOD_DIR
+    fi
+done
+
+$EMSDK/upstream/emscripten/tools/file_packager cataclysm-tiles.data --js-output=cataclysm-tiles.data.js --no-node --preload "$BUNDLE_DIR""@/"
+
 mkdir -p build/
 cp \
   build-data/web/index.html \
-  cataclysm-tiles.{data,js,wasm} \
+  cataclysm-tiles.{data,data.js,js,wasm} \
   data/font/Terminus.ttf \
   build
 cp data/cataicon.ico build/favicon.ico