fix: set Content-Type correctly on server function error responses (closes #4209 )

chore: fix outdated descriptions in FromServerFnError docs
2025-12-28 10:11:56 -05:00 · 2025-08-24 14:51:35 -04:00 · 2025-08-24 13:50:14 -04:00
99 changed files with 622 additions and 2118 deletions
--- a/.github/workflows/get-example-changed.yml
+++ b/.github/workflows/get-example-changed.yml
@@ -24,7 +24,7 @@ jobs:
          fetch-depth: 0
      - name: Get example files that changed
        id: changed-files
-        uses: tj-actions/changed-files@v47
+        uses: tj-actions/changed-files@v46
        with:
          files: |
            examples/**
--- a/.github/workflows/get-leptos-changed.yml
+++ b/.github/workflows/get-leptos-changed.yml
@@ -18,7 +18,7 @@ jobs:
          fetch-depth: 0
      - name: Get source files that changed
        id: changed-source
-        uses: tj-actions/changed-files@v47
+        uses: tj-actions/changed-files@v46
        with:
          files_ignore: |
            .*/**/*
--- a/.github/workflows/run-cargo-make-task.yml
+++ b/.github/workflows/run-cargo-make-task.yml
@@ -88,7 +88,7 @@ jobs:
        run: trunk --version
      - name: Install Node.js
        if: contains(inputs.directory, 'examples')
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v4
        with:
          node-version: 20
      - uses: pnpm/action-setup@v4
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/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.10" }
-leptos_config = { path = "./leptos_config", version = "0.8.7" }
-leptos_dom = { path = "./leptos_dom", version = "0.8.7" }
+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_hot_reload = { path = "./leptos_hot_reload", version = "0.8.5" }
-leptos_integration_utils = { path = "./integrations/utils", version = "0.8.6" }
-leptos_macro = { path = "./leptos_macro", version = "0.8.9" }
-leptos_router = { path = "./router", version = "0.8.8" }
+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_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.8" }
+reactive_graph = { path = "./reactive_graph", version = "0.2.5" }
 reactive_stores = { path = "./reactive_stores", version = "0.2.5" }
-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" }
+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" }
 server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.8.5" }
-tachys = { path = "./tachys", version = "0.2.9" }
+tachys = { path = "./tachys", version = "0.2.6" }
 wasm_split_helpers = { path = "./wasm_split", version = "0.1.2" }
-wasm_split_macros = { path = "./wasm_split_macros", version = "0.1.3" }
+wasm_split_macros = { path = "./wasm_split_macros", version = "0.1.2" }

 # 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.143" }
+serde_json = { default-features = false, version = "1.0.142" }
 trybuild = { default-features = false, version = "1.0.110" }
-typed-builder = { default-features = false, version = "0.21.2" }
-thiserror = { default-features = false, version = "2.0.16" }
+typed-builder = { default-features = false, version = "0.21.0" }
+thiserror = { default-features = false, version = "2.0.12" }
 wasm-bindgen = { default-features = false, version = "0.2.100" }
-indexmap = { default-features = false, version = "2.11.0" }
+indexmap = { default-features = false, version = "2.9.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.3" }
+cfg-if = { default-features = false, version = "1.0.0" }
 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.101" }
+proc-macro2 = { default-features = false, version = "1.0.96" }
 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.106" }
+syn = { default-features = false, version = "2.0.104" }
 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.89" }
+async-trait = { default-features = false, version = "0.1.88" }
 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.100" }
+anyhow = { default-features = false, version = "1.0.98" }
 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.37" }
-inventory = { default-features = false, version = "0.3.21" }
-config = { default-features = false, version = "0.15.14" }
+prettyplease = { default-features = false, version = "0.2.36" }
+inventory = { default-features = false, version = "0.3.20" }
+config = { default-features = false, version = "0.15.13" }
 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.2" }
+regex = { default-features = false, version = "1.11.1" }
 drain_filter_polyfill = { default-features = false, version = "0.1.3" }
-tempfile = { default-features = false, version = "3.21.0" }
+tempfile = { default-features = false, version = "3.20.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.2" }
+percent-encoding = { default-features = false, version = "2.3.1" }
 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.7.0" }
+hyper = { default-features = false, version = "1.6.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.23" }
+reqwest = { default-features = false, version = "0.12.22" }
 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.1" }
+actix-http = { default-features = false, version = "3.11.0" }
 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" }
@@ -170,9 +170,6 @@ async-lock = { default-features = false, version = "3.4.1" }
 base16 = { default-features = false, version = "0.2.1" }
 digest = { default-features = false, version = "0.10.7" }
 sha2 = { default-features = false, version = "0.10.8" }
-subsecond = { default-features = false, version = "0.7.0-rc.0" }
-dioxus-cli-config = { default-features = false, version = "0.7.0-rc.0" }
-dioxus-devtools = { default-features = false, version = "0.7.0-rc.0" }

 [profile.release]
 codegen-units = 1
--- a/README.md
+++ b/README.md
@@ -95,7 +95,7 @@ Here are some resources for learning more about Leptos:
 [`cargo-leptos`](https://github.com/leptos-rs/cargo-leptos) is a build tool that's designed to make it easy to build apps that run on both the client and the server, with seamless integration. The best way to get started with a real Leptos project right now is to use `cargo-leptos` and our starter templates for [Actix](https://github.com/leptos-rs/start) or [Axum](https://github.com/leptos-rs/start-axum).

 ```bash
-cargo install cargo-leptos --locked
+cargo install cargo-leptos
 cargo leptos new --git https://github.com/leptos-rs/start-axum
 cd [your project name]
 cargo leptos watch
--- a/examples/regression/e2e/features/issue_4005.feature
+++ b/examples/regression/e2e/features/issue_4005.feature
@@ -1,7 +0,0 @@
-@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
--- a/examples/regression/e2e/features/issue_4217.feature
+++ b/examples/regression/e2e/features/issue_4217.feature
@@ -1,9 +0,0 @@
-@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
--- a/examples/regression/e2e/features/issue_4251.feature
+++ b/examples/regression/e2e/features/issue_4251.feature
@@ -1,13 +0,0 @@
-@check_issue_4251
-Feature: Check that issue 4251 does not reappear
-
-	Scenario: Clicking a link to the same page you’re currently on should not add the page to the history stack.
-		Given I see the app
-		And I can access regression test 4324
-		When I select the link This page
-		And I select the link This page
-		And I select the link This page
-		Then I see the result is the string Issue4324
-		When I press the back button
-		And I select the link 4324
-		Then I see the result is the string Issue4324
--- a/examples/regression/e2e/features/issue_4285.feature
+++ b/examples/regression/e2e/features/issue_4285.feature
@@ -1,9 +0,0 @@
-@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
--- a/examples/regression/e2e/features/issue_4296.feature
+++ b/examples/regression/e2e/features/issue_4296.feature
@@ -1,18 +0,0 @@
-@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")
--- a/examples/regression/e2e/features/issue_4324.feature
+++ b/examples/regression/e2e/features/issue_4324.feature
@@ -1,11 +0,0 @@
-@check_issue_4324
-Feature: Check that issue 4324 does not reappear
-
-	Scenario: Navigating to the same page after clicking "Back" should set the URL correctly
-		Given I see the app
-		And I can access regression test 4324
-		Then I see the path is /4324/
-		When I press the back button
-		Then I see the path is /
-		When I select the link 4324
-		Then I see the path is /4324/
--- a/examples/regression/e2e/tests/fixtures/check.rs
+++ b/examples/regression/e2e/tests/fixtures/check.rs
@@ -18,38 +18,3 @@ 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(())
-}
-
-pub async fn path_is(client: &Client, expected_path: &str) -> Result<()> {
-    let url = client
-        .current_url()
-        .await
-        .expect("could not access current URL");
-    let path = url.path();
-    assert_eq!(expected_path, path);
-    Ok(())
-}
--- a/examples/regression/e2e/tests/fixtures/world/action_steps.rs
+++ b/examples/regression/e2e/tests/fixtures/world/action_steps.rs
@@ -45,12 +45,3 @@ async fn i_refresh_the_browser(world: &mut AppWorld) -> Result<()> {

    Ok(())
 }
-
-#[given(regex = "^I press the back button$")]
-#[when(regex = "^I press the back button$")]
-async fn i_go_back(world: &mut AppWorld) -> Result<()> {
-    let client = &world.client;
-    client.back().await?;
-
-    Ok(())
-}
--- a/examples/regression/e2e/tests/fixtures/world/check_steps.rs
+++ b/examples/regression/e2e/tests/fixtures/world/check_steps.rs
@@ -25,28 +25,3 @@ 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(())
-}
-
-#[then(regex = r"^I see the path is (.*)$")]
-async fn i_see_the_path(world: &mut AppWorld, path: String) -> Result<()> {
-    let client = &world.client;
-    check::path_is(client, &path).await?;
-    Ok(())
-}
--- a/examples/regression/src/app.rs
+++ b/examples/regression/src/app.rs
@@ -1,8 +1,4 @@
-use crate::{
-    issue_4005::Routes4005, issue_4088::Routes4088, issue_4217::Routes4217,
-    issue_4285::Routes4285, issue_4296::Routes4296, issue_4324::Routes4324,
-    pr_4015::Routes4015, pr_4091::Routes4091,
-};
+use crate::{issue_4088::Routes4088, pr_4015::Routes4015, pr_4091::Routes4091};
 use leptos::prelude::*;
 use leptos_meta::{MetaTags, *};
 use leptos_router::{
@@ -32,22 +28,15 @@ 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 set_is_routing>
+        <Router>
            <main>
                <Routes fallback>
                    <Route path=path!("") view=HomePage/>
                    <Routes4091/>
                    <Routes4015/>
                    <Routes4088/>
-                    <Routes4217/>
-                    <Routes4005/>
-                    <Routes4285/>
-                    <Routes4296/>
-                    <Routes4324/>
                </Routes>
            </main>
        </Router>
@@ -70,11 +59,6 @@ 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>
-                <li><a href="/4324/">"4324"</a></li>
            </ul>
        </nav>
    }
--- a/examples/regression/src/issue_4005.rs
+++ b/examples/regression/src/issue_4005.rs
@@ -1,24 +0,0 @@
-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>
-    }
-}
--- a/examples/regression/src/issue_4217.rs
+++ b/examples/regression/src/issue_4217.rs
@@ -1,24 +0,0 @@
-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>
-    }
-}
--- a/examples/regression/src/issue_4285.rs
+++ b/examples/regression/src/issue_4285.rs
@@ -1,49 +0,0 @@
-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)
-}
--- a/examples/regression/src/issue_4296.rs
+++ b/examples/regression/src/issue_4296.rs
@@ -1,36 +0,0 @@
-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()
-    }
-}
--- a/examples/regression/src/issue_4324.rs
+++ b/examples/regression/src/issue_4324.rs
@@ -1,21 +0,0 @@
-use leptos::prelude::*;
-#[allow(unused_imports)]
-use leptos_router::{
-    components::Route, path, Lazy, MatchNestedRoutes, NavigateOptions,
-};
-
-#[component]
-pub fn Routes4324() -> impl MatchNestedRoutes + Clone {
-    view! {
-        <Route path=path!("4324") view=Issue4324/>
-    }
-    .into_inner()
-}
-
-#[component]
-pub fn Issue4324() -> impl IntoView {
-    view! {
-        <a href="/4324/">"This page"</a>
-        <p id="result">"Issue4324"</p>
-    }
-}
--- a/examples/regression/src/lib.rs
+++ b/examples/regression/src/lib.rs
@@ -1,10 +1,5 @@
 pub mod app;
-mod issue_4005;
 mod issue_4088;
-mod issue_4217;
-mod issue_4285;
-mod issue_4296;
-mod issue_4324;
 mod pr_4015;
 mod pr_4091;

--- a/examples/subsecond_hot_patch/.gitignore
+++ b/examples/subsecond_hot_patch/.gitignore
@@ -1,7 +0,0 @@
-# Generated by Cargo
-# will have compiled files and executables
-/target
-.DS_Store
-
-# These are backup files generated by rustfmt
-**/*.rs.bk
--- a/examples/subsecond_hot_patch/Cargo.toml
+++ b/examples/subsecond_hot_patch/Cargo.toml
@@ -1,13 +0,0 @@
-[package]
-name = "subsecond_hot_patch"
-version = "0.1.0"
-authors = ["Greg Johnston <greg.johnston@gmail.com>"]
-edition = "2021"
-
-[dependencies]
-leptos = { path = "../../leptos", features = ["csr", "subsecond"] }
-leptos_router = { path = "../../router" }
-
-[features]
-default = ["web"]
-web = []
--- a/examples/subsecond_hot_patch/Dioxus.toml
+++ b/examples/subsecond_hot_patch/Dioxus.toml
@@ -1,21 +0,0 @@
-[application]
-
-[web.app]
-
-# HTML title tag content
-title = "ltest"
-
-# include `assets` in web platform
-[web.resource]
-
-# Additional CSS style files
-style = []
-
-# Additional JavaScript files
-script = []
-
-[web.resource.dev]
-
-# Javascript code file
-# serve: [dev-server] only
-script = []
--- a/examples/subsecond_hot_patch/Makefile.toml
+++ b/examples/subsecond_hot_patch/Makefile.toml
@@ -1 +0,0 @@
-extend = [{ path = "../cargo-make/main.toml" }]
--- a/examples/subsecond_hot_patch/README.md
+++ b/examples/subsecond_hot_patch/README.md
@@ -1,31 +0,0 @@
-# Hot Patching with `dx`
-
-This is an experimental example exploring how to combine Leptos with the binary hot-patching provided by Dioxus's `subsecond` library and `dx` cli.
-
-### Serving Your App
-
-This requires installing the Dioxus CLI version 0.7.0. At the time I'm writing this README, that does not yet have a stable release. Once `dioxus-cli` 0.7.0 has been released, you should use the latest stable release. Until then, I'd suggest installing from git:
-
-```sh
-cargo install dioxus-cli --git https://github.com/DioxusLabs/dioxus
-```
-
-Then you can run the example with `dx serve --hot-patch --platform web`.
-
-### Hot Patching
-
-Changes to the your application should be reflected in your app without a full rebuild and reload.
-
-### Limitatations
-
-Currently we only support hot-patching for reactive view functions. You probably want to use `AnyView` (via `.into_any()`) on any views that will be hot-patched, so they can be rebuilt correctly despite their types changing when the structure of the view tree changes.
-
-If you are using `leptos_router` this actually works quite well, as every route’s view is erased to `AnyView` and the router itself is a reactive view function: in other words, changes inside any route should be hot-patched in any case.
-
-Note that any hot-patch will cause all render effects to run again. This means that some client-side state (like the values of signals) will be wiped out.
-
-### Build Tooling
-
-The preference of the Dioxus team is that all hot-patching work that uses their `subsecond` also use `dioxus-cli`. As this demo shows, it's completely possible to use `dioxus-cli` to build and run a Leptos project. We do not plan to build `subsecond` into our own build tooling at this time.
-
-**This is an experiment/POC. It is being published because members of the community have found it useful and have asked for the support to be merged in its current state. Further development and bugfixes are a relatively low priority at this time.**
--- a/examples/subsecond_hot_patch/assets/favicon.ico
+++ b/examples/subsecond_hot_patch/assets/favicon.ico
--- a/examples/subsecond_hot_patch/assets/header.svg
+++ b/examples/subsecond_hot_patch/assets/header.svg
--- a/examples/subsecond_hot_patch/assets/main.css
+++ b/examples/subsecond_hot_patch/assets/main.css
@@ -1,46 +0,0 @@
-/* App-wide styling */
-body {
-    background-color: #0f1116;
-    color: #ffffff;
-    font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
-    margin: 20px;
-}
-
-#hero {
-    margin: 0;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-}
-
-#links {
-    width: 400px;
-    text-align: left;
-    font-size: x-large;
-    color: white;
-    display: flex;
-    flex-direction: column;
-}
-
-#links a {
-    color: white;
-    text-decoration: none;
-    margin-top: 20px;
-    margin: 10px 0px;
-    border: white 1px solid;
-    border-radius: 5px;
-    padding: 10px;
-}
-
-#links a:hover {
-    background-color: #1f1f1f;
-    cursor: pointer;
-}
-
-#header {
-    max-width: 1200px;
-}
-
-
-
--- a/examples/subsecond_hot_patch/src/main.rs
+++ b/examples/subsecond_hot_patch/src/main.rs
@@ -1,44 +0,0 @@
-use leptos::{prelude::*, subsecond::connect_to_hot_patch_messages};
-use leptos_router::{
-    components::{Route, Router, Routes},
-    path,
-};
-
-fn main() {
-    // connect to DX CLI and patch the WASM binary whenever we receive a message
-    connect_to_hot_patch_messages();
-
-    // wrapping App here in a closure so we can hot-reload it, because we only do that
-    // for reactive views right now. changing anything will re-run App and update the view
-    mount_to_body(|| App);
-}
-
-#[component]
-fn App() -> impl IntoView {
-    view! {
-        <nav>
-            <a href="/">"Home"</a>
-            <a href="/about">"About"</a>
-        </nav>
-        <Router>
-            <Routes fallback=|| "Not found">
-                <Route path=path!("/") view=HomePage/>
-                <Route path=path!("/about") view=About/>
-            </Routes>
-        </Router>
-    }
-}
-
-#[component]
-fn HomePage() -> impl IntoView {
-    view! {
-        <h1>"Home Page"</h1>
-    }
-}
-
-#[component]
-fn About() -> impl IntoView {
-    view! {
-        <h1>"About"</h1>
-    }
-}
--- a/examples/tailwind_csr/Trunk.toml
+++ b/examples/tailwind_csr/Trunk.toml
@@ -1,3 +0,0 @@
-[tools]
-tailwindcss = "4.1.13"
-
--- a/integrations/axum/Cargo.toml
+++ b/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.6"
+version = "0.8.5"
 rust-version.workspace = true
 edition.workspace = true

