Get more axum stuff upgraded to 0.7

packages/cli/Cargo.toml

@@ -32,14 +32,15 @@ tokio = { version = "1.16.1", features = ["fs", "sync", "rt", "macros"] }
 atty = "0.2.14"
 chrono = "0.4.19"
 anyhow = "1"
-hyper = {workspace = true}
-hyper-rustls = {workspace = true}
+hyper = { workspace = true }
+hyper-rustls = { workspace = true }
 indicatif = "0.17.5"
 subprocess = "0.2.9"
 rayon = "1.8.0"
 
 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"] }
 
 headers = "0.3.7"

packages/cli/src/server/web/hot_reload.rs

@@ -1,10 +1,10 @@
+use crate::server::HotReloadState;
 use axum::{
     extract::{ws::Message, WebSocketUpgrade},
     response::IntoResponse,
-    Extension, TypedHeader,
+    Extension,
 };
-
-use crate::server::HotReloadState;
+use axum_extra::TypedHeader;
 
 pub async fn hot_reload_handler(
     ws: WebSocketUpgrade,

packages/cli/src/server/web/mod.rs

@@ -19,6 +19,7 @@ use axum::{
     routing::{get, get_service},
     Router,
 };
+use axum_extra::TypedHeader;
 use axum_server::tls_rustls::RustlsConfig;
 use dioxus_cli_config::CrateConfig;
 use dioxus_cli_config::WebHttpsConfig;
@@ -298,7 +299,9 @@ async fn setup_router(
                         .body(body)
                         .unwrap()
                 } 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();
                 headers.insert(

packages/cli/src/server/web/proxy.rs

@@ -17,6 +17,7 @@ impl ProxyClient {
     fn new(url: Uri) -> Self {
         let https = hyper_rustls::HttpsConnectorBuilder::new()
             .with_native_roots()
+            .unwrap()
             .https_or_http()
             .enable_http1()
             .build();
@@ -138,7 +139,9 @@ mod test {
             .unwrap();
         assert_eq!(resp.status(), StatusCode::OK);
         assert_eq!(
-            hyper::body::to_bytes(resp.into_body()).await.unwrap(),
+            axum::body::to_bytes(resp.into_body(), usize::MAX)
+                .await
+                .unwrap(),
             "backend: /api"
         );
 
@@ -148,7 +151,9 @@ mod test {
             .unwrap();
         assert_eq!(resp.status(), StatusCode::OK);
         assert_eq!(
-            hyper::body::to_bytes(resp.into_body()).await.unwrap(),
+            axum::body::to_bytes(resp.into_body(), usize::MAX)
+                .await
+                .unwrap(),
             "backend: /api/"
         );
 
@@ -162,7 +167,9 @@ mod test {
             .unwrap();
         assert_eq!(resp.status(), StatusCode::OK);
         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_handle.abort();