fix: do not unescape query and hash in URLs when clicking links (closes

2025-12-28 09:02:37 -05:00 · 2025-11-18 20:44:55 -05:00
37 changed files with 256 additions and 938 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1920,7 +1920,7 @@ checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388"

 [[package]]
 name = "leptos"
-version = "0.8.14"
+version = "0.8.12"
 dependencies = [
 "any_spawner",
 "base64",
@@ -2004,7 +2004,7 @@ dependencies = [

 [[package]]
 name = "leptos_axum"
-version = "0.8.7"
+version = "0.8.6"
 dependencies = [
 "any_spawner",
 "axum",
@@ -2027,7 +2027,7 @@ dependencies = [

 [[package]]
 name = "leptos_config"
-version = "0.8.8"
+version = "0.8.7"
 dependencies = [
 "config",
 "regex",
@@ -2074,7 +2074,7 @@ dependencies = [

 [[package]]
 name = "leptos_integration_utils"
-version = "0.8.7"
+version = "0.8.6"
 dependencies = [
 "futures",
 "hydration_context",
@@ -2087,7 +2087,7 @@ dependencies = [

 [[package]]
 name = "leptos_macro"
-version = "0.8.12"
+version = "0.8.11"
 dependencies = [
 "attribute-derive",
 "cfg-if",
@@ -2131,7 +2131,7 @@ dependencies = [

 [[package]]
 name = "leptos_router"
-version = "0.8.10"
+version = "0.8.9"
 dependencies = [
 "any_spawner",
 "either_of",
@@ -2168,7 +2168,7 @@ dependencies = [

 [[package]]
 name = "leptos_server"
-version = "0.8.6"
+version = "0.8.5"
 dependencies = [
 "any_spawner",
 "base64",
@@ -2915,7 +2915,7 @@ dependencies = [

 [[package]]
 name = "reactive_graph"
-version = "0.2.11"
+version = "0.2.9"
 dependencies = [
 "any_spawner",
 "async-lock",
@@ -2924,7 +2924,6 @@ dependencies = [
 "hydration_context",
 "indexmap",
 "or_poisoned",
- "paste",
 "pin-project-lite",
 "rustc-hash 2.1.1",
 "rustc_version",
@@ -2936,7 +2935,6 @@ dependencies = [
 "tokio",
 "tokio-test",
 "tracing",
- "typed-builder",
 "web-sys",
 ]

@@ -3793,7 +3791,7 @@ dependencies = [

 [[package]]
 name = "tachys"
-version = "0.2.11"
+version = "0.2.10"
 dependencies = [
 "any_spawner",
 "async-trait",
@@ -4309,18 +4307,18 @@ dependencies = [

 [[package]]
 name = "typed-builder"
-version = "0.22.0"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "398a3a3c918c96de527dc11e6e846cd549d4508030b8a33e1da12789c856b81a"
+checksum = "fef81aec2ca29576f9f6ae8755108640d0a86dd3161b2e8bca6cfa554e98f77d"
 dependencies = [
 "typed-builder-macro",
 ]

 [[package]]
 name = "typed-builder-macro"
-version = "0.22.0"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e48cea23f68d1f78eb7bc092881b6bb88d3d6b5b7e6234f6f9c911da1ffb221"
+checksum = "1ecb9ecf7799210407c14a8cfdfe0173365780968dc57973ed082211958e0b18"
 dependencies = [
 "proc-macro2",
 "quote",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,6 +2,7 @@
 resolver = "2"
 members = [
  # utilities
+  "oco",
  "any_spawner",
  "const_str_slice_concat",
  "either_of",
@@ -49,26 +50,26 @@ 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.14" }
-leptos_config = { path = "./leptos_config", version = "0.8.8" }
+leptos = { path = "./leptos", version = "0.8.12" }
+leptos_config = { path = "./leptos_config", version = "0.8.7" }
 leptos_dom = { path = "./leptos_dom", version = "0.8.7" }
 leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.8.5" }
-leptos_integration_utils = { path = "./integrations/utils", version = "0.8.7" }
-leptos_macro = { path = "./leptos_macro", version = "0.8.12" }
-leptos_router = { path = "./router", version = "0.8.10" }
+leptos_integration_utils = { path = "./integrations/utils", version = "0.8.6" }
+leptos_macro = { path = "./leptos_macro", version = "0.8.11" }
+leptos_router = { path = "./router", version = "0.8.9" }
 leptos_router_macro = { path = "./router_macro", version = "0.8.6" }
-leptos_server = { path = "./leptos_server", version = "0.8.6" }
+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.11" }
+reactive_graph = { path = "./reactive_graph", version = "0.2.9" }
 reactive_stores = { path = "./reactive_stores", version = "0.3.0" }
 reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.2.6" }
 server_fn = { path = "./server_fn", version = "0.8.8" }
 server_fn_macro = { path = "./server_fn_macro", version = "0.8.8" }
 server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.8.5" }
-tachys = { path = "./tachys", version = "0.2.11" }
+tachys = { path = "./tachys", version = "0.2.10" }

 # members deps
 async-once-cell = { default-features = false, version = "0.5.3" }
@@ -76,8 +77,7 @@ 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" }
 trybuild = { default-features = false, version = "1.0.110" }
-typed-builder = { default-features = false, version = "0.22.0" }
-typed-builder-macro = { default-features = false, version = "0.22.0" }
+typed-builder = { default-features = false, version = "0.21.2" }
 thiserror = { default-features = false, version = "2.0.17" }
 wasm-bindgen = { default-features = false, version = "0.2.100" }
 indexmap = { default-features = false, version = "2.11.0" }
@@ -121,6 +121,7 @@ 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" }
+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" }
 walkdir = { default-features = false, version = "2.5.0" }
--- a/examples/islands_router/README.md
+++ b/examples/islands_router/README.md
@@ -9,3 +9,6 @@ routing when you use islands.
 This uses *only* server rendering, with no actual islands, but still maintains client-side state across page navigations.
 It does this by building on the fact that we now have a statically-typed view tree to do pretty smart updates with 
 new HTML from the client, with extremely minimal diffing.
+
+The demo itself works, but the feature that supports it is incomplete. A couple people have accidentally
+used it and broken their applications in ways they don't understand, so I've renamed the feature to `dont-use-islands-router`.
--- a/examples/lazy_routes/README.md
+++ b/examples/lazy_routes/README.md
@@ -5,4 +5,4 @@ test cases that typically happens at integration.

 ## Quick Start

-Run `cargo leptos watch --split` to run this example.
+Run `cargo leptos watch` to run this example.
--- a/examples/ssr_modes_axum/src/main.rs
+++ b/examples/ssr_modes_axum/src/main.rs
@@ -1,10 +1,7 @@
 #[cfg(feature = "ssr")]
 #[tokio::main]
 async fn main() {
-    use axum::{
-        http::{HeaderName, HeaderValue},
-        Router,
-    };
+    use axum::Router;
    use leptos::{logging::log, prelude::*};
    use leptos_axum::{generate_route_list, LeptosRoutes};
    use ssr_modes_axum::app::*;
@@ -20,24 +17,7 @@ async fn main() {
            let leptos_options = leptos_options.clone();
            move || shell(leptos_options.clone())
        })
-        .fallback(leptos_axum::file_and_error_handler_with_context(
-            move || {
-                // if you want to add custom headers to the static file handler response,
-                // you can do that by providing `ResponseOptions` via context
-                let opts = use_context::<leptos_axum::ResponseOptions>()
-                    .unwrap_or_default();
-                opts.insert_header(
-                    HeaderName::from_static("cross-origin-opener-policy"),
-                    HeaderValue::from_static("same-origin"),
-                );
-                opts.insert_header(
-                    HeaderName::from_static("cross-origin-embedder-policy"),
-                    HeaderValue::from_static("require-corp"),
-                );
-                provide_context(opts);
-            },
-            shell,
-        ))
+        .fallback(leptos_axum::file_and_error_handler(shell))
        .with_state(leptos_options);

    // run our app with hyper
--- 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.7"
+version = "0.8.6"
 rust-version.workspace = true
 edition.workspace = true

--- a/integrations/axum/src/lib.rs
+++ b/integrations/axum/src/lib.rs
@@ -2050,20 +2050,7 @@ where
                let res = res.await.unwrap();

                if res.status() == StatusCode::OK {
-                    let owner = Owner::new();
-                    owner.with(|| {
-                        additional_context();
-                        let res = res.into_response();
-                        if let Some(response_options) =
-                            use_context::<ResponseOptions>()
-                        {
-                            let mut res = AxumResponse(res);
-                            res.extend_response(&response_options);
-                            res.0
-                        } else {
-                            res
-                        }
-                    })
+                    res.into_response()
                } else {
                    let mut res = handle_response_inner(
                        move || {
--- 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.7"
+version = "0.8.6"
 rust-version.workspace = true
 edition.workspace = true

--- a/leptos/Cargo.toml
+++ b/leptos/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leptos"
-version = "0.8.14"
+version = "0.8.12"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
--- a/reactive_graph/src/callback.rs
+++ b/reactive_graph/src/callback.rs
@@ -2,19 +2,48 @@
 //! for component properties, because they can be used to define optional callback functions,
 //! which generic props don’t support.
 //!
-//! The callback types implement [`Copy`], so they can easily be moved into and out of other closures, just like signals.
+//! # Usage
+//! Callbacks can be created manually from any function or closure, but the easiest way
+//! to create them is to use `#[prop(into)]]` when defining a component.
+//! ```
+//! use leptos::prelude::*;
+//!
+//! #[component]
+//! fn MyComponent(
+//!     #[prop(into)] render_number: Callback<(i32,), String>,
+//! ) -> impl IntoView {
+//!     view! {
+//!         <div>
+//!             {render_number.run((1,))}
+//!             // callbacks can be called multiple times
+//!             {render_number.run((42,))}
+//!         </div>
+//!     }
+//! }
+//! // you can pass a closure directly as `render_number`
+//! fn test() -> impl IntoView {
+//!     view! {
+//!         <MyComponent render_number=|x: i32| x.to_string()/>
+//!     }
+//! }
+//! ```
+//!
+//! *Notes*:
+//! - The `render_number` prop can receive any type that implements `Fn(i32) -> String`.
+//! - Callbacks are most useful when you want optional generic props.
+//! - All callbacks implement the [`Callable`](leptos::callback::Callable) trait, and can be invoked with `my_callback.run(input)`.
+//! - The callback types implement [`Copy`], so they can easily be moved into and out of other closures, just like signals.
 //!
 //! # Types
 //! This modules implements 2 callback types:
-//! - [`Callback`](reactive_graph::callback::Callback)
-//! - [`UnsyncCallback`](reactive_graph::callback::UnsyncCallback)
+//! - [`Callback`](leptos::callback::Callback)
+//! - [`UnsyncCallback`](leptos::callback::UnsyncCallback)
 //!
 //! Use `SyncCallback` if the function is not `Sync` and `Send`.

-use crate::{
+use reactive_graph::{
    owner::{LocalStorage, StoredValue},
    traits::{Dispose, WithValue},
-    IntoReactiveValue,
 };
 use std::{fmt, rc::Rc, sync::Arc};

@@ -31,16 +60,7 @@ pub trait Callable<In: 'static, Out: 'static = ()> {
    fn run(&self, input: In) -> Out;
 }

-/// A callback type that is not required to be [`Send`] or [`Sync`].
-///
-/// # Example
-/// ```
-/// # use reactive_graph::prelude::*; use reactive_graph::callback::*;  let owner = reactive_graph::owner::Owner::new(); owner.set();
-/// let _: UnsyncCallback<()> = UnsyncCallback::new(|_| {});
-/// let _: UnsyncCallback<(i32, i32)> = (|_x: i32, _y: i32| {}).into();
-/// let cb: UnsyncCallback<i32, String> = UnsyncCallback::new(|x: i32| x.to_string());
-/// assert_eq!(cb.run(42), "42".to_string());
-/// ```
+/// A callback type that is not required to be `Send + Sync`.
 pub struct UnsyncCallback<In: 'static, Out: 'static = ()>(
    StoredValue<Rc<dyn Fn(In) -> Out>, LocalStorage>,
 );
@@ -128,15 +148,28 @@ impl_unsync_callable_from_fn!(
    P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12
 );

-/// A callback type that is [`Send`] + [`Sync`].
+/// Callbacks define a standard way to store functions and closures.
 ///
 /// # Example
 /// ```
-/// # use reactive_graph::prelude::*; use reactive_graph::callback::*;  let owner = reactive_graph::owner::Owner::new(); owner.set();
-/// let _: Callback<()> = Callback::new(|_| {});
-/// let _: Callback<(i32, i32)> = (|_x: i32, _y: i32| {}).into();
-/// let cb: Callback<i32, String> = Callback::new(|x: i32| x.to_string());
-/// assert_eq!(cb.run(42), "42".to_string());
+/// # use leptos::prelude::*;
+/// # use leptos::callback::{Callable, Callback};
+/// #[component]
+/// fn MyComponent(
+///     #[prop(into)] render_number: Callback<(i32,), String>,
+/// ) -> impl IntoView {
+///     view! {
+///         <div>
+///             {render_number.run((42,))}
+///         </div>
+///     }
+/// }
+///
+/// fn test() -> impl IntoView {
+///     view! {
+///         <MyComponent render_number=move |x: i32| x.to_string()/>
+///     }
+/// }
 /// ```
 pub struct Callback<In, Out = ()>(
    StoredValue<Arc<dyn Fn(In) -> Out + Send + Sync>>,
@@ -208,7 +241,6 @@ impl_callable_from_fn!(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12);

 impl<In: 'static, Out: 'static> Callback<In, Out> {
    /// Creates a new callback from the given function.
-    #[track_caller]
    pub fn new<F>(fun: F) -> Self
    where
        F: Fn(In) -> Out + Send + Sync + 'static,
@@ -230,94 +262,22 @@ impl<In: 'static, Out: 'static> Callback<In, Out> {
    }
 }

-#[doc(hidden)]
-pub struct __IntoReactiveValueMarkerCallbackSingleParam;
-
-#[doc(hidden)]
-pub struct __IntoReactiveValueMarkerCallbackStrOutputToString;
-
-impl<I, O, F>
-    IntoReactiveValue<
-        Callback<I, O>,
-        __IntoReactiveValueMarkerCallbackSingleParam,
-    > for F
-where
-    F: Fn(I) -> O + Send + Sync + 'static,
-{
-    #[track_caller]
-    fn into_reactive_value(self) -> Callback<I, O> {
-        Callback::new(self)
-    }
-}
-
-impl<I, O, F>
-    IntoReactiveValue<
-        UnsyncCallback<I, O>,
-        __IntoReactiveValueMarkerCallbackSingleParam,
-    > for F
-where
-    F: Fn(I) -> O + 'static,
-{
-    #[track_caller]
-    fn into_reactive_value(self) -> UnsyncCallback<I, O> {
-        UnsyncCallback::new(self)
-    }
-}
-
-impl<I, F>
-    IntoReactiveValue<
-        Callback<I, String>,
-        __IntoReactiveValueMarkerCallbackStrOutputToString,
-    > for F
-where
-    F: Fn(I) -> &'static str + Send + Sync + 'static,
-{
-    #[track_caller]
-    fn into_reactive_value(self) -> Callback<I, String> {
-        Callback::new(move |i| self(i).to_string())
-    }
-}
-
-impl<I, F>
-    IntoReactiveValue<
-        UnsyncCallback<I, String>,
-        __IntoReactiveValueMarkerCallbackStrOutputToString,
-    > for F
-where
-    F: Fn(I) -> &'static str + 'static,
-{
-    #[track_caller]
-    fn into_reactive_value(self) -> UnsyncCallback<I, String> {
-        UnsyncCallback::new(move |i| self(i).to_string())
-    }
-}
-
 #[cfg(test)]
 mod tests {
    use super::Callable;
-    use crate::{
-        callback::{Callback, UnsyncCallback},
-        owner::Owner,
-        traits::Dispose,
-        IntoReactiveValue,
-    };
+    use crate::callback::{Callback, UnsyncCallback};
+    use reactive_graph::traits::Dispose;

    struct NoClone {}

    #[test]
    fn clone_callback() {
-        let owner = Owner::new();
-        owner.set();
-
        let callback = Callback::new(move |_no_clone: NoClone| NoClone {});
        let _cloned = callback;
    }

    #[test]
    fn clone_unsync_callback() {
-        let owner = Owner::new();
-        owner.set();
-
        let callback =
            UnsyncCallback::new(move |_no_clone: NoClone| NoClone {});
        let _cloned = callback;
@@ -325,39 +285,20 @@ mod tests {

    #[test]
    fn runback_from() {
-        let owner = Owner::new();
-        owner.set();
-
        let _callback: Callback<(), String> = (|| "test").into();
        let _callback: Callback<(i32, String), String> =
            (|num, s| format!("{num} {s}")).into();
-        // Single params should work without needing the (foo,) tuple using IntoReactiveValue:
-        let _callback: Callback<usize, &'static str> =
-            (|_usize| "test").into_reactive_value();
-        let _callback: Callback<usize, String> =
-            (|_usize| "test").into_reactive_value();
    }

    #[test]
    fn sync_callback_from() {
-        let owner = Owner::new();
-        owner.set();
-
        let _callback: UnsyncCallback<(), String> = (|| "test").into();
        let _callback: UnsyncCallback<(i32, String), String> =
            (|num, s| format!("{num} {s}")).into();
-        // Single params should work without needing the (foo,) tuple using IntoReactiveValue:
-        let _callback: UnsyncCallback<usize, &'static str> =
-            (|_usize| "test").into_reactive_value();
-        let _callback: UnsyncCallback<usize, String> =
-            (|_usize| "test").into_reactive_value();
    }

    #[test]
    fn sync_callback_try_run() {
-        let owner = Owner::new();
-        owner.set();
-
        let callback = Callback::new(move |arg| arg);
        assert_eq!(callback.try_run((0,)), Some((0,)));
        callback.dispose();
@@ -366,9 +307,6 @@ mod tests {

    #[test]
    fn unsync_callback_try_run() {
-        let owner = Owner::new();
-        owner.set();
-
        let callback = UnsyncCallback::new(move |arg| arg);
        assert_eq!(callback.try_run((0,)), Some((0,)));
        callback.dispose();
@@ -377,9 +315,6 @@ mod tests {

    #[test]
    fn callback_matches_same() {
-        let owner = Owner::new();
-        owner.set();
-
        let callback1 = Callback::new(|x: i32| x * 2);
        let callback2 = callback1;
        assert!(callback1.matches(&callback2));
@@ -387,9 +322,6 @@ mod tests {

    #[test]
    fn callback_matches_different() {
-        let owner = Owner::new();
-        owner.set();
-
        let callback1 = Callback::new(|x: i32| x * 2);
        let callback2 = Callback::new(|x: i32| x + 1);
        assert!(!callback1.matches(&callback2));
@@ -397,9 +329,6 @@ mod tests {

    #[test]
    fn unsync_callback_matches_same() {
-        let owner = Owner::new();
-        owner.set();
-
        let callback1 = UnsyncCallback::new(|x: i32| x * 2);
        let callback2 = callback1;
        assert!(callback1.matches(&callback2));
@@ -407,9 +336,6 @@ mod tests {

    #[test]
    fn unsync_callback_matches_different() {
-        let owner = Owner::new();
-        owner.set();
-
        let callback1 = UnsyncCallback::new(|x: i32| x * 2);
        let callback2 = UnsyncCallback::new(|x: i32| x + 1);
        assert!(!callback1.matches(&callback2));
--- a/leptos/src/lib.rs
+++ b/leptos/src/lib.rs
@@ -203,7 +203,7 @@ pub mod prelude {
 pub mod form;

 /// A standard way to wrap functions and closures to pass them to components.
-pub use reactive_graph::callback;
+pub mod callback;

 /// Types that can be passed as the `children` prop of a component.
 pub mod children;
--- a/leptos/src/suspense_component.rs
+++ b/leptos/src/suspense_component.rs
@@ -6,7 +6,6 @@ use crate::{
 use futures::{channel::oneshot, select, FutureExt};
 use hydration_context::SerializedDataId;
 use leptos_macro::component;
-use or_poisoned::OrPoisoned;
 use reactive_graph::{
    computed::{
        suspense::{LocalResourceNotifier, SuspenseContext},
@@ -15,10 +14,10 @@ use reactive_graph::{
    effect::RenderEffect,
    owner::{provide_context, use_context, Owner},
    signal::ArcRwSignal,
-    traits::{Dispose, Get, Read, ReadUntracked, Track, With, WriteValue},
+    traits::{Dispose, Get, Read, Track, With, WriteValue},
 };
 use slotmap::{DefaultKey, SlotMap};
-use std::sync::{Arc, Mutex};
+use std::sync::Arc;
 use tachys::{
    either::Either,
    html::attribute::{any_attribute::AnyAttribute, Attribute},
@@ -321,66 +320,23 @@ where

        // walk over the tree of children once to make sure that all resource loads are registered
        self.children.dry_resolve();
-        let children = Arc::new(Mutex::new(Some(self.children)));

        // check the set of tasks to see if it is empty, now or later
        let eff = reactive_graph::effect::Effect::new_isomorphic({
-            let children = Arc::clone(&children);
-            move |double_checking: Option<bool>| {
-                // on the first run, always track the tasks
-                if double_checking.is_none() {
-                    tasks.track();
-                }
-
-                if let Some(curr_tasks) = tasks.try_read_untracked() {
-                    if curr_tasks.is_empty() {
-                        if double_checking == Some(true) {
-                            // we have finished loading, and checking the children again told us there are
-                            // no more pending tasks. so we can render both the children and the error boundary
-
-                            if let Some(tx) = tasks_tx.take() {
-                                // If the receiver has dropped, it means the ScopedFuture has already
-                                // dropped, so it doesn't matter if we manage to send this.
-                                _ = tx.send(());
-                            }
-                            if let Some(tx) = notify_error_boundary.take() {
-                                _ = tx.send(());
-                            }
-                        } else {
-                            // release the read guard on tasks, as we'll be updating it again
-                            drop(curr_tasks);
-                            // check the children for additional pending tasks
-                            // the will catch additional resource reads nested inside a conditional depending on initial resource reads
-                            if let Some(children) =
-                                children.lock().or_poisoned().as_mut()
-                            {
-                                children.dry_resolve();
-                            }
-
-                            if tasks
-                                .try_read()
-                                .map(|n| n.is_empty())
-                                .unwrap_or(false)
-                            {
-                                // there are no additional pending tasks, and we can simply return
-                                if let Some(tx) = tasks_tx.take() {
-                                    // If the receiver has dropped, it means the ScopedFuture has already
-                                    // dropped, so it doesn't matter if we manage to send this.
-                                    _ = tx.send(());
-                                }
-                                if let Some(tx) = notify_error_boundary.take() {
-                                    _ = tx.send(());
-                                }
-                            }
-
-                            // tell ourselves that we're just double-checking
-                            return true;
+            move |_| {
+                tasks.track();
+                if let Some(tasks) = tasks.try_read() {
+                    if tasks.is_empty() {
+                        if let Some(tx) = tasks_tx.take() {
+                            // If the receiver has dropped, it means the ScopedFuture has already
+                            // dropped, so it doesn't matter if we manage to send this.
+                            _ = tx.send(());
+                        }
+                        if let Some(tx) = notify_error_boundary.take() {
+                            _ = tx.send(());
                        }
-                    } else {
-                        tasks.track();
                    }
                }
-                false
            }
        });

@@ -406,17 +362,12 @@ where
                        None
                    }
                    _ = tasks_rx => {
-                        let children = {
-                            let mut children_lock = children.lock().or_poisoned();
-                            children_lock.take().expect("children should not be removed until we render here")
-                        };
-
                        // if we ran this earlier, reactive reads would always be registered as None
                        // this is fine in the case where we want to use Suspend and .await on some future
                        // but in situations like a <For each=|| some_resource.snapshot()/> we actually
                        // want to be able to 1) synchronously read a resource's value, but still 2) wait
                        // for it to load before we render everything
-                        let mut children = Box::pin(children.resolve().fuse());
+                        let mut children = Box::pin(self.children.resolve().fuse());

                        // we continue racing the children against the "do we have any local
                        // resources?" Future
--- a/leptos/tests/ssr.rs
+++ b/leptos/tests/ssr.rs
@@ -103,76 +103,6 @@ fn test_classes() {
    assert_eq!(rendered.to_html(), "<div class=\"my big  red car\"></div>");
 }

-#[cfg(feature = "ssr")]
-#[test]
-fn test_class_with_class_directive_merge() {
-    use leptos::prelude::*;
-
-    // class= followed by class: should merge
-    let rendered: View<HtmlElement<_, _, _>> = view! {
-        <div class="foo" class:bar=true></div>
-    };
-
-    assert_eq!(rendered.to_html(), "<div class=\"foo bar\"></div>");
-}
-
-#[cfg(feature = "ssr")]
-#[test]
-fn test_solo_class_directive() {
-    use leptos::prelude::*;
-
-    // Solo class: directive should work without class attribute
-    let rendered: View<HtmlElement<_, _, _>> = view! {
-        <div class:foo=true></div>
-    };
-
-    assert_eq!(rendered.to_html(), "<div class=\"foo\"></div>");
-}
-
-#[cfg(feature = "ssr")]
-#[test]
-fn test_class_directive_with_static_class() {
-    use leptos::prelude::*;
-
-    // class:foo comes after class= due to macro sorting
-    // The class= clears buffer, then class:foo appends
-    let rendered: View<HtmlElement<_, _, _>> = view! {
-        <div class:foo=true class="bar"></div>
-    };
-
-    // After macro sorting: class="bar" class:foo=true
-    // Expected: "bar foo"
-    assert_eq!(rendered.to_html(), "<div class=\"bar foo\"></div>");
-}
-
-#[cfg(feature = "ssr")]
-#[test]
-fn test_global_class_applied() {
-    use leptos::prelude::*;
-
-    // Test that a global class is properly applied
-    let rendered: View<HtmlElement<_, _, _>> = view! { class="global",
-        <div></div>
-    };
-
-    assert_eq!(rendered.to_html(), "<div class=\"global\"></div>");
-}
-
-#[cfg(feature = "ssr")]
-#[test]
-fn test_multiple_class_attributes_overwrite() {
-    use leptos::prelude::*;
-
-    // When multiple class attributes are applied, the last one should win (browser behavior)
-    // This simulates what happens when attributes are combined programmatically
-    let el = leptos::html::div().class("first").class("second");
-
-    let html = el.to_html();
-
-    // The second class attribute should overwrite the first
-    assert_eq!(html, "<div class=\"second\"></div>");
-}
-
 #[cfg(feature = "ssr")]
 #[test]
 fn ssr_with_styles() {
--- 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.8"
+version = "0.8.7"
 rust-version.workspace = true
 edition.workspace = true

--- a/leptos_macro/Cargo.toml
+++ b/leptos_macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leptos_macro"
-version = "0.8.12"
+version = "0.8.11"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
--- a/leptos_macro/src/component.rs
+++ b/leptos_macro/src/component.rs
@@ -1016,27 +1016,25 @@ struct PropOpt {
    name: Option<String>,
 }

-struct TypedBuilderOpts<'a> {
+struct TypedBuilderOpts {
    default: bool,
    default_with_value: Option<syn::Expr>,
    strip_option: bool,
    into: bool,
-    ty: &'a Type,
 }

-impl<'a> TypedBuilderOpts<'a> {
-    fn from_opts(opts: &PropOpt, ty: &'a Type) -> Self {
+impl TypedBuilderOpts {
+    fn from_opts(opts: &PropOpt, is_ty_option: bool) -> Self {
        Self {
            default: opts.optional || opts.optional_no_strip || opts.attrs,
            default_with_value: opts.default.clone(),
-            strip_option: opts.strip_option || opts.optional && is_option(ty),
+            strip_option: opts.strip_option || opts.optional && is_ty_option,
            into: opts.into,
-            ty,
        }
    }
 }

-impl TypedBuilderOpts<'_> {
+impl TypedBuilderOpts {
    fn to_serde_tokens(&self) -> TokenStream {
        let default = if let Some(v) = &self.default_with_value {
            let v = v.to_token_stream().to_string();
@@ -1055,7 +1053,7 @@ impl TypedBuilderOpts<'_> {
    }
 }

-impl ToTokens for TypedBuilderOpts<'_> {
+impl ToTokens for TypedBuilderOpts {
    fn to_tokens(&self, tokens: &mut TokenStream) {
        let default = if let Some(v) = &self.default_with_value {
            let v = v.to_token_stream().to_string();
@@ -1066,29 +1064,14 @@ impl ToTokens for TypedBuilderOpts<'_> {
            quote! {}
        };

-        // If self.strip_option && self.into, then the strip_option will be represented as part of the transform closure.
-        let strip_option = if self.strip_option && !self.into {
+        let strip_option = if self.strip_option {
            quote! { strip_option, }
        } else {
            quote! {}
        };

        let into = if self.into {
-            if !self.strip_option {
-                let ty = &self.ty;
-                quote! {
-                    fn transform<__IntoReactiveValueMarker>(value: impl ::leptos::prelude::IntoReactiveValue<#ty, __IntoReactiveValueMarker>) -> #ty {
-                        value.into_reactive_value()
-                    },
-                }
-            } else {
-                let ty = unwrap_option(self.ty);
-                quote! {
-                    fn transform<__IntoReactiveValueMarker>(value: impl ::leptos::prelude::IntoReactiveValue<#ty, __IntoReactiveValueMarker>) -> Option<#ty> {
-                        Some(value.into_reactive_value())
-                    },
-                }
-            }
+            quote! { into, }
        } else {
            quote! {}
        };
@@ -1124,7 +1107,8 @@ fn prop_builder_fields(
                ty,
            } = prop;

-            let builder_attrs = TypedBuilderOpts::from_opts(prop_opts, ty);
+            let builder_attrs =
+                TypedBuilderOpts::from_opts(prop_opts, is_option(ty));

            let builder_docs = prop_to_doc(prop, PropDocStyle::Inline);

@@ -1169,7 +1153,8 @@ fn prop_serializer_fields(vis: &Visibility, props: &[Prop]) -> TokenStream {
                    ty,
                } = prop;

-                let builder_attrs = TypedBuilderOpts::from_opts(prop_opts, ty);
+                let builder_attrs =
+                    TypedBuilderOpts::from_opts(prop_opts, is_option(ty));
                let serde_attrs = builder_attrs.to_serde_tokens();

                let PatIdent { ident, by_ref, .. } = &name;
--- a/leptos_macro/src/slot.rs
+++ b/leptos_macro/src/slot.rs
@@ -159,27 +159,25 @@ struct PropOpt {
    pub attrs: bool,
 }

-struct TypedBuilderOpts<'a> {
+struct TypedBuilderOpts {
    default: bool,
    default_with_value: Option<syn::Expr>,
    strip_option: bool,
    into: bool,
-    ty: &'a Type,
 }

-impl<'a> TypedBuilderOpts<'a> {
-    pub fn from_opts(opts: &PropOpt, ty: &'a Type) -> Self {
+impl TypedBuilderOpts {
+    pub fn from_opts(opts: &PropOpt, is_ty_option: bool) -> Self {
        Self {
            default: opts.optional || opts.optional_no_strip || opts.attrs,
            default_with_value: opts.default.clone(),
-            strip_option: opts.strip_option || opts.optional && is_option(ty),
+            strip_option: opts.strip_option || opts.optional && is_ty_option,
            into: opts.into,
-            ty,
        }
    }
 }

-impl ToTokens for TypedBuilderOpts<'_> {
+impl ToTokens for TypedBuilderOpts {
    fn to_tokens(&self, tokens: &mut TokenStream) {
        let default = if let Some(v) = &self.default_with_value {
            let v = v.to_token_stream().to_string();
@@ -190,29 +188,14 @@ impl ToTokens for TypedBuilderOpts<'_> {
            quote! {}
        };

-        // If self.strip_option && self.into, then the strip_option will be represented as part of the transform closure.
-        let strip_option = if self.strip_option && !self.into {
+        let strip_option = if self.strip_option {
            quote! { strip_option, }
        } else {
            quote! {}
        };

        let into = if self.into {
-            if !self.strip_option {
-                let ty = &self.ty;
-                quote! {
-                    fn transform<__IntoReactiveValueMarker>(value: impl ::leptos::prelude::IntoReactiveValue<#ty, __IntoReactiveValueMarker>) -> #ty {
-                        value.into_reactive_value()
-                    },
-                }
-            } else {
-                let ty = unwrap_option(self.ty);
-                quote! {
-                    fn transform<__IntoReactiveValueMarker>(value: impl ::leptos::prelude::IntoReactiveValue<#ty, __IntoReactiveValueMarker>) -> Option<#ty> {
-                        Some(value.into_reactive_value())
-                    },
-                }
-            }
+            quote! { into, }
        } else {
            quote! {}
        };
@@ -244,7 +227,8 @@ fn prop_builder_fields(vis: &Visibility, props: &[Prop]) -> TokenStream {
                ty,
            } = prop;

-            let builder_attrs = TypedBuilderOpts::from_opts(prop_opts, ty);
+            let builder_attrs =
+                TypedBuilderOpts::from_opts(prop_opts, is_option(ty));

            let builder_docs = prop_to_doc(prop, PropDocStyle::Inline);

--- a/leptos_macro/src/view/component_builder.rs
+++ b/leptos_macro/src/view/component_builder.rs
@@ -90,7 +90,7 @@ pub(crate) fn component_to_tokens(

        if optional {
            optional_props.push(quote! {
-                props.#name = { #value }.map(::leptos::prelude::IntoReactiveValue::into_reactive_value);
+                props.#name = { #value }.map(Into::into);
            })
        } else {
            required_props.push(quote! {
--- a/leptos_macro/tests/component.rs
+++ b/leptos_macro/tests/component.rs
@@ -120,124 +120,6 @@ fn returns_static_lifetime() {
    }
 }

-#[cfg(not(feature = "nightly"))]
-#[component]
-pub fn IntoReactiveValueTestComponentSignal(
-    #[prop(into)] arg1: Signal<String>,
-    #[prop(into)] arg2: Signal<String>,
-    #[prop(into)] arg3: Signal<String>,
-    #[prop(into)] arg4: Signal<usize>,
-    #[prop(into)] arg5: Signal<usize>,
-    #[prop(into)] arg6: Signal<usize>,
-    #[prop(into)] arg7: Signal<Option<usize>>,
-    #[prop(into)] arg8: ArcSignal<String>,
-    #[prop(into)] arg9: ArcSignal<String>,
-    #[prop(into)] arg10: ArcSignal<String>,
-    #[prop(into)] arg11: ArcSignal<usize>,
-    #[prop(into)] arg12: ArcSignal<usize>,
-    #[prop(into)] arg13: ArcSignal<usize>,
-    #[prop(into)] arg14: ArcSignal<Option<usize>>,
-    // Optionals:
-    #[prop(into, optional)] arg15: Option<Signal<usize>>,
-    #[prop(into, optional)] arg16_purposely_omitted: Option<Signal<usize>>,
-    #[prop(into, optional)] arg17: Option<Signal<usize>>,
-    #[prop(into, strip_option)] arg18: Option<Signal<usize>>,
-) -> impl IntoView {
-    move || {
-        view! {
-            <div>
-                <p>{arg1.get()}</p>
-                <p>{arg2.get()}</p>
-                <p>{arg3.get()}</p>
-                <p>{arg4.get()}</p>
-                <p>{arg5.get()}</p>
-                <p>{arg6.get()}</p>
-                <p>{arg7.get()}</p>
-                <p>{arg8.get()}</p>
-                <p>{arg9.get()}</p>
-                <p>{arg10.get()}</p>
-                <p>{arg11.get()}</p>
-                <p>{arg12.get()}</p>
-                <p>{arg13.get()}</p>
-                <p>{arg14.get()}</p>
-                <p>{arg15.get()}</p>
-                <p>{arg16_purposely_omitted.get()}</p>
-                <p>{arg17.get()}</p>
-                <p>{arg18.get()}</p>
-            </div>
-        }
-    }
-}
-
-#[component]
-pub fn IntoReactiveValueTestComponentCallback(
-    #[prop(into)] arg1: Callback<(), String>,
-    #[prop(into)] arg2: Callback<usize, String>,
-    #[prop(into)] arg3: Callback<(usize,), String>,
-    #[prop(into)] arg4: Callback<(usize, String), String>,
-    #[prop(into)] arg5: UnsyncCallback<(), String>,
-    #[prop(into)] arg6: UnsyncCallback<usize, String>,
-    #[prop(into)] arg7: UnsyncCallback<(usize,), String>,
-    #[prop(into)] arg8: UnsyncCallback<(usize, String), String>,
-) -> impl IntoView {
-    move || {
-        view! {
-            <div>
-                <p>{arg1.run(())}</p>
-                <p>{arg2.run(1)}</p>
-                <p>{arg3.run((2,))}</p>
-                <p>{arg4.run((3, "three".into()))}</p>
-                <p>{arg5.run(())}</p>
-                <p>{arg6.run(1)}</p>
-                <p>{arg7.run((2,))}</p>
-                <p>{arg8.run((3, "three".into()))}</p>
-            </div>
-        }
-    }
-}
-
-#[cfg(not(feature = "nightly"))]
-#[test]
-fn test_into_reactive_value_signal() {
-    let _ = view! {
-        <IntoReactiveValueTestComponentSignal
-            arg1=move || "I was a reactive closure!"
-            arg2="I was a basic str!"
-            arg3=Signal::stored("I was already a signal!")
-            arg4=move || 2
-            arg5=3
-            arg6=Signal::stored(4)
-            arg7=|| 2
-            arg8=move || "I was a reactive closure!"
-            arg9="I was a basic str!"
-            arg10=ArcSignal::stored("I was already a signal!".to_string())
-            arg11=move || 2
-            arg12=3
-            arg13=ArcSignal::stored(4)
-            arg14=|| 2
-            arg15=|| 2
-            nostrip:arg17=Some(|| 2)
-            arg18=|| 2
-        />
-    };
-}
-
-#[test]
-fn test_into_reactive_value_callback() {
-    let _ = view! {
-        <IntoReactiveValueTestComponentCallback
-            arg1=|| "I was a callback static str!"
-            arg2=|_n| "I was a callback static str!"
-            arg3=|(_n,)| "I was a callback static str!"
-            arg4=|(_n, _s)| "I was a callback static str!"
-            arg5=|| "I was a callback static str!"
-            arg6=|_n| "I was a callback static str!"
-            arg7=|(_n,)| "I was a callback static str!"
-            arg8=|(_n, _s)| "I was a callback static str!"
-        />
-    };
-}
-
 // an attempt to catch unhygienic macros regression
 mod macro_hygiene {
    // To ensure no relative module path to leptos inside macros.
@@ -270,7 +152,12 @@ mod macro_hygiene {

        #[component]
        fn Component() -> impl IntoView {
-            view! { <div>{().into_any()} {()}</div> }
+            view! {
+                <div>
+                    {().into_any()}
+                    {()}
+                </div>
+            }
        }
    }
 }
--- a/leptos_server/Cargo.toml
+++ b/leptos_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leptos_server"
-version = "0.8.6"
+version = "0.8.5"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
--- a/leptos_server/src/resource.rs
+++ b/leptos_server/src/resource.rs
@@ -188,39 +188,6 @@ where
    }
 }

-#[cfg(debug_assertions)]
-thread_local! {
-    static RESOURCE_SOURCE_SIGNAL_ACTIVE: AtomicBool = const { AtomicBool::new(false) };
-}
-
-#[cfg(debug_assertions)]
-/// Returns whether the current thread is currently running a resource source signal.
-pub fn in_resource_source_signal() -> bool {
-    RESOURCE_SOURCE_SIGNAL_ACTIVE
-        .with(|scope| scope.load(std::sync::atomic::Ordering::Relaxed))
-}
-
-/// Set a static to true whilst running the given function.
-/// [`is_in_effect_scope`] will return true whilst the function is running.
-fn run_in_resource_source_signal<T>(fun: impl FnOnce() -> T) -> T {
-    #[cfg(debug_assertions)]
-    {
-        // For the theoretical nested case, set back to initial value rather than false:
-        let initial = RESOURCE_SOURCE_SIGNAL_ACTIVE.with(|scope| {
-            scope.swap(true, std::sync::atomic::Ordering::Relaxed)
-        });
-        let result = fun();
-        RESOURCE_SOURCE_SIGNAL_ACTIVE.with(|scope| {
-            scope.store(initial, std::sync::atomic::Ordering::Relaxed)
-        });
-        result
-    }
-    #[cfg(not(debug_assertions))]
-    {
-        fun()
-    }
-}
-
 impl<T, Ser> ReadUntracked for ArcResource<T, Ser>
 where
    T: 'static,
@@ -235,9 +202,7 @@ where
                computed::suspense::SuspenseContext, effect::in_effect_scope,
                owner::use_context,
            };
-            if !in_effect_scope()
-                && !in_resource_source_signal()
-                && use_context::<SuspenseContext>().is_none()
+            if !in_effect_scope() && use_context::<SuspenseContext>().is_none()
            {
                let location = std::panic::Location::caller();
                reactive_graph::log_warning(format_args!(
@@ -306,7 +271,7 @@ where
        let refetch = ArcRwSignal::new(0);
        let source = ArcMemo::new({
            let refetch = refetch.clone();
-            move |_| (refetch.get(), run_in_resource_source_signal(&source))
+            move |_| (refetch.get(), source())
        });
        let fun = {
            let source = source.clone();
@@ -944,9 +909,7 @@ where
                computed::suspense::SuspenseContext, effect::in_effect_scope,
                owner::use_context,
            };
-            if !in_effect_scope()
-                && !in_resource_source_signal()
-                && use_context::<SuspenseContext>().is_none()
+            if !in_effect_scope() && use_context::<SuspenseContext>().is_none()
            {
                let location = std::panic::Location::caller();
                reactive_graph::log_warning(format_args!(
--- a/reactive_graph/Cargo.toml
+++ b/reactive_graph/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reactive_graph"
-version = "0.2.11"
+version = "0.2.9"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
@@ -29,7 +29,6 @@ send_wrapper = { features = [
 ], workspace = true, default-features = true }
 subsecond = { workspace = true, default-features = true, optional = true }
 indexmap = { workspace = true, default-features = true }
-paste = { workspace = true, default-features = true }

 [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
 web-sys = { version = "0.3.77", features = ["console"] }
@@ -41,7 +40,6 @@ tokio = { features = [
 ], workspace = true, default-features = true }
 tokio-test = { workspace = true, default-features = true }
 any_spawner = { workspace = true, features = ["futures-executor", "tokio"] }
-typed-builder.workspace = true

 [build-dependencies]
 rustc_version = { workspace = true, default-features = true }
--- a/reactive_graph/src/effect/effect.rs
+++ b/reactive_graph/src/effect/effect.rs
@@ -110,12 +110,10 @@ fn effect_base() -> (Receiver, Owner, Arc<RwLock<EffectInner>>) {
    (rx, owner, inner)
 }

-#[cfg(debug_assertions)]
 thread_local! {
    static EFFECT_SCOPE_ACTIVE: AtomicBool = const { AtomicBool::new(false) };
 }

-#[cfg(debug_assertions)]
 /// Returns whether the current thread is currently running an effect.
 pub fn in_effect_scope() -> bool {
    EFFECT_SCOPE_ACTIVE
@@ -125,22 +123,14 @@ pub fn in_effect_scope() -> bool {
 /// Set a static to true whilst running the given function.
 /// [`is_in_effect_scope`] will return true whilst the function is running.
 fn run_in_effect_scope<T>(fun: impl FnOnce() -> T) -> T {
-    #[cfg(debug_assertions)]
-    {
-        // For the theoretical nested case, set back to initial value rather than false:
-        let initial = EFFECT_SCOPE_ACTIVE.with(|scope| {
-            scope.swap(true, std::sync::atomic::Ordering::Relaxed)
-        });
-        let result = fun();
-        EFFECT_SCOPE_ACTIVE.with(|scope| {
-            scope.store(initial, std::sync::atomic::Ordering::Relaxed)
-        });
-        result
-    }
-    #[cfg(not(debug_assertions))]
-    {
-        fun()
-    }
+    // For the theoretical nested case, set back to initial value rather than false:
+    let initial = EFFECT_SCOPE_ACTIVE
+        .with(|scope| scope.swap(true, std::sync::atomic::Ordering::Relaxed));
+    let result = fun();
+    EFFECT_SCOPE_ACTIVE.with(|scope| {
+        scope.store(initial, std::sync::atomic::Ordering::Relaxed)
+    });
+    result
 }

 impl<S> Effect<S>
--- a/reactive_graph/src/into_reactive_value.rs
+++ b/reactive_graph/src/into_reactive_value.rs
@@ -1,67 +0,0 @@
-#[doc(hidden)]
-pub struct __IntoReactiveValueMarkerBaseCase;
-
-/// A helper trait that works like `Into<T>` but uses a marker generic
-/// to allow more `From` implementations than would be allowed with just `Into<T>`.
-pub trait IntoReactiveValue<T, M> {
-    /// Converts `self` into a `T`.
-    fn into_reactive_value(self) -> T;
-}
-
-// The base case, which allows anything which implements .into() to work:
-impl<T, I> IntoReactiveValue<T, __IntoReactiveValueMarkerBaseCase> for I
-where
-    I: Into<T>,
-{
-    fn into_reactive_value(self) -> T {
-        self.into()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use crate::{
-        into_reactive_value::IntoReactiveValue,
-        owner::{LocalStorage, Owner},
-        traits::GetUntracked,
-        wrappers::read::Signal,
-    };
-    use typed_builder::TypedBuilder;
-
-    #[test]
-    fn test_into_signal_compiles() {
-        let owner = Owner::new();
-        owner.set();
-
-        #[cfg(not(feature = "nightly"))]
-        let _: Signal<usize> = (|| 2).into_reactive_value();
-        let _: Signal<usize, LocalStorage> = 2.into_reactive_value();
-        #[cfg(not(feature = "nightly"))]
-        let _: Signal<usize, LocalStorage> = (|| 2).into_reactive_value();
-        let _: Signal<String> = "str".into_reactive_value();
-        let _: Signal<String, LocalStorage> = "str".into_reactive_value();
-
-        #[derive(TypedBuilder)]
-        struct Foo {
-            #[builder(setter(
-                fn transform<M>(value: impl IntoReactiveValue<Signal<usize>, M>) {
-                    value.into_reactive_value()
-                }
-            ))]
-            sig: Signal<usize>,
-        }
-
-        assert_eq!(Foo::builder().sig(2).build().sig.get_untracked(), 2);
-        #[cfg(not(feature = "nightly"))]
-        assert_eq!(Foo::builder().sig(|| 2).build().sig.get_untracked(), 2);
-        assert_eq!(
-            Foo::builder()
-                .sig(Signal::stored(2))
-                .build()
-                .sig
-                .get_untracked(),
-            2
-        );
-    }
-}
--- a/reactive_graph/src/lib.rs
+++ b/reactive_graph/src/lib.rs
@@ -90,12 +90,6 @@ pub mod traits;
 pub mod transition;
 pub mod wrappers;

-mod into_reactive_value;
-pub use into_reactive_value::*;
-
-/// A standard way to wrap functions and closures to pass them to components.
-pub mod callback;
-
 use computed::ScopedFuture;

 #[cfg(all(feature = "nightly", rustc_nightly))]
@@ -103,9 +97,7 @@ mod nightly;

 /// Reexports frequently-used traits.
 pub mod prelude {
-    pub use crate::{
-        into_reactive_value::IntoReactiveValue, owner::FromLocal, traits::*,
-    };
+    pub use crate::{owner::FromLocal, traits::*};
 }

 // TODO remove this, it's just useful while developing
--- a/reactive_graph/src/wrappers.rs
+++ b/reactive_graph/src/wrappers.rs
@@ -324,22 +324,6 @@ pub mod read {
        }
    }

-    impl<S> From<&'static str> for ArcSignal<String, S>
-    where
-        S: Storage<&'static str> + Storage<String>,
-    {
-        #[track_caller]
-        fn from(value: &'static str) -> Self {
-            Self {
-                inner: SignalTypes::Stored(ArcStoredValue::new(
-                    value.to_string(),
-                )),
-                #[cfg(any(debug_assertions, leptos_debuginfo))]
-                defined_at: std::panic::Location::caller(),
-            }
-        }
-    }
-
    impl<T, S> DefinedAt for ArcSignal<T, S>
    where
        S: Storage<T>,
@@ -1065,13 +1049,6 @@ pub mod read {
        }
    }

-    impl From<Signal<&'static str, LocalStorage>> for Signal<String, LocalStorage> {
-        #[track_caller]
-        fn from(value: Signal<&'static str, LocalStorage>) -> Self {
-            Signal::derive_local(move || value.read().to_string())
-        }
-    }
-
    impl From<Signal<&'static str>> for Signal<String, LocalStorage> {
        #[track_caller]
        fn from(value: Signal<&'static str>) -> Self {
@@ -1100,15 +1077,6 @@ pub mod read {
        }
    }

-    impl From<Signal<Option<&'static str>, LocalStorage>>
-        for Signal<Option<String>, LocalStorage>
-    {
-        #[track_caller]
-        fn from(value: Signal<Option<&'static str>, LocalStorage>) -> Self {
-            Signal::derive_local(move || value.read().map(str::to_string))
-        }
-    }
-
    impl From<Signal<Option<&'static str>>>
        for Signal<Option<String>, LocalStorage>
    {
@@ -1118,192 +1086,6 @@ pub mod read {
        }
    }

-    #[cfg(not(feature = "nightly"))]
-    #[doc(hidden)]
-    pub struct __IntoReactiveValueMarkerSignalFromReactiveClosure;
-    #[cfg(not(feature = "nightly"))]
-    #[doc(hidden)]
-    pub struct __IntoReactiveValueMarkerSignalStrOutputToString;
-    #[cfg(not(feature = "nightly"))]
-    #[doc(hidden)]
-    pub struct __IntoReactiveValueMarkerOptionalSignalFromReactiveClosureAlways;
-
-    #[cfg(not(feature = "nightly"))]
-    impl<T, F>
-        crate::IntoReactiveValue<
-            Signal<T, SyncStorage>,
-            __IntoReactiveValueMarkerSignalFromReactiveClosure,
-        > for F
-    where
-        T: Send + Sync + 'static,
-        F: Fn() -> T + Send + Sync + 'static,
-    {
-        fn into_reactive_value(self) -> Signal<T, SyncStorage> {
-            Signal::derive(self)
-        }
-    }
-
-    #[cfg(not(feature = "nightly"))]
-    impl<T, F>
-        crate::IntoReactiveValue<
-            ArcSignal<T, SyncStorage>,
-            __IntoReactiveValueMarkerSignalFromReactiveClosure,
-        > for F
-    where
-        T: Send + Sync + 'static,
-        F: Fn() -> T + Send + Sync + 'static,
-    {
-        fn into_reactive_value(self) -> ArcSignal<T, SyncStorage> {
-            ArcSignal::derive(self)
-        }
-    }
-
-    #[cfg(not(feature = "nightly"))]
-    impl<T, F>
-        crate::IntoReactiveValue<
-            Signal<T, LocalStorage>,
-            __IntoReactiveValueMarkerSignalFromReactiveClosure,
-        > for F
-    where
-        T: 'static,
-        F: Fn() -> T + 'static,
-    {
-        fn into_reactive_value(self) -> Signal<T, LocalStorage> {
-            Signal::derive_local(self)
-        }
-    }
-
-    #[cfg(not(feature = "nightly"))]
-    impl<T, F>
-        crate::IntoReactiveValue<
-            ArcSignal<T, LocalStorage>,
-            __IntoReactiveValueMarkerSignalFromReactiveClosure,
-        > for F
-    where
-        T: 'static,
-        F: Fn() -> T + 'static,
-    {
-        fn into_reactive_value(self) -> ArcSignal<T, LocalStorage> {
-            ArcSignal::derive_local(self)
-        }
-    }
-
-    #[cfg(not(feature = "nightly"))]
-    impl<F>
-        crate::IntoReactiveValue<
-            Signal<String, SyncStorage>,
-            __IntoReactiveValueMarkerSignalStrOutputToString,
-        > for F
-    where
-        F: Fn() -> &'static str + Send + Sync + 'static,
-    {
-        fn into_reactive_value(self) -> Signal<String, SyncStorage> {
-            Signal::derive(move || self().to_string())
-        }
-    }
-
-    #[cfg(not(feature = "nightly"))]
-    impl<F>
-        crate::IntoReactiveValue<
-            ArcSignal<String, SyncStorage>,
-            __IntoReactiveValueMarkerSignalStrOutputToString,
-        > for F
-    where
-        F: Fn() -> &'static str + Send + Sync + 'static,
-    {
-        fn into_reactive_value(self) -> ArcSignal<String, SyncStorage> {
-            ArcSignal::derive(move || self().to_string())
-        }
-    }
-
-    #[cfg(not(feature = "nightly"))]
-    impl<F>
-        crate::IntoReactiveValue<
-            Signal<String, LocalStorage>,
-            __IntoReactiveValueMarkerSignalStrOutputToString,
-        > for F
-    where
-        F: Fn() -> &'static str + 'static,
-    {
-        fn into_reactive_value(self) -> Signal<String, LocalStorage> {
-            Signal::derive_local(move || self().to_string())
-        }
-    }
-
-    #[cfg(not(feature = "nightly"))]
-    impl<F>
-        crate::IntoReactiveValue<
-            ArcSignal<String, LocalStorage>,
-            __IntoReactiveValueMarkerSignalStrOutputToString,
-        > for F
-    where
-        F: Fn() -> &'static str + 'static,
-    {
-        fn into_reactive_value(self) -> ArcSignal<String, LocalStorage> {
-            ArcSignal::derive_local(move || self().to_string())
-        }
-    }
-
-    #[cfg(not(feature = "nightly"))]
-    impl<T, F>
-        crate::IntoReactiveValue<
-            Signal<Option<T>, SyncStorage>,
-            __IntoReactiveValueMarkerOptionalSignalFromReactiveClosureAlways,
-        > for F
-    where
-        T: Send + Sync + 'static,
-        F: Fn() -> T + Send + Sync + 'static,
-    {
-        fn into_reactive_value(self) -> Signal<Option<T>, SyncStorage> {
-            Signal::derive(move || Some(self()))
-        }
-    }
-
-    #[cfg(not(feature = "nightly"))]
-    impl<T, F>
-        crate::IntoReactiveValue<
-            ArcSignal<Option<T>, SyncStorage>,
-            __IntoReactiveValueMarkerOptionalSignalFromReactiveClosureAlways,
-        > for F
-    where
-        T: Send + Sync + 'static,
-        F: Fn() -> T + Send + Sync + 'static,
-    {
-        fn into_reactive_value(self) -> ArcSignal<Option<T>, SyncStorage> {
-            ArcSignal::derive(move || Some(self()))
-        }
-    }
-
-    #[cfg(not(feature = "nightly"))]
-    impl<T, F>
-        crate::IntoReactiveValue<
-            Signal<Option<T>, LocalStorage>,
-            __IntoReactiveValueMarkerOptionalSignalFromReactiveClosureAlways,
-        > for F
-    where
-        T: 'static,
-        F: Fn() -> T + 'static,
-    {
-        fn into_reactive_value(self) -> Signal<Option<T>, LocalStorage> {
-            Signal::derive_local(move || Some(self()))
-        }
-    }
-
-    #[cfg(not(feature = "nightly"))]
-    impl<T, F>
-        crate::IntoReactiveValue<
-            ArcSignal<Option<T>, LocalStorage>,
-            __IntoReactiveValueMarkerOptionalSignalFromReactiveClosureAlways,
-        > for F
-    where
-        T: 'static,
-        F: Fn() -> T + 'static,
-    {
-        fn into_reactive_value(self) -> ArcSignal<Option<T>, LocalStorage> {
-            ArcSignal::derive_local(move || Some(self()))
-        }
-    }
-
    #[allow(deprecated)]
    impl<T> From<MaybeSignal<T>> for Signal<T>
    where
--- a/router/Cargo.toml
+++ b/router/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leptos_router"
-version = "0.8.10"
+version = "0.8.9"
 authors = ["Greg Johnston", "Ben Wishovich"]
 license = "MIT"
 readme = "../README.md"
--- a/router/src/lib.rs
+++ b/router/src/lib.rs
@@ -105,7 +105,7 @@
 //!     move || params.read().get("id").unwrap_or_default(),
 //!     move |id| contact_data(id)
 //!   );
-//!   // ... return some view
+//!   todo!()
 //! }
 //! ```
 //!
--- a/tachys/Cargo.toml
+++ b/tachys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tachys"
-version = "0.2.11"
+version = "0.2.10"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
--- a/tachys/src/html/class.rs
+++ b/tachys/src/html/class.rs
@@ -57,10 +57,6 @@ where
        _style: &mut String,
        _inner_html: &mut String,
    ) {
-        // If this is a class="..." attribute (not class:name=value), clear previous value
-        if self.class.should_overwrite() {
-            class.clear();
-        }
        class.push(' ');
        self.class.to_html(class);
    }
@@ -160,12 +156,6 @@ pub trait IntoClass: Send {
    /// Renders the class to HTML.
    fn to_html(self, class: &mut String);

-    /// Whether this class attribute should overwrite previous class values.
-    /// Returns `true` for `class="..."` attributes, `false` for `class:name=value` directives.
-    fn should_overwrite(&self) -> bool {
-        false
-    }
-
    /// Renders the class to HTML for a `<template>`.
    #[allow(unused)] // it's used with `nightly` feature
    fn to_template(class: &mut String) {}
@@ -299,10 +289,6 @@ impl IntoClass for &str {
        class.push_str(self);
    }

-    fn should_overwrite(&self) -> bool {
-        true
-    }
-
    fn hydrate<const FROM_SERVER: bool>(
        self,
        el: &crate::renderer::types::Element,
@@ -360,10 +346,6 @@ impl IntoClass for Cow<'_, str> {
        IntoClass::to_html(&*self, class);
    }

-    fn should_overwrite(&self) -> bool {
-        true
-    }
-
    fn hydrate<const FROM_SERVER: bool>(
        self,
        el: &crate::renderer::types::Element,
@@ -421,10 +403,6 @@ impl IntoClass for String {
        IntoClass::to_html(self.as_str(), class);
    }

-    fn should_overwrite(&self) -> bool {
-        true
-    }
-
    fn hydrate<const FROM_SERVER: bool>(
        self,
        el: &crate::renderer::types::Element,
@@ -482,10 +460,6 @@ impl IntoClass for Arc<str> {
        IntoClass::to_html(self.as_ref(), class);
    }

-    fn should_overwrite(&self) -> bool {
-        true
-    }
-
    fn hydrate<const FROM_SERVER: bool>(
        self,
        el: &crate::renderer::types::Element,
--- a/tachys/src/html/directive.rs
+++ b/tachys/src/html/directive.rs
@@ -47,13 +47,11 @@ pub fn directive<T, P, D>(handler: D, param: P) -> Directive<T, D, P>
 where
    D: IntoDirective<T, P>,
 {
-    Directive((!cfg!(feature = "ssr")).then(|| {
-        SendWrapper::new(DirectiveInner {
-            handler,
-            param,
-            t: PhantomData,
-        })
-    }))
+    Directive(Some(SendWrapper::new(DirectiveInner {
+        handler,
+        param,
+        t: PhantomData,
+    })))
 }

 /// Custom logic that runs in the browser when the element is created or hydrated.
@@ -153,7 +151,13 @@ where
        Directive(inner)
    }

-    fn dry_resolve(&mut self) {}
+    fn dry_resolve(&mut self) {
+        // dry_resolve() only runs during SSR, and we should use it to
+        // synchronously remove and drop the SendWrapper value
+        // we don't need this value during SSR and leaving it here could drop it
+        // from a different thread
+        self.0.take();
+    }

    async fn resolve(self) -> Self::AsyncOutput {
        self
--- a/tachys/src/html/event.rs
+++ b/tachys/src/html/event.rs
@@ -113,7 +113,7 @@ where
        event,
        #[cfg(feature = "reactive_graph")]
        owner: reactive_graph::owner::Owner::current().unwrap_or_default(),
-        cb: (!cfg!(feature = "ssr")).then(|| SendWrapper::new(cb)),
+        cb: Some(SendWrapper::new(cb)),
    }
 }

@@ -352,7 +352,13 @@ where
        }
    }

-    fn dry_resolve(&mut self) {}
+    fn dry_resolve(&mut self) {
+        // dry_resolve() only runs during SSR, and we should use it to
+        // synchronously remove and drop the SendWrapper value
+        // we don't need this value during SSR and leaving it here could drop it
+        // from a different thread
+        self.cb.take();
+    }

    async fn resolve(self) -> Self::AsyncOutput {
        self
--- a/tachys/src/html/property.rs
+++ b/tachys/src/html/property.rs
@@ -22,7 +22,7 @@ where
 {
    Property {
        key,
-        value: (!cfg!(feature = "ssr")).then(|| SendWrapper::new(value)),
+        value: Some(SendWrapper::new(value)),
    }
 }

@@ -115,7 +115,13 @@ where
        }
    }

-    fn dry_resolve(&mut self) {}
+    fn dry_resolve(&mut self) {
+        // dry_resolve() only runs during SSR, and we should use it to
+        // synchronously remove and drop the SendWrapper value
+        // we don't need this value during SSR and leaving it here could drop it
+        // from a different thread
+        self.value.take();
+    }

    async fn resolve(self) -> Self::AsyncOutput {
        self
--- a/tachys/src/hydration.rs
+++ b/tachys/src/hydration.rs
@@ -7,9 +7,6 @@ use std::cell::Cell;
 use std::{cell::RefCell, panic::Location, rc::Rc};
 use web_sys::{Comment, Element, Node, Text};

-#[cfg(feature = "mark_branches")]
-const COMMENT_NODE: u16 = 8;
-
 /// Hydration works by walking over the DOM, adding interactivity as needed.
 ///
 /// This cursor tracks the location in the DOM that is currently being hydrated. Each that type
@@ -46,27 +43,13 @@ where
    ///
    /// Does nothing if there is no child.
    pub fn child(&self) {
+        //crate::log("advancing to next child of ");
+        //Rndr::log_node(&self.current());
        let mut inner = self.0.borrow_mut();
        if let Some(node) = Rndr::first_child(&inner) {
            *inner = node;
        }
-
-        #[cfg(feature = "mark_branches")]
-        {
-            while inner.node_type() == COMMENT_NODE {
-                if let Some(content) = inner.text_content() {
-                    if content.starts_with("bo") || content.starts_with("bc") {
-                        if let Some(sibling) = Rndr::next_sibling(&inner) {
-                            *inner = sibling;
-                            continue;
-                        }
-                    }
-                }
-
-                break;
-            }
-        }
-        // //drop(inner);
+        //drop(inner);
        //crate::log(">> which is ");
        //Rndr::log_node(&self.current());
    }
@@ -75,25 +58,12 @@ where
    ///
    /// Does nothing if there is no sibling.
    pub fn sibling(&self) {
+        //crate::log("advancing to next sibling of ");
+        //Rndr::log_node(&self.current());
        let mut inner = self.0.borrow_mut();
        if let Some(node) = Rndr::next_sibling(&inner) {
            *inner = node;
        }
-
-        #[cfg(feature = "mark_branches")]
-        {
-            while inner.node_type() == COMMENT_NODE {
-                if let Some(content) = inner.text_content() {
-                    if content.starts_with("bo") || content.starts_with("bc") {
-                        if let Some(sibling) = Rndr::next_sibling(&inner) {
-                            *inner = sibling;
-                            continue;
-                        }
-                    }
-                }
-                break;
-            }
-        }
        //drop(inner);
        //crate::log(">> which is ");
        //Rndr::log_node(&self.current());
--- a/tachys/src/view/any_view.rs
+++ b/tachys/src/view/any_view.rs
@@ -575,7 +575,15 @@ impl RenderHtml for AnyView {
        #[cfg(feature = "hydrate")]
        {
            if FROM_SERVER {
-                (self.hydrate_from_server)(self.value, cursor, position)
+                if cfg!(feature = "mark_branches") {
+                    cursor.advance_to_placeholder(position);
+                }
+                let state =
+                    (self.hydrate_from_server)(self.value, cursor, position);
+                if cfg!(feature = "mark_branches") {
+                    cursor.advance_to_placeholder(position);
+                }
+                state
            } else {
                panic!(
                    "hydrating AnyView from inside a ViewTemplate is not \
@@ -601,8 +609,14 @@ impl RenderHtml for AnyView {
    ) -> Self::State {
        #[cfg(feature = "hydrate")]
        {
+            if cfg!(feature = "mark_branches") {
+                cursor.advance_to_placeholder(position);
+            }
            let state =
                (self.hydrate_async)(self.value, cursor, position).await;
+            if cfg!(feature = "mark_branches") {
+                cursor.advance_to_placeholder(position);
+            }
            state
        }
        #[cfg(not(feature = "hydrate"))]
--- a/tachys/src/view/either.rs
+++ b/tachys/src/view/either.rs
@@ -411,14 +411,21 @@ where
        cursor: &Cursor,
        position: &PositionState,
    ) -> Self::State {
-        match self {
+        if cfg!(feature = "mark_branches") {
+            cursor.advance_to_placeholder(position);
+        }
+        let state = match self {
            Either::Left(left) => {
                Either::Left(left.hydrate::<FROM_SERVER>(cursor, position))
            }
            Either::Right(right) => {
                Either::Right(right.hydrate::<FROM_SERVER>(cursor, position))
            }
+        };
+        if cfg!(feature = "mark_branches") {
+            cursor.advance_to_placeholder(position);
        }
+        state
    }

    async fn hydrate_async(
@@ -426,14 +433,21 @@ where
        cursor: &Cursor,
        position: &PositionState,
    ) -> Self::State {
-        match self {
+        if cfg!(feature = "mark_branches") {
+            cursor.advance_to_placeholder(position);
+        }
+        let state = match self {
            Either::Left(left) => {
                Either::Left(left.hydrate_async(cursor, position).await)
            }
            Either::Right(right) => {
                Either::Right(right.hydrate_async(cursor, position).await)
            }
+        };
+        if cfg!(feature = "mark_branches") {
+            cursor.advance_to_placeholder(position);
        }
+        state
    }

    fn into_owned(self) -> Self::Owned {
@@ -959,11 +973,17 @@ macro_rules! tuples {
                    cursor: &Cursor,
                    position: &PositionState,
                ) -> Self::State {
+                    if cfg!(feature = "mark_branches") {
+                        cursor.advance_to_placeholder(position);
+                    }
                    let state = match self {
                        $([<EitherOf $num>]::$ty(this) => {
                            [<EitherOf $num>]::$ty(this.hydrate::<FROM_SERVER>(cursor, position))
                        })*
                    };
+                    if cfg!(feature = "mark_branches") {
+                        cursor.advance_to_placeholder(position);
+                    }

                    Self::State { state }
                }
@@ -973,11 +993,17 @@ macro_rules! tuples {
                    cursor: &Cursor,
                    position: &PositionState,
                ) -> Self::State {
+                    if cfg!(feature = "mark_branches") {
+                        cursor.advance_to_placeholder(position);
+                    }
                    let state = match self {
                        $([<EitherOf $num>]::$ty(this) => {
                            [<EitherOf $num>]::$ty(this.hydrate_async(cursor, position).await)
                        })*
                    };
+                    if cfg!(feature = "mark_branches") {
+                        cursor.advance_to_placeholder(position);
+                    }

                    Self::State { state }
                }
--- a/tachys/src/view/keyed.rs
+++ b/tachys/src/view/keyed.rs
@@ -322,6 +322,10 @@ where
        cursor: &Cursor,
        position: &PositionState,
    ) -> Self::State {
+        if cfg!(feature = "mark_branches") {
+            cursor.advance_to_placeholder(position);
+        }
+
        // get parent and position
        let current = cursor.current();
        let parent = if position.get() == Position::FirstChild {
@@ -342,12 +346,22 @@ where
        for (index, item) in items.enumerate() {
            hashed_items.insert((self.key_fn)(&item));
            let (set_index, view) = (self.view_fn)(index, item);
+            if cfg!(feature = "mark_branches") {
+                cursor.advance_to_placeholder(position);
+            }
            let item = view.hydrate::<FROM_SERVER>(cursor, position);
+            if cfg!(feature = "mark_branches") {
+                cursor.advance_to_placeholder(position);
+            }
            rendered_items.push(Some((set_index, item)));
        }
        let marker = cursor.next_placeholder(position);
        position.set(Position::NextChild);

+        if cfg!(feature = "mark_branches") {
+            cursor.advance_to_placeholder(position);
+        }
+
        KeyedState {
            parent: Some(parent),
            marker,
@@ -361,6 +375,10 @@ where
        cursor: &Cursor,
        position: &PositionState,
    ) -> Self::State {
+        if cfg!(feature = "mark_branches") {
+            cursor.advance_to_placeholder(position);
+        }
+
        // get parent and position
        let current = cursor.current();
        let parent = if position.get() == Position::FirstChild {
@@ -381,12 +399,22 @@ where
        for (index, item) in items.enumerate() {
            hashed_items.insert((self.key_fn)(&item));
            let (set_index, view) = (self.view_fn)(index, item);
+            if cfg!(feature = "mark_branches") {
+                cursor.advance_to_placeholder(position);
+            }
            let item = view.hydrate_async(cursor, position).await;
+            if cfg!(feature = "mark_branches") {
+                cursor.advance_to_placeholder(position);
+            }
            rendered_items.push(Some((set_index, item)));
        }
        let marker = cursor.next_placeholder(position);
        position.set(Position::NextChild);

+        if cfg!(feature = "mark_branches") {
+            cursor.advance_to_placeholder(position);
+        }
+
        KeyedState {
            parent: Some(parent),
            marker,