From 689cddfd0cd72e2720416667c37474523c855c5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bel=C3=A9n=20Albeza?= <belen@hey.com>
Date: Wed, 16 Apr 2025 15:05:31 +0200
Subject: [PATCH 1/2] :wrench: Use cargo env variable for target and allow to
 override it as well as SKIA_BINARIES_URL

---
 render-wasm/_build_env | 3 +--
 render-wasm/build      | 5 ++++-
 render-wasm/test       | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/render-wasm/_build_env b/render-wasm/_build_env
index 9911613cc..970402da3 100644
--- a/render-wasm/_build_env
+++ b/render-wasm/_build_env
@@ -24,7 +24,7 @@ EMSDK_QUIET=1 . /usr/local/emsdk/emsdk_env.sh;
 
 export EM_CACHE="/tmp/emsdk_cache";
 
-_CARGO_PARAMS="--target=wasm32-unknown-emscripten";
+_CARGO_PARAMS="";
 
 if [ "$_BUILD_MODE" = "release" ]; then
     _CARGO_PARAMS="--release $_CARGO_PARAMS"
@@ -40,4 +40,3 @@ fi
 export EMCC_CFLAGS;
 export _CARGO_PARAMS;
 
-export SKIA_BINARIES_URL="https://github.com/penpot/skia-binaries/releases/download/0.81.0-3/skia-binaries-24dee32a277b6c7b5357-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache.tar.gz"
diff --git a/render-wasm/build b/render-wasm/build
index 9de720e0c..84536136b 100755
--- a/render-wasm/build
+++ b/render-wasm/build
@@ -4,7 +4,10 @@ set -x
 _SCRIPT_DIR=$(dirname $0);
 pushd $_SCRIPT_DIR;
 
-. ./_build_env 
+. ./_build_env
+
+export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"wasm32-unknown-emscripten"};
+export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.81.0-3/skia-binaries-24dee32a277b6c7b5357-wasm32-unknown-emscripten-gl-svg-textlayout-binary-cache.tar.gz"}
 
 cargo build $_CARGO_PARAMS
 
diff --git a/render-wasm/test b/render-wasm/test
index ded373de8..90009283f 100755
--- a/render-wasm/test
+++ b/render-wasm/test
@@ -6,10 +6,10 @@ pushd $_SCRIPT_DIR;
 
 . ./_build_env
 
-export SKIA_BINARIES_URL="https://github.com/penpot/skia-binaries/releases/download/0.81.0-3/skia-binaries-24dee32a277b6c7b5357-x86_64-unknown-linux-gnu-gl-svg-textlayout-binary-cache.tar.gz"
-export _CARGO_PARAMS="--target=x86_64-unknown-linux-gnu";
+export SKIA_BINARIES_URL=${SKIA_BINARIES_URL:-"https://github.com/penpot/skia-binaries/releases/download/0.81.0-3/skia-binaries-24dee32a277b6c7b5357-x86_64-unknown-linux-gnu-gl-svg-textlayout-binary-cache.tar.gz"}
+export CARGO_BUILD_TARGET=${CARGO_BUILD_TARGET:-"x86_64-unknown-linux-gnu"};
 
-cargo test $_CARGO_PARAMS --bin render_wasm -- --show-output
+cargo test --bin render_wasm -- --show-output
 
 # Exit with the same status code as cargo test
 exit $?

From 8ee202e5a101c0a1a0a8095f0c1a76b6e2b86a58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bel=C3=A9n=20Albeza?= <belen@hey.com>
Date: Wed, 16 Apr 2025 15:30:29 +0200
Subject: [PATCH 2/2] :wrench: Fix emscripten version in devenv

---
 docker/devenv/Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docker/devenv/Dockerfile b/docker/devenv/Dockerfile
index f5fd5f434..d9105fbe4 100644
--- a/docker/devenv/Dockerfile
+++ b/docker/devenv/Dockerfile
@@ -10,6 +10,7 @@ ENV NODE_VERSION=v22.14.0 \
     CLJFMT_VERSION=0.13.0 \
     RUSTUP_VERSION=1.27.1 \
     RUST_VERSION=1.85.0 \
+    EMSCRIPTEN_VERSION=4.0.6 \
     LANG=en_US.UTF-8 \
     LC_ALL=en_US.UTF-8
 
@@ -269,8 +270,8 @@ WORKDIR /usr/local
 RUN set -eux; \
   git clone https://github.com/emscripten-core/emsdk.git; \
   cd emsdk; \
-  ./emsdk install latest; \
-  ./emsdk activate latest; \
+  ./emsdk install $EMSCRIPTEN_VERSION; \
+  ./emsdk activate $EMSCRIPTEN_VERSION; \
   rustup target add wasm32-unknown-emscripten;
 
 WORKDIR /home