From a7012cf8a628d125b211fd164ac12fbb898f316e Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Mon, 25 Jul 2022 23:02:10 +0200
Subject: [PATCH] Use pinned version of wasm-bindgen-cli (#1855)

* Use pinned version of wasm-bindgen-cli

* Update wasm-bindgen to 0.2.82

* Call setup_web.sh from scripts that depends on it
---
 .github/workflows/rust.yml |  2 +-
 Cargo.lock                 | 24 ++++++++++++------------
 sh/build_demo_web.sh       |  2 ++
 sh/setup_web.sh            |  3 +--
 sh/wasm_bindgen_check.sh   |  2 ++
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 87747f97..3cfd99a8 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -193,5 +193,5 @@ jobs:
           toolchain: 1.60.0
           override: true
       - run: rustup target add wasm32-unknown-unknown
-      - run: cargo install wasm-bindgen-cli
+      - run: ./sh/setup_web.sh
       - run: ./sh/wasm_bindgen_check.sh
diff --git a/Cargo.lock b/Cargo.lock
index 2230f301..56b56249 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3871,7 +3871,7 @@ version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if 0.1.10",
  "static_assertions",
 ]
 
@@ -4074,9 +4074,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.81"
+version = "0.2.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c53b543413a17a202f4be280a7e5c62a1c69345f5de525ee64f8cfdbc954994"
+checksum = "fc7652e3f6c4706c8d9cd54832c4a4ccb9b5336e2c3bd154d5cccfbf1c1f5f7d"
 dependencies = [
  "cfg-if 1.0.0",
  "serde",
@@ -4086,13 +4086,13 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.81"
+version = "0.2.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5491a68ab4500fa6b4d726bd67408630c3dbe9c4fe7bda16d5c82a1fd8c7340a"
+checksum = "662cd44805586bd52971b9586b1df85cdbbd9112e4ef4d8f41559c334dc6ac3f"
 dependencies = [
  "bumpalo",
- "lazy_static",
  "log",
+ "once_cell",
  "proc-macro2",
  "quote",
  "syn",
@@ -4113,9 +4113,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.81"
+version = "0.2.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c441e177922bc58f1e12c022624b6216378e5febc2f0533e41ba443d505b80aa"
+checksum = "b260f13d3012071dfb1512849c033b1925038373aea48ced3012c09df952c602"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -4123,9 +4123,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.81"
+version = "0.2.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d94ac45fcf608c1f45ef53e748d35660f168490c10b23704c7779ab8f5c3048"
+checksum = "5be8e654bdd9b79216c2929ab90721aa82faf65c48cdf08bdc4e7f51357b80da"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4136,9 +4136,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.81"
+version = "0.2.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a89911bd99e5f3659ec4acf9c4d93b0a90fe4a2a11f15328472058edc5261be"
+checksum = "6598dd0bd3c7d51095ff6531a5b23e02acdc81804e30d8f07afb77b7215a140a"
 
 [[package]]
 name = "wayland-client"
diff --git a/sh/build_demo_web.sh b/sh/build_demo_web.sh
index 3d634bb1..a0b22de6 100755
--- a/sh/build_demo_web.sh
+++ b/sh/build_demo_web.sh
@@ -3,6 +3,8 @@ set -eu
 script_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
 cd "$script_path/.."
 
+./sh/setup_web.sh
+
 CRATE_NAME="egui_demo_app"
 FEATURES="glow,http,persistence,screen_reader"
 
diff --git a/sh/setup_web.sh b/sh/setup_web.sh
index 2c8e658e..f7ed0bd5 100755
--- a/sh/setup_web.sh
+++ b/sh/setup_web.sh
@@ -5,5 +5,4 @@ cd "$script_path/.."
 
 # Pre-requisites:
 rustup target add wasm32-unknown-unknown
-cargo install wasm-bindgen-cli
-cargo update -p wasm-bindgen
+cargo install wasm-bindgen-cli --version 0.2.82
diff --git a/sh/wasm_bindgen_check.sh b/sh/wasm_bindgen_check.sh
index e00858e1..45917f39 100755
--- a/sh/wasm_bindgen_check.sh
+++ b/sh/wasm_bindgen_check.sh
@@ -3,6 +3,8 @@ set -eu
 script_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
 cd "$script_path/.."
 
+./sh/setup_web.sh
+
 CRATE_NAME="egui_demo_app"
 FEATURES="glow,http,persistence,screen_reader"