--- a/integrations/utils/Cargo.toml
+++ b/integrations/utils/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Utilities to help build server integrations for the Leptos web framework."
-version = "0.8.6"
+version = "0.8.5"
 rust-version.workspace = true
 edition.workspace = true

--- a/integrations/utils/src/lib.rs
+++ b/integrations/utils/src/lib.rs
@@ -68,8 +68,7 @@ pub trait ExtendResponse: Sized {
                let nonce =
                    use_nonce().map(|n| n.to_string()).unwrap_or_default();
                if let Some(manifest) = use_context::<WasmSplitManifest>() {
-                    let (pkg_path, manifest, wasm_split_file) =
-                        &*manifest.0.read_value();
+                    let (pkg_path, manifest) = &*manifest.0.read_value();
                    let prefetches = prefetches.0.read_value();

                    let all_prefetches = prefetches.iter().flat_map(|key| {
@@ -91,7 +90,7 @@ pub trait ExtendResponse: Sized {
                        .to_html();
                    }
                    _ = view! {
-                        <Link rel="modulepreload" href=format!("{pkg_path}/{wasm_split_file}") crossorigin=nonce/>
+                        <Link rel="modulepreload" href=format!("{pkg_path}/__wasm_split.js") crossorigin=nonce/>
                    }
                    .to_html();
                }
--- a/leptos/Cargo.toml
+++ b/leptos/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leptos"
-version = "0.8.10"
+version = "0.8.6"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
@@ -58,9 +58,6 @@ slotmap = { workspace = true, default-features = true }
 futures = { workspace = true, default-features = true }
 send_wrapper = { workspace = true, default-features = true }
 wasm_split_helpers.workspace = true
-subsecond = { workspace = true, default-features = true, optional = true }
-dioxus-cli-config = { workspace = true, default-features = true, optional = true }
-dioxus-devtools = { workspace = true, default-features = true, optional = true }

 [features]
 hydration = [
@@ -105,16 +102,6 @@ trace-component-props = [
 ]
 delegation = ["tachys/delegation"]
 islands-router = ["tachys/mark_branches"]
-subsecond = [
-  "reactive_graph/subsecond",
-  "dep:subsecond",
-  "dep:dioxus-cli-config",
-  "dep:dioxus-devtools",
-  "web-sys/Location",
-  "web-sys/MessageEvent",
-  "web-sys/WebSocket",
-  "web-sys/Window",
-]

 [dev-dependencies]
 tokio = { features = [
--- a/leptos/src/children.rs
+++ b/leptos/src/children.rs
@@ -262,16 +262,6 @@ 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 {
@@ -299,16 +289,6 @@ 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 {
--- a/leptos/src/hydration/mod.rs
+++ b/leptos/src/hydration/mod.rs
@@ -27,6 +27,7 @@ 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://'",
        };
@@ -65,56 +66,16 @@ pub fn HydrationScripts(
    if let Some(splits) = SPLIT_MANIFEST.get_or_init(|| {
        let root = root.clone().unwrap_or_default();

-        let (wasm_split_js, wasm_split_manifest) = if options.hash_files {
-            let hash_path = std::env::current_exe()
-                .map(|path| {
-                    path.parent().map(|p| p.to_path_buf()).unwrap_or_default()
-                })
-                .unwrap_or_default()
-                .join(options.hash_file.as_ref());
-            let hashes = std::fs::read_to_string(&hash_path)
-                .expect("failed to read hash file");
-
-            let mut split =
-                "__wasm_split.______________________.js".to_string();
-            let mut manifest = "__wasm_split_manifest.json".to_string();
-            for line in hashes.lines() {
-                let line = line.trim();
-                if !line.is_empty() {
-                    if let Some((file, hash)) = line.split_once(':') {
-                        if file == "manifest" {
-                            manifest.clear();
-                            manifest.push_str("__wasm_split_manifest.");
-                            manifest.push_str(hash.trim());
-                            manifest.push_str(".json");
-                        }
-                        if file == "split" {
-                            split.clear();
-                            split.push_str("__wasm_split.");
-                            split.push_str(hash.trim());
-                            split.push_str(".js");
-                        }
-                    }
-                }
-            }
-            (split, manifest)
-        } else {
-            (
-                "__wasm_split.______________________.js".to_string(),
-                "__wasm_split_manifest.json".to_string(),
-            )
-        };
-
        let site_dir = &options.site_root;
        let pkg_dir = &options.site_pkg_dir;
        let path = PathBuf::from(site_dir.to_string());
-        let path = path.join(pkg_dir.to_string()).join(wasm_split_manifest);
+        let path = path
+            .join(pkg_dir.to_string())
+            .join("__wasm_split_manifest.json");
        let file = std::fs::read_to_string(path).ok()?;
-
        let manifest = WasmSplitManifest(ArcStoredValue::new((
            format!("{root}/{pkg_dir}"),
            serde_json::from_str(&file).expect("could not read manifest file"),
-            wasm_split_js,
        )));

        Some(manifest)
--- a/leptos/src/hydration/reload_script.js
+++ b/leptos/src/hydration/reload_script.js
@@ -1,8 +1,9 @@
-if (window.location.protocol === 'https:') {
-	protocol = 'wss://';
+let host = window.location.hostname;
+
+if (protocol === null) {
+	protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://';
 }

-let host = window.location.hostname;
 let ws = new WebSocket(`${protocol}${host}:${reload_port}/live_reload`);
 ws.onmessage = (ev) => {
 	let msg = JSON.parse(ev.data);
--- a/leptos/src/lib.rs
+++ b/leptos/src/lib.rs
@@ -1,4 +1,5 @@
 #![deny(missing_docs)]
+#![forbid(unsafe_code)]

 //! # About Leptos
 //!
@@ -84,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,
@@ -305,10 +296,6 @@ pub use tachys::mathml as math;
 #[doc(inline)]
 pub use tachys::svg;

-#[cfg(feature = "subsecond")]
-/// Utilities for using binary hot-patching with [`subsecond`].
-pub mod subsecond;
-
 /// Utilities for simple isomorphic logging to the console or terminal.
 pub mod logging {
    pub use leptos_dom::{debug_warn, error, log, warn};
@@ -395,8 +382,7 @@ pub fn prefetch_lazy_fn_on_server(id: &'static str) {
 #[derive(Clone, Debug, Default)]
 pub struct WasmSplitManifest(
    pub  reactive_graph::owner::ArcStoredValue<(
-        String,                                         // the pkg root
-        std::collections::HashMap<String, Vec<String>>, // preloads
-        String, // the name of the __wasm_split.js file
+        String,
+        std::collections::HashMap<String, Vec<String>>,
    )>,
 );
--- a/leptos/src/subsecond.rs
+++ b/leptos/src/subsecond.rs
@@ -1,62 +0,0 @@
-use dioxus_devtools::DevserverMsg;
-use wasm_bindgen::{prelude::Closure, JsCast};
-use web_sys::{js_sys::JsString, MessageEvent, WebSocket};
-
-/// Sets up a websocket connect to the `dx` CLI, waiting for incoming hot-patching messages
-/// and patching the WASM binary appropriately.
-//
-//  Note: This is a stripped-down version of Dioxus's `make_ws` from `dioxus_web`
-//  It's essentially copy-pasted here because it's not pub there.
-//  Would love to just take a dependency on that to be able to use it and deduplicate.
-//
-//  https://github.com/DioxusLabs/dioxus/blob/main/packages/web/src/devtools.rs#L36
-pub fn connect_to_hot_patch_messages() {
-    // Get the location of the devserver, using the current location plus the /_dioxus path
-    // The idea here being that the devserver is always located on the /_dioxus behind a proxy
-    let location = web_sys::window().unwrap().location();
-    let url = format!(
-        "{protocol}//{host}/_dioxus?build_id={build_id}",
-        protocol = match location.protocol().unwrap() {
-            prot if prot == "https:" => "wss:",
-            _ => "ws:",
-        },
-        host = location.host().unwrap(),
-        build_id = dioxus_cli_config::build_id(),
-    );
-
-    let ws = WebSocket::new(&url).unwrap();
-
-    ws.set_onmessage(Some(
-        Closure::<dyn FnMut(MessageEvent)>::new(move |e: MessageEvent| {
-            let Ok(text) = e.data().dyn_into::<JsString>() else {
-                return;
-            };
-
-            // The devserver messages have some &'static strs in them, so we need to leak the source string
-            let string: String = text.into();
-            let string = Box::leak(string.into_boxed_str());
-
-            if let Ok(DevserverMsg::HotReload(msg)) =
-                serde_json::from_str::<DevserverMsg>(string)
-            {
-                if let Some(jump_table) = msg.jump_table.as_ref().cloned() {
-                    if msg.for_build_id == Some(dioxus_cli_config::build_id()) {
-                        let our_pid = if cfg!(target_family = "wasm") {
-                            None
-                        } else {
-                            Some(std::process::id())
-                        };
-
-                        if msg.for_pid == our_pid {
-                            unsafe { subsecond::apply_patch(jump_table) }
-                                .unwrap();
-                        }
-                    }
-                }
-            }
-        })
-        .into_js_value()
-        .as_ref()
-        .unchecked_ref(),
-    ));
-}
--- a/leptos/src/suspense_component.rs
+++ b/leptos/src/suspense_component.rs
@@ -32,12 +32,12 @@ use tachys::{
 };
 use throw_error::ErrorHookFuture;

-/// If any [`Resource`](crate::prelude::Resource) is read in the `children` of this
+/// If any [`Resource`](leptos_reactive::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::prelude::Transition).
+/// children instead, use [Transition](crate::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
--- a/leptos/src/transition.rs
+++ b/leptos/src/transition.rs
@@ -16,11 +16,11 @@ use reactive_graph::{
 use slotmap::{DefaultKey, SlotMap};
 use tachys::reactive_graph::OwnedView;

-/// If any [`Resource`](crate::prelude::Resource) is read in the `children` of this
+/// If any [`Resource`](leptos_reactive::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::prelude::Suspense), this will not fall
+/// Unlike [`Suspense`](crate::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
--- a/leptos_config/Cargo.toml
+++ b/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.7"
+version = "0.8.5"
 rust-version.workspace = true
 edition.workspace = true

--- a/leptos_config/src/lib.rs
+++ b/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", "ws")?.as_str(),
+                env_w_default("LEPTOS_RELOAD_WS_PROTOCOL", "auto")?.as_str(),
            )?,
            not_found_path: env_w_default("LEPTOS_NOT_FOUND_PATH", "/404")?
                .into(),
@@ -283,22 +283,24 @@ impl TryFrom<String> for Env {
 pub enum ReloadWSProtocol {
    WS,
    WSS,
+    Auto,
 }

 impl Default for ReloadWSProtocol {
    fn default() -> Self {
-        Self::WS
+        Self::Auto
    }
 }

 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 `ws` or \
-             `wss`.",
+            "{input} is not a supported websocket protocol. Use only `auto`, \
+             `ws` or `wss`.",
        ))),
    }
 }
--- a/leptos_dom/Cargo.toml
+++ b/leptos_dom/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leptos_dom"
-version = "0.8.7"
+version = "0.8.5"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
--- a/leptos_dom/src/helpers.rs
+++ b/leptos_dom/src/helpers.rs
@@ -258,7 +258,15 @@ 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) {
-    tachys::renderer::dom::queue_microtask(task);
+    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);
 }

 /// Handle that is generated by [set_timeout_with_handle] and can be used to clear the timeout.
@@ -463,7 +471,7 @@ pub fn set_interval_with_handle(

    #[inline(never)]
    fn si(
-        cb: Box<dyn FnMut()>,
+        cb: Box<dyn Fn()>,
        duration: Duration,
    ) -> Result<IntervalHandle, JsValue> {
        let cb = Closure::wrap(cb).into_js_value();
--- a/leptos_macro/Cargo.toml
+++ b/leptos_macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leptos_macro"
-version = "0.8.9"
+version = "0.8.6"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
@@ -24,7 +24,9 @@ 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 }
+rstml = { workspace = true, default-features = true, features = [
+  "rawtext-stable-hack",
+] }
 leptos_hot_reload = { workspace = true }
 server_fn_macro = { workspace = true }
 convert_case = { workspace = true, default-features = true }
--- a/leptos_macro/src/lib.rs
+++ b/leptos_macro/src/lib.rs
@@ -323,7 +323,14 @@ fn view_macro_impl(tokens: TokenStream, template: bool) -> TokenStream {
            .chain(tokens)
            .collect()
    };
-    let config = rstml::ParserConfig::default().recover_block(true);
+    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 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());
--- a/leptos_macro/src/view/mod.rs
+++ b/leptos_macro/src/view/mod.rs
@@ -25,8 +25,9 @@ use std::{
 use syn::{
    punctuated::Pair::{End, Punctuated},
    spanned::Spanned,
-    Expr::{self, Tuple},
-    ExprArray, ExprLit, ExprPath, ExprRange, Lit, LitStr, RangeLimits, Stmt,
+    Expr,
+    Expr::Tuple,
+    ExprArray, ExprLit, ExprRange, Lit, LitStr, RangeLimits, Stmt,
 };

 #[derive(Clone, Copy, PartialEq, Eq)]
@@ -1870,28 +1871,6 @@ pub(crate) fn ident_from_tag_name(tag_name: &NodeName) -> Ident {
    }
 }

-pub(crate) fn full_path_from_tag_name(tag_name: &NodeName) -> Option<ExprPath> {
-    match tag_name {
-        NodeName::Path(path) => Some(path.clone()),
-        NodeName::Block(_) => {
-            let span = tag_name.span();
-            proc_macro_error2::emit_error!(
-                span,
-                "blocks not allowed in tag-name position"
-            );
-            None
-        }
-        _ => {
-            let span = tag_name.span();
-            proc_macro_error2::emit_error!(
-                span,
-                "punctuated names not allowed in slots"
-            );
-            None
-        }
-    }
-}
-
 pub(crate) fn directive_call_from_attribute_node(
    attr: &KeyedAttribute,
    directive_name: &str,
--- a/leptos_macro/src/view/slot_helper.rs
+++ b/leptos_macro/src/view/slot_helper.rs
@@ -1,6 +1,6 @@
 use super::{
    component_builder::maybe_optimised_component_children,
-    convert_to_snake_case, full_path_from_tag_name,
+    convert_to_snake_case, ident_from_tag_name,
 };
 use crate::view::{fragment_to_tokens, utils::filter_prefixed_attrs, TagType};
 use proc_macro2::{Ident, TokenStream, TokenTree};
@@ -24,7 +24,7 @@ pub(crate) fn slot_to_tokens(
        node.name().to_string()
    });

-    let component_path = full_path_from_tag_name(node.name());
+    let component_name = ident_from_tag_name(node.name());

    let Some(parent_slots) = parent_slots else {
        proc_macro_error2::emit_error!(
@@ -190,7 +190,7 @@ pub(crate) fn slot_to_tokens(

    let slot = quote_spanned! {node.span()=>
        {
-            let slot = #component_path::builder()
+            let slot = #component_name::builder()
                #(#props)*
                #(#slots)*
                #children
--- a/leptos_server/Cargo.toml
+++ b/leptos_server/Cargo.toml
@@ -44,8 +44,7 @@ denylist = ["tracing"]
 max_combination_size = 2

 [package.metadata.docs.rs]
-rustdoc-args = ["--generate-link-to-definition", "--cfg", "docsrs"]
-all-features = true
+rustdoc-args = ["--generate-link-to-definition"]

 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(leptos_debuginfo)'] }
--- a/leptos_server/src/once_resource.rs
+++ b/leptos_server/src/once_resource.rs
@@ -386,7 +386,6 @@ 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,
@@ -419,7 +418,6 @@ 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,
@@ -453,7 +451,6 @@ where
 }

 #[cfg(feature = "serde-lite")]
-#[cfg_attr(docsrs, doc(cfg(feature = "serde-lite")))]
 impl<T> ArcOnceResource<T, SerdeLite<JsonSerdeCodec>>
 where
 T: Send + Sync + 'static,
@@ -487,7 +484,6 @@ 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,
@@ -752,7 +748,6 @@ 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,
@@ -785,7 +780,6 @@ 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,
@@ -819,7 +813,6 @@ where
 }

 #[cfg(feature = "serde-lite")]
-#[cfg_attr(docsrs, doc(cfg(feature = "serde-lite")))]
 impl<T> OnceResource<T, SerdeLite<JsonSerdeCodec>>
 where
 T: Send + Sync + 'static,
@@ -853,7 +846,6 @@ 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,
--- a/leptos_server/src/resource.rs
+++ b/leptos_server/src/resource.rs
@@ -709,7 +709,6 @@ where
 }

 #[cfg(feature = "rkyv")]
-#[cfg_attr(docsrs, doc(cfg(feature = "rkyv")))]
 impl<T> ArcResource<T, RkyvCodec>
 where
    RkyvCodec: Encoder<T> + Decoder<T>,
@@ -1049,7 +1048,6 @@ 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>,
@@ -1107,7 +1105,6 @@ where
 }

 #[cfg(feature = "miniserde")]
-#[cfg_attr(docsrs, doc(cfg(feature = "miniserde")))]
 impl<T> Resource<T, MiniserdeCodec>
 where
    MiniserdeCodec: Encoder<T> + Decoder<T>,
@@ -1167,7 +1164,6 @@ 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>,
@@ -1226,7 +1222,6 @@ where
 }

 #[cfg(feature = "rkyv")]
-#[cfg_attr(docsrs, doc(cfg(feature = "rkyv")))]
 impl<T> Resource<T, RkyvCodec>
 where
    RkyvCodec: Encoder<T> + Decoder<T>,
--- a/leptos_server/src/shared.rs
+++ b/leptos_server/src/shared.rs
@@ -80,7 +80,6 @@ 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>,
@@ -103,7 +102,6 @@ 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>,
@@ -126,7 +124,6 @@ where
 }

 #[cfg(feature = "miniserde")]
-#[cfg_attr(docsrs, doc(cfg(feature = "miniserde")))]
 impl<T> SharedValue<T, MiniserdeCodec>
 where
    MiniserdeCodec: Encoder<T> + Decoder<T>,
@@ -149,7 +146,6 @@ where
 }

 #[cfg(feature = "rkyv")]
-#[cfg_attr(docsrs, doc(cfg(feature = "rkyv")))]
 impl<T> SharedValue<T, RkyvCodec>
 where
    RkyvCodec: Encoder<T> + Decoder<T>,
--- a/reactive_graph/Cargo.toml
+++ b/reactive_graph/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reactive_graph"
-version = "0.2.8"
+version = "0.2.5"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
@@ -27,7 +27,6 @@ async-lock = { workspace = true, default-features = true }
 send_wrapper = { features = [
  "futures",
 ], workspace = true, default-features = true }
-subsecond = { workspace = true, default-features = true, optional = true }
 indexmap = { workspace = true, default-features = true }

 [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
@@ -52,7 +51,6 @@ hydration = ["dep:hydration_context"]
 effects = [
 ] # whether to run effects: should be disabled for something like server rendering
 sandboxed-arenas = []
-subsecond = ["dep:subsecond"]

 [package.metadata.docs.rs]
 all-features = true
--- a/reactive_graph/src/actions/action.rs
+++ b/reactive_graph/src/actions/action.rs
@@ -1,8 +1,7 @@
 use crate::{
-    computed::{ArcMemo, Memo, ScopedFuture},
+    computed::{ArcMemo, Memo},
    diagnostics::is_suppressing_resource_load,
-    graph::untrack,
-    owner::{ArcStoredValue, ArenaItem, Owner},
+    owner::{ArcStoredValue, ArenaItem},
    send_wrapper_ext::SendOption,
    signal::{ArcMappedSignal, ArcRwSignal, MappedSignal, RwSignal},
    traits::{DefinedAt, Dispose, Get, GetUntracked, GetValue, Update, Write},
@@ -200,18 +199,13 @@ 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(owner.with(|| {
-                    ScopedFuture::new_untracked(untrack(|| action_fn(input)))
-                }))
-            }),
+            action_fn: Arc::new(move |input| Box::pin(action_fn(input))),
            #[cfg(any(debug_assertions, leptos_debuginfo))]
            defined_at: Location::caller(),
        }
@@ -376,7 +370,6 @@ 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),
@@ -385,9 +378,7 @@ where
            version: Default::default(),
            dispatched: Default::default(),
            action_fn: Arc::new(move |input| {
-                Box::pin(SendWrapper::new(owner.with(|| {
-                    ScopedFuture::new_untracked(untrack(|| action_fn(input)))
-                })))
+                Box::pin(SendWrapper::new(action_fn(input)))
            }),
            #[cfg(any(debug_assertions, leptos_debuginfo))]
            defined_at: Location::caller(),
--- a/reactive_graph/src/computed/async_derived/arc_async_derived.rs
+++ b/reactive_graph/src/computed/async_derived/arc_async_derived.rs
@@ -521,10 +521,9 @@ impl<T: 'static> ArcAsyncDerived<T> {
    {
        let fun = move || {
            let fut = fun();
-            let fut =
-                ScopedFuture::new_untracked_with_diagnostics(async move {
-                    SendOption::new(Some(fut.await))
-                });
+            let fut = ScopedFuture::new_untracked(async move {
+                SendOption::new(Some(fut.await))
+            });
            #[cfg(feature = "sandboxed-arenas")]
            let fut = Sandboxed::new(fut);
            fut
--- a/reactive_graph/src/computed/async_derived/mod.rs
+++ b/reactive_graph/src/computed/async_derived/mod.rs
@@ -54,55 +54,11 @@ 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
--- a/reactive_graph/src/effect/render_effect.rs
+++ b/reactive_graph/src/effect/render_effect.rs
@@ -9,8 +9,6 @@ use crate::{
 };
 use futures::StreamExt;
 use or_poisoned::OrPoisoned;
-#[cfg(feature = "subsecond")]
-use std::sync::Mutex;
 use std::{
    fmt::Debug,
    future::{Future, IntoFuture},
@@ -51,39 +49,13 @@ impl<T> Debug for RenderEffect<T> {
    }
 }

-#[cfg(feature = "subsecond")]
-type CurrentHotPtr = Box<dyn Fn() -> Option<subsecond::HotFnPtr> + Send + Sync>;
-
 impl<T> RenderEffect<T>
 where
    T: 'static,
 {
    /// Creates a new render effect, which immediately runs `fun`.
    pub fn new(fun: impl FnMut(Option<T>) -> T + 'static) -> Self {
-        #[cfg(feature = "subsecond")]
-        let (hot_fn_ptr, fun) = {
-            let fun = Arc::new(Mutex::new(subsecond::HotFn::current(fun)));
-            (
-                {
-                    let fun = Arc::downgrade(&fun);
-                    let wrapped = send_wrapper::SendWrapper::new(move || {
-                        fun.upgrade()
-                            .map(|n| n.lock().or_poisoned().ptr_address())
-                    });
-                    // it's not redundant, it's due to the SendWrapper deref
-                    #[allow(clippy::redundant_closure)]
-                    Box::new(move || wrapped())
-                },
-                move |prev| fun.lock().or_poisoned().call((prev,)),
-            )
-        };
-
-        Self::new_with_value_erased(
-            Box::new(fun),
-            None,
-            #[cfg(feature = "subsecond")]
-            hot_fn_ptr,
-        )
+        Self::new_with_value_erased(Box::new(fun), None)
    }

    /// Creates a new render effect with an initial value.
@@ -91,30 +63,7 @@ where
        fun: impl FnMut(Option<T>) -> T + 'static,
        initial_value: Option<T>,
    ) -> Self {
-        #[cfg(feature = "subsecond")]
-        let (hot_fn_ptr, fun) = {
-            let fun = Arc::new(Mutex::new(subsecond::HotFn::current(fun)));
-            (
-                {
-                    let fun = Arc::downgrade(&fun);
-                    let wrapped = send_wrapper::SendWrapper::new(move || {
-                        fun.upgrade()
-                            .map(|n| n.lock().or_poisoned().ptr_address())
-                    });
-                    // it's not redundant, it's due to the SendWrapper deref
-                    #[allow(clippy::redundant_closure)]
-                    Box::new(move || wrapped())
-                },
-                move |prev| fun.lock().or_poisoned().call((prev,)),
-            )
-        };
-
-        Self::new_with_value_erased(
-            Box::new(fun),
-            initial_value,
-            #[cfg(feature = "subsecond")]
-            hot_fn_ptr,
-        )
+        Self::new_with_value_erased(Box::new(fun), initial_value)
    }

    /// Creates a new render effect, which immediately runs `fun`.
@@ -122,11 +71,6 @@ where
        fun: impl FnMut(Option<T>) -> T + 'static,
        value: impl IntoFuture<Output = T> + 'static,
    ) -> Self {
-        #[cfg(feature = "subsecond")]
-        let mut fun = subsecond::HotFn::current(fun);
-        #[cfg(feature = "subsecond")]
-        let fun = move |prev| fun.call((prev,));
-
        Self::new_with_async_value_erased(
            Box::new(fun),
            Box::pin(value.into_future()),
@@ -135,13 +79,8 @@ where
    }

    fn new_with_value_erased(
-        #[allow(unused_mut)] mut fun: Box<dyn FnMut(Option<T>) -> T + 'static>,
+        mut fun: Box<dyn FnMut(Option<T>) -> T + 'static>,
        initial_value: Option<T>,
-        // this argument can be used to invalidate individual effects in the future
-        // in present experiments, I have found that it is not actually granular enough to make a difference
-        #[allow(unused)]
-        #[cfg(feature = "subsecond")]
-        hot_fn_ptr: CurrentHotPtr,
    ) -> Self {
        // codegen optimisation:
        fn prep() -> (Owner, Arc<RwLock<EffectInner>>, crate::channel::Receiver)
@@ -165,56 +104,12 @@ where
            let _ = initial_value;
            let _ = owner;
            let _ = &mut rx;
-            let _ = fun;
+            let _ = &mut fun;
        }

        #[cfg(feature = "effects")]
        {
            let subscriber = inner.to_any_subscriber();
-
-            #[cfg(all(feature = "subsecond", debug_assertions))]
-            let mut fun = {
-                use crate::graph::ReactiveNode;
-                use rustc_hash::FxHashMap;
-                use std::sync::{Arc, LazyLock, Mutex};
-                use subsecond::HotFnPtr;
-
-                static HOT_RELOAD_SUBSCRIBERS: LazyLock<
-                    Mutex<FxHashMap<AnySubscriber, (HotFnPtr, CurrentHotPtr)>>,
-                > = LazyLock::new(|| {
-                    subsecond::register_handler(Arc::new(|| {
-                        HOT_RELOAD_SUBSCRIBERS.lock().or_poisoned().retain(
-                            |subscriber, (prev_ptr, hot_fn_ptr)| {
-                                match hot_fn_ptr() {
-                                    None => false,
-                                    Some(curr_hot_ptr) => {
-                                        if curr_hot_ptr != *prev_ptr {
-                                            crate::log_warning(format_args!(
-                                                "{prev_ptr:?} <> \
-                                                 {curr_hot_ptr:?}",
-                                            ));
-                                            *prev_ptr = curr_hot_ptr;
-
-                                            subscriber.mark_dirty();
-                                        }
-                                        true
-                                    }
-                                }
-                            },
-                        );
-                    }));
-                    Default::default()
-                });
-
-                let mut fun = subsecond::HotFn::current(fun);
-                let initial_ptr = hot_fn_ptr().unwrap();
-                HOT_RELOAD_SUBSCRIBERS
-                    .lock()
-                    .or_poisoned()
-                    .insert(subscriber.clone(), (initial_ptr, hot_fn_ptr));
-                move |prev| fun.call((prev,))
-            };
-
            *value.write().or_poisoned() = Some(
                owner.with(|| subscriber.with_observer(|| fun(initial_value))),
            );
@@ -335,11 +230,6 @@ where
    pub fn new_isomorphic(
        fun: impl FnMut(Option<T>) -> T + Send + Sync + 'static,
    ) -> Self {
-        #[cfg(feature = "subsecond")]
-        let mut fun = subsecond::HotFn::current(fun);
-        #[cfg(feature = "subsecond")]
-        let fun = move |prev| fun.call((prev,));
-
        fn erased<T: Send + Sync + 'static>(
            mut fun: Box<dyn FnMut(Option<T>) -> T + Send + Sync + 'static>,
        ) -> RenderEffect<T> {
--- a/reactive_graph/src/owner.rs
+++ b/reactive_graph/src/owner.rs
@@ -209,25 +209,6 @@ impl Owner {
        this
    }

-    /// Returns the parent of this `Owner`, if any.
-    ///
-    /// None when:
-    /// - This is a root owner
-    /// - The parent has been dropped
-    pub fn parent(&self) -> Option<Owner> {
-        self.inner
-            .read()
-            .or_poisoned()
-            .parent
-            .as_ref()
-            .and_then(|p| p.upgrade())
-            .map(|inner| Owner {
-                inner,
-                #[cfg(feature = "hydration")]
-                shared_context: self.shared_context.clone(),
-            })
-    }
-
    /// Creates a new `Owner` that is the child of the current `Owner`, if any.
    pub fn child(&self) -> Self {
        let parent = Some(Arc::downgrade(&self.inner));
--- a/reactive_graph/src/wrappers.rs
+++ b/reactive_graph/src/wrappers.rs
@@ -257,20 +257,6 @@ 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 {
@@ -282,20 +268,6 @@ 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>,
@@ -310,20 +282,6 @@ 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>,
--- a/reactive_stores_macro/Cargo.toml
+++ b/reactive_stores_macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reactive_stores_macro"
-version = "0.2.6"
+version = "0.2.5"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
--- a/router/Cargo.toml
+++ b/router/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leptos_router"
-version = "0.8.8"
+version = "0.8.5"
 authors = ["Greg Johnston", "Ben Wishovich"]
 license = "MIT"
 readme = "../README.md"
--- a/router/src/location/history.rs
+++ b/router/src/location/history.rs
@@ -185,15 +185,11 @@ impl LocationProvider for BrowserUrl {
            let is_back = self.is_back.clone();
            move || match Self::current() {
                Ok(new_url) => {
-                    let mut stack = path_stack.write_value();
+                    let stack = path_stack.read_value();
                    let is_navigating_back = stack.len() == 1
                        || (stack.len() >= 2
                            && stack.get(stack.len() - 2) == Some(&new_url));

-                    if is_navigating_back {
-                        stack.pop();
-                    }
-
                    is_back.set(is_navigating_back);

                    url.set(new_url);
@@ -225,13 +221,6 @@ 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(
@@ -240,7 +229,7 @@ impl LocationProvider for BrowserUrl {
                    Some(&loc.value),
                )
                .unwrap();
-        } else if add_to_stack {
+        } else {
            // push the "forward direction" marker
            let state = &loc.state.to_js_value();
            history
@@ -251,9 +240,7 @@ 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() {
-            if add_to_stack {
-                self.path_stack.write_value().push(url);
-            }
+            self.path_stack.write_value().push(url);
            self.is_back.set(false);
        }

--- a/router/src/nested_router.rs
+++ b/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, Write},
+    traits::{Get, GetUntracked, Notify, ReadUntracked, Set, Track},
    transition::AsyncTransition,
    wrappers::write::SignalSetter,
 };
@@ -119,7 +119,6 @@ where
                    base,
                    &mut loaders,
                    &mut outlets,
-                    &outer_owner,
                );
                drop(url);

@@ -160,14 +159,13 @@ 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.write_untracked() = url_snapshot;
+        state.current_url.set(url_snapshot);

        match new_match {
            None => {
@@ -194,7 +192,6 @@ where
                    &mut state.outlets,
                    self.set_is_routing.is_some(),
                    0,
-                    &self.outer_owner,
                );

                let (abort_handle, abort_registration) =
@@ -372,7 +369,6 @@ where
                        base,
                        &mut loaders,
                        &mut outlets,
-                        &outer_owner,
                    );

                    // outlets will not send their views if the loaders are never polled
@@ -426,16 +422,8 @@ 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
@@ -487,7 +475,6 @@ where
                        base,
                        &mut loaders,
                        &mut outlets,
-                        &outer_owner,
                    );
                    drop(url);

@@ -543,7 +530,6 @@ where
                        base,
                        &mut loaders,
                        &mut outlets,
-                        &outer_owner,
                    );
                    drop(url);

@@ -580,7 +566,6 @@ pub(crate) struct RouteContext {
    base: Option<Oco<'static, str>>,
    view_fn: Arc<Mutex<OutletViewFn>>,
    owner: Arc<Mutex<Option<Owner>>>,
-    preload_owner: Owner,
    child: ChildRoute,
 }

@@ -612,7 +597,6 @@ 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(),
        }
    }
 }
@@ -624,7 +608,6 @@ 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)]
@@ -638,7 +621,6 @@ trait AddNestedRoute {
        outlets: &mut Vec<RouteContext>,
        set_is_routing: bool,
        level: u8,
-        outer_owner: &Owner,
    ) -> u8;
 }

@@ -652,7 +634,6 @@ 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;

@@ -720,7 +701,6 @@ 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);
@@ -745,15 +725,7 @@ where
                provide_context(params.clone());
                provide_context(url.clone());
                provide_context(matched.clone());
-                outlet
-                    .preload_owner
-                    .with(|| {
-                        provide_context(params.clone());
-                        provide_context(url.clone());
-                        provide_context(matched.clone());
-                        ScopedFuture::new(view.preload())
-                    })
-                    .await;
+                view.preload().await;
                let child = outlet.child.clone();
                *view_fn.lock().or_poisoned() =
                    Box::new(move |owner_where_used| {
@@ -800,13 +772,7 @@ 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,
-                outer_owner,
-            );
+            child.build_nested_route(orig_url, base, loaders, outlets);
        }
    }

@@ -821,7 +787,6 @@ where
        outlets: &mut Vec<RouteContext>,
        set_is_routing: bool,
        level: u8,
-        outer_owner: &Owner,
    ) -> u8 {
        let (parent_params, parent_matches): (Vec<_>, Vec<_>) = outlets
            .iter()
@@ -838,13 +803,7 @@ 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,
-                    outer_owner,
-                );
+                self.build_nested_route(url, base, preloaders, outlets);
                level
            }
            Some(current) => {
@@ -884,10 +843,6 @@ 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();
@@ -930,26 +885,11 @@ where
                        let child = outlet.child.clone();
                        async move {
                            let child = child.clone();
-                            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;
+                            if set_is_routing {
+                                AsyncTransition::run(|| view.preload()).await;
+                            } else {
+                                view.preload().await;
+                            }
                            *view_fn.lock().or_poisoned() =
                                Box::new(move |owner_where_used| {
                                    let prev_owner = route_owner
@@ -998,7 +938,6 @@ where
                            drop(old_params);
                            drop(old_url);
                            drop(old_matched);
-                            drop(old_preload_owner);
                            trigger
                        }
                    })));
