From 97116b1151a8942f640a264fa1c1c4a37512a482 Mon Sep 17 00:00:00 2001
From: Oscar Hinton <Hinton@users.noreply.github.com>
Date: Fri, 11 Oct 2024 14:28:28 +0200
Subject: [PATCH] Pin WASM bindgen (#1129)

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.
---
 .github/workflows/build-wasm-internal.yml |  2 +-
 .github/workflows/build-wasm.yml          |  2 +-
 Cargo.lock                                | 20 ++++++++++----------
 crates/bitwarden-wasm-internal/Cargo.toml |  3 ++-
 crates/bitwarden-wasm/Cargo.toml          |  3 ++-
 5 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-wasm-internal.yml b/.github/workflows/build-wasm-internal.yml
index 99fe06c44..0be6b29c1 100644
--- a/.github/workflows/build-wasm-internal.yml
+++ b/.github/workflows/build-wasm-internal.yml
@@ -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
diff --git a/.github/workflows/build-wasm.yml b/.github/workflows/build-wasm.yml
index 35c0ca6b6..117bbf2c7 100644
--- a/.github/workflows/build-wasm.yml
+++ b/.github/workflows/build-wasm.yml
@@ -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
diff --git a/Cargo.lock b/Cargo.lock
index 024abbe00..e6ca566f9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4503,9 +4503,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.94"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef073ced962d62984fb38a36e5fdc1a2b23c9e0e1fa0689bb97afa4202ef6887"
+checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -4516,9 +4516,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.94"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4bfab14ef75323f4eb75fa52ee0a3fb59611977fd3240da19b2cf36ff85030e"
+checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358"
 dependencies = [
  "bumpalo",
  "log",
@@ -4543,9 +4543,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.94"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7bec9830f60924d9ceb3ef99d55c155be8afa76954edffbb5936ff4509474e7"
+checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4553,9 +4553,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.94"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c74f6e152a76a2ad448e223b0fc0b6b5747649c3d769cc6bf45737bf97d0ed6"
+checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4566,9 +4566,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.94"
+version = "0.2.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a42f6c679374623f295a8623adfe63d9284091245c3504bde47c17a3ce2777d9"
+checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "wasm-bindgen-test"
diff --git a/crates/bitwarden-wasm-internal/Cargo.toml b/crates/bitwarden-wasm-internal/Cargo.toml
index 4f68c08d6..b18e412c9 100644
--- a/crates/bitwarden-wasm-internal/Cargo.toml
+++ b/crates/bitwarden-wasm-internal/Cargo.toml
@@ -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]
diff --git a/crates/bitwarden-wasm/Cargo.toml b/crates/bitwarden-wasm/Cargo.toml
index fd3c278f8..b57a0192e 100644
--- a/crates/bitwarden-wasm/Cargo.toml
+++ b/crates/bitwarden-wasm/Cargo.toml
@@ -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]