diff --git a/packages/server/examples/hello-world/src/main.rs b/packages/server/examples/hello-world/src/main.rs index 9cafe93b5..2fd6b1bde 100644 --- a/packages/server/examples/hello-world/src/main.rs +++ b/packages/server/examples/hello-world/src/main.rs @@ -1,3 +1,10 @@ +//! Run with: +//! +//! ```sh +//! dioxus build --features web +//! cargo run --features ssr +//! ``` + #![allow(non_snake_case)] use dioxus::prelude::*; use dioxus_server::prelude::*; diff --git a/packages/server/src/adapters/axum_adapter.rs b/packages/server/src/adapters/axum_adapter.rs index 649629f61..b7cc85e1c 100644 --- a/packages/server/src/adapters/axum_adapter.rs +++ b/packages/server/src/adapters/axum_adapter.rs @@ -44,11 +44,11 @@ impl DioxusRouterExt for Router { let serve_dir = ServeDir::new("dist"); self.register_server_fns(cfg.server_fn_route.unwrap_or_default()) - .nest_service("/", serve_dir) - .fallback_service(get(move || { + .route("/", get(move || { let rendered = dioxus_ssr_html(cfg); async move { Full::from(rendered) } })) + .fallback_service( serve_dir) } } diff --git a/packages/server/src/lib.rs b/packages/server/src/lib.rs index e14a445b5..98261d1d4 100644 --- a/packages/server/src/lib.rs +++ b/packages/server/src/lib.rs @@ -2,12 +2,14 @@ use dioxus_core::prelude::*; mod adapters; +#[cfg(feature = "ssr")] mod serve; mod server_fn; pub mod prelude { #[cfg(feature = "axum")] pub use crate::adapters::axum_adapter::*; + #[cfg(feature = "ssr")] pub use crate::serve::ServeConfig; pub use crate::server_fn::{DioxusServerContext, ServerFn}; pub use server_fn::{self, ServerFn as _, ServerFnError};