Skip to content

fix: update wasm bindgen; rm transpiled JS #1317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
tangowithfoxtrot wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix: update wasm bindgen; rm transpiled JS #1317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1004a1
fix: update wasm bindgen; rm transpiled JS
tangowithfoxtrot Sep 11, 2025
f784967
docs: rm mention of wasm2js; no longer needed
tangowithfoxtrot Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-wasm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
key: wasm-cargo-cache

- name: Install wasm-bindgen-cli
run: cargo install wasm-bindgen-cli --version 0.2.95
run: cargo install wasm-bindgen-cli --version 0.2.101

- name: Build
run: ./build.sh -r
Expand Down
2 changes: 1 addition & 1 deletion crates/bitwarden-wasm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ js-sys = "0.3.68"
log = "0.4.20"
serde = { version = "1.0.196", features = ["derive"] }
# When upgrading wasm-bindgen, make sure to update the version in the workflows!
wasm-bindgen = { version = "=0.2.95", features = ["serde-serialize"] }
wasm-bindgen = { version = "=0.2.101", features = ["serde-serialize"] }
wasm-bindgen-futures = "0.4.41"

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/bitwarden-wasm/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Requirements:

- `wasm32-unknown-unknown` rust target.
- `wasm-bindgen-cli` installed.
- `binaryen` installed for `wasm-opt` and `wasm2js`.
- `binaryen` installed for `wasm-opt`.

```bash
rustup target add wasm32-unknown-unknown
Expand Down
25 changes: 13 additions & 12 deletions crates/bitwarden-wasm/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
#!/usr/bin/env bash

# Move to the root of the repository
cd "$(dirname "$0")"
cd ../../

if [ "$1" != "-r" ]; then
# Dev
cargo build -p bitwarden-wasm --target wasm32-unknown-unknown
wasm-bindgen --target bundler --out-dir languages/js/wasm ./target/wasm32-unknown-unknown/debug/bitwarden_wasm.wasm
wasm-bindgen --target nodejs --out-dir languages/js/wasm/node ./target/wasm32-unknown-unknown/debug/bitwarden_wasm.wasm
echo "Building in debug mode"
RELEASE_FLAG=""
BUILD_DIR="debug"
else
# Release
cargo build -p bitwarden-wasm --target wasm32-unknown-unknown --release
wasm-bindgen --target bundler --out-dir languages/js/wasm ./target/wasm32-unknown-unknown/release/bitwarden_wasm.wasm
wasm-bindgen --target nodejs --out-dir languages/js/wasm/node ./target/wasm32-unknown-unknown/release/bitwarden_wasm.wasm
echo "Building in release mode"
RELEASE_FLAG="--release"
BUILD_DIR="release"
fi

# Build
cargo build -p bitwarden-wasm --target wasm32-unknown-unknown ${RELEASE_FLAG}
wasm-bindgen --target bundler --out-dir languages/js/wasm ./target/wasm32-unknown-unknown/${BUILD_DIR}/bitwarden_wasm.wasm
wasm-bindgen --target nodejs --out-dir languages/js/wasm/node ./target/wasm32-unknown-unknown/${BUILD_DIR}/bitwarden_wasm.wasm

# Optimize size
wasm-opt -Os ./languages/js/wasm/bitwarden_wasm_bg.wasm -o ./languages/js/wasm/bitwarden_wasm_bg.wasm
wasm-opt -Os ./languages/js/wasm/node/bitwarden_wasm_bg.wasm -o ./languages/js/wasm/node/bitwarden_wasm_bg.wasm

# Transpile to JS
wasm2js ./languages/js/wasm/bitwarden_wasm_bg.wasm -o ./languages/js/wasm/bitwarden_wasm_bg.wasm.js
npx terser ./languages/js/wasm/bitwarden_wasm_bg.wasm.js -o ./languages/js/wasm/bitwarden_wasm_bg.wasm.js
Loading