test: add regression test for #4296

This reverts commit d37512bebd.

examples/regression/e2e/features/issue_4285.feature

@@ -0,0 +1,9 @@
+@check_issue_4285
+Feature: Check that issue 4285 does not reappear
+
+	Scenario: Navigating several times to same lazy route does not cause issues.
+		Given I see the app
+		And I can access regression test 4285
+		And I can access regression test 4285
+		And I can access regression test 4285
+		Then I see the result is the string 42

examples/regression/e2e/features/issue_4296.feature

@@ -0,0 +1,18 @@
+@check_issue_4296
+Feature: Check that issue 4296 does not reappear
+
+	Scenario: Query param signals created in LazyRoute::data() are reactive in ::view().
+		Given I see the app
+		And I can access regression test 4296
+		Then I see the result is the string None
+		When I select the link abc
+		Then I see the result is the string Some("abc")
+		When I select the link def
+		Then I see the result is the string Some("def")
+
+	Scenario: Loading page with query signal works as well.
+		Given I see the app
+		And I can access regression test 4296
+		When I select the link abc
+		When I reload the page
+		Then I see the result is the string Some("abc")

examples/regression/src/app.rs

@@ -1,6 +1,7 @@
 use crate::{
     issue_4005::Routes4005, issue_4088::Routes4088, issue_4217::Routes4217,
-    pr_4015::Routes4015, pr_4091::Routes4091,
+    issue_4285::Routes4285, issue_4296::Routes4296, pr_4015::Routes4015,
+    pr_4091::Routes4091,
 };
 use leptos::prelude::*;
 use leptos_meta::{MetaTags, *};