@@ -1009,13 +948,8 @@ 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,
-                            outer_owner,
-                        );
+                        child
+                            .build_nested_route(url, base, preloaders, outlets);
                    } else {
                        *outlets[*items].child.0.lock().or_poisoned() = None;
                    }
@@ -1039,7 +973,6 @@ where
                        outlets,
                        set_is_routing,
                        level + 1,
-                        outer_owner,
                    )
                } else {
                    *current.child.0.lock().or_poisoned() = None;
--- a/server_fn/Cargo.toml
+++ b/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.7"
+version = "0.8.5"
 rust-version.workspace = true
 edition.workspace = true

--- a/server_fn/src/lib.rs
+++ b/server_fn/src/lib.rs
@@ -307,20 +307,24 @@ 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()
-                            );
-                        let content_type =
-                    <Self::Error as FromServerFnError>::Encoder::CONTENT_TYPE;
-                        response.content_type(content_type);
-                        (response, Some(e))
+                            ),
+                            Some(e),
+                        )
                    });

+            if err.is_some() {
+                res.set_content_type(
+                    <<Self::Error as FromServerFnError>::Encoder>::CONTENT_TYPE,
+                );
+            }
+
            // if it accepts HTML, we'll redirect to the Referer
            #[cfg(feature = "form-redirects")]
            if accepts_html {
--- a/server_fn/src/middleware/mod.rs
+++ b/server_fn/src/middleware/mod.rs
@@ -72,10 +72,8 @@ 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.
+                    // TODO: this needs to set the Content-Type correctly depending on the error type
+                    // note that this only applies to middleware errors
                    let err =
                        ser(ServerFnErrorErr::MiddlewareError(e.to_string()));
                    Response::<Body>::error_response(&path, err)
@@ -153,10 +151,8 @@ 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.
+                    // TODO: this needs to set the Content-Type correctly depending on the error type
+                    // note that this only applies to middleware errors
                    let err =
                        ser(ServerFnErrorErr::MiddlewareError(e.to_string()));
                    ActixResponse::error_response(&path, err).take()
--- a/server_fn/src/response/actix.rs
+++ b/server_fn/src/response/actix.rs
@@ -4,8 +4,7 @@ use crate::error::{
 };
 use actix_web::{
    http::{
-        header,
-        header::{HeaderValue, CONTENT_TYPE, LOCATION},
+        header::{self, HeaderValue, CONTENT_TYPE, LOCATION},
        StatusCode,
    },
    HttpResponse,
@@ -80,10 +79,10 @@ 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 set_content_type(&mut self, content_type: &str) {
+        self.0
+            .headers_mut()
+            .append(CONTENT_TYPE, HeaderValue::from_str(content_type).unwrap());
    }

    fn redirect(&mut self, path: &str) {
--- a/server_fn/src/response/generic.rs
+++ b/server_fn/src/response/generic.rs
@@ -19,7 +19,10 @@ use crate::error::{
 };
 use bytes::Bytes;
 use futures::{Stream, TryStreamExt};
-use http::{header, HeaderValue, Response, StatusCode};
+use http::{
+    header::{self, CONTENT_TYPE},
+    HeaderValue, Response, StatusCode,
+};
 use std::pin::Pin;
 use throw_error::Error;

@@ -100,11 +103,9 @@ 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 set_content_type(&mut self, content_type: &str) {
+        self.headers_mut()
+            .append(CONTENT_TYPE, HeaderValue::from_str(content_type).unwrap());
    }

    fn redirect(&mut self, path: &str) {
--- a/server_fn/src/response/http.rs
+++ b/server_fn/src/response/http.rs
@@ -6,7 +6,10 @@ use crate::error::{
 use axum::body::Body;
 use bytes::Bytes;
 use futures::{Stream, TryStreamExt};
-use http::{header, HeaderValue, Response, StatusCode};
+use http::{
+    header::{self, CONTENT_TYPE},
+    HeaderValue, Response, StatusCode,
+};

 impl<E> TryRes<E> for Response<Body>
 where
@@ -60,11 +63,9 @@ 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 set_content_type(&mut self, content_type: &str) {
+        self.headers_mut()
+            .append(CONTENT_TYPE, HeaderValue::from_str(content_type).unwrap());
    }

    fn redirect(&mut self, path: &str) {
--- a/server_fn/src/response/mod.rs
+++ b/server_fn/src/response/mod.rs
@@ -39,12 +39,14 @@ where
 pub trait Res {
    /// 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.
+
+    /// Sets the `Content-Type` header on the response.
+    fn set_content_type(&mut self, content_type: &str) {
+        // TODO 0.9: remove this method and default implementation
+        // it is included here to make this change non-breaking
+        _ = content_type;
    }
+
    /// Redirect the response by setting a 302 code and Location header.
    fn redirect(&mut self, path: &str);
 }
@@ -108,7 +110,8 @@ impl Res for BrowserMockRes {
        unreachable!()
    }

-    fn content_type(&mut self, _content_type: &str) {
+    fn set_content_type(&mut self, content_type: &str) {
+        _ = content_type;
        unreachable!()
    }

--- a/server_fn_macro/Cargo.toml
+++ b/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.7"
+version = "0.8.6"
 edition.workspace = true

 [dependencies]
--- a/tachys/Cargo.toml
+++ b/tachys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tachys"
-version = "0.2.9"
+version = "0.2.6"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
--- a/tachys/src/html/attribute/any_attribute.rs
+++ b/tachys/src/html/attribute/any_attribute.rs
@@ -1,10 +1,6 @@
 use super::{Attribute, NextAttribute};
-use crate::{
-    erased::{Erased, ErasedLocal},
-    html::attribute::NamedAttributeKey,
-    renderer::{dom::Element, Rndr},
-};
-use std::{any::TypeId, fmt::Debug, mem};
+use crate::erased::{Erased, ErasedLocal};
+use std::{any::TypeId, fmt::Debug};
 #[cfg(feature = "ssr")]
 use std::{future::Future, pin::Pin};

@@ -29,7 +25,6 @@ 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 {
@@ -49,7 +44,6 @@ pub struct AnyAttributeState {
    type_id: TypeId,
    state: ErasedLocal,
    el: crate::renderer::types::Element,
-    keys: Vec<NamedAttributeKey>,
 }

 /// Converts an [`Attribute`] into [`AnyAttribute`].
@@ -90,7 +84,6 @@ where
        ) -> AnyAttributeState {
            AnyAttributeState {
                type_id: TypeId::of::<T>(),
-                keys: value.get_ref::<T>().keys(),
                state: ErasedLocal::new(value.into_inner::<T>().build(&el)),
                el,
            }
@@ -103,7 +96,6 @@ where
        ) -> AnyAttributeState {
            AnyAttributeState {
                type_id: TypeId::of::<T>(),
-                keys: value.get_ref::<T>().keys(),
                state: ErasedLocal::new(
                    value.into_inner::<T>().hydrate::<true>(&el),
                ),
@@ -118,7 +110,6 @@ where
        ) -> AnyAttributeState {
            AnyAttributeState {
                type_id: TypeId::of::<T>(),
-                keys: value.get_ref::<T>().keys(),
                state: ErasedLocal::new(
                    value.into_inner::<T>().hydrate::<true>(&el),
                ),
@@ -149,12 +140,6 @@ 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>(),
@@ -173,7 +158,6 @@ where
            resolve: resolve::<T::CloneableOwned>,
            #[cfg(feature = "ssr")]
            dry_resolve: dry_resolve::<T::CloneableOwned>,
-            keys: keys::<T::CloneableOwned>,
        }
    }
 }
@@ -284,10 +268,6 @@ impl Attribute for AnyAttribute {
             enabled."
        );
    }
-
-    fn keys(&self) -> Vec<NamedAttributeKey> {
-        (self.keys)(&self.value)
-    }
 }

 impl NextAttribute for Vec<AnyAttribute> {
@@ -306,7 +286,7 @@ impl Attribute for Vec<AnyAttribute> {
    const MIN_LENGTH: usize = 0;

    type AsyncOutput = Vec<AnyAttribute>;
-    type State = (Element, Vec<AnyAttributeState>);
+    type State = Vec<AnyAttributeState>;
    type Cloneable = Vec<AnyAttribute>;
    type CloneableOwned = Vec<AnyAttribute>;

@@ -341,19 +321,13 @@ impl Attribute for Vec<AnyAttribute> {
    ) -> Self::State {
        #[cfg(feature = "hydrate")]
        if FROM_SERVER {
-            (
-                el.clone(),
-                self.into_iter()
-                    .map(|attr| attr.hydrate::<true>(el))
-                    .collect(),
-            )
+            self.into_iter()
+                .map(|attr| attr.hydrate::<true>(el))
+                .collect()
        } else {
-            (
-                el.clone(),
-                self.into_iter()
-                    .map(|attr| attr.hydrate::<false>(el))
-                    .collect(),
-            )
+            self.into_iter()
+                .map(|attr| attr.hydrate::<false>(el))
+                .collect()
        }
        #[cfg(not(feature = "hydrate"))]
        {
@@ -366,34 +340,13 @@ impl Attribute for Vec<AnyAttribute> {
    }

    fn build(self, el: &crate::renderer::types::Element) -> Self::State {
-        (
-            el.clone(),
-            self.into_iter().map(|attr| attr.build(el)).collect(),
-        )
+        self.into_iter().map(|attr| attr.build(el)).collect()
    }

    fn rebuild(self, state: &mut Self::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);
-                    }
-                }
-            }
+        for (attr, state) in self.into_iter().zip(state.iter_mut()) {
+            attr.rebuild(state)
        }
-        *state = self.into_iter().map(|s| s.build(el)).collect();
    }

    fn into_cloneable(self) -> Self::Cloneable {
@@ -432,8 +385,4 @@ impl Attribute for Vec<AnyAttribute> {
             enabled."
        );
    }
-
-    fn keys(&self) -> Vec<NamedAttributeKey> {
-        self.iter().flat_map(|s| s.keys()).collect()
-    }
 }
--- a/tachys/src/html/attribute/custom.rs
+++ b/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, NamedAttributeKey,
+        AttributeValue,
    },
    view::{add_attr::AddAnyAttr, Position, ToTemplate},
 };
@@ -112,12 +112,6 @@ 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>
--- a/tachys/src/html/attribute/global.rs
+++ b/tachys/src/html/attribute/global.rs
@@ -205,14 +205,6 @@ where
        self.add_any_attr(enterkeyhint(value))
    }

-    /// The `exportparts` attribute enables the sharing of parts of an element's shadow DOM with a containing document.
-    fn exportparts(
-        self,
-        value: V,
-    ) -> <Self as AddAnyAttr>::Output<Attr<Exportparts, V>> {
-        self.add_any_attr(exportparts(value))
-    }
-
    /// The `hidden` global attribute is a Boolean attribute indicating that the element is not yet, or is no longer, relevant.
    fn hidden(self, value: V) -> <Self as AddAnyAttr>::Output<Attr<Hidden, V>> {
        self.add_any_attr(hidden(value))
--- a/tachys/src/html/attribute/mod.rs
+++ b/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::{borrow::Cow, fmt::Debug, future::Future};
+use std::{fmt::Debug, future::Future};
 pub use value::*;

 /// Defines an attribute: anything that can modify an element.
@@ -75,25 +75,6 @@ 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.
@@ -152,10 +133,6 @@ impl Attribute for () {
    fn dry_resolve(&mut self) {}

    async fn resolve(self) -> Self::AsyncOutput {}
-
-    fn keys(&self) -> Vec<NamedAttributeKey> {
-        vec![]
-    }
 }

 impl NextAttribute for () {
@@ -272,10 +249,6 @@ 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>
@@ -380,14 +353,6 @@ 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,)*)
@@ -497,14 +462,6 @@ 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,)*)
@@ -581,10 +538,6 @@ where
    async fn resolve(self) -> Self::AsyncOutput {
        (self.0.resolve().await,)
    }
