diff --git a/.gitmodules b/.gitmodules index d7faf495..2886a98f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,7 +4,3 @@ [submodule "ts-gen"] path = ts-gen url = https://github.com/wasm-bindgen/ts-gen -[submodule "gloo"] - path = gloo - url = https://github.com/guybedford/gloo - branch = fix-gloo-timers-unwind-safety diff --git a/Cargo.lock b/Cargo.lock index a2789e66..e009d0e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1432,11 +1432,10 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.99" +version = "0.3.100" dependencies = [ "cfg-if", "futures-util", - "once_cell", "wasm-bindgen", ] @@ -3421,7 +3420,7 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.122" +version = "0.2.123" dependencies = [ "cfg-if", "once_cell", @@ -3432,7 +3431,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-cli-support" -version = "0.2.122" +version = "0.2.123" dependencies = [ "anyhow", "base64", @@ -3448,7 +3447,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.72" +version = "0.4.73" dependencies = [ "js-sys", "wasm-bindgen", @@ -3456,7 +3455,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.122" +version = "0.2.123" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3464,7 +3463,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.122" +version = "0.2.123" dependencies = [ "bumpalo", "proc-macro2", @@ -3475,14 +3474,14 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.122" +version = "0.2.123" dependencies = [ "unicode-ident", ] [[package]] name = "wasm-bindgen-test" -version = "0.3.72" +version = "0.3.73" dependencies = [ "async-trait", "cast", @@ -3502,7 +3501,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.72" +version = "0.3.73" dependencies = [ "proc-macro2", "quote", @@ -3511,7 +3510,7 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-shared" -version = "0.2.122" +version = "0.2.123" [[package]] name = "wasm-encoder" @@ -3596,7 +3595,7 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.99" +version = "0.3.100" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index 5fc64e1e..5ead2a23 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,7 +15,6 @@ exclude = [ "templates/*", "wasm-bindgen", "wasm-streams", - "gloo", "generated", ] resolver = "2" @@ -29,7 +28,7 @@ chrono = { version = "0.4.41", default-features = false, features = [ futures-channel = "0.3.31" futures-util = { version = "0.3.31", default-features = false } http = "1.3" -js-sys = { version = "0.3.99" } +js-sys = { version = "0.3.100" } serde = { version = "1.0.164", features = ["derive"] } strum = { version = "0.27", features = ["derive"] } serde_json = "1.0.140" @@ -38,14 +37,14 @@ syn = "2.0.17" trybuild = "1.0" proc-macro2 = "1.0.60" quote = "1.0.28" -wasm-bindgen = { version = "0.2.122" } -wasm-bindgen-cli-support = { version = "0.2.122" } -wasm-bindgen-futures = { version = "0.4.72" } -wasm-bindgen-macro-support = { version = "0.2.122" } -wasm-bindgen-shared = { version = "0.2.122" } -wasm-bindgen-test = { version = "0.3.72" } +wasm-bindgen = { version = "0.2.123" } +wasm-bindgen-cli-support = { version = "0.2.123" } +wasm-bindgen-futures = { version = "0.4.73" } +wasm-bindgen-macro-support = { version = "0.2.123" } +wasm-bindgen-shared = { version = "0.2.123" } +wasm-bindgen-test = { version = "0.3.73" } wasm-streams = { version = "0.6.0" } -web-sys = { version = "0.3.99", features = [ +web-sys = { version = "0.3.100", features = [ "AbortController", "AbortSignal", "BinaryType", @@ -107,11 +106,11 @@ opt-level = "z" # These are local patches we use to test against local wasm bindgen # We always align on the exact stable wasm bindgen version for releases [patch.crates-io] -js-sys = { version = "0.3.99", path = './wasm-bindgen/crates/js-sys' } -wasm-bindgen = { version = "0.2.122", path = './wasm-bindgen' } -wasm-bindgen-cli-support = { version = "0.2.122", path = "./wasm-bindgen/crates/cli-support" } -wasm-bindgen-futures = { version = "0.4.72", path = './wasm-bindgen/crates/futures' } -wasm-bindgen-macro-support = { version = "0.2.122", path = "./wasm-bindgen/crates/macro-support" } -wasm-bindgen-shared = { version = "0.2.122", path = "./wasm-bindgen/crates/shared" } -wasm-bindgen-test = { version = "0.3.72", path = "./wasm-bindgen/crates/test" } -web-sys = { version = "0.3.99", path = './wasm-bindgen/crates/web-sys' } +js-sys = { version = "0.3.100", path = './wasm-bindgen/crates/js-sys' } +wasm-bindgen = { version = "0.2.123", path = './wasm-bindgen' } +wasm-bindgen-cli-support = { version = "0.2.123", path = "./wasm-bindgen/crates/cli-support" } +wasm-bindgen-futures = { version = "0.4.73", path = './wasm-bindgen/crates/futures' } +wasm-bindgen-macro-support = { version = "0.2.123", path = "./wasm-bindgen/crates/macro-support" } +wasm-bindgen-shared = { version = "0.2.123", path = "./wasm-bindgen/crates/shared" } +wasm-bindgen-test = { version = "0.3.73", path = "./wasm-bindgen/crates/test" } +web-sys = { version = "0.3.100", path = './wasm-bindgen/crates/web-sys' } diff --git a/gloo b/gloo deleted file mode 160000 index d73276ed..00000000 --- a/gloo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d73276ed358882349d5edfb26c97573653dc389c diff --git a/wasm-bindgen b/wasm-bindgen index ddd32251..861696ae 160000 --- a/wasm-bindgen +++ b/wasm-bindgen @@ -1 +1 @@ -Subproject commit ddd322514d87a4b21342b7ab9a9d70796fc60576 +Subproject commit 861696ae5ad7679c6b3eed7a448e34d65ced12e4