Merge branch 'master' into feature/use-shared-state-better-diagnostics

packages/fullstack/Cargo.toml

@@ -3,35 +3,40 @@ name = "dioxus-fullstack"
 version = "0.1.0"
 edition = "2021"
 description = "Fullstack Dioxus Utilities"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 repository = "https://github.com/DioxusLabs/dioxus/"
 homepage = "https://dioxuslabs.com"
 keywords = ["dom", "ui", "gui", "react", "ssr", "fullstack"]
 
 [dependencies]
 # server functions
-server_fn = { git = "https://github.com/leptos-rs/leptos", rev = "15a4e54435eb5a539afb75891292bcccd2cc8e85", default-features = false, features = ["stable"] }
+server_fn = { git = "https://github.com/leptos-rs/leptos", rev = "6b90e1babd425c9a324181c86e3fd1b942c9b10f", default-features = false }
 dioxus_server_macro = { path = "server-macro" }
 
 # warp
-warp = { version = "0.3.3", optional = true }
+warp = { version = "0.3.5", features = ["compression-gzip"], optional = true }
 http-body = { version = "0.4.5", optional = true }
+http-body-util = "0.1.0-rc.2"
 
 # axum
-axum = { version = "0.6.1", features = ["ws"], optional = true }
-tower-http = { version = "0.4.0", optional = true, features = ["fs"] }
+axum = { version = "0.6.1", features = ["ws", "macros"], optional = true }
+tower-http = { version = "0.4.0", optional = true, features = ["fs", "compression-gzip"] }
+tower = { version = "0.4.13", features = ["util"], optional = true }
 axum-macros = "0.3.7"
 
 # salvo
-salvo = { version = "0.37.7", optional = true, features = ["serve-static", "ws"] }
+salvo = { version = "0.46.0", optional = true, features = ["serve-static", "websocket", "compression"] }
 serde = "1.0.159"
 
 # Dioxus + SSR
-dioxus-core = { workspace = 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 = { workspace = true, optional = true }
+
 log = { workspace = true }
 once_cell = "1.17.1"
 thiserror = { workspace = true }
@@ -43,9 +48,13 @@ serde_json = { version = "1.0.95", optional = true }
 tokio-stream = { version = "0.1.12", features = ["sync"], optional = true }
 futures-util = { workspace = true, optional = true }
 postcard = { version = "1.0.4", features = ["use-std"] }
-yazi = "0.1.5"
 base64 = "0.21.0"
 
+pin-project = "1.1.2"
+async-trait = "0.1.71"
+bytes = "1.4.0"
+tower-layer = "0.3.2"
+
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 dioxus-hot-reload = { workspace = true }
 
@@ -54,10 +63,14 @@ web-sys = { version = "0.3.61", features = ["Window", "Document", "Element", "Ht
 
 [features]
 default = ["hot-reload", "default-tls"]
-hot-reload = ["serde_json", "tokio-stream", "futures-util"]
-warp = ["dep:warp", "http-body", "ssr"]
+router = ["dioxus-router"]
+hot-reload = ["serde_json", "futures-util"]
+warp = ["dep:warp", "ssr"]
 axum = ["dep:axum", "tower-http", "ssr"]
 salvo = ["dep:salvo", "ssr"]
-ssr = ["server_fn/ssr", "tokio", "dioxus-ssr", "hyper", "http"]
+ssr = ["server_fn/ssr", "tokio", "dioxus-ssr", "tower", "hyper", "http", "http-body", "dioxus-router/ssr", "tokio-stream"]
 default-tls = ["server_fn/default-tls"]
 rustls = ["server_fn/rustls"]
+
+[dev-dependencies]
+dioxus-fullstack = { path = ".", features = ["router"] }