-
-    fn keys(&self) -> Vec<NamedAttributeKey> {
-        self.0.keys()
-    }
 }

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

 impl<C> NextAttribute for Class<C>
--- a/tachys/src/html/directive.rs
+++ b/tachys/src/html/directive.rs
@@ -3,9 +3,7 @@ use super::attribute::{
    NextAttribute,
 };
 use crate::{
-    html::attribute::{
-        maybe_next_attr_erasure_macros::next_attr_combine, NamedAttributeKey,
-    },
+    html::attribute::maybe_next_attr_erasure_macros::next_attr_combine,
    prelude::AddAnyAttr,
    view::{Position, ToTemplate},
 };
@@ -162,10 +160,6 @@ where
    async fn resolve(self) -> Self::AsyncOutput {
        self
    }
-
-    fn keys(&self) -> Vec<NamedAttributeKey> {
-        vec![]
-    }
 }

 impl<T, D, P> NextAttribute for Directive<T, D, P>
--- a/tachys/src/html/element/elements.rs
+++ b/tachys/src/html/element/elements.rs
@@ -212,7 +212,7 @@ html_self_closing_elements! {
    /// The `<img>` HTML element embeds an image into the document.
    img HtmlImageElement [alt, attributionsrc, crossorigin, decoding, elementtiming, fetchpriority, height, ismap, loading, referrerpolicy, sizes, src, srcset, usemap, width] true,
    /// The `<input>` HTML element is used to create interactive controls for web-based forms in order to accept data from the user; a wide variety of types of input data and control widgets are available, depending on the device and user agent. The `<input>` element is one of the most powerful and complex in all of HTML due to the sheer number of combinations of input types and attributes.
-    input HtmlInputElement [accept, alt, autocomplete, capture, checked, dirname, disabled, form, formaction, formenctype, formmethod, formnovalidate, formtarget, height, list, max, maxlength, min, minlength, multiple, name, pattern, placeholder, popovertarget, popovertargetaction, readonly, required, size, src, step, r#type, value, width] true,
+    input HtmlInputElement [accept, alt, autocomplete, capture, checked, disabled, form, formaction, formenctype, formmethod, formnovalidate, formtarget, height, list, max, maxlength, min, minlength, multiple, name, pattern, placeholder, popovertarget, popovertargetaction, readonly, required, size, src, step, r#type, value, width] true,
    ///	The `<link>` HTML element specifies relationships between the current document and an external resource. This element is most commonly used to link to CSS, but is also used to establish site icons (both "favicon" style icons and icons for the home screen and apps on mobile devices) among other things.
    link HtmlLinkElement [r#as, blocking, crossorigin, fetchpriority, href, hreflang, imagesizes, imagesrcset, integrity, media, rel, referrerpolicy, sizes, r#type] true,
    ///	The `<meta>` HTML element represents Metadata that cannot be represented by other HTML meta-related elements, like base, link, script, style or title.
@@ -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, referrerpolicy, rel, target, r#type ] true,
+    a HtmlAnchorElement [download, href, hreflang, ping, 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.
--- a/tachys/src/html/element/inner_html.rs
+++ b/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, NamedAttributeKey, NextAttribute,
+        Attribute, NextAttribute,
    },
    renderer::Rndr,
    view::add_attr::AddAnyAttr,
@@ -105,10 +105,6 @@ where
            value: self.value.resolve().await,
        }
    }
-
-    fn keys(&self) -> Vec<NamedAttributeKey> {
-        vec![NamedAttributeKey::InnerHtml]
-    }
 }

 impl<T> NextAttribute for InnerHtml<T>
--- a/tachys/src/html/element/mod.rs
+++ b/tachys/src/html/element/mod.rs
@@ -329,8 +329,6 @@ 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 {
@@ -339,6 +337,8 @@ where
            Some(children)
        };

+        let attrs = self.attributes.build(&el);
+
        ElementState {
            el,
            attrs,
--- a/tachys/src/html/event.rs
+++ b/tachys/src/html/event.rs
@@ -1,7 +1,6 @@
 use crate::{
    html::attribute::{
        maybe_next_attr_erasure_macros::next_attr_combine, Attribute,
-        NamedAttributeKey,
    },
    renderer::{CastFrom, RemoveEventHandler, Rndr},
    view::{Position, ToTemplate},
@@ -111,8 +110,6 @@ where
 {
    On {
        event,
-        #[cfg(feature = "reactive_graph")]
-        owner: reactive_graph::owner::Owner::current().unwrap_or_default(),
        cb: Some(SendWrapper::new(cb)),
    }
 }
@@ -138,8 +135,6 @@ 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>>,
 }

@@ -151,8 +146,6 @@ where
    fn clone(&self) -> Self {
        Self {
            event: self.event.clone(),
-            #[cfg(feature = "reactive_graph")]
-            owner: self.owner.clone(),
            cb: self.cb.clone(),
        }
    }
@@ -200,10 +193,6 @@ 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)>;

@@ -243,10 +232,6 @@ 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)>;

