swaits/dioxus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get more axum stuff upgraded to 0.7

Browse Source
This commit is contained in:
Jonathan Kelley committed 2024-02-15 18:59:57 -08:00
1 parent 214a907adc
commit 64a321eacc
25 files changed
+202 -193
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Cargo.lock
Generated
+63 -74
View File
@@ -608,7 +608,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e" checksum = "1236b4b292f6c4d6dc34604bb5120d85c3fe1d1aa596bd5cc52ca054d13e7b9e"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"axum-core 0.4.3", "axum-core",
"axum-macros", "axum-macros",
"base64", "base64",
"bytes", "bytes",
@@ -646,7 +646,7 @@ dependencies = [
"anyhow", "anyhow",
"async-trait", "async-trait",
"axum", "axum",
"axum_session 0.3.5", "axum_session",
"axum_session_auth", "axum_session_auth",
"dioxus", "dioxus",
"dioxus-fullstack", "dioxus-fullstack",
@@ -661,23 +661,6 @@ dependencies = [
"tower-http", "tower-http",
] ]
[[package]]
name = "axum-core"
version = "0.3.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
dependencies = [
"async-trait",
"bytes",
"futures-util",
"http 0.2.11",
"http-body 0.4.6",
"mime",
"rustversion",
"tower-layer",
"tower-service",
]
[[package]] [[package]]
name = "axum-core" name = "axum-core"
version = "0.4.3" version = "0.4.3"
@@ -709,6 +692,28 @@ dependencies = [
"tokio", "tokio",
] ]
[[package]]
name = "axum-extra"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "895ff42f72016617773af68fb90da2a9677d89c62338ec09162d4909d86fdd8f"
dependencies = [
"axum",
"axum-core",
"bytes",
"futures-util",
"headers 0.4.0",
"http 1.0.0",
"http-body 1.0.0",
"http-body-util",
"mime",
"pin-project-lite",
"serde",
"tower",
"tower-layer",
"tower-service",
]
[[package]] [[package]]
name = "axum-hello-world" name = "axum-hello-world"
version = "0.1.0" version = "0.1.0"
@@ -746,53 +751,27 @@ dependencies = [
[[package]] [[package]]
name = "axum-server" name = "axum-server"
version = "0.5.1" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "447f28c85900215cc1bea282f32d4a2f22d55c5a300afdfbc661c8d6a632e063" checksum = "c1ad46c3ec4e12f4a4b6835e173ba21c25e484c9d02b49770bf006ce5367c036"
dependencies = [ dependencies = [
"arc-swap", "arc-swap",
"bytes", "bytes",
"futures-util", "futures-util",
"http 0.2.11", "http 1.0.0",
"http-body 0.4.6", "http-body 1.0.0",
"hyper 0.14.28", "http-body-util",
"hyper 1.1.0",
"hyper-util",
"pin-project-lite", "pin-project-lite",
"rustls 0.21.10", "rustls 0.21.10",
"rustls-pemfile 1.0.4", "rustls-pemfile 2.1.0",
"tokio", "tokio",
"tokio-rustls 0.24.1", "tokio-rustls 0.24.1",
"tower",
"tower-service", "tower-service",
] ]
[[package]]
name = "axum_session"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b9a35d2907b706dcd52f875c4f9fe55293ebc03fc5b3c2d8883104c821452b8"
dependencies = [
"aes-gcm",
"async-trait",
"axum-core 0.3.4",
"base64",
"bytes",
"chrono",
"cookie 0.17.0",
"dashmap",
"futures",
"http 0.2.11",
"http-body 0.4.6",
"rand 0.8.5",
"serde",
"serde_json",
"sqlx",
"thiserror",
"tokio",
"tower-layer",
"tower-service",
"tracing",
"uuid",
]
[[package]] [[package]]
name = "axum_session" name = "axum_session"
version = "0.12.4" version = "0.12.4"
@@ -805,7 +784,7 @@ dependencies = [
"base64", "base64",
"bytes", "bytes",
"chrono", "chrono",
"cookie 0.18.0", "cookie",
"dashmap", "dashmap",
"forwarded-header-value", "forwarded-header-value",
"futures", "futures",
@@ -834,8 +813,8 @@ dependencies = [
"anyhow", "anyhow",
"async-recursion", "async-recursion",
"async-trait", "async-trait",
"axum-core 0.4.3", "axum-core",
"axum_session 0.12.4", "axum_session",
"bytes", "bytes",
"chrono", "chrono",
"dashmap", "dashmap",
@@ -1699,21 +1678,6 @@ dependencies = [
"unicode-segmentation", "unicode-segmentation",
] ]
[[package]]
name = "cookie"
version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24"
dependencies = [
"aes-gcm",
"base64",
"percent-encoding",
"rand 0.8.5",
"subtle",
"time",
"version_check",
]
[[package]] [[package]]
name = "cookie" name = "cookie"
version = "0.18.0" version = "0.18.0"
@@ -2285,6 +2249,7 @@ dependencies = [
"anyhow", "anyhow",
"atty", "atty",
"axum", "axum",
"axum-extra",
"axum-server", "axum-server",
"cargo-generate", "cargo-generate",
"cargo_metadata 0.18.1", "cargo_metadata 0.18.1",
@@ -2305,7 +2270,7 @@ dependencies = [
"flate2", "flate2",
"fs_extra", "fs_extra",
"futures-util", "futures-util",
"headers", "headers 0.3.9",
"html_parser", "html_parser",
"hyper 1.1.0", "hyper 1.1.0",
"hyper-rustls 0.26.0", "hyper-rustls 0.26.0",
@@ -4475,13 +4440,28 @@ checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270"
dependencies = [ dependencies = [
"base64", "base64",
"bytes", "bytes",
"headers-core", "headers-core 0.2.0",
"http 0.2.11", "http 0.2.11",
"httpdate", "httpdate",
"mime", "mime",
"sha1", "sha1",
] ]
[[package]]
name = "headers"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9"
dependencies = [
"base64",
"bytes",
"headers-core 0.3.0",
"http 1.0.0",
"httpdate",
"mime",
"sha1",
]
[[package]] [[package]]
name = "headers-core" name = "headers-core"
version = "0.2.0" version = "0.2.0"
@@ -4491,6 +4471,15 @@ dependencies = [
"http 0.2.11", "http 0.2.11",
] ]
[[package]]
name = "headers-core"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4"
dependencies = [
"http 1.0.0",
]
[[package]] [[package]]
name = "heck" name = "heck"
version = "0.3.3" version = "0.3.3"
Cargo.toml
+4
View File
@@ -107,6 +107,7 @@ manganis = { git = "https://github.com/DioxusLabs/collect-assets", rev = "f98269
lru = "0.12.2" lru = "0.12.2"
async-trait = "0.1.77" async-trait = "0.1.77"
axum = "0.7.0" axum = "0.7.0"
axum-server = "0.6.0"
tower = "0.4.13" tower = "0.4.13"
http = "1.0.0" http = "1.0.0"
tower-http = "0.5.1" tower-http = "0.5.1"
@@ -114,6 +115,9 @@ hyper = "1.0.0"
hyper-rustls = "0.26.0" hyper-rustls = "0.26.0"
serde_json = "1.0.61" serde_json = "1.0.61"
serde = "1.0.61" serde = "1.0.61"
axum_session = "0.12.1"
axum_session_auth = "0.12.1"
axum-extra = "0.9.2"
# This is a "virtual package" # This is a "virtual package"
# It is not meant to be published, but is used so "cargo run --example XYZ" works properly # It is not meant to be published, but is used so "cargo run --example XYZ" works properly
packages/cli/Cargo.toml
+4 -3
View File
@@ -32,14 +32,15 @@ tokio = { version = "1.16.1", features = ["fs", "sync", "rt", "macros"] }
atty = "0.2.14" atty = "0.2.14"
chrono = "0.4.19" chrono = "0.4.19"
anyhow = "1" anyhow = "1"
hyper = {workspace = true} hyper = { workspace = true }
hyper-rustls = {workspace = true} hyper-rustls = { workspace = true }
indicatif = "0.17.5" indicatif = "0.17.5"
subprocess = "0.2.9" subprocess = "0.2.9"
rayon = "1.8.0" rayon = "1.8.0"
axum = { workspace = true, features = ["ws"] } axum = { workspace = true, features = ["ws"] }
axum-server = { version = "0.5.1", features = ["tls-rustls"] } axum-server = { workspace = true, features = ["tls-rustls"] }
axum-extra = { workspace = true, features = ["typed-header"] }
tower-http = { workspace = true, features = ["full"] } tower-http = { workspace = true, features = ["full"] }
headers = "0.3.7" headers = "0.3.7"
packages/cli/src/server/web/hot_reload.rs
+3 -3
View File
@@ -1,10 +1,10 @@
use crate::server::HotReloadState;
use axum::{ use axum::{
extract::{ws::Message, WebSocketUpgrade}, extract::{ws::Message, WebSocketUpgrade},
response::IntoResponse, response::IntoResponse,
Extension, TypedHeader, Extension,
}; };
use axum_extra::TypedHeader;
use crate::server::HotReloadState;
pub async fn hot_reload_handler( pub async fn hot_reload_handler(
ws: WebSocketUpgrade, ws: WebSocketUpgrade,
packages/cli/src/server/web/mod.rs
+4 -1
View File
@@ -19,6 +19,7 @@ use axum::{
routing::{get, get_service}, routing::{get, get_service},
Router, Router,
}; };
use axum_extra::TypedHeader;
use axum_server::tls_rustls::RustlsConfig; use axum_server::tls_rustls::RustlsConfig;
use dioxus_cli_config::CrateConfig; use dioxus_cli_config::CrateConfig;
use dioxus_cli_config::WebHttpsConfig; use dioxus_cli_config::WebHttpsConfig;
@@ -298,7 +299,9 @@ async fn setup_router(
.body(body) .body(body)
.unwrap() .unwrap()
} else { } else {
response.map(|body| body.into()) response.map(|body| body.try_into().unwrap())
// response.into_body()
// response.map(|body| body.into())
}; };
let headers = response.headers_mut(); let headers = response.headers_mut();
headers.insert( headers.insert(
packages/cli/src/server/web/proxy.rs
+10 -3
View File
@@ -17,6 +17,7 @@ impl ProxyClient {
fn new(url: Uri) -> Self { fn new(url: Uri) -> Self {
let https = hyper_rustls::HttpsConnectorBuilder::new() let https = hyper_rustls::HttpsConnectorBuilder::new()
.with_native_roots() .with_native_roots()
.unwrap()
.https_or_http() .https_or_http()
.enable_http1() .enable_http1()
.build(); .build();
@@ -138,7 +139,9 @@ mod test {
.unwrap(); .unwrap();
assert_eq!(resp.status(), StatusCode::OK); assert_eq!(resp.status(), StatusCode::OK);
assert_eq!( assert_eq!(
hyper::body::to_bytes(resp.into_body()).await.unwrap(), axum::body::to_bytes(resp.into_body(), usize::MAX)
.await
.unwrap(),
"backend: /api" "backend: /api"
); );
@@ -148,7 +151,9 @@ mod test {
.unwrap(); .unwrap();
assert_eq!(resp.status(), StatusCode::OK); assert_eq!(resp.status(), StatusCode::OK);
assert_eq!( assert_eq!(
hyper::body::to_bytes(resp.into_body()).await.unwrap(), axum::body::to_bytes(resp.into_body(), usize::MAX)
.await
.unwrap(),
"backend: /api/" "backend: /api/"
); );
@@ -162,7 +167,9 @@ mod test {
.unwrap(); .unwrap();
assert_eq!(resp.status(), StatusCode::OK); assert_eq!(resp.status(), StatusCode::OK);
assert_eq!( assert_eq!(
hyper::body::to_bytes(resp.into_body()).await.unwrap(), axum::body::to_bytes(resp.into_body(), usize::MAX)
.await
.unwrap(),
"backend: /api/subpath" "backend: /api/subpath"
); );
backend_handle.abort(); backend_handle.abort();
packages/dioxus/Cargo.toml
+2 -1
View File
@@ -49,8 +49,9 @@ mobile = ["dioxus-mobile", "dioxus-fullstack?/mobile", "dioxus-config-macro/mobi
web = ["dioxus-web", "dioxus-fullstack?/web", "dioxus-config-macro/web", "dioxus-router?/web"] web = ["dioxus-web", "dioxus-fullstack?/web", "dioxus-config-macro/web", "dioxus-router?/web"]
ssr = ["dioxus-ssr", "dioxus-router?/ssr", "dioxus-config-macro/ssr"] ssr = ["dioxus-ssr", "dioxus-router?/ssr", "dioxus-config-macro/ssr"]
liveview = ["dioxus-liveview", "dioxus-config-macro/liveview", "dioxus-router?/liveview"] liveview = ["dioxus-liveview", "dioxus-config-macro/liveview", "dioxus-router?/liveview"]
axum = ["dioxus-fullstack?/axum", "ssr", "dioxus-liveview?/axum"] axum = ["dioxus-fullstack?/axum", "dioxus-fullstack?/server", "ssr", "dioxus-liveview?/axum"]
tui = ["dioxus-tui", "dioxus-config-macro/tui"] tui = ["dioxus-tui", "dioxus-config-macro/tui"]
# This feature just disables the no-renderer-enabled warning # This feature just disables the no-renderer-enabled warning
third-party-renderer = [] third-party-renderer = []
packages/fullstack/Cargo.toml
+19 -2
View File
@@ -69,7 +69,24 @@ hot-reload = ["serde_json", "futures-util"]
web = ["dioxus-web", "web-sys"] web = ["dioxus-web", "web-sys"]
desktop = ["dioxus-desktop"] desktop = ["dioxus-desktop"]
mobile = ["dioxus-mobile"] mobile = ["dioxus-mobile"]
axum = ["dep:axum", "tower-http", "server"]
server = ["server_fn/ssr", "dioxus_server_macro/server", "tokio", "tokio-util", "tokio-stream", "dioxus-ssr", "dioxus-ssr/incremental", "tower", "hyper", "http", "tower-layer", "anymap", "tracing-futures", "pin-project", "thiserror", "dioxus-cli-config"]
default-tls = ["server_fn/default-tls"] default-tls = ["server_fn/default-tls"]
rustls = ["server_fn/rustls"] rustls = ["server_fn/rustls"]
axum = ["dep:axum", "tower-http", "server"]
server = [
"server_fn/ssr",
"dioxus_server_macro/server",
"tokio",
"tokio-util",
"tokio-stream",
"dioxus-ssr",
"dioxus-ssr/incremental",
"tower",
"hyper",
"http",
"tower-layer",
"anymap",
"tracing-futures",
"pin-project",
"thiserror",
"dioxus-cli-config"
]
packages/fullstack/examples/axum-auth/Cargo.toml
+3 -2
View File
@@ -31,13 +31,14 @@ serde = "1.0.159"
execute = "0.2.12" execute = "0.2.12"
anyhow = "1.0.71" anyhow = "1.0.71"
[dependencies.axum_session] [dependencies.axum_session]
version = "0.3.0" workspace = true
features = ["sqlite-rustls"] features = ["sqlite-rustls"]
optional = true optional = true
[dependencies.axum_session_auth] [dependencies.axum_session_auth]
version = "0.12.0" workspace = true
features = ["sqlite-rustls"] features = ["sqlite-rustls"]
optional = true optional = true
packages/fullstack/examples/axum-auth/src/main.rs
+2 -4
View File
@@ -44,8 +44,6 @@ fn main() {
.await .await
.unwrap(); .unwrap();
//Create the Database table for storing our Session Data.
session_store.initiate().await.unwrap();
User::create_user_tables(&pool).await; User::create_user_tables(&pool).await;
// build our application with some routes // build our application with some routes
@@ -67,9 +65,9 @@ fn main() {
// run it // run it
let addr = std::net::SocketAddr::from(([127, 0, 0, 1], 3000)); let addr = std::net::SocketAddr::from(([127, 0, 0, 1], 3000));
let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
axum::Server::bind(&addr) axum::serve(listener, app.into_make_service())
.serve(app.into_make_service())
.await .await
.unwrap(); .unwrap();
}); });
packages/fullstack/examples/axum-desktop/src/server.rs
+11 -9
View File
@@ -8,17 +8,19 @@ use dioxus::prelude::*;
#[tokio::main] #[tokio::main]
async fn main() { async fn main() {
let addr = std::net::SocketAddr::from(([127, 0, 0, 1], 8080)); let listener = tokio::net::TcpListener::bind("127.0.0.01:8080")
.await
.unwrap();
let _ = PostServerData::register_explicit(); let _ = PostServerData::register_explicit();
let _ = GetServerData::register_explicit(); let _ = GetServerData::register_explicit();
axum::Server::bind(&addr) axum::serve(
.serve( listener,
axum::Router::new() axum::Router::new()
.register_server_fns("") .register_server_fns("")
.into_make_service(), .into_make_service(),
) )
.await .await
.unwrap(); .unwrap();
} }
packages/fullstack/examples/axum-router/Cargo.toml
+2 -1
View File
@@ -7,7 +7,7 @@ publish = false
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
dioxus = { workspace = true, features = ["router"] } dioxus = { workspace = true, features = ["fullstack", "router"] }
axum = { workspace = true, optional = true } axum = { workspace = true, optional = true }
tokio = {workspace = true, features = ["full"], optional = true } tokio = {workspace = true, features = ["full"], optional = true }
serde = { version = "1.0.159", features = ["derive"] } serde = { version = "1.0.159", features = ["derive"] }
@@ -16,3 +16,4 @@ serde = { version = "1.0.159", features = ["derive"] }
default = [] default = []
server = ["axum", "dioxus/axum"] server = ["axum", "dioxus/axum"]
web = ["dioxus/web"] web = ["dioxus/web"]
packages/fullstack/examples/axum-router/src/main.rs
+10 -14
View File
@@ -7,21 +7,17 @@
use dioxus::prelude::*; use dioxus::prelude::*;
fn main() { fn main() {
let config = LaunchBuilder::fullstack(); let cfg = server_only!(dioxus::fullstack::Config::new().incremental(
#[cfg(feature = "server")] IncrementalRendererConfig::default().invalidate_after(std::time::Duration::from_secs(120)),
config ));
.incremental(
IncrementalRendererConfig::default()
.invalidate_after(std::time::Duration::from_secs(120)),
)
.launch();
#[cfg(not(feature = "server"))] LaunchBuilder::fullstack().with_cfg(cfg).launch(app);
config.launch(|| { }
rsx! {
Router::<Route> {} fn app() -> Element {
} rsx! {
}); Router::<Route> {}
}
} }
#[derive(Clone, Routable, Debug, PartialEq, serde::Serialize, serde::Deserialize)] #[derive(Clone, Routable, Debug, PartialEq, serde::Serialize, serde::Deserialize)]
packages/fullstack/examples/static-hydrated/src/main.rs
+3 -8
View File
@@ -15,7 +15,7 @@ use serde::{Deserialize, Serialize};
#[tokio::main] #[tokio::main]
async fn main() { async fn main() {
pre_cache_static_routes_with_props( pre_cache_static_routes_with_props(
&ServerConfig::new_with_router( &ServeConfig::new_with_router(
dioxus_fullstack::router::FullstackRouterConfig::<Route>::default(), dioxus_fullstack::router::FullstackRouterConfig::<Route>::default(),
) )
.assets_path("docs") .assets_path("docs")
@@ -37,13 +37,11 @@ fn main() {
); );
} }
#[cfg(not(any(feature = "web", feature = "server")))]
fn main() {}
#[derive(Clone, Routable, Debug, PartialEq, Serialize, Deserialize)] #[derive(Clone, Routable, Debug, PartialEq, Serialize, Deserialize)]
enum Route { enum Route {
#[route("/")] #[route("/")]
Home {}, Home {},
#[route("/blog")] #[route("/blog")]
Blog, Blog,
} }
@@ -72,10 +70,7 @@ fn Home() -> Element {
let text = use_signal(|| "...".to_string()); let text = use_signal(|| "...".to_string());
rsx! { rsx! {
Link { Link { to: Route::Blog {}, "Go to blog" }
to: Route::Blog {},
"Go to blog"
}
div { div {
h1 { "High-Five counter: {count}" } h1 { "High-Five counter: {count}" }
button { onclick: move |_| count += 1, "Up high!" } button { onclick: move |_| count += 1, "Up high!" }
packages/fullstack/src/lib.rs
+20 -19
View File
@@ -2,7 +2,7 @@
#![doc(html_logo_url = "https://avatars.githubusercontent.com/u/79236386")] #![doc(html_logo_url = "https://avatars.githubusercontent.com/u/79236386")]
#![doc(html_favicon_url = "https://avatars.githubusercontent.com/u/79236386")] #![doc(html_favicon_url = "https://avatars.githubusercontent.com/u/79236386")]
#![deny(missing_docs)] #![deny(missing_docs)]
#![cfg_attr(any(docsrs, feature = "nightly-doc"), feature(doc_cfg))] #![cfg_attr(docsrs, feature(doc_cfg))]
pub use once_cell; pub use once_cell;
@@ -10,6 +10,7 @@ mod html_storage;
#[cfg(feature = "server")] #[cfg(feature = "server")]
mod adapters; mod adapters;
// Splitting up the glob export lets us document features required for each adapter // Splitting up the glob export lets us document features required for each adapter
#[cfg_attr(docsrs, doc(cfg(feature = "axum")))] #[cfg_attr(docsrs, doc(cfg(feature = "axum")))]
#[cfg(feature = "axum")] #[cfg(feature = "axum")]
@@ -21,45 +22,46 @@ pub use adapters::{server_fn_service, ServerFnHandler};
mod config; mod config;
mod hooks; mod hooks;
pub mod launch;
mod server_fn;
#[cfg(all(debug_assertions, feature = "hot-reload", feature = "server"))] #[cfg(all(debug_assertions, feature = "hot-reload", feature = "server"))]
mod hot_reload; mod hot_reload;
pub mod launch;
pub use config::*; pub use config::*;
#[cfg(feature = "server")] #[cfg(feature = "server")]
mod layer; mod layer;
#[cfg(feature = "server")] #[cfg(feature = "server")]
mod render; mod render;
#[cfg(feature = "server")] #[cfg(feature = "server")]
mod serve_config; mod serve_config;
#[cfg(feature = "server")] #[cfg(feature = "server")]
mod server_context; mod server_context;
mod server_fn;
/// A prelude of commonly used items in dioxus-fullstack. /// A prelude of commonly used items in dioxus-fullstack.
pub mod prelude { pub mod prelude {
use crate::hooks;
pub use hooks::{server_cached::server_cached, server_future::use_server_future};
#[cfg(feature = "axum")] #[cfg(feature = "axum")]
#[cfg_attr(docsrs, doc(cfg(feature = "axum")))] #[cfg_attr(docsrs, doc(cfg(feature = "axum")))]
pub use crate::adapters::axum_adapter::*; pub use crate::adapters::axum_adapter::*;
use crate::hooks;
#[cfg(not(feature = "server"))] #[cfg(not(feature = "server"))]
#[cfg_attr( #[cfg_attr(docsrs, doc(cfg(not(feature = "server"))))]
any(docsrs, feature = "nightly-doc"),
doc(cfg(not(feature = "server")))
)]
pub use crate::html_storage::deserialize::get_root_props_from_document; pub use crate::html_storage::deserialize::get_root_props_from_document;
#[cfg(feature = "server")] #[cfg(feature = "server")]
#[cfg_attr(docsrs, doc(cfg(feature = "server")))] #[cfg_attr(docsrs, doc(cfg(feature = "server")))]
pub use crate::layer::{Layer, Service}; pub use crate::layer::{Layer, Service};
#[cfg(all(feature = "server", feature = "router"))] #[cfg(all(feature = "server", feature = "router"))]
#[cfg_attr( #[cfg_attr(docsrs, doc(cfg(all(feature = "server", feature = "router"))))]
any(docsrs, feature = "nightly-doc"),
doc(cfg(all(feature = "server", feature = "router")))
)]
pub use crate::render::pre_cache_static_routes_with_props; pub use crate::render::pre_cache_static_routes_with_props;
#[cfg(feature = "server")] #[cfg(feature = "server")]
#[cfg_attr(docsrs, doc(cfg(feature = "server")))] #[cfg_attr(docsrs, doc(cfg(feature = "server")))]
pub use crate::render::SSRState; pub use crate::render::SSRState;
@@ -71,28 +73,27 @@ pub mod prelude {
#[cfg(feature = "server")] #[cfg(feature = "server")]
#[cfg_attr(docsrs, doc(cfg(feature = "server")))] #[cfg_attr(docsrs, doc(cfg(feature = "server")))]
pub use crate::serve_config::{ServeConfig, ServeConfigBuilder}; pub use crate::serve_config::{ServeConfig, ServeConfigBuilder};
#[cfg(all(feature = "server", feature = "axum"))] #[cfg(all(feature = "server", feature = "axum"))]
#[cfg_attr( #[cfg_attr(docsrs, doc(cfg(all(feature = "server", feature = "axum"))))]
any(docsrs, feature = "nightly-doc"),
doc(cfg(all(feature = "server", feature = "axum")))
)]
pub use crate::server_context::Axum; pub use crate::server_context::Axum;
#[cfg(feature = "server")] #[cfg(feature = "server")]
#[cfg_attr(docsrs, doc(cfg(feature = "server")))] #[cfg_attr(docsrs, doc(cfg(feature = "server")))]
pub use crate::server_context::{ pub use crate::server_context::{
extract, server_context, DioxusServerContext, FromServerContext, ProvideServerContext, extract, server_context, DioxusServerContext, FromServerContext, ProvideServerContext,
}; };
pub use crate::server_fn::DioxusServerFn; pub use crate::server_fn::DioxusServerFn;
#[cfg(feature = "server")] #[cfg(feature = "server")]
#[cfg_attr(docsrs, doc(cfg(feature = "server")))] #[cfg_attr(docsrs, doc(cfg(feature = "server")))]
pub use crate::server_fn::{ServerFnMiddleware, ServerFnTraitObj, ServerFunction}; pub use crate::server_fn::{ServerFnMiddleware, ServerFnTraitObj, ServerFunction};
pub use dioxus_server_macro::*; pub use dioxus_server_macro::*;
#[cfg(feature = "server")] #[cfg(feature = "server")]
#[cfg_attr(docsrs, doc(cfg(feature = "server")))] #[cfg_attr(docsrs, doc(cfg(feature = "server")))]
pub use dioxus_ssr::incremental::IncrementalRendererConfig; pub use dioxus_ssr::incremental::IncrementalRendererConfig;
pub use server_fn::{self, ServerFn as _, ServerFnError}; pub use server_fn::{self, ServerFn as _, ServerFnError};
pub use hooks::{server_cached::server_cached, server_future::use_server_future};
} }
// // Warn users about overlapping features // // Warn users about overlapping features
packages/fullstack/src/render.rs
-3
View File
@@ -6,7 +6,6 @@ use dioxus_ssr::{
incremental::{IncrementalRendererConfig, RenderFreshness, WrapBody}, incremental::{IncrementalRendererConfig, RenderFreshness, WrapBody},
Renderer, Renderer,
}; };
use serde::Serialize;
use std::sync::Arc; use std::sync::Arc;
use std::sync::RwLock; use std::sync::RwLock;
use tokio::task::spawn_blocking; use tokio::task::spawn_blocking;
@@ -28,7 +27,6 @@ impl SsrRendererPool {
server_context: &DioxusServerContext, server_context: &DioxusServerContext,
) -> Result<(RenderFreshness, String), dioxus_ssr::incremental::IncrementalRendererError> { ) -> Result<(RenderFreshness, String), dioxus_ssr::incremental::IncrementalRendererError> {
let wrapper = FullstackRenderer { let wrapper = FullstackRenderer {
serialized_props: None,
cfg: cfg.clone(), cfg: cfg.clone(),
server_context: server_context.clone(), server_context: server_context.clone(),
}; };
@@ -210,7 +208,6 @@ impl SSRState {
} }
struct FullstackRenderer { struct FullstackRenderer {
serialized_props: Option<String>,
cfg: ServeConfig, cfg: ServeConfig,
server_context: DioxusServerContext, server_context: DioxusServerContext,
} }
packages/fullstack/src/serve_config.rs
+1 -5
View File
@@ -1,14 +1,10 @@
#![allow(non_snake_case)] #![allow(non_snake_case)]
//! Configeration for how to serve a Dioxus application //! Configuration for how to serve a Dioxus application
#[cfg(feature = "router")]
use crate::router::*;
use std::fs::File; use std::fs::File;
use std::io::Read; use std::io::Read;
use std::path::PathBuf; use std::path::PathBuf;
use dioxus_lib::prelude::*;
/// A ServeConfig is used to configure how to serve a Dioxus application. It contains information about how to serve static assets, and what content to render with [`dioxus-ssr`]. /// A ServeConfig is used to configure how to serve a Dioxus application. It contains information about how to serve static assets, and what content to render with [`dioxus-ssr`].
#[derive(Clone)] #[derive(Clone)]
pub struct ServeConfigBuilder { pub struct ServeConfigBuilder {
packages/fullstack/src/server_context.rs
-1
View File
@@ -1,5 +1,4 @@
use crate::html_storage::HTMLData; use crate::html_storage::HTMLData;
pub use server_fn_impl::*;
use std::sync::Arc; use std::sync::Arc;
use std::sync::RwLock; use std::sync::RwLock;
packages/hot-reload/src/file_watcher.rs
+2 -4
View File
@@ -1,19 +1,17 @@
use std::{ use std::{
io::{BufRead, BufReader, Write}, io::Write,
path::PathBuf, path::PathBuf,
str::FromStr, str::FromStr,
sync::{Arc, Mutex}, sync::{Arc, Mutex},
}; };
use crate::HotReloadMsg; use crate::HotReloadMsg;
use dioxus_core::Template;
use dioxus_rsx::{ use dioxus_rsx::{
hot_reload::{FileMap, FileMapBuildResult, UpdateResult}, hot_reload::{FileMap, FileMapBuildResult, UpdateResult},
HotReloadingContext, HotReloadingContext,
}; };
use interprocess_docfix::local_socket::{LocalSocketListener, LocalSocketStream}; use interprocess_docfix::local_socket::LocalSocketListener;
use notify::{RecommendedWatcher, RecursiveMode, Watcher}; use notify::{RecommendedWatcher, RecursiveMode, Watcher};
use serde::{Deserialize, Serialize};
#[cfg(feature = "file_watcher")] #[cfg(feature = "file_watcher")]
use dioxus_html::HtmlCtx; use dioxus_html::HtmlCtx;
packages/liveview/examples/axum.rs
+2 -2
View File
@@ -23,8 +23,8 @@ async fn main() {
println!("Listening on http://{addr}"); println!("Listening on http://{addr}");
axum::Server::bind(&addr.to_string().parse().unwrap()) let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
.serve(app.into_make_service()) axum::serve(listener, app.into_make_service())
.await .await
.unwrap(); .unwrap();
} }
packages/liveview/examples/axum_stress.rs
+2 -2
View File
@@ -55,8 +55,8 @@ async fn main() {
println!("Listening on http://{addr}"); println!("Listening on http://{addr}");
axum::Server::bind(&addr.to_string().parse().unwrap()) let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
.serve(app.into_make_service()) axum::serve(listener, app.into_make_service())
.await .await
.unwrap(); .unwrap();
} }
packages/playwright-tests/liveview/src/main.rs
+2 -2
View File
@@ -57,8 +57,8 @@ async fn main() {
println!("Listening on http://{addr}"); println!("Listening on http://{addr}");
axum::Server::bind(&addr.to_string().parse().unwrap()) let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
.serve(app.into_make_service()) axum::serve(listener, app.into_make_service())
.await .await
.unwrap(); .unwrap();
} }
packages/router/benches/incremental.rs
+2
View File
@@ -45,6 +45,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
}) })
}) })
}); });
c.bench_function("build 1000 routes no memory cache", |b| { c.bench_function("build 1000 routes no memory cache", |b| {
b.to_async(tokio::runtime::Runtime::new().unwrap()) b.to_async(tokio::runtime::Runtime::new().unwrap())
.iter(|| async { .iter(|| async {
@@ -67,6 +68,7 @@ pub fn criterion_benchmark(c: &mut Criterion) {
.memory_cache_limit(0) .memory_cache_limit(0)
.invalidate_after(Duration::from_secs(10)) .invalidate_after(Duration::from_secs(10))
.build(); .build();
for id in 0..1000 { for id in 0..1000 {
render_route( render_route(
&mut renderer, &mut renderer,
packages/router/examples/simple_routes.rs
+5 -2
View File
@@ -33,8 +33,11 @@ async fn main() {
println!("Listening on http://{listen_address}"); println!("Listening on http://{listen_address}");
axum::Server::bind(&listen_address.to_string().parse().unwrap()) let listener = tokio::net::TcpListener::bind(&listen_address)
.serve(app.into_make_service()) .await
.unwrap();
axum::serve(listener, app.into_make_service())
.await .await
.unwrap(); .unwrap();
} }
packages/router/src/router_cfg.rs
+26 -28
View File
@@ -122,38 +122,36 @@ where
<R as std::str::FromStr>::Err: std::fmt::Display, <R as std::str::FromStr>::Err: std::fmt::Display,
{ {
// If we're on the web and have wasm, use the web history provider // If we're on the web and have wasm, use the web history provider
if cfg!(all(target_arch = "wasm32", feature = "web")) {
return Box::new(AnyHistoryProviderImplWrapper::new( #[cfg(all(target_arch = "wasm32", feature = "web"))]
WebHistory::<R>::default(), return Box::new(AnyHistoryProviderImplWrapper::new(
)); WebHistory::<R>::default(),
} ));
// If we're using fullstack and server side rendering, use the memory history provider // If we're using fullstack and server side rendering, use the memory history provider
if cfg!(all(feature = "fullstack", feature = "ssr")) { #[cfg(all(feature = "fullstack", feature = "ssr"))]
return Box::new(AnyHistoryProviderImplWrapper::new( return Box::new(AnyHistoryProviderImplWrapper::new(
MemoryHistory::<R>::with_initial_path( MemoryHistory::<R>::with_initial_path(
dioxus_fullstack::prelude::server_context() dioxus_fullstack::prelude::server_context()
.request_parts() .request_parts()
.unwrap() .unwrap()
.uri .uri
.to_string() .to_string()
.parse() .parse()
.unwrap_or_else(|err| { .unwrap_or_else(|err| {
tracing::error!("Failed to parse uri: {}", err); tracing::error!("Failed to parse uri: {}", err);
"/".parse().unwrap_or_else(|err| { "/".parse().unwrap_or_else(|err| {
panic!("Failed to parse uri: {}", err); panic!("Failed to parse uri: {}", err);
}) })
}), }),
), ),
)); ));
}
// If liveview is enabled, use the liveview history provider // If liveview is enabled, use the liveview history provider
if cfg!(feature = "liveview") { #[cfg(feature = "liveview")]
return Box::new(AnyHistoryProviderImplWrapper::new( return Box::new(AnyHistoryProviderImplWrapper::new(
LiveviewHistory::new_with_initial_path(initial_route), LiveviewHistory::new_with_initial_path(initial_route),
)); ));
}
// If none of the above, use the memory history provider, which is a decent enough fallback // If none of the above, use the memory history provider, which is a decent enough fallback
// Eventually we want to integrate with the mobile history provider, and other platform providers // Eventually we want to integrate with the mobile history provider, and other platform providers