Merge branch 'master' into router-typesafe

packages/fullstack/Cargo.toml

@@ -30,30 +30,30 @@ salvo = { version = "0.37.7", optional = true, features = ["serve-static", "ws"]
 serde = "1.0.159"
 
 # Dioxus + SSR
-dioxus = { path = "../dioxus", version = "^0.3.0" }
-dioxus-ssr = { path = "../ssr", version = "^0.3.0", optional = true }
+dioxus = { workspace = true }
+dioxus-ssr = { workspace = true, optional = true }
 hyper = { version = "0.14.25", optional = true }
 http = { version = "0.2.9", optional = true }
 
 # Router Intigration
-dioxus-router = { path = "../router", version = "^0.3.0", optional = true }
+dioxus-router = { workspace = true, optional = true }
 
-log = "0.4.17"
+log = { workspace = true }
 once_cell = "1.17.1"
 thiserror = "1.0.40"
-tokio = { version = "1.27.0", features = ["full"], optional = true }
+tokio = { workspace = true, features = ["full"], optional = true }
 object-pool = "0.5.4"
 anymap = "0.12.1"
 
 serde_json = { version = "1.0.95", optional = true }
 tokio-stream = { version = "0.1.12", features = ["sync"], optional = true }
-futures-util = { version = "0.3.28", optional = true }
+futures-util = { workspace = true, optional = true }
 postcard = { version = "1.0.4", features = ["use-std"] }
 yazi = "0.1.5"
 base64 = "0.21.0"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-dioxus-hot-reload = { path = "../hot-reload" }
+dioxus-hot-reload = { workspace = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 web-sys = { version = "0.3.61", features = ["Window", "Document", "Element", "HtmlDocument", "Storage", "console"] }

packages/fullstack/examples/axum-desktop/Cargo.toml

@@ -7,12 +7,12 @@ publish = false
 [lib]
 
 [dependencies]
-dioxus-desktop = { path = "../../../desktop", optional = true }
-dioxus = { path = "../../../dioxus" }
-dioxus-router = { path = "../../../router" }
-dioxus-fullstack = { path = "../../" }
+dioxus-desktop = { workspace = true, optional = true }
+dioxus = { workspace = true }
+dioxus-router = { workspace = true }
+dioxus-fullstack = { workspace = true }
 axum = { version = "0.6.12", optional = true }
-tokio = { version = "1.27.0", features = ["full"], optional = true }
+tokio = { workspace = true, features = ["full"], optional = true }
 serde = "1.0.159"
 
 [features]

packages/fullstack/examples/axum-hello-world/Cargo.toml

@@ -7,11 +7,11 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-dioxus-web = { path = "../../../web", features=["hydrate"], optional = true }
-dioxus = { path = "../../../dioxus" }
-dioxus-fullstack = { path = "../../" }
+dioxus-web = { workspace = true, features=["hydrate"], optional = true }
+dioxus = { workspace = true }
+dioxus-fullstack = { workspace = true }
 axum = { version = "0.6.12", optional = true }
-tokio = { version = "1.27.0", features = ["full"], optional = true }
+tokio = { workspace = true, features = ["full"], optional = true }
 serde = "1.0.159"
 execute = "0.2.12"
 

packages/fullstack/examples/axum-router/Cargo.toml

@@ -7,12 +7,12 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-dioxus-web = { path = "../../../web", features = ["hydrate"], optional = true }
-dioxus = { path = "../../../dioxus" }
-dioxus-router = { path = "../../../router" }
-dioxus-fullstack = { path = "../../", features = ["router"] }
+dioxus-web = { workspace = true, features = ["hydrate"], optional = true }
+dioxus = { workspace = true }
+dioxus-router = { workspace = true}
+dioxus-fullstack = { workspace = true, features = ["router"] }
 axum = { version = "0.6.12", optional = true }
-tokio = { version = "1.27.0", features = ["full"], optional = true }
+tokio = {workspace = true, features = ["full"], optional = true }
 serde = { version = "1.0.159", features = ["derive"] }
 
 [features]

packages/fullstack/examples/salvo-hello-world/Cargo.toml

@@ -7,10 +7,10 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-dioxus-web = { path = "../../../web", features=["hydrate"], optional = true }
-dioxus = { path = "../../../dioxus" }
-dioxus-fullstack = { path = "../../" }
-tokio = { version = "1.27.0", features = ["full"], optional = true }
+dioxus-web = { workspace = true, features=["hydrate"], optional = true }
+dioxus = { workspace = true }
+dioxus-fullstack = { workspace = true }
+tokio = { workspace = true, features = ["full"], optional = true }
 serde = "1.0.159"
 salvo = { version = "0.37.9", optional = true }
 execute = "0.2.12"

packages/fullstack/examples/warp-hello-world/Cargo.toml

@@ -7,10 +7,10 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-dioxus-web = { path = "../../../web", features=["hydrate"], optional = true }
-dioxus = { path = "../../../dioxus" }
-dioxus-fullstack = { path = "../../" }
-tokio = { version = "1.27.0", features = ["full"], optional = true }
+dioxus-web = { workspace = true, features=["hydrate"], optional = true }
+dioxus = { workspace = true }
+dioxus-fullstack = { workspace = true }
+tokio = { workspace = true, features = ["full"], optional = true }
 serde = "1.0.159"
 warp = { version = "0.3.3", optional = true }
 execute = "0.2.12"