@@ -31,9 +32,11 @@ pub fn shell(options: LeptosOptions) -> impl IntoView {
 pub fn App() -> impl IntoView {
     provide_meta_context();
     let fallback = || view! { "Page not found." }.into_view();
+    let (_, set_is_routing) = signal(false);
+
     view! {
         <Stylesheet id="leptos" href="/pkg/regression.css"/>
-        <Router>
+        <Router set_is_routing>
             <main>
                 <Routes fallback>
                     <Route path=path!("") view=HomePage/>
@@ -42,6 +45,8 @@ pub fn App() -> impl IntoView {
                     <Routes4088/>
                     <Routes4217/>
                     <Routes4005/>
+                    <Routes4285/>
+                    <Routes4296/>
                 </Routes>
             </main>
         </Router>
@@ -66,6 +71,8 @@ fn HomePage() -> impl IntoView {
                 <li><a href="/4088/">"4088"</a></li>
                 <li><a href="/4217/">"4217"</a></li>
                 <li><a href="/4005/">"4005"</a></li>
+                <li><a href="/4285/">"4285"</a></li>
+                <li><a href="/4296/">"4296"</a></li>
             </ul>
         </nav>
     }

examples/regression/src/issue_4285.rs

@@ -0,0 +1,49 @@
+use leptos::prelude::*;
+use leptos_router::LazyRoute;
+#[allow(unused_imports)]
+use leptos_router::{
+    components::Route, path, Lazy, MatchNestedRoutes, NavigateOptions,
+};
+
+#[component]
+pub fn Routes4285() -> impl MatchNestedRoutes + Clone {
+    view! {
+        <Route path=path!("4285") view={Lazy::<Issue4285>::new()}/>
+    }
+    .into_inner()
+}
+
+struct Issue4285 {
+    data: Resource<Result<i32, ServerFnError>>,
+}
+
+impl LazyRoute for Issue4285 {
+    fn data() -> Self {
+        Self {
+            data: Resource::new(|| (), |_| slow_call()),
+        }
+    }
+
+    async fn view(this: Self) -> AnyView {
+        let Issue4285 { data } = this;
+        view! {
+            <Suspense>
+                {move || {
+                    Suspend::new(async move {
+                        let data = data.await;
+                        view! {
+                            <p id="result">{data}</p>
+                        }
+                    })
+                }}
+            </Suspense>
+        }
+        .into_any()
+    }
+}
+
+#[server]
+async fn slow_call() -> Result<i32, ServerFnError> {
+    tokio::time::sleep(std::time::Duration::from_millis(250)).await;
+    Ok(42)
+}

examples/regression/src/issue_4296.rs

@@ -0,0 +1,36 @@
+use leptos::prelude::*;
+#[allow(unused_imports)]
+use leptos_router::{
+    components::Route, path, Lazy, MatchNestedRoutes, NavigateOptions,
+};
+use leptos_router::{hooks::use_query_map, LazyRoute};
+
+#[component]
+pub fn Routes4296() -> impl MatchNestedRoutes + Clone {
+    view! {
+        <Route path=path!("4296") view={Lazy::<Issue4296>::new()}/>
+    }
+    .into_inner()
+}
+
+struct Issue4296 {
+    query: Signal<Option<String>>,
+}
+
+impl LazyRoute for Issue4296 {
+    fn data() -> Self {
+        let query = use_query_map();
+        let query = Signal::derive(move || query.read().get("q"));
+        Self { query }
+    }
+
+    async fn view(this: Self) -> AnyView {
+        let Issue4296 { query } = this;
+        view! {
+            <a href="?q=abc">"abc"</a>
+            <a href="?q=def">"def"</a>
+            <p id="result">{move || format!("{:?}", query.get())}</p>
+        }
+        .into_any()
+    }
+}

examples/regression/src/lib.rs

@@ -2,6 +2,8 @@ pub mod app;
 mod issue_4005;
 mod issue_4088;
 mod issue_4217;
+mod issue_4285;
+mod issue_4296;
 mod pr_4015;
 mod pr_4091;
 

leptos/src/lib.rs

@@ -85,22 +85,12 @@
 //! # Feature Flags
 //!
 //! - **`nightly`**: On `nightly` Rust, enables the function-call syntax for signal getters and setters.
-//!   Also enables some experimental optimizations that improve the handling of static strings and
-//!   the performance of the `template! {}` macro.
 //! - **`csr`** Client-side rendering: Generate DOM nodes in the browser.
 //! - **`ssr`** Server-side rendering: Generate an HTML string (typically on the server).
-//! - **`islands`** Activates “islands mode,” in which components are not made interactive on the
-//!   client unless they use the `#[island]` macro.
 //! - **`hydrate`** Hydration: use this to add interactivity to an SSRed Leptos app.
-//! - **`nonce`** Adds support for nonces to be added as part of a Content Security Policy.
-//! - **`rkyv`** In SSR/hydrate mode, enables using [`rkyv`](https://docs.rs/rkyv/latest/rkyv/) to serialize resources.
+//! - **`rkyv`** In SSR/hydrate mode, uses [`rkyv`](https://docs.rs/rkyv/latest/rkyv/) to serialize resources and send them
+//!   from the server to the client.
 //! - **`tracing`** Adds support for [`tracing`](https://docs.rs/tracing/latest/tracing/).
-//! - **`trace-component-props`** Adds `tracing` support for component props.
-//! - **`delegation`** Uses event delegation rather than the browser’s native event handling
-//!   system. (This improves the performance of creating large numbers of elements simultaneously,
-//!   in exchange for occasional edge cases in which events behave differently from native browser
-//!   events.)
-//! - **`rustls`** Use `rustls` for server functions.
 //!
 //! **Important Note:** You must enable one of `csr`, `hydrate`, or `ssr` to tell Leptos
 //! which mode your app is operating in. You should only enable one of these per build target,

router/src/nested_router.rs

@@ -26,7 +26,7 @@ use reactive_graph::{
     computed::{ArcMemo, ScopedFuture},
     owner::{provide_context, use_context, Owner},
     signal::{ArcRwSignal, ArcTrigger},
-    traits::{Get, GetUntracked, Notify, ReadUntracked, Set, Track},
+    traits::{Get, GetUntracked, Notify, ReadUntracked, Set, Track, Write},
     transition::AsyncTransition,
     wrappers::write::SignalSetter,
 };
@@ -119,6 +119,7 @@ where
                     base,
                     &mut loaders,
                     &mut outlets,
+                    &outer_owner,
                 );
                 drop(url);
 
@@ -159,13 +160,14 @@ where
             }
             return;
         }
+
         // since the path didn't match, we'll update the retained path for future diffing
         state.path.clear();
         state.path.push_str(url_snapshot.path());
 
         let new_match = self.routes.match_route(url_snapshot.path());
 
-        state.current_url.set(url_snapshot);
+        *state.current_url.write_untracked() = url_snapshot;
 
         match new_match {
             None => {
@@ -192,6 +194,7 @@ where
                     &mut state.outlets,
                     self.set_is_routing.is_some(),
                     0,
+                    &self.outer_owner,
                 );
 
                 let (abort_handle, abort_registration) =
@@ -369,6 +372,7 @@ where
                         base,
                         &mut loaders,
                         &mut outlets,
+                        &outer_owner,
                     );
 
                     // outlets will not send their views if the loaders are never polled
@@ -422,8 +426,16 @@ where
                     base,
                     &mut loaders,
                     &mut outlets,
+                    &outer_owner,
                 );
 
