diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml index bfc81509d..f5b9eb6f9 100644 --- a/.github/workflows/release_nightly.yml +++ b/.github/workflows/release_nightly.yml @@ -329,9 +329,10 @@ jobs: registry-url: https://registry.npmjs.org # wasm-bindgen-cli version must match wasm-bindgen crate version. - # Be sure to update in test_web.yml, web/Cargo.toml and web/README.md. + # Be sure to update in test_web.yml, Cargo.toml, web/docker/Dockerfile, + # and web/README.md as well. - name: Install wasm-bindgen - run: cargo install wasm-bindgen-cli --version 0.2.92 + run: cargo install wasm-bindgen-cli --version 0.2.93 # Keep the version number in sync in all workflows, # and in the extension builder Dockerfile! diff --git a/.github/workflows/test_extension_dockerfile.yml b/.github/workflows/test_extension_dockerfile.yml index 1436d648d..419f2cd25 100644 --- a/.github/workflows/test_extension_dockerfile.yml +++ b/.github/workflows/test_extension_dockerfile.yml @@ -29,7 +29,7 @@ jobs: registry-url: https://registry.npmjs.org - name: Install wasm-bindgen - run: cargo install wasm-bindgen-cli --version 0.2.92 + run: cargo install wasm-bindgen-cli --version 0.2.93 # Keep the version number in sync in all workflows, # and in the extension builder Dockerfile! diff --git a/.github/workflows/test_web.yml b/.github/workflows/test_web.yml index cdcdf2700..c425a44e9 100644 --- a/.github/workflows/test_web.yml +++ b/.github/workflows/test_web.yml @@ -60,9 +60,10 @@ jobs: save-if: ${{ github.ref == 'refs/heads/master' }} # wasm-bindgen-cli version must match wasm-bindgen crate version. - # Be sure to update in release_nightly.yml, web/Cargo.toml and web/README.md. + # Be sure to update in release_nightly.yml, Cargo.toml, web/docker/Dockerfile, + # and web/README.md as well. - name: Install wasm-bindgen - run: cargo install wasm-bindgen-cli --version 0.2.92 + run: cargo install wasm-bindgen-cli --version 0.2.93 # Keep the version number in sync in all workflows, # and in the extension builder Dockerfile! diff --git a/Cargo.lock b/Cargo.lock index 4a9f9b3b0..a93031e81 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5952,19 +5952,20 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", @@ -5989,9 +5990,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5999,9 +6000,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", @@ -6012,9 +6013,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-streams" diff --git a/Cargo.toml b/Cargo.toml index 27c7692bd..5b24625c8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -69,7 +69,8 @@ num-traits = "0.2.19" serde = "1.0.207" thiserror = "1.0" url = "2.5.2" -wasm-bindgen = "=0.2.92" +# Make sure to match wasm-bindgen-cli version to this everywhere. +wasm-bindgen = "=0.2.93" walkdir = "2.5.0" tokio = { version = "1.39.2" } diff --git a/web/README.md b/web/README.md index 4fb945115..c1da7e0e1 100644 --- a/web/README.md +++ b/web/README.md @@ -65,7 +65,7 @@ Note that npm 7 or newer is required. It should come bundled with Node.js 15 or -This can be installed with `cargo install wasm-bindgen-cli --version 0.2.92`. Be sure to install this specific version of `wasm-bindgen-cli` to match the version used by Ruffle. +This can be installed with `cargo install wasm-bindgen-cli --version 0.2.93`. Be sure to install this specific version of `wasm-bindgen-cli` to match the version used by Ruffle. #### Binaryen @@ -143,7 +143,7 @@ Pass `--spec ` to filter a test based on name. For example, `--spec extern ### Testing tips! If debugging a failing test, use `await browser.pause(100000);` in the test file to pause it, and don't start the test with `--headless`. -That way you can actually see what's happening, and manually get involved to debug it. +That way you can actually see what's happening, and manually get involved to debug it. ## Structure diff --git a/web/docker/Dockerfile b/web/docker/Dockerfile index 21c8a0691..7caca4b91 100644 --- a/web/docker/Dockerfile +++ b/web/docker/Dockerfile @@ -13,7 +13,9 @@ RUN mv binaryen-version_118/bin/wasm-opt /usr/local/bin # Installing Rust using rustup: RUN wget 'https://sh.rustup.rs' --quiet -O- | sh -s -- -y --profile minimal --target wasm32-unknown-unknown ENV PATH="/root/.cargo/bin:$PATH" -RUN cargo install wasm-bindgen-cli --version 0.2.92 +# wasm-bindgen-cli version must match wasm-bindgen crate version. +# Be sure to update in test_web.yml, release_nightly.yml, Cargo.toml, and web/README.md as well. +RUN cargo install wasm-bindgen-cli --version 0.2.93 # Building Ruffle: COPY . ruffle