From 9bb464dd7d687cf72735b670786e5d92be5d5630 Mon Sep 17 00:00:00 2001 From: Evan Almloff Date: Wed, 15 Nov 2023 09:29:15 -0600 Subject: [PATCH] fix cli tests --- packages/cli/Cargo.toml | 2 +- packages/cli/README.md | 8 ++++---- packages/cli/src/server/web/mod.rs | 4 ++-- packages/cli/src/server/web/proxy.rs | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/cli/Cargo.toml b/packages/cli/Cargo.toml index 0730b59e7..050d9a78f 100644 --- a/packages/cli/Cargo.toml +++ b/packages/cli/Cargo.toml @@ -37,7 +37,7 @@ hyper-rustls = "0.23.2" indicatif = "0.17.5" subprocess = "0.2.9" -axum = { version = "0.6.20", features = ["ws", "headers"] } +axum = { version = "0.5.1", features = ["ws", "headers"] } axum-server = { version = "0.5.1", features = ["tls-rustls"] } tower-http = { version = "0.2.2", features = ["full"] } headers = "0.3.7" diff --git a/packages/cli/README.md b/packages/cli/README.md index 8379f22cc..be053a2d2 100644 --- a/packages/cli/README.md +++ b/packages/cli/README.md @@ -10,7 +10,7 @@ It handles building, bundling, development and publishing to simplify developmen ### Install the stable version (recommended) -``` +```sh cargo install dioxus-cli ``` @@ -20,7 +20,7 @@ To get the latest bug fixes and features, you can install the development versio However, this is not fully tested. That means you're probably going to have more bugs despite having the latest bug fixes. -``` +```sh cargo install --git https://github.com/DioxusLabs/dioxus dioxus-cli ``` @@ -29,7 +29,7 @@ and install it in Cargo's global binary directory (`~/.cargo/bin/` by default). ### Install from local folder -``` +```sh cargo install --path . --debug ``` @@ -40,7 +40,7 @@ It will be cloned from the [dioxus-template](https://github.com/DioxusLabs/dioxu Alternatively, you can specify the template path: -``` +```sh dx create hello --template gh:dioxuslabs/dioxus-template ``` diff --git a/packages/cli/src/server/web/mod.rs b/packages/cli/src/server/web/mod.rs index 42a235f4a..b38c535f4 100644 --- a/packages/cli/src/server/web/mod.rs +++ b/packages/cli/src/server/web/mod.rs @@ -313,9 +313,9 @@ async fn setup_router( router = if let Some(base_path) = config.dioxus_config.web.app.base_path.clone() { let base_path = format!("/{}", base_path.trim_matches('/')); Router::new() - .nest_service( + .nest( &base_path, - axum::routing::method_routing::any_service(router), + axum::routing::any_service(router), ) .fallback(get(move || { let base_path = base_path.clone(); diff --git a/packages/cli/src/server/web/proxy.rs b/packages/cli/src/server/web/proxy.rs index 4242a55eb..d7b4837e8 100644 --- a/packages/cli/src/server/web/proxy.rs +++ b/packages/cli/src/server/web/proxy.rs @@ -1,6 +1,6 @@ -use crate::Result; +use crate::{Result,}; use dioxus_cli_config::WebProxyConfig; - + use anyhow::Context; use axum::{http::StatusCode, routing::any, Router}; use hyper::{Request, Response, Uri};