Merge branch 'master' into intigrate-collect-assets

packages/fullstack/examples/axum-hello-world/src/main.rs

@@ -27,9 +27,7 @@ fn app(cx: Scope<AppProps>) -> Element {
     let eval = use_eval(cx);
 
     cx.render(rsx! {
-        div {
-            "Server state: {state}"
-        }
+        div { "Server state: {state}" }
         h1 { "High-Five counter: {count}" }
         button { onclick: move |_| count += 1, "Up high!" }
         button { onclick: move |_| count -= 1, "Down low!" }

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

@@ -12,7 +12,7 @@ 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 }
+salvo = { version = "0.63.0", optional = true }
 execute = "0.2.12"
 reqwest = "0.11.18"
 simple_logger = "4.2.0"