chore: updated axum version in perseus-axum (#244)

* Update axum version for perseus-axum * Attempt to fix CI * Fix tests for axum, leading slashes are no longer guaranteed
framesurge · Dec 1, 2022 · 9e6501a · 9e6501a
1 parent 968595b
commit 9e6501a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/packages/perseus-axum/Cargo.toml b/packages/perseus-axum/Cargo.toml
@@ -15,7 +15,7 @@ categories = ["wasm", "web-programming::http-server", "development-tools", "asyn
 
 [dependencies]
 perseus = { path = "../perseus", version = "0.4.0-beta.11" }
-axum = "0.5"
+axum = "0.6"
 tower = "0.4"
 tower-http = { version = "0.3", features = [ "fs" ] }
 urlencoding = "2.1"

diff --git a/packages/perseus-axum/src/dflt_server.rs b/packages/perseus-axum/src/dflt_server.rs
@@ -1,7 +1,5 @@
 use crate::get_router;
-use perseus::{
-    i18n::TranslationsManager, server::ServerProps, stores::MutableStore, PerseusAppBase, SsrNode,
-};
+use perseus::{i18n::TranslationsManager, server::ServerProps, stores::MutableStore};
 use std::net::SocketAddr;
 
 /// Creates and starts the default Perseus server with Axum. This should be run

diff --git a/packages/perseus-axum/src/page_data.rs b/packages/perseus-axum/src/page_data.rs
@@ -52,7 +52,8 @@ pub async fn page_handler<M: MutableStore, T: TranslationsManager>(
         .collect::<Vec<&str>>()
         .join("/");
     // Axum's paths have leading slashes
-    let path = path.strip_prefix('/').unwrap();
+    // As of 0.6, they do not always have slashes, see #1086 in tokio-rs/axum
+    let path = path.strip_prefix('/').unwrap_or(&path);
 
     let templates = &opts.templates_map;
     // Check if the locale is supported

diff --git a/packages/perseus-axum/src/router.rs b/packages/perseus-axum/src/router.rs
@@ -93,7 +93,7 @@ pub async fn get_router<M: MutableStore + 'static, T: TranslationsManager + 'sta
         ));
     // Only add the static content directory route if such a directory is being used
     if let Some(static_dir) = static_dir {
-        router = router.nest(
+        router = router.nest_service(
             "/.perseus/static",
             get_service(ServeDir::new(static_dir)).handle_error(handle_fs_error),
         )
@@ -108,7 +108,7 @@ pub async fn get_router<M: MutableStore + 'static, T: TranslationsManager + 'sta
         );
     }
     // And add the fallback for initial loads
-    router.fallback(get(closure!(
+    router.fallback_service(get(closure!(
         clone opts,
         clone html_shell,
         clone render_cfg,