WIP

frontend/scripts/build

@@ -23,21 +23,20 @@ corepack enable;
 corepack install;
 yarn install || exit 1;
 
-rm -rf target/dist;
 rm -rf resources/public;
-
-mkdir -p resources/public;
-
-pushd ../render-wasm;
-./build
-popd
+rm -rf target/dist;
 
 yarn run build:app:main --config-merge "{:release-version \"${CURRENT_HASH}-${TS}\"}" $EXTRA_PARAMS;
+
+if [ "$INCLUDE_WASM" = "yes" ];  then
+    pushd ../render-wasm;
+    ./build
+    popd
+fi
+
 yarn run build:app:libs || exit 1;
 yarn run build:app:assets || exit 1;
 
-sed -i "s/\.\/render.js/.\/render.js?version=$CURRENT_VERSION/g" resources/public/js/worker/main*.js
-
 mkdir -p target/dist;
 rsync -avr resources/public/ target/dist/
 

frontend/shadow-cljs.edn

@@ -94,7 +94,7 @@
    {:main
     {:entries [app.worker]
      :web-worker true
-     :prepend-js "importScripts('./render.js');"
+     :prepend-js "importScripts('/js/worker/render.js');"
      :depends-on #{}}}
 
    :js-options

render-wasm/_build_env

@@ -63,12 +63,6 @@ function clean {
     cargo clean;
 }
 
-function setup {
-    corepack enable;
-    corepack install;
-    yarn install;
-}
-
 function build {
     cargo build $CARGO_PARAMS;
 }
@@ -76,8 +70,6 @@ function build {
 function copy_artifacts {
     DEST=$1;
 
-    mkdir -p $DEST;
-
     cp target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.js $DEST/$BUILD_NAME.js;
     cp target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.wasm $DEST/$BUILD_NAME.wasm;
 

render-wasm/build

@@ -11,7 +11,10 @@ pushd $_SCRIPT_DIR;
 
 set -ex;
 
-setup;
+corepack enable;
+corepack install;
+yarn install;
+
 build;
 copy_artifacts "../frontend/resources/public/js";
 copy_shared_artifact;

render-wasm/watch

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -x
 
 _SCRIPT_DIR=$(dirname $0);
 pushd $_SCRIPT_DIR;