Merge pull request #71 from element-hq/langley/update-wasm-script

Update rust sdk and improve script

Author: langleyd

build-wasm-bindings.sh

@@ -6,34 +6,51 @@ yarn ubrn:clean
 echo "==> Step 2: Checking out..."
 yarn ubrn:checkout
 
-echo "==> Step 3: Fetching full git history for patch application..."
+echo "==> Step 3: Resetting any modifications after checkout..."
+git -C rust_modules/matrix-rust-sdk reset --hard HEAD
+echo "    ✓ Repository clean"
+
+echo "==> Step 4: Fetching full git history for patch application..."
 git -C rust_modules/matrix-rust-sdk fetch --unshallow
 
-echo "==> Step 4: Applying patches..."
-cd rust_modules/matrix-rust-sdk && git apply ../../patches/0001-Fix-uniffi-and-wasm-build.patch && git apply ../../patches/0001-Fix-wasm-default-features.patch && cd ../..
-echo "    ✓ Patches applied successfully"
+echo "==> Step 5: Applying uniffi downgrade patch..."
+if git -C rust_modules/matrix-rust-sdk apply ../../patches/0001-Downgrade-uniffi-to-0.29.4.patch; then
+    echo "    ✓ Patch applied (uniffi downgrade to 0.29.4)"
+else
+    echo "    ✗ Patch failed!"
+    exit 1
+fi
 
-echo "==> Step 5: Removing bindings/wasm from Cargo.toml..."
+echo "==> Step 6: Removing bindings/wasm from workspace..."
+# Remove the non-existent bindings/wasm from workspace members
 sed -i.bak '/bindings\/wasm/d' rust_modules/matrix-rust-sdk/Cargo.toml
+echo "    ✓ Removed from workspace"
 
-echo "==> Step 6: Building web (first pass, expected to fail)..."
-yarn ubrn:web:build:release || true
+echo "==> Step 7: Building web (first pass to generate wasm bindings)..."
+yarn ubrn:web:build:release || echo "    (First pass may have warnings)"
 
-echo "==> Step 7: Adding bindings/wasm back to Cargo.toml..."
-sed -i.bak '/uniffi-bindgen/a\
+echo "==> Step 8: Adding bindings/wasm back to workspace..."
+# Add bindings/wasm back to workspace members now that it exists
+sed -i.bak '/"xtask",/a\
     "bindings/wasm",
 ' rust_modules/matrix-rust-sdk/Cargo.toml
+echo "    ✓ Added back to workspace"
 
-echo "==> Step 8: Building web (second pass, should succeed)..."
+echo "==> Step 9: Building web (second pass with complete workspace)..."
 set -e
 yarn ubrn:web:build:release
 
-echo "==> Step 9: Fixing index.web.ts import..."
-INDEX_FILE="/Users/davidlangley/dev/aurora/src/index.web.ts"
-sed -i.bak -E "s/index_bg\\.wasm/index_bg.wasm?url/" "$INDEX_FILE"
+echo "==> Step 10: Fixing index.web.ts import..."
+INDEX_FILE="src/index.web.ts"
+if [ -f "$INDEX_FILE" ]; then
+    sed -i.bak -E "s/index_bg\\.wasm/index_bg.wasm?url/" "$INDEX_FILE"
+    echo "    ✓ Import fixed"
+else
+    echo "    ⚠ $INDEX_FILE not found, skipping import fix"
+fi
 
-echo "==> Step 10: Optimizing wasm binary with wasm-opt..."
-WASM_FILE="/Users/davidlangley/dev/aurora/src/generated/wasm-bindgen/index_bg.wasm"
+echo "==> Step 11: Optimizing wasm binary with wasm-opt..."
+WASM_FILE="src/generated/wasm-bindgen/index_bg.wasm"
 if [ -f "$WASM_FILE" ]; then
     echo "    Optimizing $WASM_FILE (this may take a few minutes)..."
     wasm-opt -Oz "$WASM_FILE" -o "${WASM_FILE}.tmp" && mv "${WASM_FILE}.tmp" "$WASM_FILE"

patches/0001-Downgrade-uniffi-to-0.29.4.patch

@@ -0,0 +1,15 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 16a3f409c..eee32bb2d 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -105,8 +105,8 @@ tracing-appender = "0.2.3"
+ tracing-core = "0.1.34"
+ tracing-subscriber = "0.3.20"
+ unicode-normalization = "0.1.25"
+-uniffi = { version = "0.30.0" }
+-uniffi_bindgen = { version = "0.30.0" }
++uniffi = { version = "=0.29.4" }
++uniffi_bindgen = { version = "=0.29.4" }
+ url = "2.5.7"
+ uuid = "1.18.1"
+ vergen-gitcl = "1.0.8"