@@ -323,9 +308,7 @@ where
    fn rebuild(self, state: &mut Self::State) {
        let (el, prev_cleanup) = state;
        if let Some(prev) = prev_cleanup.take() {
-            if let Some(remove) = prev.into_inner() {
-                remove();
-            }
+            (prev.into_inner())(el);
        }
        *prev_cleanup = Some(if E::CAPTURE {
            self.attach_capture(el)
@@ -337,8 +320,6 @@ 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,
        }
    }
@@ -346,8 +327,6 @@ 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,
        }
    }
@@ -363,10 +342,6 @@ where
    async fn resolve(self) -> Self::AsyncOutput {
        self
    }
-
-    fn keys(&self) -> Vec<NamedAttributeKey> {
-        vec![]
-    }
 }

 impl<E, F> NextAttribute for On<E, F>
--- a/tachys/src/html/node_ref.rs
+++ b/tachys/src/html/node_ref.rs
@@ -7,10 +7,7 @@ use super::{
 };
 use crate::{
    html::{
-        attribute::{
-            maybe_next_attr_erasure_macros::next_attr_combine,
-            NamedAttributeKey,
-        },
+        attribute::maybe_next_attr_erasure_macros::next_attr_combine,
        element::HtmlElement,
    },
    prelude::Render,
@@ -115,10 +112,6 @@ where
    async fn resolve(self) -> Self::AsyncOutput {
        self
    }
-
-    fn keys(&self) -> Vec<NamedAttributeKey> {
-        vec![]
-    }
 }

 impl<E, C> NextAttribute for NodeRefAttr<E, C>
