From a2e8e1d69efeb7ea6f3898c1817f2af8ebf0bcbe Mon Sep 17 00:00:00 2001 From: Jonathan Kelley Date: Fri, 1 Nov 2024 16:11:24 -0700 Subject: [PATCH] Remove latent dependencies in router --- Cargo.lock | 164 +------------------------------------ packages/router/Cargo.toml | 17 ++-- 2 files changed, 8 insertions(+), 173 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b473371bf..15da157aa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1523,15 +1523,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - [[package]] name = "bindgen" version = "0.69.5" @@ -3754,9 +3745,8 @@ name = "dioxus-router" version = "0.6.0-alpha.3" dependencies = [ "axum 0.7.7", - "base64 0.21.7", + "base64 0.22.1", "ciborium", - "console_error_panic_hook", "criterion", "dioxus", "dioxus-cli-config", @@ -3764,14 +3754,12 @@ dependencies = [ "dioxus-lib", "dioxus-router-macro", "dioxus-ssr", - "gloo", "rustversion", "serde", "tokio", "tracing", "url", "urlencoding", - "wasm-bindgen-test", ] [[package]] @@ -5482,38 +5470,6 @@ dependencies = [ "regex-syntax 0.8.5", ] -[[package]] -name = "gloo" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28999cda5ef6916ffd33fb4a7b87e1de633c47c0dc6d97905fee1cdaa142b94d" -dependencies = [ - "gloo-console", - "gloo-dialogs", - "gloo-events", - "gloo-file", - "gloo-history", - "gloo-net 0.3.1", - "gloo-render", - "gloo-storage", - "gloo-timers 0.2.6", - "gloo-utils 0.1.7", - "gloo-worker", -] - -[[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", -] - [[package]] name = "gloo-dialogs" version = "0.1.1" @@ -5524,65 +5480,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-file" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d5564e570a38b43d78bdc063374a0c3098c4f0d64005b12f9bbe87e869b6d7" -dependencies = [ - "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", - "gloo-utils 0.1.7", - "serde", - "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.6.0" @@ -5592,7 +5489,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-sink", - "gloo-utils 0.2.0", + "gloo-utils", "http 1.1.0", "js-sys", "pin-project", @@ -5604,31 +5501,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-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-timers" version = "0.2.6" @@ -5651,19 +5523,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" @@ -5677,23 +5536,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", - "gloo-utils 0.1.7", - "js-sys", - "serde", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - [[package]] name = "gobject-sys" version = "0.18.0" @@ -10248,7 +10090,7 @@ dependencies = [ "const_format", "dashmap", "futures", - "gloo-net 0.6.0", + "gloo-net", "http 1.1.0", "http-body-util", "hyper 1.5.0", diff --git a/packages/router/Cargo.toml b/packages/router/Cargo.toml index a1b5eb37c..e6141ae0f 100644 --- a/packages/router/Cargo.toml +++ b/packages/router/Cargo.toml @@ -11,7 +11,7 @@ keywords = ["dom", "ui", "gui", "react", "wasm"] [dependencies] dioxus-lib = { workspace = true } -dioxus-history = { workspace = true } +dioxus-history = { workspace = true } dioxus-router-macro = { workspace = true } tracing = { workspace = true } urlencoding = "2.1.3" @@ -19,13 +19,6 @@ url = "2.3.1" dioxus-cli-config = { workspace = true } rustversion = "1.0.17" -# you need to comment this out when publishing since cargo workspaces is not smart enough to wipe this when dropping -# dev-dependncey crates -[target.'cfg(target_family = "wasm")'.dev-dependencies] -console_error_panic_hook = "0.1.7" -gloo = "0.8.0" -wasm-bindgen-test = "0.3.33" - [features] default = [] @@ -34,15 +27,15 @@ axum = { workspace = true, features = ["ws"] } dioxus = { workspace = true, features = ["router"] } dioxus-ssr = { workspace = true } criterion = { workspace = true, features = ["async_tokio", "html_reports"] } -ciborium = { version = "0.2.1" } -base64 = { version = "0.21.0" } -serde = { version = "1", features = ["derive"] } +ciborium = { workspace = true } +base64 = { workspace = true } +serde = { workspace = true, features = ["derive"] } tokio = { workspace = true, features = ["full"] } [package.metadata.docs.rs] cargo-args = ["-Zunstable-options", "-Zrustdoc-scrape-examples"] -# Most of the examples live in the workspace. We include some here so that docs.rs can scrape our examples for better inline docs +# Most of the examples live in the workspace. We include some here so that docs.rs can scrape our examples for better inline docs [[example]] name = "hash_fragment_state" path = "../../examples/hash_fragment_state.rs"