fix: maintain send/syncness of the handle

fix: prevent double-rebuild and correctly navigate multiple times to same lazy route (closes #4285)

Cargo.toml

@@ -50,39 +50,39 @@ any_spawner = { path = "./any_spawner/", version = "0.3.0" }
 const_str_slice_concat = { path = "./const_str_slice_concat", version = "0.1" }
 either_of = { path = "./either_of/", version = "0.1.6" }
 hydration_context = { path = "./hydration_context", version = "0.3.0" }
-leptos = { path = "./leptos", version = "0.8.6" }
-leptos_config = { path = "./leptos_config", version = "0.8.5" }
-leptos_dom = { path = "./leptos_dom", version = "0.8.5" }
+leptos = { path = "./leptos", version = "0.8.9" }
+leptos_config = { path = "./leptos_config", version = "0.8.7" }
+leptos_dom = { path = "./leptos_dom", version = "0.8.6" }
 leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.8.5" }
 leptos_integration_utils = { path = "./integrations/utils", version = "0.8.5" }
-leptos_macro = { path = "./leptos_macro", version = "0.8.6" }
-leptos_router = { path = "./router", version = "0.8.5" }
+leptos_macro = { path = "./leptos_macro", version = "0.8.8" }
+leptos_router = { path = "./router", version = "0.8.7" }
 leptos_router_macro = { path = "./router_macro", version = "0.8.5" }
 leptos_server = { path = "./leptos_server", version = "0.8.5" }
 leptos_meta = { path = "./meta", version = "0.8.5" }
 next_tuple = { path = "./next_tuple", version = "0.1.0" }
 oco_ref = { path = "./oco", version = "0.2.1" }
 or_poisoned = { path = "./or_poisoned", version = "0.1.0" }
-reactive_graph = { path = "./reactive_graph", version = "0.2.5" }
+reactive_graph = { path = "./reactive_graph", version = "0.2.7" }
 reactive_stores = { path = "./reactive_stores", version = "0.2.5" }
-reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.2.5" }
-server_fn = { path = "./server_fn", version = "0.8.5" }
-server_fn_macro = { path = "./server_fn_macro", version = "0.8.6" }
+reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.2.6" }
+server_fn = { path = "./server_fn", version = "0.8.7" }
+server_fn_macro = { path = "./server_fn_macro", version = "0.8.7" }
 server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.8.5" }
-tachys = { path = "./tachys", version = "0.2.6" }
+tachys = { path = "./tachys", version = "0.2.8" }
 wasm_split_helpers = { path = "./wasm_split", version = "0.1.2" }
-wasm_split_macros = { path = "./wasm_split_macros", version = "0.1.2" }
+wasm_split_macros = { path = "./wasm_split_macros", version = "0.1.3" }
 
 # members deps
 async-once-cell = { default-features = false, version = "0.5.3" }
 itertools = { default-features = false, version = "0.14.0" }
 convert_case = { default-features = false, version = "0.8.0" }
-serde_json = { default-features = false, version = "1.0.142" }
+serde_json = { default-features = false, version = "1.0.143" }
 trybuild = { default-features = false, version = "1.0.110" }
-typed-builder = { default-features = false, version = "0.21.0" }
-thiserror = { default-features = false, version = "2.0.12" }
+typed-builder = { default-features = false, version = "0.21.2" }
+thiserror = { default-features = false, version = "2.0.16" }
 wasm-bindgen = { default-features = false, version = "0.2.100" }
-indexmap = { default-features = false, version = "2.9.0" }
+indexmap = { default-features = false, version = "2.11.0" }
 rstml = { default-features = false, version = "0.12.1" }
 rustc_version = { default-features = false, version = "0.4.1" }
 guardian = { default-features = false, version = "1.3.0" }
@@ -102,15 +102,15 @@ gloo-net = { default-features = false, version = "0.6.0" }
 url = { default-features = false, version = "2.5.4" }
 tokio = { default-features = false, version = "1.47.1" }
 base64 = { default-features = false, version = "0.22.1" }
-cfg-if = { default-features = false, version = "1.0.0" }
+cfg-if = { default-features = false, version = "1.0.3" }
 wasm-bindgen-futures = { default-features = false, version = "0.4.50" }
 tower = { default-features = false, version = "0.5.2" }
-proc-macro2 = { default-features = false, version = "1.0.96" }
+proc-macro2 = { default-features = false, version = "1.0.101" }
 serde = { default-features = false, version = "1.0.219" }
 parking_lot = { default-features = false, version = "0.12.4" }
 axum = { default-features = false, version = "0.8.4" }
 serde_qs = { default-features = false, version = "0.15.0" }
-syn = { default-features = false, version = "2.0.104" }
+syn = { default-features = false, version = "2.0.106" }
 xxhash-rust = { default-features = false, version = "0.8.15" }
 paste = { default-features = false, version = "1.0.15" }
 quote = { default-features = false, version = "1.0.40" }
@@ -122,16 +122,16 @@ tokio-tungstenite = { default-features = false, version = "0.27.0" }
 serial_test = { default-features = false, version = "3.2.0" }
 erased = { default-features = false, version = "0.1.2" }
 glib = { default-features = false, version = "0.20.12" }
-async-trait = { default-features = false, version = "0.1.88" }
+async-trait = { default-features = false, version = "0.1.89" }
 typed-builder-macro = { default-features = false, version = "0.21.0" }
 linear-map = { default-features = false, version = "1.2.0" }
-anyhow = { default-features = false, version = "1.0.98" }
+anyhow = { default-features = false, version = "1.0.99" }
 walkdir = { default-features = false, version = "2.5.0" }
 actix-ws = { default-features = false, version = "0.3.0" }
 tower-http = { default-features = false, version = "0.6.4" }
-prettyplease = { default-features = false, version = "0.2.36" }
-inventory = { default-features = false, version = "0.3.20" }
-config = { default-features = false, version = "0.15.13" }
+prettyplease = { default-features = false, version = "0.2.37" }
+inventory = { default-features = false, version = "0.3.21" }
+config = { default-features = false, version = "0.15.14" }
 camino = { default-features = false, version = "1.1.11" }
 ciborium = { default-features = false, version = "0.2.2" }
 multer = { default-features = false, version = "3.1.0" }
@@ -144,24 +144,24 @@ temp-env = { default-features = false, version = "0.3.6" }
 uuid = { default-features = false, version = "1.18.0" }
 bytes = { default-features = false, version = "1.10.1" }
 http = { default-features = false, version = "1.3.1" }
-regex = { default-features = false, version = "1.11.1" }
+regex = { default-features = false, version = "1.11.2" }
 drain_filter_polyfill = { default-features = false, version = "0.1.3" }
-tempfile = { default-features = false, version = "3.20.0" }
+tempfile = { default-features = false, version = "3.21.0" }
 futures-lite = { default-features = false, version = "2.6.1" }
 log = { default-features = false, version = "0.4.27" }
-percent-encoding = { default-features = false, version = "2.3.1" }
+percent-encoding = { default-features = false, version = "2.3.2" }
 async-executor = { default-features = false, version = "1.13.2" }
 const-str = { default-features = false, version = "0.6.4" }
 http-body-util = { default-features = false, version = "0.1.3" }
-hyper = { default-features = false, version = "1.6.0" }
+hyper = { default-features = false, version = "1.7.0" }
 postcard = { default-features = false, version = "1.1.3" }
 rmp-serde = { default-features = false, version = "1.3.0" }
-reqwest = { default-features = false, version = "0.12.22" }
+reqwest = { default-features = false, version = "0.12.23" }
 tower-layer = { default-features = false, version = "0.3.3" }
 attribute-derive = { default-features = false, version = "0.10.3" }
 insta = { default-features = false, version = "1.43.1" }
 codee = { default-features = false, version = "0.3.0" }
-actix-http = { default-features = false, version = "3.11.0" }
+actix-http = { default-features = false, version = "3.11.1" }
 wasm-bindgen-test = { default-features = false, version = "0.3.50" }
 rustversion = { default-features = false, version = "1.0.22" }
 getrandom = { default-features = false, version = "0.3.3" }

examples/regression/e2e/features/issue_4005.feature

@@ -0,0 +1,7 @@
+@check_issue_4005
+Feature: Check that issue 4005 does not reappear
+
+	Scenario: The second item is selected.
+		Given I see the app
+		And I can access regression test 4005
+		Then I see the value of select is 2

examples/regression/e2e/features/issue_4217.feature

@@ -0,0 +1,9 @@
+@check_issue_4217
+Feature: Check that issue 4217 does not reappear
+
+	Scenario: All items are selected.
+		Given I see the app
+		And I can access regression test 4217
+		Then I see option1 is selected
+		And I see option2 is selected
+		And I see option3 is selected

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/e2e/tests/fixtures/check.rs

@@ -18,3 +18,28 @@ pub async fn element_exists(client: &Client, id: &str) -> Result<()> {
         .expect(&format!("could not find element with id `{id}`"));
     Ok(())
 }
+
+pub async fn select_option_is_selected(
+    client: &Client,
+    id: &str,
+) -> Result<()> {
+    let el = find::element_by_id(client, id)
+        .await
+        .expect(&format!("could not find element with id `{id}`"));
+    let selected = el.prop("selected").await?;
+    assert_eq!(selected.as_deref(), Some("true"));
+    Ok(())
+}
+
+pub async fn element_value_is(
+    client: &Client,
+    id: &str,
+    expected: &str,
+) -> Result<()> {
+    let el = find::element_by_id(client, id)
+        .await
+        .expect(&format!("could not find element with id `{id}`"));
+    let value = el.prop("value").await?;
+    assert_eq!(value.as_deref(), Some(expected));
+    Ok(())
+}

examples/regression/e2e/tests/fixtures/world/check_steps.rs

@@ -25,3 +25,21 @@ async fn i_see_the_navbar(world: &mut AppWorld) -> Result<()> {
     check::element_exists(client, "nav").await?;
     Ok(())
 }
+
+#[then(regex = r"^I see ([\d\w]+) is selected$")]
+async fn i_see_the_select(world: &mut AppWorld, id: String) -> Result<()> {
+    let client = &world.client;
+    check::select_option_is_selected(client, &id).await?;
+    Ok(())
+}
+
+#[then(regex = r"^I see the value of (\w+) is (.*)$")]
+async fn i_see_the_value(
+    world: &mut AppWorld,
+    id: String,
+    value: String,
+) -> Result<()> {
+    let client = &world.client;
+    check::element_value_is(client, &id, &value).await?;
+    Ok(())
+}

examples/regression/src/app.rs

@@ -1,4 +1,8 @@
-use crate::{issue_4088::Routes4088, pr_4015::Routes4015, pr_4091::Routes4091};
+use crate::{
+    issue_4005::Routes4005, issue_4088::Routes4088, issue_4217::Routes4217,
+    issue_4285::Routes4285, issue_4296::Routes4296, pr_4015::Routes4015,
+    pr_4091::Routes4091,
+};
 use leptos::prelude::*;
 use leptos_meta::{MetaTags, *};
 use leptos_router::{
@@ -28,15 +32,21 @@ 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/>
                     <Routes4091/>
                     <Routes4015/>
                     <Routes4088/>
+                    <Routes4217/>
+                    <Routes4005/>
+                    <Routes4285/>
+                    <Routes4296/>
                 </Routes>
             </main>
         </Router>
@@ -59,6 +69,10 @@ fn HomePage() -> impl IntoView {
                 <li><a href="/4091/">"4091"</a></li>
                 <li><a href="/4015/">"4015"</a></li>
                 <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_4005.rs

@@ -0,0 +1,24 @@
+use leptos::prelude::*;
+#[allow(unused_imports)]
+use leptos_router::{
+    components::Route, path, MatchNestedRoutes, NavigateOptions,
+};
+
+#[component]
+pub fn Routes4005() -> impl MatchNestedRoutes + Clone {
+    view! {
+        <Route path=path!("4005") view=Issue4005/>
+    }
+    .into_inner()
+}
+
+#[component]
+fn Issue4005() -> impl IntoView {
+    view! {
+        <select id="select" prop:value="2">
+            <option value="1">"Option 1"</option>
+            <option value="2">"Option 2"</option>
+            <option value="3">"Option 3"</option>
+        </select>
+    }
+}

examples/regression/src/issue_4217.rs

@@ -0,0 +1,24 @@
+use leptos::prelude::*;
+#[allow(unused_imports)]
+use leptos_router::{
+    components::Route, path, MatchNestedRoutes, NavigateOptions,
+};
+
+#[component]
+pub fn Routes4217() -> impl MatchNestedRoutes + Clone {
+    view! {
+        <Route path=path!("4217") view=Issue4217/>
+    }
+    .into_inner()
+}
+
+#[component]
+fn Issue4217() -> impl IntoView {
+    view! {
+        <select multiple=true>
+            <option id="option1" value="1" selected>"Option 1"</option>
+            <option id="option2" value="2" selected>"Option 2"</option>
+            <option id="option3" value="3" selected>"Option 3"</option>
+        </select>
+    }
+}

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

@@ -1,5 +1,9 @@
 pub mod app;
+mod issue_4005;
 mod issue_4088;
+mod issue_4217;
+mod issue_4285;
+mod issue_4296;
 mod pr_4015;
 mod pr_4091;
 

integrations/axum/Cargo.toml

@@ -4,7 +4,7 @@ authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Axum integrations for the Leptos web framework."
-version = "0.8.5"
+version = "0.8.6"
 rust-version.workspace = true
 edition.workspace = true
 

leptos/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos"
-version = "0.8.6"
+version = "0.8.9"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"

leptos/src/children.rs

@@ -262,6 +262,16 @@ where
     }
 }
 
+impl<C> From<View<C>> for ViewFn
+where
+    C: Clone + Send + Sync + 'static,
+    View<C>: IntoAny,
+{
+    fn from(value: View<C>) -> Self {
+        Self(Arc::new(move || value.clone().into_any()))
+    }
+}
+
 impl ViewFn {
     /// Execute the wrapped function
     pub fn run(&self) -> AnyView {
@@ -289,6 +299,16 @@ where
     }
 }
 
+impl<C> From<View<C>> for ViewFnOnce
+where
+    C: Send + Sync + 'static,
+    View<C>: IntoAny,
+{
+    fn from(value: View<C>) -> Self {
+        Self(Box::new(move || value.into_any()))
+    }
+}
+
 impl ViewFnOnce {
     /// Execute the wrapped function
     pub fn run(self) -> AnyView {

leptos/src/hydration/mod.rs

@@ -27,7 +27,6 @@ pub fn AutoReload(
             None => options.reload_port,
         };
         let protocol = match options.reload_ws_protocol {
-            leptos_config::ReloadWSProtocol::Auto => "null",
             leptos_config::ReloadWSProtocol::WS => "'ws://'",
             leptos_config::ReloadWSProtocol::WSS => "'wss://'",
         };

leptos/src/hydration/reload_script.js

@@ -1,9 +1,8 @@
-let host = window.location.hostname;
-
-if (protocol === null) {
-	protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://';
+if (window.location.protocol === 'https:') {
+	protocol = 'wss://';
 }
 
+let host = window.location.hostname;
 let ws = new WebSocket(`${protocol}${host}:${reload_port}/live_reload`);
 ws.onmessage = (ev) => {
 	let msg = JSON.parse(ev.data);

leptos/src/lib.rs

@@ -85,12 +85,22 @@
 //! # 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.
-//! - **`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.
+//! - **`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.
 //! - **`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,

leptos/src/suspense_component.rs

@@ -32,12 +32,12 @@ use tachys::{
 };
 use throw_error::ErrorHookFuture;
 
-/// If any [`Resource`](leptos_reactive::Resource) is read in the `children` of this
+/// If any [`Resource`](crate::prelude::Resource) is read in the `children` of this
 /// component, it will show the `fallback` while they are loading. Once all are resolved,
 /// it will render the `children`.
 ///
 /// Each time one of the resources is loading again, it will fall back. To keep the current
-/// children instead, use [Transition](crate::Transition).
+/// children instead, use [Transition](crate::prelude::Transition).
 ///
 /// Note that the `children` will be rendered initially (in order to capture the fact that
 /// those resources are read under the suspense), so you cannot assume that resources read

leptos/src/transition.rs

@@ -16,11 +16,11 @@ use reactive_graph::{
 use slotmap::{DefaultKey, SlotMap};
 use tachys::reactive_graph::OwnedView;
 
-/// If any [`Resource`](leptos_reactive::Resource) is read in the `children` of this
+/// If any [`Resource`](crate::prelude::Resource) is read in the `children` of this
 /// component, it will show the `fallback` while they are loading. Once all are resolved,
 /// it will render the `children`.
 ///
-/// Unlike [`Suspense`](crate::Suspense), this will not fall
+/// Unlike [`Suspense`](crate::prelude::Suspense), this will not fall
 /// back to the `fallback` state if there are further changes after the initial load.
 ///
 /// Note that the `children` will be rendered initially (in order to capture the fact that

leptos_config/Cargo.toml

@@ -5,7 +5,7 @@ license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Configuration for the Leptos web framework."
 readme = "../README.md"
-version = "0.8.5"
+version = "0.8.7"
 rust-version.workspace = true
 edition.workspace = true
 

leptos_config/src/lib.rs

@@ -153,7 +153,7 @@ impl LeptosOptions {
                 None => None,
             },
             reload_ws_protocol: ws_from_str(
-                env_w_default("LEPTOS_RELOAD_WS_PROTOCOL", "auto")?.as_str(),
+                env_w_default("LEPTOS_RELOAD_WS_PROTOCOL", "ws")?.as_str(),
             )?,
             not_found_path: env_w_default("LEPTOS_NOT_FOUND_PATH", "/404")?
                 .into(),
@@ -283,24 +283,22 @@ impl TryFrom<String> for Env {
 pub enum ReloadWSProtocol {
     WS,
     WSS,
-    Auto,
 }
 
 impl Default for ReloadWSProtocol {
     fn default() -> Self {
-        Self::Auto
+        Self::WS
     }
 }
 
 fn ws_from_str(input: &str) -> Result<ReloadWSProtocol, LeptosConfigError> {
     let sanitized = input.to_lowercase();
     match sanitized.as_ref() {
-        "auto" => Ok(ReloadWSProtocol::Auto),
         "ws" | "WS" => Ok(ReloadWSProtocol::WS),
         "wss" | "WSS" => Ok(ReloadWSProtocol::WSS),
         _ => Err(LeptosConfigError::EnvVarError(format!(
-            "{input} is not a supported websocket protocol. Use only `auto`, \
-             `ws` or `wss`.",
+            "{input} is not a supported websocket protocol. Use only `ws` or \
+             `wss`.",
         ))),
     }
 }

leptos_dom/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_dom"
-version = "0.8.5"
+version = "0.8.6"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"

leptos_dom/src/helpers.rs

@@ -258,15 +258,7 @@ pub fn request_idle_callback_with_handle(
 ///
 /// <div class="warning">The task is called outside of the ownership tree, this means that if you want to access for example the context you need to reestablish the owner.</div>
 pub fn queue_microtask(task: impl FnOnce() + 'static) {
-    use js_sys::{Function, Reflect};
-
-    let task = Closure::once_into_js(task);
-    let window = web_sys::window().expect("window not available");
-    let queue_microtask =
-        Reflect::get(&window, &JsValue::from_str("queueMicrotask"))
-            .expect("queueMicrotask not available");
-    let queue_microtask = queue_microtask.unchecked_into::<Function>();
-    _ = queue_microtask.call1(&JsValue::UNDEFINED, &task);
+    tachys::renderer::dom::queue_microtask(task);
 }
 
 /// Handle that is generated by [set_timeout_with_handle] and can be used to clear the timeout.

leptos_macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_macro"
-version = "0.8.6"
+version = "0.8.8"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
@@ -24,9 +24,7 @@ proc-macro-error2 = { default-features = false, workspace = true }
 proc-macro2 = { workspace = true, default-features = true }
 quote = { workspace = true, default-features = true }
 syn = { features = ["full"], workspace = true, default-features = true }
-rstml = { workspace = true, default-features = true, features = [
-  "rawtext-stable-hack",
-] }
+rstml = { workspace = true, default-features = true }
 leptos_hot_reload = { workspace = true }
 server_fn_macro = { workspace = true }
 convert_case = { workspace = true, default-features = true }

leptos_macro/src/lib.rs

@@ -323,14 +323,7 @@ fn view_macro_impl(tokens: TokenStream, template: bool) -> TokenStream {
             .chain(tokens)
             .collect()
     };
-    let macro_call_pattern = if let Some(class) = &global_class {
-        quote!(view! { class = #class, %% })
-    } else {
-        quote!(view! {%%})
-    };
-    let config = rstml::ParserConfig::default()
-        .recover_block(true)
-        .macro_call_pattern(macro_call_pattern);
+    let config = rstml::ParserConfig::default().recover_block(true);
     let parser = rstml::Parser::new(config);
     let (mut nodes, errors) = parser.parse_recoverable(tokens).split_vec();
     let errors = errors.into_iter().map(|e| e.emit_as_expr_tokens());

leptos_server/Cargo.toml

@@ -44,7 +44,8 @@ denylist = ["tracing"]
 max_combination_size = 2
 
 [package.metadata.docs.rs]
-rustdoc-args = ["--generate-link-to-definition"]
+rustdoc-args = ["--generate-link-to-definition", "--cfg", "docsrs"]
+all-features = true
 
 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(leptos_debuginfo)'] }

leptos_server/src/once_resource.rs

@@ -386,6 +386,7 @@ T: Send + Sync + 'static,
 }
 
 #[cfg(feature = "serde-wasm-bindgen")]
+#[cfg_attr(docsrs, doc(cfg(feature = "serde-wasm-bindgen")))]
 impl<T> ArcOnceResource<T, JsonSerdeWasmCodec>
 where
 T: Send + Sync + 'static,
@@ -418,6 +419,7 @@ fut: impl Future<Output = T> + Send + 'static
     }
 }
 #[cfg(feature = "miniserde")]
+#[cfg_attr(docsrs, doc(cfg(feature = "miniserde")))]
 impl<T> ArcOnceResource<T, MiniserdeCodec>
 where
     T: Send + Sync + 'static,
@@ -451,6 +453,7 @@ where
 }
 
 #[cfg(feature = "serde-lite")]
+#[cfg_attr(docsrs, doc(cfg(feature = "serde-lite")))]
 impl<T> ArcOnceResource<T, SerdeLite<JsonSerdeCodec>>
 where
 T: Send + Sync + 'static,
@@ -484,6 +487,7 @@ fut: impl Future<Output = T> + Send + 'static
 }
 
 #[cfg(feature = "rkyv")]
+#[cfg_attr(docsrs, doc(cfg(feature = "rkyv")))]
 impl<T> ArcOnceResource<T, RkyvCodec>
 where
     T: Send + Sync + 'static,
@@ -748,6 +752,7 @@ T: Send + Sync + 'static,
 }
 
 #[cfg(feature = "serde-wasm-bindgen")]
+#[cfg_attr(docsrs, doc(cfg(feature = "serde-wasm-bindgen")))]
 impl<T> OnceResource<T, JsonSerdeWasmCodec>
 where
 T: Send + Sync + 'static,
@@ -780,6 +785,7 @@ fut: impl Future<Output = T> + Send + 'static
     }
 }
 #[cfg(feature = "miniserde")]
+#[cfg_attr(docsrs, doc(cfg(feature = "miniserde")))]
 impl<T> OnceResource<T, MiniserdeCodec>
 where
     T: Send + Sync + 'static,
@@ -813,6 +819,7 @@ where
 }
 
 #[cfg(feature = "serde-lite")]
+#[cfg_attr(docsrs, doc(cfg(feature = "serde-lite")))]
 impl<T> OnceResource<T, SerdeLite<JsonSerdeCodec>>
 where
 T: Send + Sync + 'static,
@@ -846,6 +853,7 @@ fut: impl Future<Output = T> + Send + 'static
 }
 
 #[cfg(feature = "rkyv")]