--- a/tachys/src/html/property.rs
+++ b/tachys/src/html/property.rs
@@ -3,9 +3,7 @@ use super::attribute::{
    NextAttribute,
 };
 use crate::{
-    html::attribute::{
-        maybe_next_attr_erasure_macros::next_attr_combine, NamedAttributeKey,
-    },
+    html::attribute::maybe_next_attr_erasure_macros::next_attr_combine,
    renderer::Rndr,
    view::{Position, ToTemplate},
 };
@@ -126,12 +124,6 @@ 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>
@@ -210,7 +202,7 @@ macro_rules! prop_type {
                key: &str,
            ) -> Self::State {
                let value = self.into();
-                Rndr::set_property_or_value(el, key, &value);
+                Rndr::set_property(el, key, &value);
                (el.clone(), value)
            }

@@ -220,14 +212,14 @@ macro_rules! prop_type {
                key: &str,
            ) -> Self::State {
                let value = self.into();
-                Rndr::set_property_or_value(el, key, &value);
+                Rndr::set_property(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_or_value(el, key, &value);
+                Rndr::set_property(el, key, &value);
                *prev = value;
            }

@@ -253,7 +245,7 @@ macro_rules! prop_type {
                let was_some = self.is_some();
                let value = self.into();
                if was_some {
-                    Rndr::set_property_or_value(el, key, &value);
+                    Rndr::set_property(el, key, &value);
                }
                (el.clone(), value)
            }
@@ -266,7 +258,7 @@ macro_rules! prop_type {
                let was_some = self.is_some();
                let value = self.into();
                if was_some {
-                    Rndr::set_property_or_value(el, key, &value);
+                    Rndr::set_property(el, key, &value);
                }
                (el.clone(), value)
            }
@@ -274,7 +266,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_or_value(el, key, &value);
+                Rndr::set_property(el, key, &value);
                *prev = value;
            }

