Skip to content

Commit

Permalink
Pin WASM bindgen (#1129)
Browse files Browse the repository at this point in the history
Every time wasm-bindgen is updated we run into conflicts with the
wasm-bindgen-cli version. Pin it to avoid this problem in the future.
  • Loading branch information
Hinton authored Oct 11, 2024
1 parent 7e90f52 commit 97116b1
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-wasm-internal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
key: wasm-cargo-cache

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

- name: Build
run: ./build.sh -r
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-wasm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
key: wasm-cargo-cache

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

- name: Build
run: ./build.sh -r
Expand Down
20 changes: 10 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion crates/bitwarden-wasm-internal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ console_log = { version = "1.0.0", features = ["color"] }
js-sys = "0.3.68"
log = "0.4.20"
serde_json = ">=1.0.96, <2.0"
wasm-bindgen = { version = "0.2.91", features = ["serde-serialize"] }
# When upgrading wasm-bindgen, make sure to update the version in the workflows!
wasm-bindgen = { version = "=0.2.95", features = ["serde-serialize"] }
wasm-bindgen-futures = "0.4.41"

[lints]
Expand Down
3 changes: 2 additions & 1 deletion crates/bitwarden-wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ console_log = { version = "1.0.0", features = ["color"] }
js-sys = "0.3.68"
log = "0.4.20"
serde = { version = "1.0.196", features = ["derive"] }
wasm-bindgen = { version = "0.2.91", features = ["serde-serialize"] }
# When upgrading wasm-bindgen, make sure to update the version in the workflows!
wasm-bindgen = { version = "=0.2.95", features = ["serde-serialize"] }
wasm-bindgen-futures = "0.4.41"

[dev-dependencies]
Expand Down

0 comments on commit 97116b1

Please sign in to comment.