+#[cfg_attr(docsrs, doc(cfg(feature = "rkyv")))]
 impl<T> OnceResource<T, RkyvCodec>
 where
     T: Send + Sync + 'static,

leptos_server/src/resource.rs

@@ -709,6 +709,7 @@ where
 }
 
 #[cfg(feature = "rkyv")]
+#[cfg_attr(docsrs, doc(cfg(feature = "rkyv")))]
 impl<T> ArcResource<T, RkyvCodec>
 where
     RkyvCodec: Encoder<T> + Decoder<T>,
@@ -1048,6 +1049,7 @@ where
 }
 
 #[cfg(feature = "serde-wasm-bindgen")]
+#[cfg_attr(docsrs, doc(cfg(feature = "serde-wasm-bindgen")))]
 impl<T> Resource<T, JsonSerdeWasmCodec>
 where
     JsonSerdeWasmCodec: Encoder<T> + Decoder<T>,
@@ -1105,6 +1107,7 @@ where
 }
 
 #[cfg(feature = "miniserde")]
+#[cfg_attr(docsrs, doc(cfg(feature = "miniserde")))]
 impl<T> Resource<T, MiniserdeCodec>
 where
     MiniserdeCodec: Encoder<T> + Decoder<T>,
@@ -1164,6 +1167,7 @@ where
 }
 
 #[cfg(feature = "serde-lite")]
