From 5ffdb4dbede3e8806566a0debd69d0442c8521a9 Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Fri, 31 Mar 2023 16:16:47 -0500 Subject: [PATCH] prefech wasm + JS by default --- .../server/examples/axum-router/src/main.rs | 15 ++++----- packages/server/src/render.rs | 31 +++++++++++++------ 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/packages/server/examples/axum-router/src/main.rs b/packages/server/examples/axum-router/src/main.rs index 8745aa7f1..0ae68d50e 100644 --- a/packages/server/examples/axum-router/src/main.rs +++ b/packages/server/examples/axum-router/src/main.rs @@ -41,15 +41,12 @@ fn main() { // If the path is unknown, render the application .fallback( move |uri: http::uri::Uri, State(ssr_state): State| { - let rendered = ssr_state.render( - &ServeConfig::new( - App, - AppProps { - route: Some(format!("http://{addr}{uri}")), - }, - ) - .head(r#"Hello World!"#), - ); + let rendered = ssr_state.render(&ServeConfig::new( + App, + AppProps { + route: Some(format!("http://{addr}{uri}")), + }, + )); async move { axum::body::Full::from(rendered) } }, ) diff --git a/packages/server/src/render.rs b/packages/server/src/render.rs index 5c15bd097..872a6cffc 100644 --- a/packages/server/src/render.rs +++ b/packages/server/src/render.rs @@ -20,25 +20,36 @@ fn dioxus_ssr_html(cfg: &ServeConfig

, renderer: &mut Rend let mut vdom = VirtualDom::new_with_props(*app, props.clone()); let _ = vdom.rebuild(); let base_path = base_path.unwrap_or("."); - let head = head.unwrap_or( - r#"Dioxus Application - - - "#, - ); let mut html = String::new(); - if let Err(err) = write!( - &mut html, - r#" + let result = match head { + Some(head) => { + write!( + &mut html, + r#" {head}

"# - ) { + ) + } + None => { + write!( + &mut html, + r#"Dioxus Application + + + + + "# + ) + } + }; + + if let Err(err) = result { eprintln!("Failed to write to html: {}", err); }