+                let preload_owners = outlets
+                    .iter()
+                    .map(|o| o.preload_owner.clone())
+                    .collect::<Vec<_>>();
+                outer_owner
+                    .with(|| Owner::on_cleanup(move || drop(preload_owners)));
+
                 // outlets will not send their views if the loaders are never polled
                 // the loaders are async so that they can lazy-load routes in the browser,
                 // but they should always be synchronously available on the server
@@ -475,6 +487,7 @@ where
                         base,
                         &mut loaders,
                         &mut outlets,
+                        &outer_owner,
                     );
                     drop(url);
 
@@ -530,6 +543,7 @@ where
                         base,
                         &mut loaders,
                         &mut outlets,
+                        &outer_owner,
                     );
                     drop(url);
 
@@ -566,6 +580,7 @@ pub(crate) struct RouteContext {
     base: Option<Oco<'static, str>>,
     view_fn: Arc<Mutex<OutletViewFn>>,
     owner: Arc<Mutex<Option<Owner>>>,
+    preload_owner: Owner,
     child: ChildRoute,
 }
 
@@ -597,6 +612,7 @@ impl Clone for RouteContext {
             view_fn: Arc::clone(&self.view_fn),
             owner: Arc::clone(&self.owner),
             child: self.child.clone(),
+            preload_owner: self.preload_owner.clone(),
         }
     }
 }
@@ -608,6 +624,7 @@ trait AddNestedRoute {
         base: Option<Oco<'static, str>>,
         loaders: &mut Vec<Pin<Box<dyn Future<Output = ArcTrigger>>>>,
         outlets: &mut Vec<RouteContext>,
+        outer_owner: &Owner,
     );
 
     #[allow(clippy::too_many_arguments)]
@@ -621,6 +638,7 @@ trait AddNestedRoute {
         outlets: &mut Vec<RouteContext>,
         set_is_routing: bool,
         level: u8,
+        outer_owner: &Owner,
     ) -> u8;
 }
 
@@ -634,6 +652,7 @@ where
         base: Option<Oco<'static, str>>,
         loaders: &mut Vec<Pin<Box<dyn Future<Output = ArcTrigger>>>>,
         outlets: &mut Vec<RouteContext>,