+#[cfg_attr(docsrs, doc(cfg(feature = "serde-lite")))]
 impl<T> Resource<T, SerdeLite<JsonSerdeCodec>>
 where
     SerdeLite<JsonSerdeCodec>: Encoder<T> + Decoder<T>,
@@ -1222,6 +1226,7 @@ where
 }
 
 #[cfg(feature = "rkyv")]
+#[cfg_attr(docsrs, doc(cfg(feature = "rkyv")))]
 impl<T> Resource<T, RkyvCodec>
 where
     RkyvCodec: Encoder<T> + Decoder<T>,

leptos_server/src/shared.rs

@@ -80,6 +80,7 @@ where
 }
 
 #[cfg(feature = "serde-lite")]
+#[cfg_attr(docsrs, doc(cfg(feature = "serde-lite")))]
 impl<T> SharedValue<T, SerdeLite<JsonSerdeCodec>>
 where
     SerdeLite<JsonSerdeCodec>: Encoder<T> + Decoder<T>,
@@ -102,6 +103,7 @@ where
 }
 
 #[cfg(feature = "serde-wasm-bindgen")]
+#[cfg_attr(docsrs, doc(cfg(feature = "serde-wasm-bindgen")))]
 impl<T> SharedValue<T, JsonSerdeWasmCodec>
 where
     JsonSerdeWasmCodec: Encoder<T> + Decoder<T>,
@@ -124,6 +126,7 @@ where
 }
 
 #[cfg(feature = "miniserde")]
+#[cfg_attr(docsrs, doc(cfg(feature = "miniserde")))]
 impl<T> SharedValue<T, MiniserdeCodec>
 where
     MiniserdeCodec: Encoder<T> + Decoder<T>,
@@ -146,6 +149,7 @@ where
 }
 
 #[cfg(feature = "rkyv")]
+#[cfg_attr(docsrs, doc(cfg(feature = "rkyv")))]
 impl<T> SharedValue<T, RkyvCodec>
 where
     RkyvCodec: Encoder<T> + Decoder<T>,

reactive_graph/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reactive_graph"
-version = "0.2.5"
+version = "0.2.7"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"

reactive_graph/src/actions/action.rs