@@ -302,7 +294,7 @@ macro_rules! prop_type_str {
                key: &str,
            ) -> Self::State {
                let value = JsValue::from(&*self);
-                Rndr::set_property_or_value(el, key, &value);
+                Rndr::set_property(el, key, &value);
                (el.clone(), value)
            }

@@ -312,14 +304,14 @@ macro_rules! prop_type_str {
                key: &str,
            ) -> Self::State {
                let value = JsValue::from(&*self);
-                Rndr::set_property_or_value(el, key, &value);
+                Rndr::set_property(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_or_value(el, key, &value);
+                Rndr::set_property(el, key, &value);
                *prev = value;
            }

@@ -347,7 +339,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_or_value(el, key, &value);
+                    Rndr::set_property(el, key, &value);
                }
                (el.clone(), value)
            }
@@ -360,7 +352,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_or_value(el, key, &value);
+                    Rndr::set_property(el, key, &value);
                }
                (el.clone(), value)
            }
@@ -368,7 +360,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_or_value(el, key, &value);
+                Rndr::set_property(el, key, &value);
                *prev = value;
            }

@@ -400,7 +392,7 @@ impl IntoProperty for Arc<str> {
        key: &str,
    ) -> Self::State {
        let value = JsValue::from_str(self.as_ref());
-        Rndr::set_property_or_value(el, key, &value);
+        Rndr::set_property(el, key, &value);
        (el.clone(), value)
    }

@@ -410,14 +402,14 @@ impl IntoProperty for Arc<str> {
        key: &str,
    ) -> Self::State {
        let value = JsValue::from_str(self.as_ref());
-        Rndr::set_property_or_value(el, key, &value);
+        Rndr::set_property(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_or_value(el, key, &value);
+        Rndr::set_property(el, key, &value);
        *prev = value;
    }

@@ -443,7 +435,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_or_value(el, key, &value);
+            Rndr::set_property(el, key, &value);
        }
        (el.clone(), value)
    }
@@ -456,7 +448,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_or_value(el, key, &value);
+            Rndr::set_property(el, key, &value);
        }
        (el.clone(), value)
    }
@@ -464,7 +456,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_or_value(el, key, &value);
+        Rndr::set_property(el, key, &value);
        *prev = value;
    }

--- a/tachys/src/html/style.rs
+++ b/tachys/src/html/style.rs
@@ -5,9 +5,7 @@ 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, NamedAttributeKey,
-    },
+    html::attribute::maybe_next_attr_erasure_macros::next_attr_combine,
    renderer::{dom::CssStyleDeclaration, Rndr},
    view::{Position, ToTemplate},
 };
@@ -102,10 +100,6 @@ where
            style: self.style.resolve().await,
        }
    }
-
-    fn keys(&self) -> Vec<NamedAttributeKey> {
-        vec![NamedAttributeKey::Attribute("style".into())]
-    }
 }

 impl<S> NextAttribute for Style<S>
--- a/tachys/src/lib.rs
+++ b/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.
--- a/tachys/src/oco.rs
+++ b/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_or_value(el, key, &value);
+        Rndr::set_property(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_or_value(el, key, &value);
+        Rndr::set_property(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_or_value(el, key, &value);
+        Rndr::set_property(el, key, &value);
        *prev = value;
    }

--- a/tachys/src/reactive_graph/bind.rs
+++ b/tachys/src/reactive_graph/bind.rs
@@ -5,8 +5,7 @@ use crate::{
            maybe_next_attr_erasure_macros::{
                next_attr_combine, next_attr_output_type,
            },
-            Attribute, AttributeKey, AttributeValue, NamedAttributeKey,
-            NextAttribute,
+            Attribute, AttributeKey, AttributeValue, NextAttribute,
        },
        event::{change, input, on},
        property::{prop, IntoProperty},
@@ -258,9 +257,7 @@ where
        prop(self.key(), signal).rebuild(attr_state);

        if let Some(prev) = prev_cleanup.take() {
-            if let Some(remove) = prev.into_inner() {
-                remove();
-            }
+            (prev.into_inner())(el);
        }
        *prev_cleanup = Some(self.attach(el));
    }
