diff --git a/Cargo.lock b/Cargo.lock index bb01707a980..35659dacc2c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -349,9 +349,9 @@ dependencies = [ [[package]] name = "cfg-if" -version = "1.0.1" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" +checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" [[package]] name = "changelog" @@ -430,7 +430,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1" dependencies = [ - "thiserror 2.0.15", + "thiserror 2.0.16", ] [[package]] @@ -2293,29 +2293,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "parking_lot" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.52.6", -] - [[package]] name = "password_strength" version = "0.1.0" @@ -2446,9 +2423,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.36" +version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff24dfcda44452b9816fff4cd4227e1bb73ff5a2f1bc1105aa92fb8565ce44d2" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", "syn 2.0.106", @@ -2619,15 +2596,6 @@ dependencies = [ "getrandom 0.3.3", ] -[[package]] -name = "redox_syscall" -version = "0.5.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77" -dependencies = [ - "bitflags", -] - [[package]] name = "regex" version = "1.11.1" @@ -2907,9 +2875,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.142" +version = "1.0.143" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7" +checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a" dependencies = [ "itoa", "memchr", @@ -2974,15 +2942,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" -[[package]] -name = "signal-hook-registry" -version = "1.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b" -dependencies = [ - "libc", -] - [[package]] name = "simple_ssr" version = "0.1.0" @@ -3207,15 +3166,15 @@ checksum = "1ac9aa371f599d22256307c24a9d748c041e548cbf599f35d890f9d365361790" [[package]] name = "tempfile" -version = "3.20.0" +version = "3.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" +checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e" dependencies = [ "fastrand", "getrandom 0.3.3", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -3248,11 +3207,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d76d3f064b981389ecb4b6b7f45a0bf9fdac1d5b9204c7bd6714fecc302850" +checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0" dependencies = [ - "thiserror-impl 2.0.15", + "thiserror-impl 2.0.16", ] [[package]] @@ -3268,9 +3227,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d29feb33e986b6ea906bd9c3559a856983f92371b3eaa5e83782a351623de0" +checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960" dependencies = [ "proc-macro2", "quote", @@ -3349,9 +3308,7 @@ dependencies = [ "io-uring", "libc", "mio", - "parking_lot", "pin-project-lite", - "signal-hook-registry", "slab", "socket2 0.6.0", "tokio-macros", @@ -4021,11 +3978,11 @@ dependencies = [ [[package]] name = "winapi-util" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -4303,7 +4260,7 @@ dependencies = [ "rustversion", "serde", "slab", - "thiserror 2.0.15", + "thiserror 2.0.16", "tokio", "tokise", "tracing", diff --git a/Cargo.toml b/Cargo.toml index 134a425b46e..7254f0ac2bb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,3 +28,5 @@ unexpected_cfgs = { level = "warn", check-cfg = [ "cfg(nightly_yew)", "cfg(wasm_bindgen_unstable_test_coverage)" ]} +[workspace.dependencies] +tokio = { version = "1.47.1" } diff --git a/examples/simple_ssr/Cargo.toml b/examples/simple_ssr/Cargo.toml index 766dd6bc5f3..28b524da456 100644 --- a/examples/simple_ssr/Cargo.toml +++ b/examples/simple_ssr/Cargo.toml @@ -26,7 +26,7 @@ wasm-logger = "0.2" log = "0.4" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -tokio = { version = "1.43.1", features = ["full"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread", "fs"] } warp = "0.3" clap = { version = "4", features = ["derive"] } diff --git a/examples/ssr_router/Cargo.toml b/examples/ssr_router/Cargo.toml index 2f14ac4a81d..db67d0f22ff 100644 --- a/examples/ssr_router/Cargo.toml +++ b/examples/ssr_router/Cargo.toml @@ -25,7 +25,7 @@ wasm-bindgen-futures = "0.4" wasm-logger = "0.2" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -tokio = { version = "1.43.1", features = ["full"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread", "net", "fs"] } axum = "0.8" tower = { version = "0.5", features = ["make"] } tower-http = { version = "0.6", features = ["fs"] } diff --git a/examples/wasi_ssr_module/Cargo.toml b/examples/wasi_ssr_module/Cargo.toml index bf1b0db59d9..03f673f5f77 100644 --- a/examples/wasi_ssr_module/Cargo.toml +++ b/examples/wasi_ssr_module/Cargo.toml @@ -14,4 +14,4 @@ serde = { version = "^1", features = ["derive"] } serde_json = "^1" lazy_static = "^1" -tokio = { version = "^1", features = ["macros", "rt", "time"] } +tokio = { workspace = true, features = ["macros", "rt", "time"] } diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index bba6d14d32b..2d51fb3d00f 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -40,7 +40,7 @@ wasm-bindgen-futures = "0.4" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] # We still need tokio as we have docs linked to it. -tokio = { version = "1.43", features = ["rt"] } +tokio = { workspace = true, features = ["rt"] } [dependencies.web-sys] version = "^0.3.70" @@ -79,10 +79,10 @@ features = [ ] [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] -tokio = { version = "1.43", features = ["full"] } +tokio = { workspace = true, features = ["rt", "rt-multi-thread", "macros"] } [target.'cfg(all(target_arch = "wasm32", target_os = "wasi"))'.dependencies] -tokio = { version = "1.40", features = ["macros", "rt", "time"] } +tokio = { workspace = true, features = ["macros", "rt", "time"] } [dev-dependencies] wasm-bindgen-test = "0.3" diff --git a/tools/benchmark-ssr/Cargo.toml b/tools/benchmark-ssr/Cargo.toml index bfca0247a1b..7e7f58c5781 100644 --- a/tools/benchmark-ssr/Cargo.toml +++ b/tools/benchmark-ssr/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] yew = { path = "../../packages/yew", features = ["ssr"] } function_router = { path = "../../examples/function_router" } -tokio = { version = "1.43", features = ["full"] } +tokio = { workspace = true, features = ["macros", "rt-multi-thread", "time"] } average = "0.15.1" tabled = "0.18.0" indicatif = "0.17.8" diff --git a/tools/website-test/Cargo.toml b/tools/website-test/Cargo.toml index 6ae122be341..ed4646849c3 100644 --- a/tools/website-test/Cargo.toml +++ b/tools/website-test/Cargo.toml @@ -21,7 +21,7 @@ weblog = "0.3.0" yew = { path = "../../packages/yew/", features = ["ssr", "csr", "serde"] } yew-autoprops = "0.4.1" yew-router = { path = "../../packages/yew-router/" } -tokio = { version = "1.43.1", features = ["rt", "macros"] } +tokio = { workspace = true, features = ["rt", "macros"] } [dev-dependencies.web-sys] version = "0.3"