@@ -1,7 +1,8 @@
 use crate::{
-    computed::{ArcMemo, Memo},
+    computed::{ArcMemo, Memo, ScopedFuture},
     diagnostics::is_suppressing_resource_load,
-    owner::{ArcStoredValue, ArenaItem},
+    graph::untrack,
+    owner::{ArcStoredValue, ArenaItem, Owner},
     send_wrapper_ext::SendOption,
     signal::{ArcMappedSignal, ArcRwSignal, MappedSignal, RwSignal},
     traits::{DefinedAt, Dispose, Get, GetUntracked, GetValue, Update, Write},
@@ -199,13 +200,18 @@ where
         I: Send + Sync,
         O: Send + Sync,
     {
+        let owner = Owner::current().unwrap_or_default();
         ArcAction {
             in_flight: ArcRwSignal::new(0),
             input: ArcRwSignal::new(SendOption::new(None)),
             value: ArcRwSignal::new(SendOption::new(value)),
             version: Default::default(),
             dispatched: Default::default(),
-            action_fn: Arc::new(move |input| Box::pin(action_fn(input))),
+            action_fn: Arc::new(move |input| {
+                Box::pin(owner.with(|| {
+                    ScopedFuture::new_untracked(untrack(|| action_fn(input)))
+                }))
+            }),
             #[cfg(any(debug_assertions, leptos_debuginfo))]
             defined_at: Location::caller(),
         }
@@ -370,6 +376,7 @@ where
         F: Fn(&I) -> Fu + 'static,
         Fu: Future<Output = O> + 'static,
     {
+        let owner = Owner::current().unwrap_or_default();
         let action_fn = SendWrapper::new(action_fn);
         ArcAction {
             in_flight: ArcRwSignal::new(0),
@@ -378,7 +385,9 @@ where
             version: Default::default(),
             dispatched: Default::default(),
             action_fn: Arc::new(move |input| {
-                Box::pin(SendWrapper::new(action_fn(input)))
+                Box::pin(SendWrapper::new(owner.with(|| {
+                    ScopedFuture::new_untracked(untrack(|| action_fn(input)))
+                })))
             }),
             #[cfg(any(debug_assertions, leptos_debuginfo))]
             defined_at: Location::caller(),

reactive_graph/src/computed/async_derived/arc_async_derived.rs

@@ -521,9 +521,10 @@ impl<T: 'static> ArcAsyncDerived<T> {
     {
         let fun = move || {
             let fut = fun();
-            let fut = ScopedFuture::new_untracked(async move {
-                SendOption::new(Some(fut.await))
-            });
+            let fut =
+                ScopedFuture::new_untracked_with_diagnostics(async move {
+                    SendOption::new(Some(fut.await))
+                });
             #[cfg(feature = "sandboxed-arenas")]
             let fut = Sandboxed::new(fut);
             fut

reactive_graph/src/computed/async_derived/mod.rs

@@ -54,11 +54,55 @@ impl<Fut> ScopedFuture<Fut> {
             fut,
         }
     }
+
+    #[doc(hidden)]
+    #[track_caller]
+    pub fn new_untracked_with_diagnostics(
+        fut: Fut,
+    ) -> ScopedFutureUntrackedWithDiagnostics<Fut> {
+        let owner = Owner::current().unwrap_or_default();
+        ScopedFutureUntrackedWithDiagnostics {
+            owner,
+            observer: None,
+            fut,
+        }
+    }
 }
 
 impl<Fut: Future> Future for ScopedFuture<Fut> {
     type Output = Fut::Output;
 
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let this = self.project();
+        this.owner.with(|| {
+            #[cfg(debug_assertions)]
+            let _maybe_guard = if this.observer.is_none() {
+                Some(crate::diagnostics::SpecialNonReactiveZone::enter())
+            } else {
+                None
+            };
+            this.observer.with_observer(|| this.fut.poll(cx))
+        })
+    }
+}
+
+pin_project! {
+    /// A [`Future`] wrapper that sets the [`Owner`] and [`Observer`] before polling the inner
+    /// `Future`, output of [`ScopedFuture::new_untracked_with_diagnostics`].
+    ///
+    /// In leptos 0.9 this will be replaced with `ScopedFuture` itself.
+    #[derive(Clone)]
+    pub struct ScopedFutureUntrackedWithDiagnostics<Fut> {
+        owner: Owner,
+        observer: Option<AnySubscriber>,
+        #[pin]
+        fut: Fut,
+    }
+}
+
+impl<Fut: Future> Future for ScopedFutureUntrackedWithDiagnostics<Fut> {
+    type Output = Fut::Output;
+
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.project();
         this.owner

reactive_graph/src/wrappers.rs

@@ -257,6 +257,20 @@ pub mod read {
         }
     }
 
+    impl<T, S> From<ReadSignal<T, S>> for ArcSignal<T, S>
+    where
+        S: Storage<ArcReadSignal<T>> + Storage<T>,
+    {
+        #[track_caller]
+        fn from(value: ReadSignal<T, S>) -> Self {
+            Self {
+                inner: SignalTypes::ReadSignal(value.into()),
+                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                defined_at: std::panic::Location::caller(),
+            }
+        }
+    }
+
     impl<T: Send + Sync> From<ArcRwSignal<T>> for ArcSignal<T, SyncStorage> {
         #[track_caller]
         fn from(value: ArcRwSignal<T>) -> Self {
@@ -268,6 +282,20 @@ pub mod read {
         }
     }
 
+    impl<T, S> From<RwSignal<T, S>> for ArcSignal<T, S>
+    where
+        S: Storage<ArcRwSignal<T>> + Storage<ArcReadSignal<T>> + Storage<T>,
+    {
+        #[track_caller]
+        fn from(value: RwSignal<T, S>) -> Self {
+            Self {
+                inner: SignalTypes::ReadSignal(value.read_only().into()),
+                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                defined_at: std::panic::Location::caller(),
+            }
+        }
+    }
+
     impl<T, S> From<ArcMemo<T, S>> for ArcSignal<T, S>
     where
         S: Storage<T>,
@@ -282,6 +310,20 @@ pub mod read {
         }
     }
 
+    impl<T, S> From<Memo<T, S>> for ArcSignal<T, S>
+    where
+        S: Storage<ArcMemo<T, S>> + Storage<T>,
+    {
+        #[track_caller]
+        fn from(value: Memo<T, S>) -> Self {
+            Self {
+                inner: SignalTypes::Memo(value.into()),
+                #[cfg(any(debug_assertions, leptos_debuginfo))]
+                defined_at: std::panic::Location::caller(),
+            }
+        }
+    }
+
     impl<T, S> DefinedAt for ArcSignal<T, S>
     where
         S: Storage<T>,

reactive_stores_macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reactive_stores_macro"
-version = "0.2.5"
+version = "0.2.6"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"

router/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_router"
-version = "0.8.5"
+version = "0.8.7"
 authors = ["Greg Johnston", "Ben Wishovich"]
 license = "MIT"
 readme = "../README.md"

router/src/location/history.rs

@@ -221,6 +221,13 @@ impl LocationProvider for BrowserUrl {
     fn complete_navigation(&self, loc: &LocationChange) {
         let history = window().history().unwrap();
 
+        let current_path = self
+            .path_stack
+            .read_value()
+            .last()
+            .map(|url| url.to_full_path());
+        let add_to_stack = current_path.as_ref() != Some(&loc.value);
+
         if loc.replace {
             history
                 .replace_state_with_url(
@@ -229,7 +236,7 @@ impl LocationProvider for BrowserUrl {
                     Some(&loc.value),
                 )
                 .unwrap();
-        } else {
+        } else if add_to_stack {
             // push the "forward direction" marker
             let state = &loc.state.to_js_value();
             history
@@ -240,7 +247,9 @@ impl LocationProvider for BrowserUrl {
         // add this URL to the "path stack" for detecting back navigations, and
         // unset "navigating back" state
         if let Ok(url) = Self::current() {
-            self.path_stack.write_value().push(url);
+            if add_to_stack {
+                self.path_stack.write_value().push(url);
+            }
             self.is_back.set(false);
         }
 

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;

server_fn/Cargo.toml

@@ -5,7 +5,7 @@ license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "RPC for any web framework."
 readme = "../README.md"
-version = "0.8.5"
+version = "0.8.7"
 rust-version.workspace = true
 edition.workspace = true
 

server_fn/src/error.rs

@@ -568,7 +568,7 @@ pub trait FromServerFnError: std::fmt::Debug + Sized + 'static {
     /// Converts a [`ServerFnErrorErr`] into the application-specific custom error type.
     fn from_server_fn_error(value: ServerFnErrorErr) -> Self;
 
-    /// Converts the custom error type to a [`String`].
+    /// Serializes the custom error type to bytes, according to the encoding given by `Self::Encoding`.
     fn ser(&self) -> Bytes {
         Self::Encoder::encode(self).unwrap_or_else(|e| {
             Self::Encoder::encode(&Self::from_server_fn_error(
@@ -581,7 +581,7 @@ pub trait FromServerFnError: std::fmt::Debug + Sized + 'static {
         })
     }
 
-    /// Deserializes the custom error type from a [`&str`].
+    /// Deserializes the custom error type, according to the encoding given by `Self::Encoding`.
     fn de(data: Bytes) -> Self {
         Self::Encoder::decode(data).unwrap_or_else(|e| {
             ServerFnErrorErr::Deserialization(e.to_string()).into_app_error()

server_fn/src/lib.rs

@@ -307,16 +307,18 @@ pub trait ServerFn: Send + Sized {
                     .await
                     .map(|res| (res, None))
                     .unwrap_or_else(|e| {
-                        (
+                        let mut response =
                             <<Self as ServerFn>::Server as crate::Server<
                                 Self::Error,
                                 Self::InputStreamError,
                                 Self::OutputStreamError,
                             >>::Response::error_response(
                                 Self::PATH, e.ser()
-                            ),
-                            Some(e),
-                        )
+                            );
+                        let content_type =
+                    <Self::Error as FromServerFnError>::Encoder::CONTENT_TYPE;
+                        response.content_type(content_type);
+                        (response, Some(e))
                     });
 
             // if it accepts HTML, we'll redirect to the Referer

server_fn/src/middleware/mod.rs

@@ -72,6 +72,10 @@ mod axum {
             let inner = self.call(req);
             Box::pin(async move {
                 inner.await.unwrap_or_else(|e| {
+                    // TODO: This does not set the Content-Type on the response. Doing so will
+                    //  require a breaking change in order to get the correct encoding from the
+                    //  error's `FromServerFnError::Encoder::CONTENT_TYPE` impl.
+                    //  Note: This only applies to middleware errors.
                     let err =
                         ser(ServerFnErrorErr::MiddlewareError(e.to_string()));
                     Response::<Body>::error_response(&path, err)
@@ -149,6 +153,10 @@ mod actix {
             let inner = self.call(req);
             Box::pin(async move {
                 inner.await.unwrap_or_else(|e| {
+                    // TODO: This does not set the Content-Type on the response. Doing so will
+                    //  require a breaking change in order to get the correct encoding from the
+                    //  error's `FromServerFnError::Encoder::CONTENT_TYPE` impl.
+                    //  Note: This only applies to middleware errors.
                     let err =
                         ser(ServerFnErrorErr::MiddlewareError(e.to_string()));
                     ActixResponse::error_response(&path, err).take()

server_fn/src/response/actix.rs

@@ -5,7 +5,7 @@ use crate::error::{
 use actix_web::{
     http::{
         header,
-        header::{HeaderValue, LOCATION},
+        header::{HeaderValue, CONTENT_TYPE, LOCATION},
         StatusCode,
     },
     HttpResponse,
@@ -80,6 +80,12 @@ impl Res for ActixResponse {
         ))
     }
 
+    fn content_type(&mut self, content_type: &str) {
+        if let Ok(content_type) = HeaderValue::from_str(content_type) {
+            self.0.headers_mut().insert(CONTENT_TYPE, content_type);
+        }
+    }
+
     fn redirect(&mut self, path: &str) {
         if let Ok(path) = HeaderValue::from_str(path) {
             *self.0.status_mut() = StatusCode::FOUND;

server_fn/src/response/generic.rs

@@ -100,6 +100,13 @@ impl Res for Response<Body> {
             .unwrap()
     }
 
+    fn content_type(&mut self, content_type: &str) {
+        if let Ok(content_type) = HeaderValue::from_str(content_type) {
+            self.headers_mut()
+                .insert(header::CONTENT_TYPE, content_type);
+        }
+    }
+
     fn redirect(&mut self, path: &str) {
         if let Ok(path) = HeaderValue::from_str(path) {
             self.headers_mut().insert(header::LOCATION, path);

server_fn/src/response/http.rs

@@ -60,6 +60,13 @@ impl Res for Response<Body> {
             .unwrap()
     }
 
+    fn content_type(&mut self, content_type: &str) {
+        if let Ok(content_type) = HeaderValue::from_str(content_type) {
+            self.headers_mut()
+                .insert(header::CONTENT_TYPE, content_type);
+        }
+    }
+
     fn redirect(&mut self, path: &str) {
         if let Ok(path) = HeaderValue::from_str(path) {
             self.headers_mut().insert(header::LOCATION, path);

server_fn/src/response/mod.rs

@@ -37,9 +37,14 @@ where
 
 /// Represents the response as created by the server;
 pub trait Res {
-    /// Converts an error into a response, with a `500` status code and the error text as its body.
+    /// Converts an error into a response, with a `500` status code and the error as its body.
     fn error_response(path: &str, err: Bytes) -> Self;
-
+    /// Set the `Content-Type` header for the response.
+    fn content_type(&mut self, #[allow(unused_variables)] content_type: &str) {
+        // TODO 0.9: remove this method and default implementation. It is only included here
+        //  to allow setting the `Content-Type` header for error responses without requiring a
+        //  semver-incompatible change.
+    }
     /// Redirect the response by setting a 302 code and Location header.
     fn redirect(&mut self, path: &str);
 }
@@ -103,6 +108,10 @@ impl Res for BrowserMockRes {
         unreachable!()
     }
 
+    fn content_type(&mut self, _content_type: &str) {
+        unreachable!()
+    }
+
     fn redirect(&mut self, _path: &str) {
         unreachable!()
     }

server_fn_macro/Cargo.toml

@@ -5,7 +5,7 @@ license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "RPC for any web framework."
 readme = "../README.md"
-version = "0.8.6"
+version = "0.8.7"
 edition.workspace = true
 
 [dependencies]

tachys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tachys"
-version = "0.2.6"
+version = "0.2.8"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"

tachys/src/html/attribute/any_attribute.rs

@@ -1,6 +1,10 @@
 use super::{Attribute, NextAttribute};
-use crate::erased::{Erased, ErasedLocal};
-use std::{any::TypeId, fmt::Debug};
+use crate::{
+    erased::{Erased, ErasedLocal},
+    html::attribute::NamedAttributeKey,
+    renderer::{dom::Element, Rndr},
+};
+use std::{any::TypeId, fmt::Debug, mem};
 #[cfg(feature = "ssr")]
 use std::{future::Future, pin::Pin};
 
@@ -25,6 +29,7 @@ pub struct AnyAttribute {
     resolve: fn(Erased) -> Pin<Box<dyn Future<Output = AnyAttribute> + Send>>,
     #[cfg(feature = "ssr")]
     dry_resolve: fn(&mut Erased),
+    keys: fn(&Erased) -> Vec<NamedAttributeKey>,
 }
 
 impl Clone for AnyAttribute {
@@ -44,6 +49,7 @@ pub struct AnyAttributeState {
     type_id: TypeId,
     state: ErasedLocal,
     el: crate::renderer::types::Element,
+    keys: Vec<NamedAttributeKey>,
 }
 
 /// Converts an [`Attribute`] into [`AnyAttribute`].
@@ -84,6 +90,7 @@ where
         ) -> AnyAttributeState {
             AnyAttributeState {
                 type_id: TypeId::of::<T>(),
+                keys: value.get_ref::<T>().keys(),
                 state: ErasedLocal::new(value.into_inner::<T>().build(&el)),
                 el,
             }
@@ -96,6 +103,7 @@ where
         ) -> AnyAttributeState {
             AnyAttributeState {
                 type_id: TypeId::of::<T>(),
+                keys: value.get_ref::<T>().keys(),
                 state: ErasedLocal::new(
                     value.into_inner::<T>().hydrate::<true>(&el),
                 ),
@@ -110,6 +118,7 @@ where
         ) -> AnyAttributeState {
             AnyAttributeState {
                 type_id: TypeId::of::<T>(),
+                keys: value.get_ref::<T>().keys(),
                 state: ErasedLocal::new(
                     value.into_inner::<T>().hydrate::<true>(&el),
                 ),
@@ -140,6 +149,12 @@ where
             async move {value.into_inner::<T>().resolve().await.into_any_attr()}.boxed()
         }
 
+        fn keys<T: Attribute + 'static>(
+            value: &Erased,
+        ) -> Vec<NamedAttributeKey> {
+            value.get_ref::<T>().keys()
+        }
+
         let value = self.into_cloneable_owned();
         AnyAttribute {
             type_id: TypeId::of::<T::CloneableOwned>(),
@@ -158,6 +173,7 @@ where
             resolve: resolve::<T::CloneableOwned>,
             #[cfg(feature = "ssr")]
             dry_resolve: dry_resolve::<T::CloneableOwned>,
+            keys: keys::<T::CloneableOwned>,
         }
     }
 }
@@ -268,6 +284,10 @@ impl Attribute for AnyAttribute {
              enabled."
         );
     }
+
+    fn keys(&self) -> Vec<NamedAttributeKey> {
+        (self.keys)(&self.value)
+    }
 }
 
 impl NextAttribute for Vec<AnyAttribute> {
@@ -286,7 +306,7 @@ impl Attribute for Vec<AnyAttribute> {
     const MIN_LENGTH: usize = 0;
 
     type AsyncOutput = Vec<AnyAttribute>;
-    type State = Vec<AnyAttributeState>;
+    type State = (Element, Vec<AnyAttributeState>);
     type Cloneable = Vec<AnyAttribute>;
     type CloneableOwned = Vec<AnyAttribute>;
 
@@ -321,13 +341,19 @@ impl Attribute for Vec<AnyAttribute> {
     ) -> Self::State {
         #[cfg(feature = "hydrate")]
         if FROM_SERVER {
-            self.into_iter()
-                .map(|attr| attr.hydrate::<true>(el))
-                .collect()
+            (
+                el.clone(),
+                self.into_iter()
+                    .map(|attr| attr.hydrate::<true>(el))
+                    .collect(),
+            )
         } else {
-            self.into_iter()
-                .map(|attr| attr.hydrate::<false>(el))
-                .collect()
+            (
+                el.clone(),
+                self.into_iter()
+                    .map(|attr| attr.hydrate::<false>(el))
+                    .collect(),
+            )
         }
         #[cfg(not(feature = "hydrate"))]
         {
@@ -340,13 +366,34 @@ impl Attribute for Vec<AnyAttribute> {
     }
 
     fn build(self, el: &crate::renderer::types::Element) -> Self::State {
-        self.into_iter().map(|attr| attr.build(el)).collect()
+        (
+            el.clone(),
+            self.into_iter().map(|attr| attr.build(el)).collect(),
+        )
     }
 
     fn rebuild(self, state: &mut Self::State) {
-        for (attr, state) in self.into_iter().zip(state.iter_mut()) {
-            attr.rebuild(state)
+        let (el, state) = state;
+        for old in mem::take(state) {
+            for key in old.keys {
+                match key {
+                    NamedAttributeKey::InnerHtml => {
+                        Rndr::set_inner_html(&old.el, "");
+                    }
+                    NamedAttributeKey::Property(prop_name) => {
+                        Rndr::set_property(
+                            &old.el,
+                            &prop_name,
+                            &wasm_bindgen::JsValue::UNDEFINED,
+                        );
+                    }
+                    NamedAttributeKey::Attribute(key) => {
+                        Rndr::remove_attribute(&old.el, &key);
+                    }
+                }
+            }
         }
+        *state = self.into_iter().map(|s| s.build(el)).collect();
     }
 
     fn into_cloneable(self) -> Self::Cloneable {
@@ -385,4 +432,8 @@ impl Attribute for Vec<AnyAttribute> {
              enabled."
         );
     }
+
+    fn keys(&self) -> Vec<NamedAttributeKey> {
+        self.iter().flat_map(|s| s.keys()).collect()
+    }
 }

tachys/src/html/attribute/custom.rs

@@ -4,7 +4,7 @@ use super::{
 use crate::{
     html::attribute::{
         maybe_next_attr_erasure_macros::next_attr_combine, Attribute,
-        AttributeValue,
+        AttributeValue, NamedAttributeKey,
     },
     view::{add_attr::AddAnyAttr, Position, ToTemplate},
 };
@@ -112,6 +112,12 @@ where
             value: self.value.resolve().await,
         }
     }
+
+    fn keys(&self) -> Vec<NamedAttributeKey> {
+        vec![NamedAttributeKey::Attribute(
+            self.key.as_ref().to_string().into(),
+        )]
+    }
 }
 
 impl<K, V> NextAttribute for CustomAttr<K, V>

tachys/src/html/attribute/mod.rs

@@ -15,7 +15,7 @@ pub use key::*;
 use maybe_next_attr_erasure_macros::{
     next_attr_combine, next_attr_output_type,
 };
-use std::{fmt::Debug, future::Future};
+use std::{borrow::Cow, fmt::Debug, future::Future};
 pub use value::*;
 
 /// Defines an attribute: anything that can modify an element.
@@ -75,6 +75,25 @@ pub trait Attribute: NextAttribute + Send {
 
     /// “Resolves” this into a type that is not waiting for any asynchronous data.
     fn resolve(self) -> impl Future<Output = Self::AsyncOutput> + Send;
+
+    /// Returns a set of attribute keys, associated with this attribute, if any.
+    ///
+    /// This is only used to manage the removal of type-erased attributes, when needed.
+    fn keys(&self) -> Vec<NamedAttributeKey> {
+        // TODO: remove default implementation in 0.9, or fix this whole approach
+        // by making it easier to remove attributes
+        vec![]
+    }
+}
+
+/// An attribute key can be used to remove an attribute from an element.
+pub enum NamedAttributeKey {
+    /// An ordinary attribute.
+    Attribute(Cow<'static, str>),
+    /// A DOM property.
+    Property(Cow<'static, str>),
+    /// The `inner_html` pseudo-attribute.
+    InnerHtml,
 }
 
 /// Adds another attribute to this one, returning a new attribute.
@@ -133,6 +152,10 @@ impl Attribute for () {
     fn dry_resolve(&mut self) {}
 
     async fn resolve(self) -> Self::AsyncOutput {}
+
+    fn keys(&self) -> Vec<NamedAttributeKey> {
+        vec![]
+    }
 }
 
 impl NextAttribute for () {
@@ -249,6 +272,10 @@ where
     async fn resolve(self) -> Self::AsyncOutput {
         Attr(self.0, self.1.resolve().await)
     }
+
+    fn keys(&self) -> Vec<NamedAttributeKey> {
+        vec![NamedAttributeKey::Attribute(K::KEY.into())]
+    }
 }
 
 impl<K, V> NextAttribute for Attr<K, V>
@@ -353,6 +380,14 @@ macro_rules! impl_attr_for_tuples {
                     $($ty.resolve()),*
                 )
             }
+
+            fn keys(&self) -> Vec<NamedAttributeKey> {
+                #[allow(non_snake_case)]
+                let ($first, $($ty,)*) = &self;
+                let mut buf = $first.keys();
+                $(buf.extend($ty.keys());)*
+                buf
+            }
         }
 
         impl<$first, $($ty),*> NextAttribute for ($first, $($ty,)*)
@@ -462,6 +497,14 @@ macro_rules! impl_attr_for_tuples_truncate_additional {
                     $($ty.resolve()),*
                 )
             }
+
+            fn keys(&self) -> Vec<NamedAttributeKey> {
+                #[allow(non_snake_case)]
+                let ($first, $($ty,)*) = &self;
+                let mut buf = $first.keys();
+                $(buf.extend($ty.keys());)*
+                buf
+            }
         }
 
         impl<$first, $($ty),*> NextAttribute for ($first, $($ty,)*)
@@ -538,6 +581,10 @@ where
     async fn resolve(self) -> Self::AsyncOutput {
         (self.0.resolve().await,)
     }
+
+    fn keys(&self) -> Vec<NamedAttributeKey> {
+        self.0.keys()
+    }
 }
 
 impl<A> NextAttribute for (A,)

tachys/src/html/class.rs

@@ -1,6 +1,6 @@
 use super::attribute::{
     maybe_next_attr_erasure_macros::next_attr_output_type, Attribute,
-    NextAttribute,
+    NamedAttributeKey, NextAttribute,
 };
 use crate::{
     html::attribute::maybe_next_attr_erasure_macros::next_attr_combine,
@@ -97,6 +97,10 @@ where
             class: self.class.resolve().await,
         }
     }
+
+    fn keys(&self) -> Vec<NamedAttributeKey> {
+        vec![NamedAttributeKey::Attribute("class".into())]
+    }
 }
 
 impl<C> NextAttribute for Class<C>

tachys/src/html/directive.rs

@@ -3,7 +3,9 @@ use super::attribute::{
     NextAttribute,
 };
 use crate::{
-    html::attribute::maybe_next_attr_erasure_macros::next_attr_combine,
+    html::attribute::{
+        maybe_next_attr_erasure_macros::next_attr_combine, NamedAttributeKey,
+    },
     prelude::AddAnyAttr,
     view::{Position, ToTemplate},
 };
@@ -160,6 +162,10 @@ where
     async fn resolve(self) -> Self::AsyncOutput {
         self
     }
+
+    fn keys(&self) -> Vec<NamedAttributeKey> {
+        vec![]
+    }
 }
 
 impl<T, D, P> NextAttribute for Directive<T, D, P>

tachys/src/html/element/elements.rs

@@ -227,7 +227,7 @@ html_self_closing_elements! {
 
 html_elements! {
     /// The `<a>` HTML element (or anchor element), with its href attribute, creates a hyperlink to web pages, files, email addresses, locations in the same page, or anything else a URL can address.
-    a HtmlAnchorElement [download, href, hreflang, ping, rel, target, r#type ] true,
+    a HtmlAnchorElement [download, href, hreflang, ping, referrerpolicy, rel, target, r#type ] true,
     /// The `<abbr>` HTML element represents an abbreviation or acronym; the optional title attribute can provide an expansion or description for the abbreviation. If present, title must contain this full description and nothing else.
     abbr HtmlElement [] true,
     /// The `<address>` HTML element indicates that the enclosed HTML provides contact information for a person or people, or for an organization.

tachys/src/html/element/inner_html.rs

@@ -4,7 +4,7 @@ use crate::{
         maybe_next_attr_erasure_macros::{
             next_attr_combine, next_attr_output_type,
         },
-        Attribute, NextAttribute,
+        Attribute, NamedAttributeKey, NextAttribute,
     },
     renderer::Rndr,
     view::add_attr::AddAnyAttr,
@@ -105,6 +105,10 @@ where
             value: self.value.resolve().await,
         }
     }
+
+    fn keys(&self) -> Vec<NamedAttributeKey> {
+        vec![NamedAttributeKey::InnerHtml]
+    }
 }
 
 impl<T> NextAttribute for InnerHtml<T>

tachys/src/html/element/mod.rs

@@ -329,6 +329,8 @@ where
     fn build(self) -> Self::State {
         let el = Rndr::create_element(self.tag.tag(), E::NAMESPACE);
 
+        let attrs = self.attributes.build(&el);
+
         let children = if E::SELF_CLOSING {
             None
         } else {
@@ -337,8 +339,6 @@ where
             Some(children)
         };
 
-        let attrs = self.attributes.build(&el);
-
         ElementState {
             el,
             attrs,

tachys/src/html/event.rs

@@ -1,6 +1,7 @@
 use crate::{
     html::attribute::{
         maybe_next_attr_erasure_macros::next_attr_combine, Attribute,
+        NamedAttributeKey,
     },
     renderer::{CastFrom, RemoveEventHandler, Rndr},
     view::{Position, ToTemplate},
@@ -110,6 +111,8 @@ where
 {
     On {
         event,
+        #[cfg(feature = "reactive_graph")]
+        owner: reactive_graph::owner::Owner::current().unwrap_or_default(),
         cb: Some(SendWrapper::new(cb)),
     }
 }
@@ -135,6 +138,8 @@ where
 /// An [`Attribute`] that adds an event listener to an element.
 pub struct On<E, F> {
     event: E,
+    #[cfg(feature = "reactive_graph")]
+    owner: reactive_graph::owner::Owner,
     cb: Option<SendWrapper<F>>,
 }
 
@@ -146,6 +151,8 @@ where
     fn clone(&self) -> Self {
         Self {
             event: self.event.clone(),
+            #[cfg(feature = "reactive_graph")]
+            owner: self.owner.clone(),
             cb: self.cb.clone(),
         }
     }
@@ -193,6 +200,10 @@ where
             let _tracing_guard = span.enter();
 
             let ev = E::EventType::from(ev);
+
+            #[cfg(feature = "reactive_graph")]
+            self.owner.with(|| cb.invoke(ev));
+            #[cfg(not(feature = "reactive_graph"))]
             cb.invoke(ev);
         }) as Box<dyn FnMut(crate::renderer::types::Event)>;
 
@@ -232,6 +243,10 @@ where
             let _tracing_guard = span.enter();
 
             let ev = E::EventType::from(ev);
+
+            #[cfg(feature = "reactive_graph")]
+            self.owner.with(|| cb.invoke(ev));
+            #[cfg(not(feature = "reactive_graph"))]
             cb.invoke(ev);
         }) as Box<dyn FnMut(crate::renderer::types::Event)>;
 
@@ -308,7 +323,9 @@ where
     fn rebuild(self, state: &mut Self::State) {
         let (el, prev_cleanup) = state;
         if let Some(prev) = prev_cleanup.take() {
-            (prev.into_inner())(el);
+            if let Some(remove) = prev.into_inner() {
+                remove();
+            }
         }
         *prev_cleanup = Some(if E::CAPTURE {
             self.attach_capture(el)
@@ -320,6 +337,8 @@ where
     fn into_cloneable(self) -> Self::Cloneable {
         On {
             cb: self.cb.map(|cb| SendWrapper::new(cb.take().into_shared())),
+            #[cfg(feature = "reactive_graph")]
+            owner: self.owner,
             event: self.event,
         }
     }
@@ -327,6 +346,8 @@ where
     fn into_cloneable_owned(self) -> Self::CloneableOwned {
         On {
             cb: self.cb.map(|cb| SendWrapper::new(cb.take().into_shared())),
+            #[cfg(feature = "reactive_graph")]
+            owner: self.owner,
             event: self.event,
         }
     }
@@ -342,6 +363,10 @@ where
     async fn resolve(self) -> Self::AsyncOutput {
         self
     }
+
+    fn keys(&self) -> Vec<NamedAttributeKey> {
+        vec![]
+    }
 }
 
 impl<E, F> NextAttribute for On<E, F>

tachys/src/html/node_ref.rs

@@ -7,7 +7,10 @@ use super::{
 };
 use crate::{
     html::{
-        attribute::maybe_next_attr_erasure_macros::next_attr_combine,
+        attribute::{
+            maybe_next_attr_erasure_macros::next_attr_combine,
+            NamedAttributeKey,
+        },
         element::HtmlElement,
     },
     prelude::Render,
@@ -112,6 +115,10 @@ where
     async fn resolve(self) -> Self::AsyncOutput {
         self
     }
+
+    fn keys(&self) -> Vec<NamedAttributeKey> {
+        vec![]
+    }
 }
 
 impl<E, C> NextAttribute for NodeRefAttr<E, C>

tachys/src/html/property.rs

@@ -3,7 +3,9 @@ use super::attribute::{
     NextAttribute,
 };
 use crate::{
-    html::attribute::maybe_next_attr_erasure_macros::next_attr_combine,
+    html::attribute::{
+        maybe_next_attr_erasure_macros::next_attr_combine, NamedAttributeKey,
+    },
     renderer::Rndr,
     view::{Position, ToTemplate},
 };
@@ -124,6 +126,12 @@ where
     async fn resolve(self) -> Self::AsyncOutput {
         self
     }
+
+    fn keys(&self) -> Vec<NamedAttributeKey> {
+        vec![NamedAttributeKey::Property(
+            self.key.as_ref().to_string().into(),
+        )]
+    }
 }
 
 impl<K, P> NextAttribute for Property<K, P>
@@ -202,7 +210,7 @@ macro_rules! prop_type {
                 key: &str,
             ) -> Self::State {
                 let value = self.into();
-                Rndr::set_property(el, key, &value);
+                Rndr::set_property_or_value(el, key, &value);
                 (el.clone(), value)
             }
 
@@ -212,14 +220,14 @@ macro_rules! prop_type {
                 key: &str,
             ) -> Self::State {
                 let value = self.into();
-                Rndr::set_property(el, key, &value);
+                Rndr::set_property_or_value(el, key, &value);
                 (el.clone(), value)
             }
 
             fn rebuild(self, state: &mut Self::State, key: &str) {
                 let (el, prev) = state;
                 let value = self.into();
-                Rndr::set_property(el, key, &value);
+                Rndr::set_property_or_value(el, key, &value);
                 *prev = value;
             }
 
@@ -245,7 +253,7 @@ macro_rules! prop_type {
                 let was_some = self.is_some();
                 let value = self.into();
                 if was_some {
-                    Rndr::set_property(el, key, &value);
+                    Rndr::set_property_or_value(el, key, &value);
                 }
                 (el.clone(), value)
             }
@@ -258,7 +266,7 @@ macro_rules! prop_type {
                 let was_some = self.is_some();
                 let value = self.into();
                 if was_some {
-                    Rndr::set_property(el, key, &value);
+                    Rndr::set_property_or_value(el, key, &value);
                 }
                 (el.clone(), value)
             }
@@ -266,7 +274,7 @@ macro_rules! prop_type {
             fn rebuild(self, state: &mut Self::State, key: &str) {
                 let (el, prev) = state;
                 let value = self.into();
-                Rndr::set_property(el, key, &value);
+                Rndr::set_property_or_value(el, key, &value);
                 *prev = value;
             }
 
@@ -294,7 +302,7 @@ macro_rules! prop_type_str {
                 key: &str,
             ) -> Self::State {
                 let value = JsValue::from(&*self);
-                Rndr::set_property(el, key, &value);
+                Rndr::set_property_or_value(el, key, &value);
                 (el.clone(), value)
             }
 
@@ -304,14 +312,14 @@ macro_rules! prop_type_str {
                 key: &str,
             ) -> Self::State {
                 let value = JsValue::from(&*self);
-                Rndr::set_property(el, key, &value);
+                Rndr::set_property_or_value(el, key, &value);
                 (el.clone(), value)
             }
 
             fn rebuild(self, state: &mut Self::State, key: &str) {
                 let (el, prev) = state;
                 let value = JsValue::from(&*self);
-                Rndr::set_property(el, key, &value);
+                Rndr::set_property_or_value(el, key, &value);
                 *prev = value;
             }
 
@@ -339,7 +347,7 @@ macro_rules! prop_type_str {
                 let was_some = self.is_some();
                 let value = JsValue::from(self.map(|n| JsValue::from_str(&n)));
                 if was_some {
-                    Rndr::set_property(el, key, &value);
+                    Rndr::set_property_or_value(el, key, &value);
                 }
                 (el.clone(), value)
             }
@@ -352,7 +360,7 @@ macro_rules! prop_type_str {
                 let was_some = self.is_some();
                 let value = JsValue::from(self.map(|n| JsValue::from_str(&n)));
                 if was_some {
-                    Rndr::set_property(el, key, &value);
+                    Rndr::set_property_or_value(el, key, &value);
                 }
                 (el.clone(), value)
             }
@@ -360,7 +368,7 @@ macro_rules! prop_type_str {
             fn rebuild(self, state: &mut Self::State, key: &str) {
                 let (el, prev) = state;
                 let value = JsValue::from(self.map(|n| JsValue::from_str(&n)));
-                Rndr::set_property(el, key, &value);
+                Rndr::set_property_or_value(el, key, &value);
                 *prev = value;
             }
 
@@ -392,7 +400,7 @@ impl IntoProperty for Arc<str> {
         key: &str,
     ) -> Self::State {
         let value = JsValue::from_str(self.as_ref());
-        Rndr::set_property(el, key, &value);
+        Rndr::set_property_or_value(el, key, &value);
         (el.clone(), value)
     }
 
@@ -402,14 +410,14 @@ impl IntoProperty for Arc<str> {
         key: &str,
     ) -> Self::State {
         let value = JsValue::from_str(self.as_ref());
-        Rndr::set_property(el, key, &value);
+        Rndr::set_property_or_value(el, key, &value);
         (el.clone(), value)
     }
 
     fn rebuild(self, state: &mut Self::State, key: &str) {
         let (el, prev) = state;
         let value = JsValue::from_str(self.as_ref());
-        Rndr::set_property(el, key, &value);
+        Rndr::set_property_or_value(el, key, &value);
         *prev = value;
     }
 
@@ -435,7 +443,7 @@ impl IntoProperty for Option<Arc<str>> {
         let was_some = self.is_some();
         let value = JsValue::from(self.map(|n| JsValue::from_str(&n)));
         if was_some {
-            Rndr::set_property(el, key, &value);
+            Rndr::set_property_or_value(el, key, &value);
         }
         (el.clone(), value)
     }
@@ -448,7 +456,7 @@ impl IntoProperty for Option<Arc<str>> {
         let was_some = self.is_some();
         let value = JsValue::from(self.map(|n| JsValue::from_str(&n)));
         if was_some {
-            Rndr::set_property(el, key, &value);
+            Rndr::set_property_or_value(el, key, &value);
         }
         (el.clone(), value)
     }
@@ -456,7 +464,7 @@ impl IntoProperty for Option<Arc<str>> {
     fn rebuild(self, state: &mut Self::State, key: &str) {
         let (el, prev) = state;
         let value = JsValue::from(self.map(|n| JsValue::from_str(&n)));
-        Rndr::set_property(el, key, &value);
+        Rndr::set_property_or_value(el, key, &value);
         *prev = value;
     }
 

tachys/src/html/style.rs

@@ -5,7 +5,9 @@ use super::attribute::{
 #[cfg(all(feature = "nightly", rustc_nightly))]
 use crate::view::static_types::Static;
 use crate::{
-    html::attribute::maybe_next_attr_erasure_macros::next_attr_combine,
+    html::attribute::{
+        maybe_next_attr_erasure_macros::next_attr_combine, NamedAttributeKey,
+    },
     renderer::{dom::CssStyleDeclaration, Rndr},
     view::{Position, ToTemplate},
 };
@@ -100,6 +102,10 @@ where
             style: self.style.resolve().await,
         }
     }
+
+    fn keys(&self) -> Vec<NamedAttributeKey> {
+        vec![NamedAttributeKey::Attribute("style".into())]
+    }
 }
 
 impl<S> NextAttribute for Style<S>

tachys/src/lib.rs

@@ -10,6 +10,9 @@
     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.

tachys/src/oco.rs

@@ -261,7 +261,7 @@ impl IntoProperty for Oco<'static, str> {
         key: &str,
     ) -> Self::State {
         let value = JsValue::from_str(self.as_ref());
-        Rndr::set_property(el, key, &value);
+        Rndr::set_property_or_value(el, key, &value);
         (el.clone(), value)
     }
 
@@ -271,14 +271,14 @@ impl IntoProperty for Oco<'static, str> {
         key: &str,
     ) -> Self::State {
         let value = JsValue::from_str(self.as_ref());
-        Rndr::set_property(el, key, &value);
+        Rndr::set_property_or_value(el, key, &value);
         (el.clone(), value)
     }
 
     fn rebuild(self, state: &mut Self::State, key: &str) {
         let (el, prev) = state;
         let value = JsValue::from_str(self.as_ref());
-        Rndr::set_property(el, key, &value);
+        Rndr::set_property_or_value(el, key, &value);
         *prev = value;
     }
 

tachys/src/reactive_graph/bind.rs

@@ -5,7 +5,8 @@ use crate::{
             maybe_next_attr_erasure_macros::{
                 next_attr_combine, next_attr_output_type,
             },
-            Attribute, AttributeKey, AttributeValue, NextAttribute,
+            Attribute, AttributeKey, AttributeValue, NamedAttributeKey,
+            NextAttribute,
         },
         event::{change, input, on},
         property::{prop, IntoProperty},
@@ -257,7 +258,9 @@ where
         prop(self.key(), signal).rebuild(attr_state);
 
         if let Some(prev) = prev_cleanup.take() {
-            (prev.into_inner())(el);
+            if let Some(remove) = prev.into_inner() {
+                remove();
+            }
         }
         *prev_cleanup = Some(self.attach(el));
     }
@@ -275,6 +278,10 @@ where
     async fn resolve(self) -> Self::AsyncOutput {
         self
     }
+
+    fn keys(&self) -> Vec<NamedAttributeKey> {
+        vec![]
+    }
 }
 
 impl<Key, T, R, W> NextAttribute for Bind<Key, T, R, W>

tachys/src/renderer/dom.rs

@@ -36,6 +36,46 @@ pub type ClassList = web_sys::DomTokenList;
 pub type CssStyleDeclaration = web_sys::CssStyleDeclaration;
 pub type TemplateElement = web_sys::HtmlTemplateElement;
 
+/// A microtask is a short function which will run after the current task has
+/// completed its work and when there is no other code waiting to be run before
+/// control of the execution context is returned to the browser's event loop.
+///
+/// Microtasks are especially useful for libraries and frameworks that need
+/// to perform final cleanup or other just-before-rendering tasks.
+///
+/// [MDN queueMicrotask](https://developer.mozilla.org/en-US/docs/Web/API/queueMicrotask)
+pub fn queue_microtask(task: impl FnOnce() + 'static) {
+    use js_sys::{Function, Reflect};
+
+    let task = Closure::once_into_js(task);
+    let window = window();
+    let queue_microtask =
+        Reflect::get(&window, &JsValue::from_str("queueMicrotask"))
+            .expect("queueMicrotask not available");
+    let queue_microtask = queue_microtask.unchecked_into::<Function>();
+    _ = queue_microtask.call1(&JsValue::UNDEFINED, &task);
+}
+
+fn queue(fun: Box<dyn FnOnce()>) {
+    use std::cell::{Cell, RefCell};
+
+    thread_local! {
+        static PENDING: Cell<bool> = const { Cell::new(false) };
+        static QUEUE: RefCell<Vec<Box<dyn FnOnce()>>> = RefCell::new(Vec::new());
+    }
+
+    QUEUE.with_borrow_mut(|q| q.push(fun));
+    if !PENDING.replace(true) {
+        queue_microtask(|| {
+            let tasks = QUEUE.take();
+            for task in tasks {
+                task();
+            }
+            PENDING.set(false);
+        })
+    }
+}
+
 impl Dom {
     pub fn intern(text: &str) -> &str {
         intern(text)
@@ -211,6 +251,20 @@ impl Dom {
         }
     }
 
+    pub fn set_property_or_value(el: &Element, key: &str, value: &JsValue) {
+        if key == "value" {
+            queue(Box::new({
+                let el = el.clone();
+                let value = value.clone();
+                move || {
+                    Self::set_property(&el, "value", &value);
+                }
+            }))
+        } else {
+            Self::set_property(el, key, value);
+        }
+    }
+
     pub fn set_property(el: &Element, key: &str, value: &JsValue) {
         or_debug!(
             js_sys::Reflect::set(
@@ -242,19 +296,20 @@ impl Dom {
         // return the remover
         RemoveEventHandler::new({
             let name = name.to_owned();
+            let el = el.clone();
             // safe to construct this here, because it will only run in the browser
             // so it will always be accessed or dropped from the main thread
-            let cb = send_wrapper::SendWrapper::new(cb);
-            move |el: &Element| {
+            let cb = send_wrapper::SendWrapper::new(move || {
                 or_debug!(
                     el.remove_event_listener_with_callback(
                         intern(&name),
                         cb.as_ref().unchecked_ref()
                     ),
-                    el,
+                    &el,
                     "removeEventListener"
                 )
-            }
+            });
+            move || cb()
         })
     }
 
@@ -280,20 +335,21 @@ impl Dom {
         // return the remover
         RemoveEventHandler::new({
             let name = name.to_owned();
+            let el = el.clone();
             // safe to construct this here, because it will only run in the browser
             // so it will always be accessed or dropped from the main thread
-            let cb = send_wrapper::SendWrapper::new(cb);
-            move |el: &Element| {
+            let cb = send_wrapper::SendWrapper::new(move || {
                 or_debug!(
                     el.remove_event_listener_with_callback_and_bool(
                         intern(&name),
                         cb.as_ref().unchecked_ref(),
                         true
                     ),
-                    el,
+                    &el,
                     "removeEventListener"
                 )
-            }
+            });
+            move || cb()
         })
     }
 
@@ -394,17 +450,19 @@ impl Dom {
         // return the remover
         RemoveEventHandler::new({
             let key = key.to_owned();
+            let el = el.clone();
             // safe to construct this here, because it will only run in the browser
             // so it will always be accessed or dropped from the main thread
-            let cb = send_wrapper::SendWrapper::new(cb);
-            move |el: &Element| {
-                drop(cb.take());
+            let el_cb = send_wrapper::SendWrapper::new((el, cb));
+            move || {
+                let (el, cb) = el_cb.take();
+                drop(cb);
                 or_debug!(
                     js_sys::Reflect::delete_property(
-                        el,
+                        &el,
                         &JsValue::from_str(&key)
                     ),
-                    el,
+                    &el,
                     "delete property"
                 );
             }

tachys/src/renderer/mod.rs

@@ -1,5 +1,5 @@
 use crate::view::{Mountable, ToTemplate};
-use std::{borrow::Cow, fmt::Debug};
+use std::{borrow::Cow, fmt::Debug, marker::PhantomData};
 use wasm_bindgen::JsValue;
 
 /// A DOM renderer.
@@ -120,16 +120,33 @@ pub trait Renderer: Send + Sized + Debug + 'static {
               should store it in some other data structure to clean it up \
               later to avoid dropping it immediately, or leak it with \
               std::mem::forget() to never drop it."]
-pub struct RemoveEventHandler<T>(Box<dyn FnOnce(&T) + Send + Sync>);
+#[allow(clippy::type_complexity)]
+pub struct RemoveEventHandler<T>(
+    Option<Box<dyn FnOnce() + Send + Sync>>,
+    // only here to keep the generic, removing which would be a breaking change
+    // TODO remove generic in 0.9
+    PhantomData<fn() -> T>,
+);
 
 impl<T> RemoveEventHandler<T> {
     /// Creates a new container with a function that will be called when it is dropped.
-    pub(crate) fn new(remove: impl FnOnce(&T) + Send + Sync + 'static) -> Self {
-        Self(Box::new(remove))
+    pub(crate) fn new(remove: impl FnOnce() + Send + Sync + 'static) -> Self {
+        Self(Some(Box::new(remove)), PhantomData)
     }
 
-    pub(crate) fn into_inner(self) -> Box<dyn FnOnce(&T) + Send + Sync> {
-        self.0
+    #[allow(clippy::type_complexity)]
+    pub(crate) fn into_inner(
+        mut self,
+    ) -> Option<Box<dyn FnOnce() + Send + Sync>> {
+        self.0.take()
+    }
+}
+
+impl<T> Drop for RemoveEventHandler<T> {
+    fn drop(&mut self) {
+        if let Some(cb) = self.0.take() {
+            cb()
+        }
     }
 }
 

tachys/src/view/any_view.rs

@@ -699,7 +699,15 @@ impl Render for AnyViewWithAttrs {
 
     fn rebuild(self, state: &mut Self::State) {
         self.view.rebuild(&mut state.view);
-        self.attrs.rebuild(&mut state.attrs);
+
+        let elements = state.elements();
+        // FIXME this seems wrong but I think the previous version was also broken!
+        if let Some(element) = elements.first() {
+            self.attrs.rebuild(&mut (
+                element.clone(),
+                std::mem::take(&mut state.attrs),
+            ));
+        }
     }
 }
 
@@ -820,7 +828,7 @@ impl AddAnyAttr for AnyViewWithAttrs {
     }
 }
 
-/// wip
+/// State for any view with attributes spread onto it.
 pub struct AnyViewWithAttrsState {
     view: AnyViewState,
     attrs: Vec<AnyAttributeState>,

tachys/src/view/either.rs

@@ -3,7 +3,10 @@ use super::{
     Render, RenderHtml,
 };
 use crate::{
-    html::attribute::{any_attribute::AnyAttribute, Attribute, NextAttribute},
+    html::attribute::{
+        any_attribute::AnyAttribute, Attribute, NamedAttributeKey,
+        NextAttribute,
+    },
     hydration::Cursor,
     ssr::StreamBuilder,
 };
@@ -264,6 +267,13 @@ where
             Either::Right(right) => Either::Right(right.resolve().await),
         }
     }
+
+    fn keys(&self) -> Vec<NamedAttributeKey> {
+        match self {
+            Either::Left(left) => left.keys(),
+            Either::Right(right) => right.keys(),
+        }
+    }
 }
 
 impl<A, B> RenderHtml for Either<A, B>

tachys/src/view/static_types.rs

@@ -8,7 +8,8 @@ use crate::{
         maybe_next_attr_erasure_macros::{
             next_attr_combine, next_attr_output_type,
         },
-        Attribute, AttributeKey, AttributeValue, NextAttribute,
+        Attribute, AttributeKey, AttributeValue, NamedAttributeKey,
+        NextAttribute,
     },
     hydration::Cursor,
     renderer::{CastFrom, Rndr},
@@ -111,6 +112,10 @@ where
     async fn resolve(self) -> Self::AsyncOutput {
         self
     }
+
+    fn keys(&self) -> Vec<NamedAttributeKey> {
+        vec![NamedAttributeKey::Attribute(K::KEY.into())]
+    }
 }
 
 impl<K, const V: &'static str> NextAttribute for StaticAttr<K, V>

wasm_split_macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wasm_split_macros"
-version = "0.1.2"
+version = "0.1.3"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "README.md"

wasm_split_macros/src/lib.rs

@@ -85,6 +85,7 @@ pub fn wasm_split(args: TokenStream, input: TokenStream) -> TokenStream {
         import_sig.output = async_output;
     }
 
+    let wrapper_pub = item_fn.vis;
     let mut wrapper_sig = item_fn.sig;
     wrapper_sig.asyncness = Some(Default::default());
     let mut args = Vec::new();
@@ -147,7 +148,8 @@ pub fn wasm_split(args: TokenStream, input: TokenStream) -> TokenStream {
         }
 
         #[allow(non_snake_case)]
-        #wrapper_sig {
+        #(#attrs)*
+        #wrapper_pub #wrapper_sig {
             #(#attrs)*
             #[allow(improper_ctypes_definitions)]
             #[allow(non_snake_case)]
@@ -162,7 +164,7 @@ pub fn wasm_split(args: TokenStream, input: TokenStream) -> TokenStream {
 
         #[doc(hidden)]
         #[allow(non_snake_case)]
-        pub async fn #preload_name() {
+        #wrapper_pub async fn #preload_name() {
             ::leptos::wasm_split_helpers::ensure_loaded(&#split_loader_ident).await.unwrap();
         }
     }