@@ -278,10 +275,6 @@ 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>
--- a/tachys/src/renderer/dom.rs
+++ b/tachys/src/renderer/dom.rs
@@ -36,46 +36,6 @@ 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)
@@ -251,20 +211,6 @@ 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(
@@ -296,20 +242,19 @@ 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(move || {
+            let cb = send_wrapper::SendWrapper::new(cb);
+            move |el: &Element| {
                or_debug!(
                    el.remove_event_listener_with_callback(
                        intern(&name),
                        cb.as_ref().unchecked_ref()
                    ),
-                    &el,
+                    el,
                    "removeEventListener"
                )
-            });
-            move || cb()
+            }
        })
    }

@@ -335,21 +280,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(move || {
+            let cb = send_wrapper::SendWrapper::new(cb);
+            move |el: &Element| {
                or_debug!(
                    el.remove_event_listener_with_callback_and_bool(
                        intern(&name),
                        cb.as_ref().unchecked_ref(),
                        true
                    ),
-                    &el,
+                    el,
                    "removeEventListener"
                )
-            });
-            move || cb()
+            }
        })
    }

@@ -450,19 +394,17 @@ 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 el_cb = send_wrapper::SendWrapper::new((el, cb));
-            move || {
-                let (el, cb) = el_cb.take();
-                drop(cb);
+            let cb = send_wrapper::SendWrapper::new(cb);
+            move |el: &Element| {
+                drop(cb.take());
                or_debug!(
                    js_sys::Reflect::delete_property(
-                        &el,
+                        el,
                        &JsValue::from_str(&key)
                    ),
-                    &el,
+                    el,
                    "delete property"
                );
            }
--- a/tachys/src/renderer/mod.rs
+++ b/tachys/src/renderer/mod.rs
@@ -1,5 +1,5 @@
 use crate::view::{Mountable, ToTemplate};
-use std::{borrow::Cow, fmt::Debug, marker::PhantomData};
+use std::{borrow::Cow, fmt::Debug};
 use wasm_bindgen::JsValue;

 /// A DOM renderer.
@@ -120,33 +120,16 @@ 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."]
-#[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>,
-);
+pub struct RemoveEventHandler<T>(Box<dyn FnOnce(&T) + Send + Sync>);

 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() + Send + Sync + 'static) -> Self {
-        Self(Some(Box::new(remove)), PhantomData)
+    pub(crate) fn new(remove: impl FnOnce(&T) + Send + Sync + 'static) -> Self {
+        Self(Box::new(remove))
    }

-    #[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()
-        }
+    pub(crate) fn into_inner(self) -> Box<dyn FnOnce(&T) + Send + Sync> {
+        self.0
    }
 }

--- a/tachys/src/ssr/mod.rs
+++ b/tachys/src/ssr/mod.rs
@@ -378,91 +378,83 @@ impl Stream for StreamBuilder {
            let next_chunk = this.chunks.pop_front();
            match next_chunk {
                None => {
-                    if this.pending_ooo.is_empty() {
-                        if this.sync_buf.is_empty() {
-                            Poll::Ready(None)
-                        } else {
-                            Poll::Ready(Some(mem::take(&mut this.sync_buf)))
-                        }
-                    } else {
-                        // check if *any* pending out-of-order chunk is ready
-                        for mut chunk in mem::take(&mut this.pending_ooo) {
-                            match chunk.as_mut().poll(cx) {
-                                Poll::Ready(OooChunk {
-                                    id,
-                                    chunks,
-                                    replace,
-                                    nonce,
-                                }) => {
-                                    let opening = format!("<!--s-{id}o-->");
-                                    let placeholder_at =
-                                        this.sync_buf.find(&opening);
-                                    if let Some(start) = placeholder_at {
-                                        let closing = format!("<!--s-{id}c-->");
-                                        let end = this
-                                            .sync_buf
-                                            .find(&closing)
-                                            .unwrap();
-                                        let chunks_iter =
-                                            chunks.into_iter().rev();
+                    // now, handle out-of-order chunks
+                    if let Some(mut pending) = this.pending_ooo.pop_front() {
+                        match pending.as_mut().poll(cx) {
+                            Poll::Ready(OooChunk {
+                                id,
+                                chunks,
+                                replace,
+                                nonce,
+                            }) => {
+                                let opening = format!("<!--s-{id}o-->");
+                                let placeholder_at =
+                                    this.sync_buf.find(&opening);
+                                if let Some(start) = placeholder_at {
+                                    let closing = format!("<!--s-{id}c-->");
+                                    let end =
+                                        this.sync_buf.find(&closing).unwrap();
+                                    let chunks_iter = chunks.into_iter().rev();

-                                        // TODO can probably make this more efficient
-                                        let (before, replaced) =
-                                            this.sync_buf.split_at(start);
-                                        let (_, after) = replaced.split_at(
-                                            end - start + closing.len(),
-                                        );
-                                        let mut buf = String::new();
-                                        buf.push_str(before);
+                                    // TODO can probably make this more efficient
+                                    let (before, replaced) =
+                                        this.sync_buf.split_at(start);
+                                    let (_, after) = replaced
+                                        .split_at(end - start + closing.len());
+                                    let mut buf = String::new();
+                                    buf.push_str(before);

-                                        let mut held_chunks = VecDeque::new();
-                                        for chunk in chunks_iter {
-                                            if let StreamChunk::Sync(ready) =
-                                                chunk
-                                            {
-                                                buf.push_str(&ready);
-                                            } else {
-                                                held_chunks.push_front(chunk);
-                                            }
+                                    let mut held_chunks = VecDeque::new();
+                                    for chunk in chunks_iter {
+                                        if let StreamChunk::Sync(ready) = chunk
+                                        {
+                                            buf.push_str(&ready);
+                                        } else {
+                                            held_chunks.push_front(chunk);
                                        }
-                                        buf.push_str(after);
-                                        this.sync_buf = buf;
-                                        for chunk in held_chunks {
+                                    }
+                                    buf.push_str(after);
+                                    this.sync_buf = buf;
+                                    for chunk in held_chunks {
+                                        this.chunks.push_front(chunk);
+                                    }
+                                } else {
+                                    OooChunk::push_start(
+                                        &id,
+                                        &mut this.sync_buf,
+                                    );
+                                    for chunk in chunks.into_iter().rev() {
+                                        if let StreamChunk::Sync(ready) = chunk
+                                        {
+                                            this.sync_buf.push_str(&ready);
+                                        } else {
                                            this.chunks.push_front(chunk);
                                        }
-                                    } else {
-                                        OooChunk::push_start(
-                                            &id,
-                                            &mut this.sync_buf,
-                                        );
-                                        for chunk in chunks.into_iter().rev() {
-                                            if let StreamChunk::Sync(ready) =
-                                                chunk
-                                            {
-                                                this.sync_buf.push_str(&ready);
-                                            } else {
-                                                this.chunks.push_front(chunk);
-                                            }
-                                        }
-                                        OooChunk::push_end_with_nonce(
-                                            replace,
-                                            &id,
-                                            &mut this.sync_buf,
-                                            nonce.as_deref(),
-                                        );
                                    }
+                                    OooChunk::push_end_with_nonce(
+                                        replace,
+                                        &id,
+                                        &mut this.sync_buf,
+                                        nonce.as_deref(),
+                                    );
                                }
-                                Poll::Pending => {
-                                    this.pending_ooo.push_back(chunk);
+                                self.poll_next(cx)
+                            }
+                            Poll::Pending => {
+                                this.pending_ooo.push_back(pending);
+                                if this.sync_buf.is_empty() {
+                                    Poll::Pending
+                                } else {
+                                    Poll::Ready(Some(mem::take(
+                                        &mut this.sync_buf,
+                                    )))
                                }
                            }
                        }
-
-                        if this.sync_buf.is_empty() {
-                            Poll::Pending
-                        } else {
-                            Poll::Ready(Some(mem::take(&mut this.sync_buf)))
-                        }
+                    } else if this.sync_buf.is_empty() {
+                        Poll::Ready(None)
+                    } else {
+                        Poll::Ready(Some(mem::take(&mut this.sync_buf)))
                    }
                }
                Some(StreamChunk::Sync(value)) => {
--- a/tachys/src/view/any_view.rs
+++ b/tachys/src/view/any_view.rs
@@ -699,15 +699,7 @@ impl Render for AnyViewWithAttrs {

    fn rebuild(self, state: &mut Self::State) {
        self.view.rebuild(&mut state.view);
-
-        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),
-            ));
-        }
+        self.attrs.rebuild(&mut state.attrs);
    }
 }

@@ -828,7 +820,7 @@ impl AddAnyAttr for AnyViewWithAttrs {
    }
 }

-/// State for any view with attributes spread onto it.
+/// wip
 pub struct AnyViewWithAttrsState {
    view: AnyViewState,
    attrs: Vec<AnyAttributeState>,
--- a/tachys/src/view/either.rs
+++ b/tachys/src/view/either.rs
@@ -3,10 +3,7 @@ use super::{
    Render, RenderHtml,
 };
 use crate::{
-    html::attribute::{
-        any_attribute::AnyAttribute, Attribute, NamedAttributeKey,
-        NextAttribute,
-    },
+    html::attribute::{any_attribute::AnyAttribute, Attribute, NextAttribute},
    hydration::Cursor,
    ssr::StreamBuilder,
 };
@@ -267,13 +264,6 @@ 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>
--- a/tachys/src/view/static_types.rs
+++ b/tachys/src/view/static_types.rs
@@ -8,8 +8,7 @@ use crate::{
        maybe_next_attr_erasure_macros::{
            next_attr_combine, next_attr_output_type,
        },
-        Attribute, AttributeKey, AttributeValue, NamedAttributeKey,
-        NextAttribute,
+        Attribute, AttributeKey, AttributeValue, NextAttribute,
    },
    hydration::Cursor,
    renderer::{CastFrom, Rndr},
@@ -112,10 +111,6 @@ 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>
--- a/wasm_split_macros/Cargo.toml
+++ b/wasm_split_macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasm_split_macros"
-version = "0.1.3"
+version = "0.1.2"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "README.md"
--- a/wasm_split_macros/src/lib.rs
+++ b/wasm_split_macros/src/lib.rs
@@ -85,7 +85,6 @@ 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();
@@ -148,8 +147,7 @@ pub fn wasm_split(args: TokenStream, input: TokenStream) -> TokenStream {
        }

        #[allow(non_snake_case)]
-        #(#attrs)*
-        #wrapper_pub #wrapper_sig {
+        #wrapper_sig {
            #(#attrs)*
            #[allow(improper_ctypes_definitions)]
            #[allow(non_snake_case)]
@@ -164,7 +162,7 @@ pub fn wasm_split(args: TokenStream, input: TokenStream) -> TokenStream {

        #[doc(hidden)]
        #[allow(non_snake_case)]
-        #wrapper_pub async fn #preload_name() {
+        pub async fn #preload_name() {
            ::leptos::wasm_split_helpers::ensure_loaded(&#split_loader_ident).await.unwrap();
        }
    }
Author	SHA1	Message	Date
Greg Johnston	e8d80e0733	fix: set `Content-Type` correctly on server function error responses (closes #4209 )	2025-08-24 14:51:35 -04:00
Greg Johnston	0f2168b92c	chore: fix outdated descriptions in `FromServerFnError` docs	2025-08-24 13:50:14 -04:00
				`@@ -1 +0,0 @@`
				`extend = [{ path = "../cargo-make/main.toml" }]`