Merge branch 'DioxusLabs:master' into master

Cargo.toml

@@ -11,7 +11,7 @@ license = "MIT/Apache-2.0"
 [dependencies]
 
 # cli core
-clap = {version = "3.0.14", features = ["derive"]}
+clap = { version = "3.0.14", features = ["derive"] }
 thiserror = "1.0.30"
 wasm-bindgen-cli-support = "0.2.79"
 

src/server/mod.rs

@@ -3,7 +3,7 @@ use axum::{
     http::StatusCode,
     response::IntoResponse,
     routing::{get, get_service},
-    AddExtensionLayer, Router,
+    Router,
 };
 use notify::{RecommendedWatcher, Watcher};
 
@@ -88,7 +88,7 @@ pub async fn startup(config: CrateConfig) -> Result<()> {
                         },
                     ),
                 )
-                .layer(AddExtensionLayer::new(ws_reload_state))
+                .layer(Extension(ws_reload_state))
                 .into_make_service(),
         )
         .await?;