add note on how to get ResponseOptions

* added hashes generated from cargo-leptos

* Added config option to disable frontend file name hash

Cargo.toml

@@ -26,6 +26,7 @@ exclude = ["benchmarks", "examples"]
 
 [workspace.package]
 version = "0.6.6"
+rust-version = "1.75"
 
 [workspace.dependencies]
 leptos = { path = "./leptos", version = "0.6.5" }

benchmarks/Cargo.toml

@@ -2,6 +2,7 @@
 name = "benchmarks"
 version = "0.1.0"
 edition = "2021"
+rust-version.workspace = true
 
 [dependencies]
 l0410 = { package = "leptos", version = "0.4.10", features = [

examples/counter_without_macros/Cargo.toml

@@ -2,6 +2,7 @@
 name = "counter_without_macros"
 version = "0.1.0"
 edition = "2021"
+rust-version = "1.75"
 
 [profile.release]
 codegen-units = 1

examples/counters_stable/Cargo.toml

@@ -2,6 +2,7 @@
 name = "counters_stable"
 version = "0.1.0"
 edition = "2021"
+rust-version = "1.75"
 
 [dependencies]
 leptos = { path = "../../leptos", features = ["csr"] }

examples/ssr_modes/src/app.rs

@@ -9,12 +9,13 @@ use thiserror::Error;
 pub fn App() -> impl IntoView {
     // Provides context that manages stylesheets, titles, meta tags, etc.
     provide_meta_context();
+    let fallback = || view! { "Page not found." }.into_view();
 
     view! {
         <Stylesheet id="leptos" href="/pkg/ssr_modes.css"/>
         <Title text="Welcome to Leptos"/>
 
-        <Router>
+        <Router fallback>
             <main>
                 <Routes>
                     // We’ll load the home page with out-of-order streaming and <Suspense/>

examples/ssr_modes_axum/src/app.rs

@@ -9,12 +9,13 @@ use thiserror::Error;
 pub fn App() -> impl IntoView {
     // Provides context that manages stylesheets, titles, meta tags, etc.
     provide_meta_context();
+    let fallback = || view! { "Page not found." }.into_view();
 
     view! {
         <Stylesheet id="leptos" href="/pkg/ssr_modes.css"/>
         <Title text="Welcome to Leptos"/>
 
-        <Router>
+        <Router fallback>
             <main>
                 <Routes>
                     // We’ll load the home page with out-of-order streaming and <Suspense/>

integrations/actix/Cargo.toml

@@ -6,6 +6,7 @@ authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Actix integrations for the Leptos web framework."
+rust-version.workspace = true
 
 [dependencies]
 actix-http = "3"

integrations/actix/src/lib.rs

@@ -1215,13 +1215,18 @@ where
             let mode = listing.mode();
 
             for method in listing.methods() {
+                let additional_context = additional_context.clone();
+                let additional_context_and_method = move || {
+                    provide_context(method);
+                    additional_context();
+                };
                 router = if let Some(static_mode) = listing.static_mode() {
                     router.route(
                         path,
                         static_route(
                             options.clone(),
                             app_fn.clone(),
-                            additional_context.clone(),
+                            additional_context_and_method.clone(),
                             method,
                             static_mode,
                         ),
@@ -1233,7 +1238,7 @@ where
                         SsrMode::OutOfOrder => {
                             render_app_to_stream_with_context(
                                 options.clone(),
-                                additional_context.clone(),
+                                additional_context_and_method.clone(),
                                 app_fn.clone(),
                                 method,
                             )
@@ -1241,7 +1246,7 @@ where
                         SsrMode::PartiallyBlocked => {
                             render_app_to_stream_with_context_and_replace_blocks(
                                 options.clone(),
-                                additional_context.clone(),
+                                additional_context_and_method.clone(),
                                 app_fn.clone(),
                                 method,
                                 true,
@@ -1250,14 +1255,14 @@ where
                         SsrMode::InOrder => {
                             render_app_to_stream_in_order_with_context(
                                 options.clone(),
-                                additional_context.clone(),
+                                additional_context_and_method.clone(),
                                 app_fn.clone(),
                                 method,
                             )
                         }
                         SsrMode::Async => render_app_async_with_context(
                             options.clone(),
-                            additional_context.clone(),
+                            additional_context_and_method.clone(),
                             app_fn.clone(),
                             method,
                         ),

integrations/actix/tests/extract_routes.rs

@@ -0,0 +1,148 @@
+use leptos::*;
+use leptos_actix::generate_route_list;
+use leptos_router::{Route, Router, Routes, TrailingSlash};
+
+#[component]
+fn DefaultApp() -> impl IntoView {
+    let view = || view! { "" };
+    view! {
+        <Router>
+            <Routes>
+                <Route path="/foo" view/>
+                <Route path="/bar/" view/>
+                <Route path="/baz/:id" view/>
+                <Route path="/baz/:name/" view/>
+                <Route path="/baz/*any" view/>
+            </Routes>
+        </Router>
+    }
+}
+
+#[test]
+fn test_default_app() {
+    let routes = generate_route_list(DefaultApp);
+
+    // We still have access to the original (albeit normalized) Leptos paths:
+    assert_same(
+        &routes,
+        |r| r.leptos_path(),
+        &["/bar", "/baz/*any", "/baz/:id", "/baz/:name", "/foo"],
+    );
+
+    // ... But leptos-actix has also reformatted "paths" to work for Actix.
+    assert_same(
+        &routes,
+        |r| r.path(),
+        &["/bar", "/baz/{id}", "/baz/{name}", "/baz/{tail:.*}", "/foo"],
+    );
+}
+
+#[component]
+fn ExactApp() -> impl IntoView {
+    let view = || view! { "" };
+    let trailing_slash = TrailingSlash::Exact;
+    view! {
+        <Router trailing_slash>
+            <Routes>
+                <Route path="/foo" view/>
+                <Route path="/bar/" view/>
+                <Route path="/baz/:id" view/>
+                <Route path="/baz/:name/" view/>
+                <Route path="/baz/*any" view/>
+            </Routes>
+        </Router>
+    }
+}
+
+#[test]
+fn test_exact_app() {
+    let routes = generate_route_list(ExactApp);
+
+    // In Exact mode, the Leptos paths no longer have their trailing slashes stripped:
+    assert_same(
+        &routes,
+        |r| r.leptos_path(),
+        &["/bar/", "/baz/*any", "/baz/:id", "/baz/:name/", "/foo"],
+    );
+
+    // Actix paths also have trailing slashes as a result:
+    assert_same(
+        &routes,
+        |r| r.path(),
+        &[
+            "/bar/",
+            "/baz/{id}",
+            "/baz/{name}/",
+            "/baz/{tail:.*}",
+            "/foo",
+        ],
+    );
+}
+
+#[component]
+fn RedirectApp() -> impl IntoView {
+    let view = || view! { "" };
+    let trailing_slash = TrailingSlash::Redirect;
+    view! {
+        <Router trailing_slash>
+            <Routes>
+                <Route path="/foo" view/>
+                <Route path="/bar/" view/>
+                <Route path="/baz/:id" view/>
+                <Route path="/baz/:name/" view/>
+                <Route path="/baz/*any" view/>
+            </Routes>
+        </Router>
+    }
+}
+
+#[test]
+fn test_redirect_app() {
+    let routes = generate_route_list(RedirectApp);
+
+    assert_same(
+        &routes,
+        |r| r.leptos_path(),
+        &[
+            "/bar",
+            "/bar/",
+            "/baz/*any",
+            "/baz/:id",
+            "/baz/:id/",
+            "/baz/:name",
+            "/baz/:name/",
+            "/foo",
+            "/foo/",
+        ],
+    );
+
+    // ... But leptos-actix has also reformatted "paths" to work for Actix.
+    assert_same(
+        &routes,
+        |r| r.path(),
+        &[
+            "/bar",
+            "/bar/",
+            "/baz/{id}",
+            "/baz/{id}/",
+            "/baz/{name}",
+            "/baz/{name}/",
+            "/baz/{tail:.*}",
+            "/foo",
+            "/foo/",
+        ],
+    );
+}
+
+fn assert_same<'t, T, F, U>(
+    input: &'t Vec<T>,
+    mapper: F,
+    expected_sorted_values: &[U],
+) where
+    F: Fn(&'t T) -> U + 't,
+    U: Ord + std::fmt::Debug,
+{
+    let mut values: Vec<U> = input.iter().map(mapper).collect();
+    values.sort();
+    assert_eq!(values, expected_sorted_values);
+}

integrations/axum/Cargo.toml

@@ -6,6 +6,7 @@ authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Axum integrations for the Leptos web framework."
+rust-version.workspace = true
 
 [dependencies]
 axum = { version = "0.7", default-features = false, features = [

integrations/axum/src/lib.rs

@@ -79,6 +79,13 @@ impl ResponseParts {
 }
 
 /// Allows you to override details of the HTTP response like the status code and add Headers/Cookies.
+/// ResponseOptions is stored in your server's context if you've called `.leptos_routes` on your router.
+/// ```rust
+/// #[server]
+/// pub async fn get_opts() -> Result<(),ServerFnError> {
+///     let opts = expect_context::<leptos_axum::ResponseOptions>();
+///     Ok(())
+/// }
 #[derive(Debug, Clone, Default)]
 pub struct ResponseOptions(pub Arc<RwLock<ResponseParts>>);
 
@@ -1615,6 +1622,11 @@ where
             let path = listing.path();
 
             for method in listing.methods() {
+                let cx_with_state = cx_with_state.clone();
+                let cx_with_state_and_method = move || {
+                    provide_context(method);
+                    cx_with_state();
+                };
                 router = if let Some(static_mode) = listing.static_mode() {
                     #[cfg(feature = "default")]
                     {
@@ -1623,7 +1635,7 @@ where
                             path,
                             LeptosOptions::from_ref(options),
                             app_fn.clone(),
-                            cx_with_state.clone(),
+                            cx_with_state_and_method.clone(),
                             method,
                             static_mode,
                         )
@@ -1643,7 +1655,7 @@ where
                         SsrMode::OutOfOrder => {
                             let s = render_app_to_stream_with_context(
                                 LeptosOptions::from_ref(options),
-                                cx_with_state.clone(),
+                                cx_with_state_and_method.clone(),
                                 app_fn.clone(),
                             );
                             match method {
@@ -1657,7 +1669,7 @@ where
                         SsrMode::PartiallyBlocked => {
                             let s = render_app_to_stream_with_context_and_replace_blocks(
                                 LeptosOptions::from_ref(options),
-                                cx_with_state.clone(),
+                                cx_with_state_and_method.clone(),
                                 app_fn.clone(),
                                 true
                             );
@@ -1672,7 +1684,7 @@ where
                         SsrMode::InOrder => {
                             let s = render_app_to_stream_in_order_with_context(
                                 LeptosOptions::from_ref(options),
-                                cx_with_state.clone(),
+                                cx_with_state_and_method.clone(),
                                 app_fn.clone(),
                             );
                             match method {
@@ -1686,7 +1698,7 @@ where
                         SsrMode::Async => {
                             let s = render_app_async_with_context(
                                 LeptosOptions::from_ref(options),
-                                cx_with_state.clone(),
+                                cx_with_state_and_method.clone(),
                                 app_fn.clone(),
                             );
                             match method {

integrations/utils/Cargo.toml

@@ -6,6 +6,7 @@ authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Utilities to help build server integrations for the Leptos web framework."
+rust-version.workspace = true
 
 [dependencies]
 futures = "0.3"

integrations/utils/src/lib.rs

@@ -2,7 +2,7 @@ use futures::{Stream, StreamExt};
 use leptos::{nonce::use_nonce, use_context, RuntimeId};
 use leptos_config::LeptosOptions;
 use leptos_meta::MetaContext;
-use std::borrow::Cow;
+use std::{borrow::Cow, collections::HashMap, env, fs};
 
 extern crate tracing;
 
@@ -103,6 +103,14 @@ pub fn html_parts_separated(
     } else {
         "() => mod.hydrate()"
     };
+
+    let (js_hash, wasm_hash, css_hash) = get_hashes(&options);
+
+    let head = head.replace(
+        &format!("{output_name}.css"),
+        &format!("{output_name}{css_hash}.css"),
+    );
+
     let head = format!(
         r#"<!DOCTYPE html>
             <html{html_metadata}>
@@ -110,8 +118,8 @@ pub fn html_parts_separated(
                     <meta charset="utf-8"/>
                     <meta name="viewport" content="width=device-width, initial-scale=1"/>
                     {head}
-                    <link rel="modulepreload" href="{pkg_path}/{output_name}.js"{nonce}>
-                    <link rel="preload" href="{pkg_path}/{wasm_output_name}.wasm" as="fetch" type="application/wasm" crossorigin=""{nonce}>
+                    <link rel="modulepreload" href="{pkg_path}/{output_name}{js_hash}.js"{nonce}>
+                    <link rel="preload" href="{pkg_path}/{wasm_output_name}{wasm_hash}.wasm" as="fetch" type="application/wasm" crossorigin=""{nonce}>
                     <script type="module"{nonce}>
                         function idle(c) {{
                             if ("requestIdleCallback" in window) {{
@@ -121,9 +129,9 @@ pub fn html_parts_separated(
                             }}
                         }}
                         idle(() => {{
-                            import('{pkg_path}/{output_name}.js')
+                            import('{pkg_path}/{output_name}{js_hash}.js')
                                 .then(mod => {{
-                                    mod.default('{pkg_path}/{wasm_output_name}.wasm').then({import_callback});
+                                    mod.default('{pkg_path}/{wasm_output_name}{wasm_hash}.wasm').then({import_callback});
                                 }})
                         }});
                     </script>
@@ -134,6 +142,46 @@ pub fn html_parts_separated(
     (head, tail)
 }
 
+#[tracing::instrument(level = "trace", fields(error), skip_all)]
+fn get_hashes(options: &LeptosOptions) -> (String, String, String) {
+    let mut ext_to_hash = HashMap::from([
+        ("js".to_string(), "".to_string()),
+        ("wasm".to_string(), "".to_string()),
+        ("css".to_string(), "".to_string()),
+    ]);
+
+    if options.frontend_files_content_hashes {
+        let hash_path = env::current_exe()
+            .map(|path| {
+                path.parent().map(|p| p.to_path_buf()).unwrap_or_default()
+            })
+            .unwrap_or_default()
+            .join(&options.hash_file);
+
+        if hash_path.exists() {
+            let hashes = fs::read_to_string(&hash_path)
+                .expect("failed to read hash file");
+            for line in hashes.lines() {
+                let line = line.trim();
+                if !line.is_empty() {
+                    if let Some((k, v)) = line.split_once(':') {
+                        ext_to_hash.insert(
+                            k.trim().to_string(),
+                            format!(".{}", v.trim()),
+                        );
+                    }
+                }
+            }
+        }
+    }
+
+    (
+        ext_to_hash["js"].clone(),
+        ext_to_hash["wasm"].clone(),
+        ext_to_hash["css"].clone(),
+    )
+}
+
 #[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub async fn build_async_response(
     stream: impl Stream<Item = String> + 'static,

leptos/Cargo.toml

@@ -7,6 +7,7 @@ license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Leptos is a full-stack, isomorphic Rust web framework leveraging fine-grained reactivity to build declarative user interfaces."
 readme = "../README.md"
+rust-version.workspace = true
 
 [dependencies]
 cfg-if = "1"

leptos_config/Cargo.toml

@@ -7,6 +7,7 @@ license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Configuration for the Leptos web framework."
 readme = "../README.md"
+rust-version.workspace = true
 
 [dependencies]
 config = { version = "0.14", default-features = false, features = ["toml"] }

leptos_config/src/errors.rs

@@ -1,4 +1,4 @@
-use std::{net::AddrParseError, num::ParseIntError};
+use std::{net::AddrParseError, num::ParseIntError, str::ParseBoolError};
 use thiserror::Error;
 
 #[derive(Debug, Error, Clone)]
@@ -31,3 +31,9 @@ impl From<AddrParseError> for LeptosConfigError {
         Self::ConfigError(e.to_string())
     }
 }
+
+impl From<ParseBoolError> for LeptosConfigError {
+    fn from(e: ParseBoolError) -> Self {
+        Self::ConfigError(e.to_string())
+    }
+}

leptos_config/src/lib.rs

@@ -70,6 +70,15 @@ pub struct LeptosOptions {
     #[builder(default = default_not_found_path())]
     #[serde(default = "default_not_found_path")]
     pub not_found_path: String,
+    /// The file name of the hash text file generated by cargo-leptos. Defaults to `hash.txt`.
+    #[builder(default = default_hash_file_name())]
+    #[serde(default = "default_hash_file_name")]
+    pub hash_file: String,
+    /// If true, hashes will be generated for all files in the site_root and added to their file names.
+    /// Defaults to `true`.
+    #[builder(default = default_frontend_files_content_hashes())]
+    #[serde(default = "default_frontend_files_content_hashes")]
+    pub frontend_files_content_hashes: bool,
 }
 
 impl LeptosOptions {
@@ -108,6 +117,15 @@ impl LeptosOptions {
                 env_w_default("LEPTOS_RELOAD_WS_PROTOCOL", "ws")?.as_str(),
             )?,
             not_found_path: env_w_default("LEPTOS_NOT_FOUND_PATH", "/404")?,
+            hash_file: env_w_default("LEPTOS_HASH_FILE_NAME", "hash.txt")?,
+            frontend_files_content_hashes: env_w_default(
+                "LEPTOS_FRONTEND_FILES_CONTENT_HASHES",
+                "ON",
+            )?
+            .to_uppercase()
+            .replace("ON", "true")
+            .replace("OFF", "false")
+            .parse()?,
         })
     }
 }
@@ -146,6 +164,14 @@ fn default_not_found_path() -> String {
     "/404".to_string()
 }
 
+fn default_hash_file_name() -> String {
+    "hash.txt".to_string()
+}
+
+fn default_frontend_files_content_hashes() -> bool {
+    true
+}
+
 fn env_wo_default(key: &str) -> Result<Option<String>, LeptosConfigError> {
     match std::env::var(key) {
         Ok(val) => Ok(Some(val)),

leptos_dom/Cargo.toml

@@ -6,6 +6,7 @@ authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "DOM operations for the Leptos web framework."
+rust-version.workspace = true
 
 [dependencies]
 async-recursion = "1"

leptos_hot_reload/Cargo.toml

@@ -7,6 +7,7 @@ license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Utility types used for dev mode and hot-reloading for the Leptos web framework."
 readme = "../README.md"
+rust-version.workspace = true
 
 [dependencies]
 anyhow = "1"

leptos_macro/Cargo.toml

@@ -7,6 +7,7 @@ license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "view macro for the Leptos web framework."
 readme = "../README.md"
+rust-version.workspace = true
 
 [lib]
 proc-macro = true

leptos_reactive/Cargo.toml

@@ -6,6 +6,7 @@ authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Reactive system for the Leptos web framework."
+rust-version.workspace = true
 
 [dependencies]
 slotmap = { version = "1", features = ["serde"] }

leptos_reactive/src/resource.rs

@@ -1003,11 +1003,11 @@ where
     /// // when we read the signal, it contains either
     /// // 1) None (if the Future isn't ready yet) or
     /// // 2) Some(T) (if the future's already resolved)
-    /// assert_eq!(cats.read(), Some(vec!["1".to_string()]));
+    /// assert_eq!(cats.get(), Some(vec!["1".to_string()]));
     ///
     /// // when the signal's value changes, the `Resource` will generate and run a new `Future`
     /// set_how_many_cats.set(2);
-    /// assert_eq!(cats.read(), Some(vec!["2".to_string()]));
+    /// assert_eq!(cats.get(), Some(vec!["2".to_string()]));
     /// # }
     /// # runtime.dispose();
     /// ```

leptos_server/Cargo.toml

@@ -7,6 +7,7 @@ license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "RPC for the Leptos web framework."
 readme = "../README.md"
+rust-version.workspace = true
 
 [dependencies]
 leptos_reactive = { workspace = true }

meta/Cargo.toml

@@ -6,6 +6,7 @@ authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Tools to set HTML metadata in the Leptos web framework."
+rust-version.workspace = true
 
 [dependencies]
 cfg-if = "1"

router/Cargo.toml

@@ -7,6 +7,7 @@ license = "MIT"
 readme = "../README.md"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Router for the Leptos web framework."
+rust-version.workspace = true
 
 [dependencies]
 leptos = { workspace = true }

router/src/components/route.rs

@@ -1,6 +1,7 @@
 use crate::{
     matching::{resolve_path, PathMatch, RouteDefinition, RouteMatch},
     ParamsMap, RouterContext, SsrMode, StaticData, StaticMode, StaticParamsMap,
+    TrailingSlash,
 };
 use leptos::{leptos_dom::Transparent, *};
 use std::{
@@ -17,6 +18,16 @@ thread_local! {
     static ROUTE_ID: Cell<usize> = const { Cell::new(0) };
 }
 
+// RouteDefinition.id is `pub` and required to be unique.
+// Should we make this public so users can generate unique IDs?
+pub(in crate::components) fn new_route_id() -> usize {
+    ROUTE_ID.with(|id| {
+        let next = id.get() + 1;
+        id.set(next);
+        next
+    })
+}
+
 /// Represents an HTTP method that can be handled by this route.
 #[derive(Copy, Clone, Debug, Default, PartialEq, Eq, Hash)]
 pub enum Method {
@@ -65,6 +76,11 @@ pub fn Route<E, F, P>(
     /// accessed with [`use_route_data`](crate::use_route_data).
     #[prop(optional, into)]
     data: Option<Loader>,
+    /// How this route should handle trailing slashes in its path.
+    /// Overrides any setting applied to [`crate::components::Router`].
+    /// Serves as a default for any inner Routes.
+    #[prop(optional)]
+    trailing_slash: Option<TrailingSlash>,
     /// `children` may be empty or include nested routes.
     #[prop(optional)]
     children: Option<Children>,
@@ -83,6 +99,7 @@ where
         data,
         None,
         None,
+        trailing_slash,
     )
 }
 
@@ -115,6 +132,11 @@ pub fn ProtectedRoute<P, E, F, C>(
     /// accessed with [`use_route_data`](crate::use_route_data).
     #[prop(optional, into)]
     data: Option<Loader>,
+    /// How this route should handle trailing slashes in its path.
+    /// Overrides any setting applied to [`crate::components::Router`].
+    /// Serves as a default for any inner Routes.
+    #[prop(optional)]
+    trailing_slash: Option<TrailingSlash>,
     /// `children` may be empty or include nested routes.
     #[prop(optional)]
     children: Option<Children>,
@@ -143,6 +165,7 @@ where
         data,
         None,
         None,
+        trailing_slash,
     )
 }
 
@@ -171,6 +194,11 @@ pub fn StaticRoute<E, F, P, S>(
     /// accessed with [`use_route_data`](crate::use_route_data).
     #[prop(optional, into)]
     data: Option<Loader>,
+    /// How this route should handle trailing slashes in its path.
+    /// Overrides any setting applied to [`crate::components::Router`].
+    /// Serves as a default for any inner Routes.
+    #[prop(optional)]
+    trailing_slash: Option<TrailingSlash>,
     /// `children` may be empty or include nested routes.
     #[prop(optional)]
     children: Option<Children>,
@@ -193,6 +221,7 @@ where
         data,
         Some(mode),
         Some(Arc::new(static_params)),
+        trailing_slash,
     )
 }
 
@@ -210,6 +239,7 @@ pub(crate) fn define_route(
     data: Option<Loader>,
     static_mode: Option<StaticMode>,
     static_params: Option<StaticData>,
+    trailing_slash: Option<TrailingSlash>,
 ) -> RouteDefinition {
     let children = children
         .map(|children| {
@@ -226,14 +256,8 @@ pub(crate) fn define_route(
         })
         .unwrap_or_default();
 
-    let id = ROUTE_ID.with(|id| {
-        let next = id.get() + 1;
-        id.set(next);
-        next
-    });
-
     RouteDefinition {
-        id,
+        id: new_route_id(),
         path,
         children,
         view,
@@ -242,6 +266,7 @@ pub(crate) fn define_route(
         data,
         static_mode,
         static_params,
+        trailing_slash,
     }
 }
 
@@ -385,6 +410,11 @@ impl RouteContext {
     pub fn outlet(&self) -> impl IntoView {
         (self.inner.outlet)()
     }
+
+    /// The http method used to navigate to this route. Defaults to [`Method::Get`] when unavailable like in client side routing
+    pub fn method(&self) -> Method {
+        use_context().unwrap_or_default()
+    }
 }
 
 pub(crate) struct RouteContextInner {

router/src/components/router.rs

@@ -41,13 +41,16 @@ pub fn Router(
     /// A signal that will be set while the navigation process is underway.
     #[prop(optional, into)]
     set_is_routing: Option<SignalSetter<bool>>,
+    /// How trailing slashes should be handled in [`Route`] paths.
+    #[prop(optional)]
+    trailing_slash: TrailingSlash,
     /// The `<Router/>` should usually wrap your whole page. It can contain
     /// any elements, and should include a [`Routes`](crate::Routes) component somewhere
     /// to define and display [`Route`](crate::Route)s.
     children: Children,
 ) -> impl IntoView {
     // create a new RouterContext and provide it to every component beneath the router
-    let router = RouterContext::new(base, fallback);
+    let router = RouterContext::new(base, fallback, trailing_slash);
     provide_context(router);
     provide_context(GlobalSuspenseContext::new());
     if let Some(set_is_routing) = set_is_routing {
@@ -67,7 +70,7 @@ pub fn Router(
             let navigate = navigate.clone();
             // delay by a tick here, so that the Action updates *before* the redirect
             request_animation_frame(move || {
-                navigate(&url.pathname(), Default::default());
+                navigate(&url.href(), Default::default());
             });
             // Use set_href() if the conditions for client-side navigation were not satisfied
         } else if let Err(e) =
@@ -103,6 +106,7 @@ pub(crate) struct RouterContextInner {
     id: usize,
     pub location: Location,
     pub base: RouteContext,
+    trailing_slash: TrailingSlash,
     pub possible_routes: RefCell<Option<Vec<Branch>>>,
     #[allow(unused)] // used in CSR/hydrate
     base_path: String,
@@ -139,6 +143,7 @@ impl RouterContext {
     pub(crate) fn new(
         base: Option<&'static str>,
         fallback: Option<fn() -> View>,
+        trailing_slash: TrailingSlash,
     ) -> Self {
         cfg_if! {
             if #[cfg(any(feature = "csr", feature = "hydrate"))] {
@@ -220,6 +225,7 @@ impl RouterContext {
             path_stack: store_value(vec![location.pathname.get_untracked()]),
             location,
             base,
+            trailing_slash,
             history: Box::new(history),
 
             reference,
@@ -258,6 +264,10 @@ impl RouterContext {
         self.inner.id
     }
 
+    pub(crate) fn trailing_slash(&self) -> TrailingSlash {
+        self.inner.trailing_slash.clone()
+    }
+
     /// A list of all possible routes this router can match.
     pub fn possible_branches(&self) -> Vec<Branch> {
         self.inner
@@ -515,3 +525,64 @@ impl Default for NavigateOptions {
         }
     }
 }
+
+/// Declares how you would like to handle trailing slashes in Route paths. This
+/// can be set on [`Router`] and overridden in [`crate::components::Route`]
+#[derive(Default, Clone, Debug, PartialEq, Eq)]
+pub enum TrailingSlash {
+    /// This is the default behavior as of Leptos 0.5.  Trailing slashes in your
+    /// `Route` path are stripped. i.e.: the following two route declarations
+    /// are equivalent:
+    ///  * `<Route path="/foo">`
+    ///  * `<Route path="/foo/">`
+    #[default]
+    Drop,
+
+    /// This mode will respect your path as it is written. Ex:
+    ///  * If you specify `<Route path="/foo">`, then `/foo` matches, but
+    ///    `/foo/` does not.
+    ///  * If you specify `<Route path="/foo/">`, then `/foo/` matches, but
+    ///    `/foo` does not.
+    Exact,
+
+    /// Like `Exact`, this mode respects your path as-written. But it will also
+    /// add redirects to the specified path if a user nagivates to a URL that is
+    /// off by only the trailing slash.
+    ///
+    /// Given `<Route path="/foo">`
+    ///  * Visiting `/foo` is valid.
+    ///  * Visiting `/foo/` serves a redirect to `/foo`
+    ///
+    /// Given `<Route path="/foo/">`
+    ///  * Visiting `/foo` serves a redirect to `/foo/`
+    ///  * Visiting `/foo/` is valid.
+    Redirect,
+}
+
+impl TrailingSlash {
+    /// Should we redirect requests that come in with the wrong (extra/missing) trailng slash?
+    pub(crate) fn should_redirect(&self) -> bool {
+        use TrailingSlash::*;
+        match self {
+            Redirect => true,
+            Drop | Exact => false,
+        }
+    }
+
+    pub(crate) fn normalize_route_path(&self, path: &mut String) {
+        if !self.should_drop() {
+            return;
+        }
+        while path.ends_with('/') {
+            path.pop();
+        }
+    }
+
+    fn should_drop(&self) -> bool {
+        use TrailingSlash::*;
+        match self {
+            Redirect | Exact => false,
+            Drop => true,
+        }
+    }
+}

router/src/components/routes.rs

@@ -1,10 +1,12 @@
 use crate::{
     animation::*,
+    components::route::new_route_id,
     matching::{
         expand_optionals, get_route_matches, join_paths, Branch, Matcher,
         RouteDefinition, RouteMatch,
     },
-    use_is_back_navigation, RouteContext, RouterContext, SetIsRouting,
+    use_is_back_navigation, use_route, NavigateOptions, Redirect, RouteContext,
+    RouterContext, SetIsRouting, TrailingSlash,
 };
 use leptos::{leptos_dom::HydrationCtx, *};
 use std::{
@@ -82,7 +84,7 @@ pub fn Routes(
     let base_route = router.base();
     let base = base.unwrap_or_default();
 
-    Branches::initialize(router_id, &base, children());
+    Branches::initialize(&router, &base, children());
 
     #[cfg(feature = "ssr")]
     if let Some(context) = use_context::<crate::PossibleBranchContext>() {
@@ -164,7 +166,7 @@ pub fn AnimatedRoutes(
     let base_route = router.base();
     let base = base.unwrap_or_default();
 
-    Branches::initialize(router_id, &base, children());
+    Branches::initialize(&router, &base, children());
 
     #[cfg(feature = "ssr")]
     if let Some(context) = use_context::<crate::PossibleBranchContext>() {
@@ -278,7 +280,7 @@ thread_local! {
 }
 
 impl Branches {
-    pub fn initialize(router_id: usize, base: &str, children: Fragment) {
+    pub fn initialize(router: &RouterContext, base: &str, children: Fragment) {
         BRANCHES.with(|branches| {
             #[cfg(debug_assertions)]
             {
@@ -293,9 +295,9 @@ impl Branches {
             }
 
             let mut current = branches.borrow_mut();
-            if !current.contains_key(&(router_id, Cow::from(base))) {
+            if !current.contains_key(&(router.id(), Cow::from(base))) {
                 let mut branches = Vec::new();
-                let children = children
+                let mut children = children
                     .as_children()
                     .iter()
                     .filter_map(|child| {
@@ -315,6 +317,7 @@ impl Branches {
                     })
                     .cloned()
                     .collect::<Vec<_>>();
+                inherit_settings(&mut children, router);
                 create_branches(
                     &children,
                     base,
@@ -323,7 +326,7 @@ impl Branches {
                     true,
                     base,
                 );
-                current.insert((router_id, Cow::Owned(base.into())), branches);
+                current.insert((router.id(), Cow::Owned(base.into())), branches);
             }
         })
     }
@@ -344,6 +347,36 @@ impl Branches {
     }
 }
 
+// <Route>s may inherit settings from each other or <Router>.
+// This mutates RouteDefinitions to propagate those settings.
+fn inherit_settings(children: &mut [RouteDefinition], router: &RouterContext) {
+    struct InheritProps {
+        trailing_slash: Option<TrailingSlash>,
+    }
+    fn route_def_inherit(
+        children: &mut [RouteDefinition],
+        inherited: InheritProps,
+    ) {
+        for child in children {
+            if child.trailing_slash.is_none() {
+                child.trailing_slash = inherited.trailing_slash.clone();
+            }
+            route_def_inherit(
+                &mut child.children,
+                InheritProps {
+                    trailing_slash: child.trailing_slash.clone(),
+                },
+            );
+        }
+    }
+    route_def_inherit(
+        children,
+        InheritProps {
+            trailing_slash: Some(router.trailing_slash()),
+        },
+    );
+}
+
 fn route_states(
     router_id: usize,
     base: String,
@@ -553,6 +586,7 @@ pub(crate) struct RouterState {
 
 #[derive(Debug, Clone, PartialEq)]
 pub struct RouteData {
+    // This ID is always the same as key.id.  Deprecate?
     pub id: usize,
     pub key: RouteDefinition,
     pub pattern: String,
@@ -647,24 +681,110 @@ fn create_routes(
             parents_path, route_def.path
         );
     }
+    let trailing_slash = route_def
+        .trailing_slash
+        .clone()
+        .expect("trailng_slash should be set by this point");
     let mut acc = Vec::new();
     for original_path in expand_optionals(&route_def.path) {
-        let path = join_paths(base, &original_path);
+        let mut path = join_paths(base, &original_path).to_string();
+        trailing_slash.normalize_route_path(&mut path);
         let pattern = if is_leaf {
             path
+        } else if let Some((path, _splat)) = path.split_once("/*") {
+            path.to_string()
         } else {
-            path.split("/*")
-                .next()
-                .map(|n| n.to_string())
-                .unwrap_or(path)
+            path
         };
-        acc.push(RouteData {
+
+        let route_data = RouteData {
             key: route_def.clone(),
             id: route_def.id,
             matcher: Matcher::new_with_partial(&pattern, !is_leaf),
             pattern,
             original_path: original_path.into_owned(),
-        });
+        };
+
+        if route_data.matcher.is_wildcard() {
+            // already handles trailing_slash
+        } else if let Some(redirect_route) = redirect_route_for(route_def) {
+            let pattern = &redirect_route.path;
+            let redirect_route_data = RouteData {
+                id: redirect_route.id,
+                matcher: Matcher::new_with_partial(pattern, !is_leaf),
+                pattern: pattern.to_owned(),
+                original_path: pattern.to_owned(),
+                key: redirect_route,
+            };
+            acc.push(redirect_route_data);
+        }
+
+        acc.push(route_data);
     }
     acc
 }
+
+/// A new route that redirects to `route` with the correct trailng slash.
+fn redirect_route_for(route: &RouteDefinition) -> Option<RouteDefinition> {
+    if matches!(route.path.as_str(), "" | "/") {
+        // Root paths are an exception to the rule and are always equivalent:
+        return None;
+    }
+
+    let trailing_slash = route
+        .trailing_slash
+        .clone()
+        .expect("trailing_slash should be defined by now");
+
+    if !trailing_slash.should_redirect() {
+        return None;
+    }
+
+    // Are we creating a new route that adds or removes a slash?
+    let add_slash = route.path.ends_with('/');
+    let view = Rc::new(move || {
+        view! {
+            <FixTrailingSlash add_slash />
+        }
+        .into_view()
+    });
+
+    let new_pattern = if add_slash {
+        // If we need to add a slash, we need to match on the path w/o it:
+        route.path.trim_end_matches('/').to_string()
+    } else {
+        format!("{}/", route.path)
+    };
+    let new_route = RouteDefinition {
+        path: new_pattern,
+        children: vec![],
+        data: None,
+        methods: route.methods,
+        id: new_route_id(),
+        view,
+        ssr_mode: route.ssr_mode,
+        static_mode: route.static_mode,
+        static_params: None,
+        trailing_slash: None, // Shouldn't be needed/used from here on out
+    };
+
+    Some(new_route)
+}
+
+#[component]
+fn FixTrailingSlash(add_slash: bool) -> impl IntoView {
+    let route = use_route();
+    let path = if add_slash {
+        format!("{}/", route.path())
+    } else {
+        route.path().trim_end_matches('/').to_string()
+    };
+    let options = NavigateOptions {
+        replace: true,
+        ..Default::default()
+    };
+
+    view! {
+        <Redirect path options/>
+    }
+}

router/src/extract_routes.rs

@@ -1,6 +1,9 @@
+mod test_extract_routes;
+
 use crate::{
-    Branch, Method, RouterIntegrationContext, ServerIntegration, SsrMode,
-    StaticDataMap, StaticMode, StaticParamsMap, StaticPath,
+    provide_server_redirect, Branch, Method, RouterIntegrationContext,
+    ServerIntegration, SsrMode, StaticDataMap, StaticMode, StaticParamsMap,
+    StaticPath,
 };
 use leptos::*;
 use std::{
@@ -42,6 +45,9 @@ impl RouteListing {
     }
 
     /// The path this route handles.
+    ///
+    /// This should be formatted for whichever web server integegration is being used. (ex: leptos-actix.)
+    /// When returned from leptos-router, it matches `self.leptos_path()`.  
     pub fn path(&self) -> &str {
         &self.path
     }
@@ -128,21 +134,9 @@ where
 {
     let runtime = create_runtime();
 
-    let integration = ServerIntegration {
-        path: "http://leptos.rs/".to_string(),
-    };
-
-    provide_context(RouterIntegrationContext::new(integration));
-    let branches = PossibleBranchContext::default();
-    provide_context(branches.clone());
-
-    additional_context();
-
-    leptos::suppress_resource_load(true);
-    _ = app_fn().into_view();
-    leptos::suppress_resource_load(false);
-
+    let branches = get_branches(app_fn, additional_context);
     let branches = branches.0.borrow();
+
     let mut static_data_map: StaticDataMap = HashMap::new();
     let routes = branches
         .iter()
@@ -182,3 +176,29 @@ where
     runtime.dispose();
     (routes, static_data_map)
 }
+
+fn get_branches<IV>(
+    app_fn: impl Fn() -> IV + 'static + Clone,
+    additional_context: impl Fn() + 'static + Clone,
+) -> PossibleBranchContext
+where
+    IV: IntoView + 'static,
+{
+    let integration = ServerIntegration {
+        path: "http://leptos.rs/".to_string(),
+    };
+
+    provide_context(RouterIntegrationContext::new(integration));
+    let branches = PossibleBranchContext::default();
+    provide_context(branches.clone());
+    // Suppress startup warning about using <Redirect/> without ServerRedirectFunction:
+    provide_server_redirect(|_str| ());
+
+    additional_context();
+
+    leptos::suppress_resource_load(true);
+    _ = app_fn().into_view();
+    leptos::suppress_resource_load(false);
+
+    branches
+}

router/src/extract_routes/test_extract_routes.rs

@@ -0,0 +1,258 @@
+// This is here, vs /router/tests/, because it accesses some `pub(crate)`
+// features to test crate internals that wouldn't be available there.
+
+#![cfg(all(test, feature = "ssr"))]
+
+use crate::*;
+use itertools::Itertools;
+use leptos::*;
+use std::{cell::RefCell, rc::Rc};
+
+#[component]
+fn DefaultApp() -> impl IntoView {
+    let view = || view! { "" };
+    view! {
+        <Router>
+            <Routes>
+                <Route path="/foo" view/>
+                <Route path="/bar/" view/>
+                <Route path="/baz/:id" view/>
+                <Route path="/name/:name/" view/>
+                <Route path="/any/*any" view/>
+            </Routes>
+        </Router>
+    }
+}
+
+#[component]
+fn ExactApp() -> impl IntoView {
+    let view = || view! { "" };
+    let trailing_slash = TrailingSlash::Exact;
+    view! {
+        <Router trailing_slash>
+            <Routes>
+                <Route path="/foo" view/>
+                <Route path="/bar/" view/>
+                <Route path="/baz/:id" view/>
+                <Route path="/name/:name/" view/>
+                <Route path="/any/*any" view/>
+            </Routes>
+        </Router>
+    }
+}
+
+#[component]
+fn RedirectApp() -> impl IntoView {
+    let view = || view! { "" };
+    let trailing_slash = TrailingSlash::Redirect;
+    view! {
+        <Router trailing_slash>
+            <Routes>
+                <Route path="/foo" view/>
+                <Route path="/bar/" view/>
+                <Route path="/baz/:id" view/>
+                <Route path="/name/:name/" view/>
+                <Route path="/any/*any" view/>
+            </Routes>
+        </Router>
+    }
+}
+#[test]
+fn test_generated_routes_default() {
+    // By default, we use the behavior as of Leptos 0.5, which is equivalent to TrailingSlash::Drop.
+    assert_generated_paths(
+        DefaultApp,
+        &["/any/*any", "/bar", "/baz/:id", "/foo", "/name/:name"],
+    );
+}
+
+#[test]
+fn test_generated_routes_exact() {
+    // Allow users to precisely define whether slashes are present:
+    assert_generated_paths(
+        ExactApp,
+        &["/any/*any", "/bar/", "/baz/:id", "/foo", "/name/:name/"],
+    );
+}
+
+#[test]
+fn test_generated_routes_redirect() {
+    // TralingSlashes::Redirect generates paths to redirect to the path with the "correct" trailing slash ending (or lack thereof).
+    assert_generated_paths(
+        RedirectApp,
+        &[
+            "/any/*any",
+            "/bar",
+            "/bar/",
+            "/baz/:id",
+            "/baz/:id/",
+            "/foo",
+            "/foo/",
+            "/name/:name",
+            "/name/:name/",
+        ],
+    )
+}
+
+#[test]
+fn test_rendered_redirect() {
+    // Given an app that uses TrailngSlsahes::Redirect, rendering the redirected path
+    // should render the redirect. Other paths should not.
+
+    let expected_redirects = &[
+        ("/bar", "/bar/"),
+        ("/baz/some_id/", "/baz/some_id"),
+        ("/name/some_name", "/name/some_name/"),
+        ("/foo/", "/foo"),
+    ];
+
+    let redirect_result = Rc::new(RefCell::new(Option::None));
+    let rc = redirect_result.clone();
+    let server_redirect = move |new_value: &str| {
+        rc.replace(Some(new_value.to_string()));
+    };
+
+    let _runtime = Disposable(create_runtime());
+    let history = TestHistory::new("/");
+    provide_context(RouterIntegrationContext::new(history.clone()));
+    provide_server_redirect(server_redirect);
+
+    // We expect these redirects to exist:
+    for (src, dest) in expected_redirects {
+        let loc = format!("https://example.com{src}");
+        history.goto(&loc);
+        redirect_result.replace(None);
+        RedirectApp().into_view().render_to_string();
+        let redirected_to = redirect_result.borrow().clone();
+        assert!(
+            redirected_to.is_some(),
+            "Should redirect from {src} to {dest}"
+        );
+        assert_eq!(redirected_to.unwrap(), *dest);
+    }
+
+    // But the destination paths shouldn't themselves redirect:
+    redirect_result.replace(None);
+    for (_src, dest) in expected_redirects {
+        let loc = format!("https://example.com{dest}");
+        history.goto(&loc);
+        RedirectApp().into_view().render_to_string();
+        let redirected_to = redirect_result.borrow().clone();
+        assert!(
+            redirected_to.is_none(),
+            "Destination of redirect shouldn't also redirect: {dest}"
+        );
+    }
+}
+
+struct Disposable(RuntimeId);
+
+// If the test fails, and we don't dispose, we get irrelevant panics.
+impl Drop for Disposable {
+    fn drop(&mut self) {
+        self.0.dispose()
+    }
+}
+
+#[derive(Clone)]
+struct TestHistory {
+    loc: RwSignal<LocationChange>,
+}
+
+impl TestHistory {
+    fn new(initial: &str) -> Self {
+        let lc = LocationChange {
+            value: initial.to_owned(),
+            ..Default::default()
+        };
+        Self {
+            loc: create_rw_signal(lc),
+        }
+    }
+
+    fn goto(&self, loc: &str) {
+        let change = LocationChange {
+            value: loc.to_string(),
+            ..Default::default()
+        };
+
+        self.navigate(&change);
+    }
+}
+
+impl History for TestHistory {
+    fn location(&self) -> ReadSignal<LocationChange> {
+        self.loc.read_only()
+    }
+
+    fn navigate(&self, new_loc: &LocationChange) {
+        self.loc.update(|loc| loc.value = new_loc.value.clone())
+    }
+}
+
+// WARNING!
+//
+// Despite generate_route_list_inner() using a new leptos_reactive::RuntimeID
+// each time we call this function, somehow Routes are leaked between different
+// apps. To avoid that, make sure to put each call in a separate #[test] method.
+//
+// TODO: Better isolation for different apps to avoid this issue?
+fn assert_generated_paths<F, IV>(app: F, expected_sorted_paths: &[&str])
+where
+    F: Clone + Fn() -> IV + 'static,
+    IV: IntoView + 'static,
+{
+    let (routes, static_data) = generate_route_list_inner(app);
+
+    let mut paths = routes.iter().map(|route| route.path()).collect_vec();
+    paths.sort();
+
+    assert_eq!(paths, expected_sorted_paths);
+
+    let mut keys = static_data.keys().collect_vec();
+    keys.sort();
+    assert_eq!(paths, keys);
+
+    // integrations can update "path" to be valid for themselves, but
+    // when routes are returned by leptos_router, these are equal:
+    assert!(routes
+        .iter()
+        .all(|route| route.path() == route.leptos_path()));
+}
+
+#[test]
+fn test_unique_route_ids() {
+    let branches = get_branches(RedirectApp);
+    assert!(!branches.is_empty());
+
+    assert!(branches
+        .iter()
+        .flat_map(|branch| &branch.routes)
+        .map(|route| route.id)
+        .all_unique());
+}
+
+#[test]
+fn test_unique_route_patterns() {
+    let branches = get_branches(RedirectApp);
+    assert!(!branches.is_empty());
+
+    assert!(branches
+        .iter()
+        .flat_map(|branch| &branch.routes)
+        .map(|route| route.pattern.as_str())
+        .all_unique());
+}
+
+fn get_branches<F, IV>(app_fn: F) -> Vec<Branch>
+where
+    F: Fn() -> IV + Clone + 'static,
+    IV: IntoView + 'static,
+{
+    let runtime = create_runtime();
+    let additional_context = || ();
+    let branches = super::get_branches(app_fn, additional_context);
+    let branches = branches.0.borrow().clone();
+    runtime.dispose();
+    branches
+}

router/src/matching/matcher.rs

@@ -31,14 +31,8 @@ impl Matcher {
             Some((p, s)) => (p, Some(s.to_string())),
             None => (path, None),
         };
-        let segments = pattern
-            .split('/')
-            .filter(|n| !n.is_empty())
-            .map(|n| n.to_string())
-            .collect::<Vec<_>>();
-
+        let segments: Vec<String> = get_segments(pattern);
         let len = segments.len();
-
         Self {
             splat,
             segments,
@@ -49,10 +43,7 @@ impl Matcher {
 
     #[doc(hidden)]
     pub fn test(&self, location: &str) -> Option<PathMatch> {
-        let loc_segments = location
-            .split('/')
-            .filter(|n| !n.is_empty())
-            .collect::<Vec<_>>();
+        let loc_segments: Vec<&str> = get_segments(location);
 
         let loc_len = loc_segments.len();
         let len_diff: i32 = loc_len as i32 - self.len as i32;
@@ -107,4 +98,24 @@ impl Matcher {
             Some(PathMatch { path, params })
         }
     }
+
+    #[doc(hidden)]
+    pub(crate) fn is_wildcard(&self) -> bool {
+        self.splat.is_some()
+    }
+}
+
+fn get_segments<'a, S: From<&'a str>>(pattern: &'a str) -> Vec<S> {
+    // URL root paths ("/" and "") are equivalent and treated as 0-segment paths.
+    // non-root paths with trailing slashes get extra empty segment at the end.
+    // This makes sure that segment matching is trailing-slash sensitive.
+    let mut segments: Vec<S> = pattern
+        .split('/')
+        .filter(|p| !p.is_empty())
+        .map(Into::into)
+        .collect();
+    if !segments.is_empty() && pattern.ends_with('/') {
+        segments.push("".into());
+    }
+    segments
 }

router/src/matching/resolve_path.rs

@@ -51,7 +51,14 @@ fn has_scheme(path: &str) -> bool {
 
 #[doc(hidden)]
 fn normalize(path: &str, omit_slash: bool) -> Cow<'_, str> {
-    let s = path.trim_start_matches('/').trim_end_matches('/');
+    let s = path.trim_start_matches('/');
+    let trim_end = s
+        .chars()
+        .rev()
+        .take_while(|c| *c == '/')
+        .count()
+        .saturating_sub(1);
+    let s = &s[0..s.len() - trim_end];
     if s.is_empty() || omit_slash || begins_with_query_or_hash(s) {
         s.into()
     } else {
@@ -70,9 +77,10 @@ fn begins_with_query_or_hash(text: &str) -> bool {
 }
 
 fn remove_wildcard(text: &str) -> String {
-    text.split_once('*')
-        .map(|(prefix, _)| prefix.trim_end_matches('/'))
+    text.rsplit_once('*')
+        .map(|(prefix, _)| prefix)
         .unwrap_or(text)
+        .trim_end_matches('/')
         .to_string()
 }
 
@@ -83,4 +91,14 @@ mod tests {
     fn normalize_query_string_with_opening_slash() {
         assert_eq!(normalize("/?foo=bar", false), "?foo=bar");
     }
+
+    #[test]
+    fn normalize_retain_trailing_slash() {
+        assert_eq!(normalize("foo/bar/", false), "/foo/bar/");
+    }
+
+    #[test]
+    fn normalize_dedup_trailing_slashes() {
+        assert_eq!(normalize("foo/bar/////", false), "/foo/bar/");
+    }
 }

router/src/matching/route.rs

@@ -1,4 +1,4 @@
-use crate::{Loader, Method, SsrMode, StaticData, StaticMode};
+use crate::{Loader, Method, SsrMode, StaticData, StaticMode, TrailingSlash};
 use leptos::leptos_dom::View;
 use std::rc::Rc;
 
@@ -25,6 +25,8 @@ pub struct RouteDefinition {
     pub static_mode: Option<StaticMode>,
     /// The data required to fill any dynamic segments in the path during static rendering.
     pub static_params: Option<StaticData>,
+    /// How a trailng slash in `path` should be handled.
+    pub trailing_slash: Option<TrailingSlash>,
 }
 
 impl core::fmt::Debug for RouteDefinition {
@@ -34,6 +36,7 @@ impl core::fmt::Debug for RouteDefinition {
             .field("children", &self.children)
             .field("ssr_mode", &self.ssr_mode)
             .field("static_render", &self.static_mode)
+            .field("trailing_slash", &self.trailing_slash)
             .finish()
     }
 }

router/tests/join_paths.rs

@@ -44,5 +44,14 @@ cfg_if! {
             assert_eq!(join_paths("/foo", ":bar/baz"), "/foo/:bar/baz");
             assert_eq!(join_paths("", ":bar/baz"), "/:bar/baz");
         }
+
+        // Additional tests NOT from Solid Router:
+        #[test]
+        fn join_paths_for_root() {
+            assert_eq!(join_paths("", ""), "");
+            assert_eq!(join_paths("", "/"), "");
+            assert_eq!(join_paths("/", ""), "");
+            assert_eq!(join_paths("/", "/"), "");
+        }
     }
 }

router/tests/trailing_slashes.rs

@@ -0,0 +1,59 @@
+//! Some extra tests for Matcher NOT based on SolidJS's tests cases (as in matcher.rs)
+
+use leptos_router::*;
+
+#[test]
+fn trailing_slashes_match_exactly() {
+    let matcher = Matcher::new("/foo/");
+    assert_matches(&matcher, "/foo/");
+    assert_no_match(&matcher, "/foo");
+
+    let matcher = Matcher::new("/foo/bar/");
+    assert_matches(&matcher, "/foo/bar/");
+    assert_no_match(&matcher, "/foo/bar");
+
+    let matcher = Matcher::new("/");
+    assert_matches(&matcher, "/");
+    assert_matches(&matcher, "");
+
+    let matcher = Matcher::new("");
+    assert_matches(&matcher, "");
+
+    // Despite returning a pattern of "", web servers (known: Actix-Web and Axum)
+    // may send us a path of "/". We should match those at the root:
+    assert_matches(&matcher, "/");
+}
+
+#[cfg(feature = "ssr")]
+#[test]
+fn trailing_slashes_params_match_exactly() {
+    let matcher = Matcher::new("/foo/:bar/");
+    assert_matches(&matcher, "/foo/bar/");
+    assert_matches(&matcher, "/foo/42/");
+    assert_matches(&matcher, "/foo/%20/");
+
+    assert_no_match(&matcher, "/foo/bar");
+    assert_no_match(&matcher, "/foo/42");
+    assert_no_match(&matcher, "/foo/%20");
+
+    let m = matcher.test("/foo/asdf/").unwrap();
+    assert_eq!(m.params, params_map! { "bar" => "asdf" });
+}
+
+fn assert_matches(matcher: &Matcher, path: &str) {
+    assert!(
+        matches(matcher, path),
+        "{matcher:?} should match path {path:?}"
+    );
+}
+
+fn assert_no_match(matcher: &Matcher, path: &str) {
+    assert!(
+        !matches(matcher, path),
+        "{matcher:?} should NOT match path {path:?}"
+    );
+}
+
+fn matches(m: &Matcher, loc: &str) -> bool {
+    m.test(loc).is_some()
+}

server_fn/Cargo.toml

@@ -7,6 +7,7 @@ license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "RPC for any web framework."
 readme = "../README.md"
+rust-version.workspace = true
 
 [dependencies]
 server_fn_macro_default = { workspace = true }