From ff8f8e9e21ed11376de1aa70eca714327d14ed41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=96R=C3=96K=20Attila?= Date: Wed, 18 Dec 2024 12:14:20 +0100 Subject: [PATCH] chore: Bump wasm-bindgen to 0.2.99, wasm-bindgen-futures to 0.4.49, js-sys and web-sys to 0.3.76 --- .github/workflows/release_nightly.yml | 2 +- .../workflows/test_extension_dockerfile.yml | 2 +- .github/workflows/test_web.yml | 4 +- Cargo.lock | 47 +++++++++---------- Cargo.toml | 6 +-- core/Cargo.toml | 2 +- web/Cargo.toml | 2 +- web/README.md | 2 +- web/docker/Dockerfile | 2 +- 9 files changed, 34 insertions(+), 35 deletions(-) diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml index da77e5253c2f..df3fbba9ef9c 100644 --- a/.github/workflows/release_nightly.yml +++ b/.github/workflows/release_nightly.yml @@ -347,7 +347,7 @@ jobs: # 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.97 + run: cargo install wasm-bindgen-cli --version 0.2.99 # 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 01b256645cc4..27acaa7c89e7 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.97 + run: cargo install wasm-bindgen-cli --version 0.2.99 # 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 0021d1e0d80e..83c51c795424 100644 --- a/.github/workflows/test_web.yml +++ b/.github/workflows/test_web.yml @@ -63,7 +63,7 @@ jobs: # 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.97 + run: cargo install wasm-bindgen-cli --version 0.2.99 # Keep the version number in sync in all workflows, # and in the extension builder Dockerfile! @@ -128,7 +128,7 @@ jobs: # 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.97 + run: cargo install wasm-bindgen-cli --version 0.2.99 # No real need to install wasm-opt here diff --git a/Cargo.lock b/Cargo.lock index b1f070aaac94..babade9dd481 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -765,15 +765,15 @@ dependencies = [ [[package]] name = "console" -version = "0.15.8" +version = "0.15.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" +checksum = "ea3c6ecd8059b57859df5c69830340ed3c41d30e3da0c1cbed90a96ac853041b" dependencies = [ "encode_unicode", - "lazy_static", "libc", - "unicode-width 0.1.14", - "windows-sys 0.52.0", + "once_cell", + "unicode-width 0.2.0", + "windows-sys 0.59.0", ] [[package]] @@ -1394,9 +1394,9 @@ dependencies = [ [[package]] name = "encode_unicode" -version = "0.3.6" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] name = "encoding_rs" @@ -2619,9 +2619,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.74" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705" +checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7" dependencies = [ "once_cell", "wasm-bindgen", @@ -5797,9 +5797,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.97" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c" +checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396" dependencies = [ "cfg-if", "once_cell", @@ -5808,13 +5808,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.97" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd" +checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn", @@ -5823,9 +5822,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.47" +version = "0.4.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dfaf8f50e5f293737ee323940c7d8b08a66a95a419223d9f41610ca08b0833d" +checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2" dependencies = [ "cfg-if", "js-sys", @@ -5836,9 +5835,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.97" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051" +checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5846,9 +5845,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.97" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d" +checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2" dependencies = [ "proc-macro2", "quote", @@ -5859,9 +5858,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.97" +version = "0.2.99" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49" +checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6" [[package]] name = "wasm-streams" @@ -5993,9 +5992,9 @@ checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549" [[package]] name = "web-sys" -version = "0.3.74" +version = "0.3.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c" +checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index dad0ec4dea80..cfb5563c9fc4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,8 +63,8 @@ enum-map = "2.7.3" flate2 = "1.0.35" futures = "0.3.31" image = { version = "0.25.5", default-features = false } -js-sys = "0.3.74" -web-sys = "0.3.74" +js-sys = "0.3.76" +web-sys = "0.3.76" log = "0.4" num-derive = "0.4.2" num-traits = "0.2.19" @@ -72,7 +72,7 @@ serde = "1.0.215" thiserror = "2.0.6" url = "2.5.2" # Make sure to match wasm-bindgen-cli version to this everywhere. -wasm-bindgen = "=0.2.97" +wasm-bindgen = "=0.2.99" walkdir = "2.5.0" tokio = "1.42.0" # Switching from the `async-std` to the `tokio` runtime, which we depend on anyway. diff --git a/core/Cargo.toml b/core/Cargo.toml index 8809f0d04211..4dff4f21f155 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -74,7 +74,7 @@ tracy-client = { version = "0.17.6", optional = true, default-features = false } workspace = true [target.'cfg(target_family = "wasm")'.dependencies.wasm-bindgen-futures] -version = "0.4.47" +version = "0.4.49" [features] default = [] diff --git a/web/Cargo.toml b/web/Cargo.toml index 69f31735307d..d845f417c3e6 100644 --- a/web/Cargo.toml +++ b/web/Cargo.toml @@ -46,7 +46,7 @@ ruffle_render_wgpu = { path = "../render/wgpu", optional = true } ruffle_video_software = { path = "../video/software" } url = { workspace = true } wasm-bindgen = { workspace = true } -wasm-bindgen-futures = "0.4.47" +wasm-bindgen-futures = "0.4.49" serde-wasm-bindgen = "0.6.5" chrono = { workspace = true, features = ["wasmbind", "clock"] } getrandom = { version = "0.2", features = ["js"] } diff --git a/web/README.md b/web/README.md index ff600de1feb9..fef30a31af9f 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.97`. 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.99`. Be sure to install this specific version of `wasm-bindgen-cli` to match the version used by Ruffle. #### Binaryen diff --git a/web/docker/Dockerfile b/web/docker/Dockerfile index 88230fed7d80..59a950d6d67c 100644 --- a/web/docker/Dockerfile +++ b/web/docker/Dockerfile @@ -15,7 +15,7 @@ RUN wget 'https://sh.rustup.rs' --quiet -O- | sh -s -- -y --profile minimal --ta ENV PATH="/root/.cargo/bin:$PATH" # 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.97 +RUN cargo install wasm-bindgen-cli --version 0.2.99 # Building Ruffle: COPY . ruffle