+        outer_owner: &Owner,
     ) {
         let orig_url = url;
 
@@ -701,6 +720,7 @@ where
             base: base.clone(),
             child: ChildRoute(Arc::new(Mutex::new(None))),
             owner: Arc::new(Mutex::new(None)),
+            preload_owner: outer_owner.child(),
         };
         if !outlets.is_empty() {
             let prev_index = outlets.len().saturating_sub(1);
@@ -725,7 +745,15 @@ where
                 provide_context(params.clone());
                 provide_context(url.clone());
                 provide_context(matched.clone());
-                view.preload().await;
+                outlet
+                    .preload_owner
+                    .with(|| {
+                        provide_context(params.clone());
+                        provide_context(url.clone());
+                        provide_context(matched.clone());
+                        ScopedFuture::new(view.preload())
+                    })
+                    .await;
                 let child = outlet.child.clone();
                 *view_fn.lock().or_poisoned() =
                     Box::new(move |owner_where_used| {
@@ -772,7 +800,13 @@ where
         // this is important because to build the view, we need access to the outlet
         // and the outlet will be returned from building this child
         if let Some(child) = child {
-            child.build_nested_route(orig_url, base, loaders, outlets);
+            child.build_nested_route(
+                orig_url,
+                base,
+                loaders,
+                outlets,
+                outer_owner,
+            );
         }
     }
 
@@ -787,6 +821,7 @@ where
         outlets: &mut Vec<RouteContext>,
         set_is_routing: bool,
         level: u8,
+        outer_owner: &Owner,
     ) -> u8 {
         let (parent_params, parent_matches): (Vec<_>, Vec<_>) = outlets
             .iter()
@@ -803,7 +838,13 @@ where
         match current {
             // if there's nothing currently in the routes at this point, build from here
             None => {
-                self.build_nested_route(url, base, preloaders, outlets);
+                self.build_nested_route(
+                    url,
+                    base,
+                    preloaders,
+                    outlets,
+                    outer_owner,
+                );
                 level
             }
             Some(current) => {
@@ -843,6 +884,10 @@ where
                         &mut current.matched,
                         ArcRwSignal::new(new_match),
                     );
+                    let old_preload_owner = mem::replace(
+                        &mut current.preload_owner,
+                        outer_owner.child(),
+                    );
                     let matched_including_parents = {
                         ArcMemo::new({
                             let matched = current.matched.clone();
@@ -885,11 +930,26 @@ where
                         let child = outlet.child.clone();
                         async move {
                             let child = child.clone();
-                            if set_is_routing {
-                                AsyncTransition::run(|| view.preload()).await;
-                            } else {
-                                view.preload().await;
-                            }
+                            outlet
+                                .preload_owner
+                                .with(|| {
+                                    provide_context(
+                                        params_including_parents.clone(),
+                                    );
+                                    provide_context(url.clone());
+                                    provide_context(matched.clone());
+                                    ScopedFuture::new(async {
+                                        if set_is_routing {
+                                            AsyncTransition::run(|| {
+                                                view.preload()
+                                            })
+                                            .await;
+                                        } else {
+                                            view.preload().await;
+                                        }
+                                    })
+                                })
+                                .await;
                             *view_fn.lock().or_poisoned() =
                                 Box::new(move |owner_where_used| {
                                     let prev_owner = route_owner
@@ -938,6 +998,7 @@ where
                             drop(old_params);
                             drop(old_url);
                             drop(old_matched);
+                            drop(old_preload_owner);
                             trigger
                         }
                     })));
@@ -948,8 +1009,13 @@ where
 
                     // if this children has matches, then rebuild the lower section of the tree
                     if let Some(child) = child {
-                        child
-                            .build_nested_route(url, base, preloaders, outlets);
+                        child.build_nested_route(
+                            url,
+                            base,
+                            preloaders,
+                            outlets,
+                            outer_owner,
+                        );
                     } else {
                         *outlets[*items].child.0.lock().or_poisoned() = None;
                     }
@@ -973,6 +1039,7 @@ where
                         outlets,
                         set_is_routing,
                         level + 1,
+                        outer_owner,
                     )
                 } else {
                     *current.child.0.lock().or_poisoned() = None;

tachys/src/lib.rs

@@ -10,9 +10,6 @@
     all(feature = "nightly", rustc_nightly),
     feature(unsized_const_params)
 )]
-// support for const generic &'static str has now moved back and forth between
-// these two features a couple times; we'll just enable both
-#![cfg_attr(all(feature = "nightly", rustc_nightly), feature(adt_const_params))]
 #![deny(missing_docs)]
 
 /// Commonly-used traits.