diff --git a/Cargo.lock b/Cargo.lock index dd98df06af8..d1a67995678 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -96,12 +96,6 @@ version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" -[[package]] -name = "anymap2" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" - [[package]] name = "async-trait" version = "0.1.81" @@ -312,7 +306,7 @@ version = "0.1.0" dependencies = [ "anyhow", "getrandom", - "gloo 0.11.0", + "gloo", "rand", "serde", "web-sys", @@ -528,7 +522,7 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" name = "counter" version = "0.1.1" dependencies = [ - "gloo 0.11.0", + "gloo", "js-sys", "wasm-bindgen", "yew", @@ -712,7 +706,7 @@ dependencies = [ name = "dyn_create_destroy_apps" version = "0.1.0" dependencies = [ - "gloo 0.11.0", + "gloo", "js-sys", "slab", "wasm-bindgen", @@ -821,7 +815,7 @@ name = "file_upload" version = "0.1.0" dependencies = [ "base64 0.22.1", - "gloo 0.11.0", + "gloo", "js-sys", "web-sys", "yew", @@ -868,7 +862,7 @@ name = "function_memory_game" version = "0.1.0" dependencies = [ "getrandom", - "gloo 0.11.0", + "gloo", "nanoid", "rand", "serde", @@ -883,7 +877,7 @@ name = "function_router" version = "0.1.0" dependencies = [ "getrandom", - "gloo 0.11.0", + "gloo", "instant", "lipsum", "log", @@ -899,7 +893,7 @@ dependencies = [ name = "function_todomvc" version = "0.1.0" dependencies = [ - "gloo 0.11.0", + "gloo", "serde", "strum", "strum_macros", @@ -911,7 +905,7 @@ dependencies = [ name = "futures" version = "0.1.0" dependencies = [ - "gloo 0.11.0", + "gloo", "pulldown-cmark", "wasm-bindgen", "wasm-bindgen-futures", @@ -1013,7 +1007,7 @@ name = "game_of_life" version = "0.1.4" dependencies = [ "getrandom", - "gloo 0.11.0", + "gloo", "log", "rand", "wasm-logger", @@ -1070,55 +1064,23 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "gloo" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28999cda5ef6916ffd33fb4a7b87e1de633c47c0dc6d97905fee1cdaa142b94d" -dependencies = [ - "gloo-console 0.2.3", - "gloo-dialogs 0.1.1", - "gloo-events 0.1.2", - "gloo-file 0.2.3", - "gloo-history 0.1.5", - "gloo-net 0.3.1", - "gloo-render 0.1.1", - "gloo-storage 0.2.2", - "gloo-timers 0.2.6", - "gloo-utils 0.1.7", - "gloo-worker 0.2.1", -] - [[package]] name = "gloo" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d15282ece24eaf4bd338d73ef580c6714c8615155c4190c781290ee3fa0fd372" dependencies = [ - "gloo-console 0.3.0", - "gloo-dialogs 0.2.0", - "gloo-events 0.2.0", - "gloo-file 0.3.0", - "gloo-history 0.2.2", + "gloo-console", + "gloo-dialogs", + "gloo-events", + "gloo-file", + "gloo-history", "gloo-net 0.5.0", - "gloo-render 0.2.0", - "gloo-storage 0.3.0", - "gloo-timers 0.3.0", - "gloo-utils 0.2.0", - "gloo-worker 0.5.0", -] - -[[package]] -name = "gloo-console" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b7ce3c05debe147233596904981848862b068862e9ec3e34be446077190d3f" -dependencies = [ - "gloo-utils 0.1.7", - "js-sys", - "serde", - "wasm-bindgen", - "web-sys", + "gloo-render", + "gloo-storage", + "gloo-timers", + "gloo-utils", + "gloo-worker", ] [[package]] @@ -1127,23 +1089,13 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a17868f56b4a24f677b17c8cb69958385102fa879418052d60b50bc1727e261" dependencies = [ - "gloo-utils 0.2.0", + "gloo-utils", "js-sys", "serde", "wasm-bindgen", "web-sys", ] -[[package]] -name = "gloo-dialogs" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67062364ac72d27f08445a46cab428188e2e224ec9e37efdba48ae8c289002e6" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - [[package]] name = "gloo-dialogs" version = "0.2.0" @@ -1154,16 +1106,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "gloo-events" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68b107f8abed8105e4182de63845afcc7b69c098b7852a813ea7462a320992fc" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - [[package]] name = "gloo-events" version = "0.2.0" @@ -1174,18 +1116,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "gloo-file" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d5564e570a38b43d78bdc063374a0c3098c4f0d64005b12f9bbe87e869b6d7" -dependencies = [ - "gloo-events 0.1.2", - "js-sys", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "gloo-file" version = "0.3.0" @@ -1193,28 +1123,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97563d71863fb2824b2e974e754a81d19c4a7ec47b09ced8a0e6656b6d54bd1f" dependencies = [ "futures-channel", - "gloo-events 0.2.0", + "gloo-events", "js-sys", "wasm-bindgen", "web-sys", ] -[[package]] -name = "gloo-history" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85725d90bf0ed47063b3930ef28e863658a7905989e9929a8708aab74a1d5e7f" -dependencies = [ - "gloo-events 0.1.2", - "gloo-utils 0.1.7", - "serde", - "serde-wasm-bindgen 0.5.0", - "serde_urlencoded", - "thiserror", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "gloo-history" version = "0.2.2" @@ -1222,37 +1136,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "903f432be5ba34427eac5e16048ef65604a82061fe93789f2212afc73d8617d6" dependencies = [ "getrandom", - "gloo-events 0.2.0", - "gloo-utils 0.2.0", + "gloo-events", + "gloo-utils", "serde", - "serde-wasm-bindgen 0.6.5", + "serde-wasm-bindgen", "serde_urlencoded", "thiserror", "wasm-bindgen", "web-sys", ] -[[package]] -name = "gloo-net" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66b4e3c7d9ed8d315fd6b97c8b1f74a7c6ecbbc2320e65ae7ed38b7068cc620" -dependencies = [ - "futures-channel", - "futures-core", - "futures-sink", - "gloo-utils 0.1.7", - "http 0.2.12", - "js-sys", - "pin-project", - "serde", - "serde_json", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "gloo-net" version = "0.5.0" @@ -1262,7 +1155,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-sink", - "gloo-utils 0.2.0", + "gloo-utils", "http 0.2.12", "js-sys", "pin-project", @@ -1283,7 +1176,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-sink", - "gloo-utils 0.2.0", + "gloo-utils", "http 1.1.0", "js-sys", "pin-project", @@ -1295,16 +1188,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "gloo-render" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fd9306aef67cfd4449823aadcd14e3958e0800aa2183955a309112a84ec7764" -dependencies = [ - "wasm-bindgen", - "web-sys", -] - [[package]] name = "gloo-render" version = "0.2.0" @@ -1315,28 +1198,13 @@ dependencies = [ "web-sys", ] -[[package]] -name = "gloo-storage" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6ab60bf5dbfd6f0ed1f7843da31b41010515c745735c970e821945ca91e480" -dependencies = [ - "gloo-utils 0.1.7", - "js-sys", - "serde", - "serde_json", - "thiserror", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "gloo-storage" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fbc8031e8c92758af912f9bc08fbbadd3c6f3cfcbf6b64cdf3d6a81f0139277a" dependencies = [ - "gloo-utils 0.2.0", + "gloo-utils", "js-sys", "serde", "serde_json", @@ -1345,16 +1213,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - [[package]] name = "gloo-timers" version = "0.3.0" @@ -1367,19 +1225,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "gloo-utils" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" -dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "gloo-utils" version = "0.2.0" @@ -1393,23 +1238,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "gloo-worker" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13471584da78061a28306d1359dd0178d8d6fc1c7c80e5e35d27260346e0516a" -dependencies = [ - "anymap2", - "bincode", - "gloo-console 0.2.3", - "gloo-utils 0.1.7", - "js-sys", - "serde", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "gloo-worker" version = "0.5.0" @@ -1418,7 +1246,7 @@ checksum = "085f262d7604911c8150162529cefab3782e91adb20202e8658f7275d2aefe5d" dependencies = [ "bincode", "futures 0.3.30", - "gloo-utils 0.2.0", + "gloo-utils", "gloo-worker-macros", "js-sys", "pinned", @@ -1832,7 +1660,7 @@ dependencies = [ name = "inner_html" version = "0.1.0" dependencies = [ - "gloo 0.11.0", + "gloo", "web-sys", "yew", ] @@ -2114,7 +1942,7 @@ dependencies = [ name = "mount_point" version = "0.1.0" dependencies = [ - "gloo 0.11.0", + "gloo", "wasm-bindgen", "web-sys", "yew", @@ -2387,7 +2215,7 @@ checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" name = "portals" version = "0.1.0" dependencies = [ - "gloo 0.11.0", + "gloo", "wasm-bindgen", "web-sys", "yew", @@ -2487,23 +2315,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "prokio" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b55e106e5791fa5a13abd13c85d6127312e8e09098059ca2bc9b03ca4cf488" -dependencies = [ - "futures 0.3.30", - "gloo 0.8.1", - "num_cpus", - "once_cell", - "pin-project", - "pinned", - "tokio", - "tokio-stream", - "wasm-bindgen-futures", -] - [[package]] name = "pulldown-cmark" version = "0.12.1" @@ -2668,7 +2479,7 @@ name = "router" version = "0.1.0" dependencies = [ "getrandom", - "gloo 0.11.0", + "gloo", "instant", "lipsum", "log", @@ -2828,17 +2639,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-wasm-bindgen" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - [[package]] name = "serde-wasm-bindgen" version = "0.6.5" @@ -3047,7 +2847,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" name = "suspense" version = "0.1.0" dependencies = [ - "gloo 0.11.0", + "gloo", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -3210,7 +3010,7 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" name = "timer" version = "0.1.0" dependencies = [ - "gloo 0.11.0", + "gloo", "js-sys", "wasm-bindgen", "yew", @@ -3220,7 +3020,7 @@ dependencies = [ name = "timer_functional" version = "0.1.0" dependencies = [ - "gloo 0.11.0", + "gloo", "js-sys", "yew", ] @@ -3244,7 +3044,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" name = "todomvc" version = "0.1.0" dependencies = [ - "gloo 0.11.0", + "gloo", "serde", "serde_derive", "strum", @@ -3339,6 +3139,23 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokise" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fae352452702497bdbde0ce9c79a27fa488c73be42c77e0e9ee4a1b5cce97596" +dependencies = [ + "futures 0.3.30", + "gloo", + "num_cpus", + "once_cell", + "pin-project", + "pinned", + "tokio", + "tokio-stream", + "wasm-bindgen-futures", +] + [[package]] name = "toml" version = "0.8.19" @@ -3512,7 +3329,7 @@ dependencies = [ name = "two_apps" version = "0.1.0" dependencies = [ - "gloo 0.11.0", + "gloo", "yew", ] @@ -3840,7 +3657,7 @@ version = "0.1.0" dependencies = [ "derive_more", "glob", - "gloo 0.11.0", + "gloo", "js-sys", "tokio", "wasm-bindgen", @@ -4009,17 +3826,17 @@ dependencies = [ "bincode", "console_error_panic_hook", "futures 0.3.30", - "gloo 0.11.0", + "gloo", "html-escape", "implicit-clone", "indexmap", "js-sys", - "prokio", "rustversion", "serde", "slab", "thiserror", "tokio", + "tokise", "tracing", "trybuild", "wasm-bindgen", @@ -4034,7 +3851,7 @@ name = "yew-agent" version = "0.3.0" dependencies = [ "futures 0.3.30", - "gloo-worker 0.5.0", + "gloo-worker", "serde", "wasm-bindgen", "yew", @@ -4083,7 +3900,7 @@ dependencies = [ name = "yew-router" version = "0.18.0" dependencies = [ - "gloo 0.11.0", + "gloo", "js-sys", "route-recognizer", "serde", diff --git a/packages/yew/Cargo.toml b/packages/yew/Cargo.toml index 30a1f2538d6..fe5449c054f 100644 --- a/packages/yew/Cargo.toml +++ b/packages/yew/Cargo.toml @@ -32,7 +32,7 @@ base64ct = { version = "1.6.0", features = ["std"], optional = true } bincode = { version = "1.3.3", optional = true } serde = { version = "1", features = ["derive"] } tracing = "0.1.40" -prokio = "0.1.0" +tokise = "0.1.0" rustversion = "1" [target.'cfg(target_arch = "wasm32")'.dependencies] diff --git a/packages/yew/src/platform.rs b/packages/yew/src/platform.rs index 20c35fba80f..760e65a9caa 100644 --- a/packages/yew/src/platform.rs +++ b/packages/yew/src/platform.rs @@ -1,6 +1,6 @@ //! Yew's compatibility between JavaScript Runtime and Native Runtimes. //! -//! This module is also published under the name [prokio] on crates.io. +//! This module is also published under the name [tokise] on crates.io. //! //! # Rationale //! @@ -45,4 +45,4 @@ //! - `tokio` (non-WebAssembly targets) #[doc(inline)] -pub use prokio::*; +pub use tokise::*;