From 22898f7afd0efb6c3cd6d931c5b9e9d445e74add Mon Sep 17 00:00:00 2001 From: Kevin Reid Date: Fri, 29 Nov 2024 13:13:11 -0800 Subject: [PATCH] Deps: Update other wasm deps and workaround features bug in wasm-bindgen-futures 0.4.46. --- Cargo.lock | 35 ++++++++++++++++++----------------- Cargo.toml | 3 ++- all-is-cubes-gpu/Cargo.toml | 2 +- all-is-cubes-wasm/Cargo.lock | 13 +++++++------ all-is-cubes-wasm/Cargo.toml | 6 +++--- 5 files changed, 31 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index edc42a108..3c303c275 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2965,9 +2965,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "fb15147158e79fd8b8afd0252522769c4f48725460b37338544d8379d94fc8f9" dependencies = [ "wasm-bindgen", ] @@ -3103,7 +3103,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -6213,9 +6213,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "21d3b25c3ea1126a2ad5f4f9068483c2af1e64168f847abe863a526b8dbfe00b" dependencies = [ "cfg-if", "once_cell", @@ -6224,9 +6224,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "52857d4c32e496dc6537646b5b117081e71fd2ff06de792e3577a150627db283" dependencies = [ "bumpalo", "log", @@ -6239,21 +6239,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.45" +version = "0.4.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +checksum = "951fe82312ed48443ac78b66fa43eded9999f738f6022e67aead7b708659e49a" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "920b0ffe069571ebbfc9ddc0b36ba305ef65577c94b06262ed793716a1afd981" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6261,9 +6262,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "bf59002391099644be3524e23b781fa43d2be0c5aa0719a18c0731b9d195cab6" dependencies = [ "proc-macro2", "quote", @@ -6274,15 +6275,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "e5047c5392700766601942795a436d7d2599af60dcc3cc1248c9120bfb0827b0" [[package]] name = "web-sys" -version = "0.3.72" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +checksum = "476364ff87d0ae6bfb661053a9104ab312542658c3d8f963b7ace80b6f9b26b9" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index 8a0ef41d8..e37679c35 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -150,7 +150,8 @@ tokio = { version = "1.28.0", default-features = false } trycmd = "0.15.4" # keep in sync with `snapbox` unicode-segmentation = { version = "1.10.1", default-features = false } unicode-width = { version = "0.2", default-features = false } -wasm-bindgen-futures = { version = "0.4.45", default-features = false } +# explicitly enabling "std" needed for +wasm-bindgen-futures = { version = "0.4.46", default-features = false, features = ["std"] } web-time = { version = "1.1.0", default-features = false } wgpu = { version = "23.0.0", default-features = false, features = ["wgsl"] } yield-progress = { version = "0.1.6", default-features = false } diff --git a/all-is-cubes-gpu/Cargo.toml b/all-is-cubes-gpu/Cargo.toml index 2d44ffea5..f4c6d56cf 100644 --- a/all-is-cubes-gpu/Cargo.toml +++ b/all-is-cubes-gpu/Cargo.toml @@ -78,7 +78,7 @@ resource = "0.5.0" send_wrapper = { workspace = true, features = ["futures"] } wasm-bindgen-futures = { workspace = true } # For initializing tests on web. (This is not a dev-dependency because some of said tests are not in this package.) -web-sys = { version = "0.3.72", features = ["OffscreenCanvas"] } +web-sys = { version = "0.3.73", features = ["OffscreenCanvas"] } web-time = { workspace = true } wgpu = { workspace = true, optional = true } diff --git a/all-is-cubes-wasm/Cargo.lock b/all-is-cubes-wasm/Cargo.lock index ebdcab7d9..86b9936a4 100644 --- a/all-is-cubes-wasm/Cargo.lock +++ b/all-is-cubes-wasm/Cargo.lock @@ -945,9 +945,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "fb15147158e79fd8b8afd0252522769c4f48725460b37338544d8379d94fc8f9" dependencies = [ "wasm-bindgen", ] @@ -1762,12 +1762,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.45" +version = "0.4.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +checksum = "951fe82312ed48443ac78b66fa43eded9999f738f6022e67aead7b708659e49a" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] @@ -1829,9 +1830,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.72" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +checksum = "476364ff87d0ae6bfb661053a9104ab312542658c3d8f963b7ace80b6f9b26b9" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/all-is-cubes-wasm/Cargo.toml b/all-is-cubes-wasm/Cargo.toml index ba3caf7ef..56fd4cefe 100644 --- a/all-is-cubes-wasm/Cargo.toml +++ b/all-is-cubes-wasm/Cargo.toml @@ -43,12 +43,12 @@ futures-core = { version = "0.3.31", default-features = false, features = ["allo # Feature enabling for indirect dependency all-is-cubes → rand → getrandom, # as well as our direct dependency getrandom = { version = "0.2.7", features = ["js"] } -js-sys = "0.3.72" +js-sys = "0.3.73" log = { version = "0.4.17", default-features = false } rand = { version = "0.8.3", default-features = false, features = ["std", "std_rng"] } send_wrapper = { version = "0.6.0", default-features = false } wasm-bindgen = "0.2.96" -wasm-bindgen-futures = "0.4.45" +wasm-bindgen-futures = "0.4.46" web-time = { version = "1.1.0" } # Must be the same version as in the main workspace, i.e. as in all-is-cubes-gpu. wgpu = { version = "23.0.0", default-features = false, features = ["webgpu", "webgl"] } @@ -56,7 +56,7 @@ wgpu = { version = "23.0.0", default-features = false, features = ["webgpu", "we yield-progress = { version = "0.1.6", features = ["log_hiccups"] } [dependencies.web-sys] -version = "0.3.72" +version = "0.3.73" features = [ "console", "AddEventListenerOptions",