fix: don't re-mount identical child in DynChild

.github/workflows/run-example-task.yml

@@ -26,11 +26,6 @@ jobs:
 
     steps:
       # Setup environment
-      - name: Install playwright browser dependencies
-        run: | 
-          sudo apt-get update
-          sudo apt-get install libegl1 libvpx7 libevent-2.1-7 libopus0 libopengl0 libwoff1 libharfbuzz-icu0 libgstreamer-plugins-base1.0-0 libgstreamer-gl1.0-0 libhyphen0 libmanette-0.2-0 libgles2 gstreamer1.0-libav                   
-
       - uses: actions/checkout@v3
 
       - name: Setup Rust

CODE_OF_CONDUCT.md

@@ -2,7 +2,7 @@
 
 _This Code of Conduct is based on the [Rust Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct)
 and the [Bevy Code of Conduct](https://raw.githubusercontent.com/bevyengine/bevy/main/CODE_OF_CONDUCT.md),
-which are adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling)
+which are adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling) 
 and the [Contributor Covenant](https://www.contributor-covenant.org)._
 
 ## Our Pledge

CONTRIBUTING.md

@@ -22,7 +22,7 @@ Leptos, as a framework, reflects certain technical values:
 - **Expose primitives rather than imposing patterns.** Provide building blocks
   that users can combine together to build up more complex behavior, rather than
   requiring users follow certain templates, file formats, etc. e.g., components
-  are defined as functions, rather than a bespoke single-file component format.
+  are defined as functions, rather than a bespoke single-file comonent format.
   The reactive system feeds into the rendering system, rather than being defined
   by it.
 - **Bottom-up over top-down.** If you envision a user’s application as a tree
@@ -42,7 +42,7 @@ Leptos, as a framework, reflects certain technical values:
 - **Embrace Rust semantics.** Especially in things like UI templating, use Rust
   semantics or extend them in a predictable way with control-flow components
   rather than overloading the meaning of Rust terms like `if` or `for` in a
-  framework-specific way.
+  framework-speciic way.
 - **Enhance ergonomics without obfuscating what’s happening.** This is by far
   the hardest to achieve. It’s often the case that adding additional layers to
   improve DX (like a custom build tool and starter templates) comes across as
@@ -67,7 +67,7 @@ are a few guidelines that will make it a better experience for everyone:
 - Our CI tests every PR against all the existing examples, sometimes requiring
   compilation for both server and client side, etc. It’s thorough but slow. If
   you want to run CI locally to reduce frustration, you can do that by installing
-  `cargo-make` and using `cargo make check && cargo make test && cargo make
+  `cargo-make` and using `cargo make check && cargo make test && cargo make 
 check-examples`.
 
 ## Architecture

README.md

@@ -8,6 +8,7 @@
 [![Discord](https://img.shields.io/discord/1031524867910148188?color=%237289DA&label=discord)](https://discord.gg/YdRAhS7eQB)
 [![Matrix](https://img.shields.io/badge/Matrix-leptos-grey?logo=matrix&labelColor=white&logoColor=black)](https://matrix.to/#/#leptos:matrix.org)
 
+
 [Website](https://leptos.dev) | [Book](https://leptos-rs.github.io/leptos/) | [Docs.rs](https://docs.rs/leptos/latest/leptos/) | [Playground](https://codesandbox.io/p/sandbox/leptos-rtfggt?file=%2Fsrc%2Fmain.rs%3A1%2C1) | [Discord](https://discord.gg/YdRAhS7eQB)
 
 # Leptos

docs/book/src/interlude_projecting_children.md

@@ -29,9 +29,9 @@ where
 }
 ```
 
-This is pretty straightforward: when the user is logged in, we want to show `children`. If the user is not logged in, we want to show `fallback`. And while we’re waiting to find out, we just render `()`, i.e., nothing.
+This is pretty straightforward: when the user is logged in, we want to show `children`. Until if the user is not logged in, we want to show `fallback`. And while we’re waiting to find out, we just render `()`, i.e., nothing.
 
-In other words, we want to pass the children of `<LoggedIn/>` _through_ the `<Suspense/>` component to become the children of the `<Show/>`. This is what I mean by “projection.”
+In other words, we want to pass the children of `<WhenLoaded/>` _through_ the `<Suspense/>` component to become the children of the `<Show/>`. This is what I mean by “projection.”
 
 This won’t compile.
 

docs/book/src/metadata.md

@@ -24,7 +24,7 @@ That’s where the [`leptos_meta`](https://docs.rs/leptos_meta/latest/leptos_met
 
 `leptos_meta` also provides a [`<Script/>`](https://docs.rs/leptos_meta/latest/leptos_meta/fn.Script.html) component, and it’s worth pausing here for a second. All of the other components we’ve considered inject `<head>`-only elements in the `<head>`. But a `<script>` can also be included in the body.
 
-There’s a very simple way to determine whether you should use a capital-S `<Script/>` component or a lowercase-s `<script>` element: the `<Script/>` component will be rendered in the `<head>`, and the `<script>` element will be rendered wherever in the `<body>` of your user interface you put it in, alongside other normal HTML elements. These cause JavaScript to load and run at different times, so use whichever is appropriate to your needs.
+There’s a very simple way to determine whether you should use a capital-S `<Script/>` component or a lowercase-s `<script>` element: the `<Script/>` component will be rendered in the `<head>`, and the `<script>` element will be rendered wherever in your the `<body>` of your user interface you put in, alongside other normal HTML elements. These cause JavaScript to load and run at different times, so use whichever is appropriate to your needs.
 
 ## `<Body/>` and `<Html/>`
 

docs/book/src/reactivity/working_with_signals.md

@@ -9,7 +9,7 @@ There are four basic signal operations:
 1. [`.get()`](https://docs.rs/leptos/latest/leptos/struct.ReadSignal.html#impl-SignalGet%3CT%3E-for-ReadSignal%3CT%3E) clones the current value of the signal and tracks any future changes to the value reactively.
 2. [`.with()`](https://docs.rs/leptos/latest/leptos/struct.ReadSignal.html#impl-SignalWith%3CT%3E-for-ReadSignal%3CT%3E) takes a function, which receives the current value of the signal by reference (`&T`), and tracks any future changes.
 3. [`.set()`](https://docs.rs/leptos/latest/leptos/struct.WriteSignal.html#impl-SignalSet%3CT%3E-for-WriteSignal%3CT%3E) replaces the current value of the signal and notifies any subscribers that they need to update.
-4. [`.update()`](https://docs.rs/leptos/latest/leptos/struct.WriteSignal.html#impl-SignalUpdate%3CT%3E-for-WriteSignal%3CT%3E) takes a function, which receives a mutable reference to the current value of the signal (`&mut T`), and notifies any subscribers that they need to update. (`.update()` doesn’t return the value returned by the closure, but you can use [`.try_update()`](https://docs.rs/leptos/latest/leptos/trait.SignalUpdate.html#tymethod.try_update) if you need to; for example, if you’re removing an item from a `Vec<_>` and want the removed item.)
+4. [`.update()`](https://docs.rs/leptos/latest/leptos/struct.WriteSignal.html#impl-SignalUpdate%3CT%3E-for-WriteSignal%3CT%3E) takes a function, which receives a mutable reference to the current value of the signal (`&T`), and notifies any subscribers that they need to update. (`.update()` doesn’t return the value returned by the closure, but you can use [`.try_update()`](https://docs.rs/leptos/latest/leptos/trait.SignalUpdate.html#tymethod.try_update) if you need to; for example, if you’re removing an item from a `Vec<_>` and want the removed item.)
 
 Calling a `ReadSignal` as a function is syntax sugar for `.get()`. Calling a `WriteSignal` as a function is syntax sugar for `.set()`. So
 
@@ -99,7 +99,7 @@ let clear_handler = move |_| {
 ### If you really must...
 **4) Create an effect to write to B whenever A changes.** This is officially discouraged, for several reasons:
 a) It will always be less efficient, as it means every time A updates you do two full trips through the reactive process. (You set A, which causes the effect to run, as well as any other effects that depend on A. Then you set B, which causes any effects that depend on B to run.)
-b) It increases your chances of accidentally creating things like infinite loops or over-re-running effects. This is the kind of ping-ponging, reactive spaghetti code that was common in the early 2010s and that we try to avoid with things like read-write segregation and discouraging writing to signals from effects.
+b) It increases your chances of accidentally creating things like infinite loops or over-re-running effects. This is the kind of ping-ponging, reactive spaghetti code that was common in the early 2010s and that we try to avoid with things like read-write segregation and discouraging writing to signals frome effects.
 
 In most situations, it’s best to rewrite things such that there’s a clear, top-down data flow based on derived signals or memos. But this isn’t the end of the world.
 

docs/book/src/router/README.md

@@ -4,10 +4,10 @@
 
 Routing drives most websites. A router is the answer to the question, “Given this URL, what should appear on the page?”
 
-A URL consists of many parts. For example, the URL `https://my-cool-blog.com/blog/search?q=Search#results` consists of
+A URL consists of many parts. For example, the URL `https://leptos.dev/blog/search?q=Search#results` consists of
 
 - a _scheme_: `https`
-- a _domain_: `my-cool-blog.com`
+- a _domain_: `leptos.dev`
 - a **path**: `/blog/search`
 - a **query** (or **search**): `?q=Search`
 - a _hash_: `#results`

docs/book/src/view/01_basic_component.md

@@ -28,7 +28,7 @@ fn App(cx: Scope) -> impl IntoView {
     view! { cx,
         <button
             on:click=move |_| {
-                set_count(3);
+                set_count.update(|n| *n += 1);
             }
         >
             "Click me: "
@@ -142,7 +142,7 @@ in a function, telling the framework to update the view every time `count` chang
 `{count()}` access the value of `count` once, and passes an `i32` into the view,
 rendering it once, unreactively. You can see the difference in the CodeSandbox below!
 
-Let’s make one final change. `set_count(3)` is a pretty useless thing for a click handler to do. Let’s replace “set this value to 3” with “increment this value by 1”:
+Let’s make one final change. `set_count(3)` is a pretty useless thing for a click handler to do. Let’s replacing “set this value to 3” with “increment this value by 1”:
 
 ```rust
 move |_| {

docs/book/src/view/03_components.md

@@ -98,6 +98,18 @@ notice that you can easily tell the difference between an element and a componen
 because components always have `PascalCase` names. You pass the `progress` prop
 in as if it were an HTML element attribute. Simple.
 
+> ### Important Note
+>
+> For every `Component`, Leptos generates a corresponding `ComponentProps` type. This
+> is what allows us to have named props, when Rust does not have named function parameters.
+> If you’re defining a component in one module and importing it into another, make
+> sure you include this `ComponentProps` type:
+>
+> `use progress_bar::{ProgressBar, ProgressBarProps};`
+>
+> **Note**: This is still true as of `0.2.5`, but the requirement has been removed on `main`
+> and will not apply to later versions.
+
 ### Reactive and Static Props
 
 You’ll notice that throughout this example, `progress` takes a reactive

examples/errors_axum/src/landing.rs

@@ -34,7 +34,10 @@ pub fn App(cx: Scope) -> impl IntoView {
             </header>
             <main>
                 <Routes>
-                    <Route path="" view=|cx| view! { cx, <ExampleErrors/> }/>
+                    <Route path="" view=|cx| view! {
+                        cx,
+                        <ExampleErrors/>
+                    }/>
                 </Routes>
             </main>
         </Router>
@@ -63,7 +66,7 @@ pub fn ExampleErrors(cx: Scope) -> impl IntoView {
         // note that the error boundaries could be placed above in the Router or lower down
         // in a particular route. The generated errors on the entire page contribute to the
         // final status code sent by the server when producing ssr pages.
-        <ErrorBoundary fallback=|cx, errors| view!{ cx, <ErrorTemplate errors=errors/>}>
+        <ErrorBoundary fallback=|cx, errors| view!{cx, <ErrorTemplate errors=errors/>}>
             <ReturnsError/>
         </ErrorBoundary>
         </div>

examples/fetch/src/lib.rs

@@ -1,4 +1,4 @@
-use leptos::{error::Result, *};
+use leptos::*;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
@@ -8,24 +8,30 @@ pub struct Cat {
 }
 
 #[derive(Error, Clone, Debug)]
-pub enum CatError {
+pub enum FetchError {
     #[error("Please request more than zero cats.")]
     NonZeroCats,
+    #[error("Error loading data from serving.")]
+    Request,
+    #[error("Error deserializaing cat data from request.")]
+    Json,
 }
 
 type CatCount = usize;
 
-async fn fetch_cats(count: CatCount) -> Result<Vec<String>> {
+async fn fetch_cats(count: CatCount) -> Result<Vec<String>, FetchError> {
     if count > 0 {
         // make the request
         let res = reqwasm::http::Request::get(&format!(
             "https://api.thecatapi.com/v1/images/search?limit={count}",
         ))
         .send()
-        .await?
+        .await
+        .map_err(|_| FetchError::Request)?
         // convert it to JSON
         .json::<Vec<Cat>>()
-        .await?
+        .await
+        .map_err(|_| FetchError::Json)?
         // extract the URL field for each cat
         .into_iter()
         .take(count)
@@ -33,7 +39,7 @@ async fn fetch_cats(count: CatCount) -> Result<Vec<String>> {
         .collect::<Vec<_>>();
         Ok(res)
     } else {
-        Err(CatError::NonZeroCats.into())
+        Err(FetchError::NonZeroCats)
     }
 }
 

examples/leptos-tailwind-axum/Cargo.toml

@@ -11,12 +11,10 @@ axum = { version = "0.6.18", optional = true }
 console_error_panic_hook = "0.1.7"
 console_log = "1"
 cfg-if = "1"
-leptos = { path = "../../leptos", default-features = false, features = [
-  "serde",
-] }
-leptos_meta = { path = "../../meta", default-features = false }
-leptos_axum = { path = "../../integrations/axum", default-features = false, optional = true }
-leptos_router = { path = "../../router", default-features = false }
+leptos = { version = "0.3", default-features = false, features = ["serde"] }
+leptos_axum = { version = "0.3", optional = true }
+leptos_meta = { version = "0.3", default-features = false }
+leptos_router = { version = "0.3", default-features = false }
 log = "0.4.17"
 simple_logger = "4"
 tokio = { version = "1.28.1", optional = true }

examples/leptos-tailwind-axum/src/error_template.rs

@@ -0,0 +1,75 @@
+use cfg_if::cfg_if;
+use http::status::StatusCode;
+use leptos::*;
+#[cfg(feature = "ssr")]
+use leptos_axum::ResponseOptions;
+use thiserror::Error;
+
+#[derive(Clone, Debug, Error)]
+pub enum AppError {
+    #[error("Not Found")]
+    NotFound,
+}
+
+impl AppError {
+    pub fn status_code(&self) -> StatusCode {
+        match self {
+            AppError::NotFound => StatusCode::NOT_FOUND,
+        }
+    }
+}
+
+// A basic function to display errors served by the error boundaries.
+// Feel free to do more complicated things here than just displaying the error.
+#[component]
+pub fn ErrorTemplate(
+    cx: Scope,
+    #[prop(optional)] outside_errors: Option<Errors>,
+    #[prop(optional)] errors: Option<RwSignal<Errors>>,
+) -> impl IntoView {
+    let errors = match outside_errors {
+        Some(e) => create_rw_signal(cx, e),
+        None => match errors {
+            Some(e) => e,
+            None => panic!("No Errors found and we expected errors!"),
+        },
+    };
+    // Get Errors from Signal
+    let errors = errors.get();
+
+    // Downcast lets us take a type that implements `std::error::Error`
+    let errors: Vec<AppError> = errors
+        .into_iter()
+        .filter_map(|(_k, v)| v.downcast_ref::<AppError>().cloned())
+        .collect();
+    println!("Errors: {errors:#?}");
+
+    // Only the response code for the first error is actually sent from the server
+    // this may be customized by the specific application
+    cfg_if! { if #[cfg(feature="ssr")] {
+        let response = use_context::<ResponseOptions>(cx);
+        if let Some(response) = response {
+            response.set_status(errors[0].status_code());
+        }
+    }}
+
+    view! {cx,
+        <h1>{if errors.len() > 1 {"Errors"} else {"Error"}}</h1>
+        <For
+            // a function that returns the items we're iterating over; a signal is fine
+            each= move || {errors.clone().into_iter().enumerate()}
+            // a unique key for each item as a reference
+            key=|(index, _error)| *index
+            // renders each item to a view
+            view= move |cx, error| {
+                let error_string = error.1.to_string();
+                let error_code= error.1.status_code();
+                view! {
+                    cx,
+                    <h2>{error_code.to_string()}</h2>
+                    <p>"Error: " {error_string}</p>
+                }
+            }
+        />
+    }
+}

examples/leptos-tailwind-axum/src/fileserv.rs

@@ -3,27 +3,29 @@ use cfg_if::cfg_if;
 cfg_if! { if #[cfg(feature = "ssr")] {
     use axum::{
         body::{boxed, Body, BoxBody},
-        extract::State,
+        extract::Extension,
         response::IntoResponse,
         http::{Request, Response, StatusCode, Uri},
     };
     use axum::response::Response as AxumResponse;
     use tower::ServiceExt;
     use tower_http::services::ServeDir;
-    use leptos::{LeptosOptions, view};
-    use crate::app::App;
+    use std::sync::Arc;
+    use leptos::*;
+    use crate::error_template::ErrorTemplate;
+    use crate::error_template::AppError;
 
-    pub async fn file_and_error_handler(uri: Uri, State(options): State<LeptosOptions>, req: Request<Body>) -> AxumResponse {
+    pub async fn file_and_error_handler(uri: Uri, Extension(options): Extension<Arc<LeptosOptions>>, req: Request<Body>) -> AxumResponse {
+        let options = &*options;
         let root = options.site_root.clone();
         let res = get_static_file(uri.clone(), &root).await.unwrap();
 
         if res.status() == StatusCode::OK {
-            res.into_response()
-        } else{
-            let handler = leptos_axum::render_app_to_stream(
-                options.to_owned(),
-                move |cx| view!{ cx, <App/> }
-            );
+           res.into_response()
+        } else {
+            let mut errors = Errors::default();
+            errors.insert_with_default_key(AppError::NotFound);
+            let handler = leptos_axum::render_app_to_stream(options.to_owned(), move |cx| view!{cx, <ErrorTemplate outside_errors=errors.clone()/>});
             handler(req).await.into_response()
         }
     }

examples/leptos-tailwind-axum/src/lib.rs

@@ -1,6 +1,7 @@
 use cfg_if::cfg_if;
 pub mod app;
-pub mod fallback;
+pub mod error_template;
+pub mod fileserv;
 
 cfg_if! { if #[cfg(feature = "hydrate")] {
     use leptos::*;

examples/leptos-tailwind-axum/src/main.rs

@@ -1,11 +1,12 @@
 #[cfg(feature = "ssr")]
 #[tokio::main]
 async fn main() {
-    use axum::{routing::post, Router};
+    use axum::{extract::Extension, routing::post, Router};
     use leptos::*;
     use leptos_axum::{generate_route_list, LeptosRoutes};
-    use leptos_tailwind::{app::*, fallback::file_and_error_handler};
+    use leptos_tailwind::{app::*, fileserv::file_and_error_handler};
     use log::info;
+    use std::sync::Arc;
 
     simple_logger::init_with_level(log::Level::Info)
         .expect("couldn't initialize logging");
@@ -16,17 +17,20 @@ async fn main() {
     // Alternately a file can be specified such as Some("Cargo.toml")
     // The file would need to be included with the executable when moved to deployment
     let conf = get_configuration(None).await.unwrap();
-    let addr = conf.leptos_options.site_addr;
     let leptos_options = conf.leptos_options;
-    // Generate the list of routes in your Leptos App
+    let addr = leptos_options.site_addr;
     let routes = generate_route_list(|cx| view! { cx, <App/> }).await;
 
     // build our application with a route
     let app = Router::new()
         .route("/api/*fn_name", post(leptos_axum::handle_server_fns))
-        .leptos_routes(&leptos_options, routes, |cx| view! { cx, <App/> })
+        .leptos_routes(
+            leptos_options.clone(),
+            routes,
+            |cx| view! { cx, <App/> },
+        )
         .fallback(file_and_error_handler)
-        .with_state(leptos_options);
+        .layer(Extension(Arc::new(leptos_options)));
 
     // run our app with hyper
     // `axum::Server` is a re-export of `hyper::Server`

examples/session_auth_axum/src/auth.rs

@@ -163,11 +163,12 @@ pub async fn login(
 
     let user: User = User::get_from_username(username, &pool)
         .await
-        .ok_or_else(|| {
-            ServerFnError::ServerError("User does not exist.".into())
-        })?;
+        .ok_or("User does not exist.")
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))?;
 
-    match verify(password, &user.password)? {
+    match verify(password, &user.password)
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))?
+    {
         true => {
             auth.login_user(user.id);
             auth.remember_user(remember.is_some());
@@ -203,16 +204,13 @@ pub async fn signup(
         .bind(username.clone())
         .bind(password_hashed)
         .execute(&pool)
-        .await?;
+        .await
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))?;
 
-    let user =
-        User::get_from_username(username, &pool)
-            .await
-            .ok_or_else(|| {
-                ServerFnError::ServerError(
-                    "Signup failed: User does not exist.".into(),
-                )
-            })?;
+    let user = User::get_from_username(username, &pool)
+        .await
+        .ok_or("Signup failed: User does not exist.")
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))?;
 
     auth.login_user(user.id);
     auth.remember_user(remember.is_some());

examples/session_auth_axum/src/todo.rs

@@ -21,12 +21,14 @@ if #[cfg(feature = "ssr")] {
 
     pub fn pool(cx: Scope) -> Result<SqlitePool, ServerFnError> {
        use_context::<SqlitePool>(cx)
-            .ok_or_else(|| ServerFnError::ServerError("Pool missing.".into()))
+            .ok_or("Pool missing.")
+            .map_err(|e| ServerFnError::ServerError(e.to_string()))
     }
 
     pub fn auth(cx: Scope) -> Result<AuthSession, ServerFnError> {
         use_context::<AuthSession>(cx)
-            .ok_or_else(|| ServerFnError::ServerError("Auth session missing.".into()))
+            .ok_or("Auth session missing.")
+            .map_err(|e| ServerFnError::ServerError(e.to_string()))
     }
 
     #[derive(sqlx::FromRow, Clone)]
@@ -62,7 +64,11 @@ pub async fn get_todos(cx: Scope) -> Result<Vec<Todo>, ServerFnError> {
     let mut rows =
         sqlx::query_as::<_, SqlTodo>("SELECT * FROM todos").fetch(&pool);
 
-    while let Some(row) = rows.try_next().await? {
+    while let Some(row) = rows
+        .try_next()
+        .await
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))?
+    {
         todos.push(row);
     }
 
@@ -111,11 +117,12 @@ pub async fn add_todo(cx: Scope, title: String) -> Result<(), ServerFnError> {
 pub async fn delete_todo(cx: Scope, id: u16) -> Result<(), ServerFnError> {
     let pool = pool(cx)?;
 
-    Ok(sqlx::query("DELETE FROM todos WHERE id = $1")
+    sqlx::query("DELETE FROM todos WHERE id = $1")
         .bind(id)
         .execute(&pool)
         .await
-        .map(|_| ())?)
+        .map(|_| ())
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))
 }
 
 #[component]
@@ -170,7 +177,12 @@ pub fn TodoApp(cx: Scope) -> impl IntoView {
             <hr/>
             <main>
                 <Routes>
-                    <Route path="" view=|cx| view! { cx, <Todos/> }/> //Route
+                    <Route path="" view=|cx| view! {
+                        cx,
+                        <ErrorBoundary fallback=|cx, errors| view!{cx, <ErrorTemplate errors=errors/>}>
+                            <Todos/>
+                        </ErrorBoundary>
+                    }/> //Route
                     <Route path="signup" view=move |cx| view! {
                         cx,
                         <Signup action=signup/>
@@ -214,71 +226,69 @@ pub fn Todos(cx: Scope) -> impl IntoView {
                 <input type="submit" value="Add"/>
             </MultiActionForm>
             <Transition fallback=move || view! {cx, <p>"Loading..."</p> }>
-                <ErrorBoundary fallback=|cx, errors| view!{ cx, <ErrorTemplate errors=errors/>}>
-                    {move || {
-                        let existing_todos = {
-                            move || {
-                                todos.read(cx)
-                                    .map(move |todos| match todos {
-                                        Err(e) => {
-                                            view! { cx, <pre class="error">"Server Error: " {e.to_string()}</pre>}.into_view(cx)
+                {move || {
+                    let existing_todos = {
+                        move || {
+                            todos.read(cx)
+                                .map(move |todos| match todos {
+                                    Err(e) => {
+                                        view! { cx, <pre class="error">"Server Error: " {e.to_string()}</pre>}.into_view(cx)
+                                    }
+                                    Ok(todos) => {
+                                        if todos.is_empty() {
+                                            view! { cx, <p>"No tasks were found."</p> }.into_view(cx)
+                                        } else {
+                                            todos
+                                                .into_iter()
+                                                .map(move |todo| {
+                                                    view! {
+                                                        cx,
+                                                        <li>
+                                                            {todo.title}
+                                                            ": Created at "
+                                                            {todo.created_at}
+                                                            " by "
+                                                            {
+                                                                todo.user.unwrap_or_default().username
+                                                            }
+                                                            <ActionForm action=delete_todo>
+                                                                <input type="hidden" name="id" value={todo.id}/>
+                                                                <input type="submit" value="X"/>
+                                                            </ActionForm>
+                                                        </li>
+                                                    }
+                                                })
+                                                .collect_view(cx)
                                         }
-                                        Ok(todos) => {
-                                            if todos.is_empty() {
-                                                view! { cx, <p>"No tasks were found."</p> }.into_view(cx)
-                                            } else {
-                                                todos
-                                                    .into_iter()
-                                                    .map(move |todo| {
-                                                        view! {
-                                                            cx,
-                                                            <li>
-                                                                {todo.title}
-                                                                ": Created at "
-                                                                {todo.created_at}
-                                                                " by "
-                                                                {
-                                                                    todo.user.unwrap_or_default().username
-                                                                }
-                                                                <ActionForm action=delete_todo>
-                                                                    <input type="hidden" name="id" value={todo.id}/>
-                                                                    <input type="submit" value="X"/>
-                                                                </ActionForm>
-                                                            </li>
-                                                        }
-                                                    })
-                                                    .collect_view(cx)
-                                            }
-                                        }
-                                    })
-                                    .unwrap_or_default()
-                            }
-                        };
-
-                        let pending_todos = move || {
-                            submissions
-                            .get()
-                            .into_iter()
-                            .filter(|submission| submission.pending().get())
-                            .map(|submission| {
-                                view! {
-                                    cx,
-                                    <li class="pending">{move || submission.input.get().map(|data| data.title) }</li>
-                                }
-                            })
-                            .collect_view(cx)
-                        };
-
-                        view! {
-                            cx,
-                            <ul>
-                                {existing_todos}
-                                {pending_todos}
-                            </ul>
+                                    }
+                                })
+                                .unwrap_or_default()
                         }
+                    };
+
+                    let pending_todos = move || {
+                        submissions
+                        .get()
+                        .into_iter()
+                        .filter(|submission| submission.pending().get())
+                        .map(|submission| {
+                            view! {
+                                cx,
+                                <li class="pending">{move || submission.input.get().map(|data| data.title) }</li>
+                            }
+                        })
+                        .collect_view(cx)
+                    };
+
+                    view! {
+                        cx,
+                        <ul>
+                            {existing_todos}
+                            {pending_todos}
+                        </ul>
                     }
                 }
-                </ErrorBoundary>
+            }
             </Transition>
         </div>
     }

examples/ssr_modes_axum/src/app.rs

@@ -87,27 +87,22 @@ fn Post(cx: Scope) -> impl IntoView {
         }
     });
 
-    // this view needs to take the `Scope` from the `<Suspense/>`, not
-    // from the parent component, so we take that as an argument and
-    // pass it in under the `<Suspense/>` so that it is correct
-    let post_view = move |cx| {
-        move || {
-            post.with(cx, |post| {
-                post.clone().map(|post| {
-                    view! { cx,
-                        // render content
-                        <h1>{&post.title}</h1>
-                        <p>{&post.content}</p>
+    let post_view = move || {
+        post.with(cx, |post| {
+            post.clone().map(|post| {
+                view! { cx,
+                    // render content
+                    <h1>{&post.title}</h1>
+                    <p>{&post.content}</p>
 
-                        // since we're using async rendering for this page,
-                        // this metadata should be included in the actual HTML <head>
-                        // when it's first served
-                        <Title text=post.title/>
-                        <Meta name="description" content=post.content/>
-                    }
-                })
+                    // since we're using async rendering for this page,
+                    // this metadata should be included in the actual HTML <head>
+                    // when it's first served
+                    <Title text=post.title/>
+                    <Meta name="description" content=post.content/>
+                }
             })
-        }
+        })
     };
 
     view! { cx,
@@ -126,7 +121,7 @@ fn Post(cx: Scope) -> impl IntoView {
                     </div>
                 }
             }>
-                {post_view(cx)}
+                {post_view}
             </ErrorBoundary>
         </Suspense>
     }

examples/todo_app_sqlite/src/todo.rs

@@ -9,7 +9,7 @@ cfg_if! {
         use sqlx::{Connection, SqliteConnection};
 
         pub async fn db() -> Result<SqliteConnection, ServerFnError> {
-            Ok(SqliteConnection::connect("sqlite:Todos.db").await?)
+            SqliteConnection::connect("sqlite:Todos.db").await.map_err(|e| ServerFnError::ServerError(e.to_string()))
         }
 
         #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, sqlx::FromRow)]
@@ -43,7 +43,11 @@ pub async fn get_todos(cx: Scope) -> Result<Vec<Todo>, ServerFnError> {
     let mut todos = Vec::new();
     let mut rows =
         sqlx::query_as::<_, Todo>("SELECT * FROM todos").fetch(&mut conn);
-    while let Some(row) = rows.try_next().await? {
+    while let Some(row) = rows
+        .try_next()
+        .await
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))?
+    {
         todos.push(row);
     }
 
@@ -72,11 +76,12 @@ pub async fn add_todo(title: String) -> Result<(), ServerFnError> {
 pub async fn delete_todo(id: u16) -> Result<(), ServerFnError> {
     let mut conn = db().await?;
 
-    Ok(sqlx::query("DELETE FROM todos WHERE id = $1")
+    sqlx::query("DELETE FROM todos WHERE id = $1")
         .bind(id)
         .execute(&mut conn)
         .await
-        .map(|_| ())?)
+        .map(|_| ())
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))
 }
 
 #[component]

examples/todo_app_sqlite_axum/src/todo.rs

@@ -11,7 +11,7 @@ cfg_if! {
         // use http::{header::SET_COOKIE, HeaderMap, HeaderValue, StatusCode};
 
         pub async fn db() -> Result<SqliteConnection, ServerFnError> {
-            Ok(SqliteConnection::connect("sqlite:Todos.db").await?)
+            SqliteConnection::connect("sqlite:Todos.db").await.map_err(|e| ServerFnError::ServerError(e.to_string()))
         }
 
         #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, sqlx::FromRow)]
@@ -47,7 +47,11 @@ pub async fn get_todos(cx: Scope) -> Result<Vec<Todo>, ServerFnError> {
     let mut todos = Vec::new();
     let mut rows =
         sqlx::query_as::<_, Todo>("SELECT * FROM todos").fetch(&mut conn);
-    while let Some(row) = rows.try_next().await? {
+    while let Some(row) = rows
+        .try_next()
+        .await
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))?
+    {
         todos.push(row);
     }
 
@@ -89,11 +93,12 @@ pub async fn add_todo(title: String) -> Result<(), ServerFnError> {
 pub async fn delete_todo(id: u16) -> Result<(), ServerFnError> {
     let mut conn = db().await?;
 
-    Ok(sqlx::query("DELETE FROM todos WHERE id = $1")
+    sqlx::query("DELETE FROM todos WHERE id = $1")
         .bind(id)
         .execute(&mut conn)
         .await
-        .map(|_| ())?)
+        .map(|_| ())
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))
 }
 
 #[component]
@@ -110,7 +115,9 @@ pub fn TodoApp(cx: Scope) -> impl IntoView {
             </header>
             <main>
                 <Routes>
-                    <Route path="" view=|cx| view! { cx, <Todos/> }/>
+                    <Route path="" view=|cx| view! { cx,
+                        <Todos/>
+                    }/>
                 </Routes>
             </main>
         </Router>

examples/todo_app_sqlite_viz/src/todo.rs

@@ -11,7 +11,7 @@ cfg_if! {
         // use http::{header::SET_COOKIE, HeaderMap, HeaderValue, StatusCode};
 
         pub async fn db() -> Result<SqliteConnection, ServerFnError> {
-            Ok(SqliteConnection::connect("sqlite:Todos.db").await?)
+            SqliteConnection::connect("sqlite:Todos.db").await.map_err(|e| ServerFnError::ServerError(e.to_string()))
         }
 
         #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, sqlx::FromRow)]
@@ -47,7 +47,11 @@ pub async fn get_todos(cx: Scope) -> Result<Vec<Todo>, ServerFnError> {
     let mut todos = Vec::new();
     let mut rows =
         sqlx::query_as::<_, Todo>("SELECT * FROM todos").fetch(&mut conn);
-    while let Some(row) = rows.try_next().await? {
+    while let Some(row) = rows
+        .try_next()
+        .await
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))?
+    {
         todos.push(row);
     }
 
@@ -89,11 +93,12 @@ pub async fn add_todo(title: String) -> Result<(), ServerFnError> {
 pub async fn delete_todo(id: u16) -> Result<(), ServerFnError> {
     let mut conn = db().await?;
 
-    Ok(sqlx::query("DELETE FROM todos WHERE id = $1")
+    sqlx::query("DELETE FROM todos WHERE id = $1")
         .bind(id)
         .execute(&mut conn)
         .await
-        .map(|_| ())?)
+        .map(|_| ())
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))
 }
 
 #[component]
@@ -112,7 +117,9 @@ pub fn TodoApp(cx: Scope) -> impl IntoView {
                 <Routes>
                     <Route path="" view=|cx| view! {
                         cx,
+                        <ErrorBoundary fallback=|cx, errors| view!{cx, <ErrorTemplate errors=errors/>}>
                             <Todos/>
+                        </ErrorBoundary>
                     }/> //Route
                 </Routes>
             </main>
@@ -144,65 +151,63 @@ pub fn Todos(cx: Scope) -> impl IntoView {
                 <input type="submit" value="Add"/>
             </MultiActionForm>
             <Transition fallback=move || view! {cx, <p>"Loading..."</p> }>
-                <ErrorBoundary fallback=|cx, errors| view!{cx, <ErrorTemplate errors/>}>
-                    {move || {
-                        let existing_todos = {
-                            move || {
-                                todos.read(cx)
-                                    .map(move |todos| match todos {
-                                        Err(e) => {
-                                            view! { cx, <pre class="error">"Server Error: " {e.to_string()}</pre>}.into_view(cx)
+                {move || {
+                    let existing_todos = {
+                        move || {
+                            todos.read(cx)
+                                .map(move |todos| match todos {
+                                    Err(e) => {
+                                        view! { cx, <pre class="error">"Server Error: " {e.to_string()}</pre>}.into_view(cx)
+                                    }
+                                    Ok(todos) => {
+                                        if todos.is_empty() {
+                                            view! { cx, <p>"No tasks were found."</p> }.into_view(cx)
+                                        } else {
+                                            todos
+                                                .into_iter()
+                                                .map(move |todo| {
+                                                    view! {
+                                                        cx,
+                                                        <li>
+                                                            {todo.title}
+                                                            <ActionForm action=delete_todo>
+                                                                <input type="hidden" name="id" value={todo.id}/>
+                                                                <input type="submit" value="X"/>
+                                                            </ActionForm>
+                                                        </li>
+                                                    }
+                                                })
+                                                .collect_view(cx)
                                         }
-                                        Ok(todos) => {
-                                            if todos.is_empty() {
-                                                view! { cx, <p>"No tasks were found."</p> }.into_view(cx)
-                                            } else {
-                                                todos
-                                                    .into_iter()
-                                                    .map(move |todo| {
-                                                        view! {
-                                                            cx,
-                                                            <li>
-                                                                {todo.title}
-                                                                <ActionForm action=delete_todo>
-                                                                    <input type="hidden" name="id" value={todo.id}/>
-                                                                    <input type="submit" value="X"/>
-                                                                </ActionForm>
-                                                            </li>
-                                                        }
-                                                    })
-                                                    .collect_view(cx)
-                                            }
-                                        }
-                                    })
-                                    .unwrap_or_default()
-                            }
-                        };
-
-                        let pending_todos = move || {
-                            submissions
-                            .get()
-                            .into_iter()
-                            .filter(|submission| submission.pending().get())
-                            .map(|submission| {
-                                view! {
-                                    cx,
-                                    <li class="pending">{move || submission.input.get().map(|data| data.title) }</li>
-                                }
-                            })
-                            .collect_view(cx)
-                        };
-
-                        view! {
-                            cx,
-                            <ul>
-                                {existing_todos}
-                                {pending_todos}
-                            </ul>
+                                    }
+                                })
+                                .unwrap_or_default()
                         }
+                    };
+
+                    let pending_todos = move || {
+                        submissions
+                        .get()
+                        .into_iter()
+                        .filter(|submission| submission.pending().get())
+                        .map(|submission| {
+                            view! {
+                                cx,
+                                <li class="pending">{move || submission.input.get().map(|data| data.title) }</li>
+                            }
+                        })
+                        .collect_view(cx)
+                    };
+
+                    view! {
+                        cx,
+                        <ul>
+                            {existing_todos}
+                            {pending_todos}
+                        </ul>
                     }
                 }
-                </ErrorBoundary>
+            }
             </Transition>
         </div>
     }

leptos/src/error_boundary.rs

@@ -28,24 +28,6 @@ use leptos_reactive::{
 /// }
 /// # });
 /// ```
-///
-/// ## Interaction with `<Suspense/>`
-/// If you use this with a `<Suspense/>` or `<Transition/>` component, note that the
-/// `<ErrorBoundary/>` should go inside the `<Suspense/>`, not the other way around,
-/// if there’s a chance that the `<ErrorBoundary/>` will begin in the error state.
-/// This is a limitation of the current design of the two components and the way they
-/// hydrate. Placing the `<ErrorBoundary/>` outside the `<Suspense/>` means that
-/// it is rendered on the server without any knowledge of the suspended view, so it
-/// will always be rendered on the server as if there were no errors, but might need
-/// to be hydrated with errors, depending on the actual result.
-///
-/// ```rust,ignore
-/// view! { cx,
-///   <Suspense fallback=move || view! {cx, <p>"Loading..."</p> }>
-///     <ErrorBoundary fallback=|cx, errors| view!{ cx, <ErrorTemplate errors=errors/>}>
-///       {move || {
-///   /* etc. */
-/// ```
 #[component]
 pub fn ErrorBoundary<F, IV>(
     cx: Scope,
@@ -64,25 +46,7 @@ where
     provide_context(cx, errors);
 
     // Run children so that they render and execute resources
-    let children = children(cx);
-
-    #[cfg(all(debug_assertions, feature = "hydrate"))]
-    {
-        use leptos_dom::View;
-        if children.nodes.iter().any(|child| {
-            matches!(child, View::Suspense(_, _))
-            || matches!(child, View::Component(repr) if repr.name() == "Transition")
-        }) {
-            crate::debug_warn!("You are using a <Suspense/> or \
-            <Transition/> as the direct child of an <ErrorBoundary/>. To ensure correct \
-            hydration, these should be reorganized so that the <ErrorBoundary/> is a child \
-            of the <Suspense/> or <Transition/> instead: \n\
-            \nview! {{ cx,\
-            \n  <Suspense fallback=todo!()>\n    <ErrorBoundary fallback=todo!()>\n      {{move || {{ /* etc. */")
-        }
-    }
-
-    let children = children.into_view(cx);
+    let children = children(cx).into_view(cx);
     let errors_empty = create_memo(cx, move |_| errors.with(Errors::is_empty));
 
     move || {

leptos/src/lib.rs

@@ -171,11 +171,6 @@ pub use leptos_dom::{
     Class, CollectView, Errors, Fragment, HtmlElement, IntoAttribute,
     IntoClass, IntoProperty, IntoStyle, IntoView, NodeRef, Property, View,
 };
-
-/// Types to make it easier to handle errors in your application.
-pub mod error {
-    pub use server_fn::error::{Error, Result};
-}
 #[cfg(not(any(target_arch = "wasm32", feature = "template_macro")))]
 pub use leptos_macro::view as template;
 pub use leptos_macro::{component, server, slot, view, Params};
@@ -183,7 +178,6 @@ pub use leptos_reactive::*;
 pub use leptos_server::{
     self, create_action, create_multi_action, create_server_action,
     create_server_multi_action, Action, MultiAction, ServerFn, ServerFnError,
-    ServerFnErrorErr,
 };
 pub use server_fn::{self, ServerFn as _};
 pub use typed_builder;

leptos/tests/test_examples/suspense-tests/Cargo.toml

@@ -17,7 +17,7 @@ leptos_actix = { path = "../../../../integrations/actix", optional = true }
 leptos_router = { path = "../../../../router", default-features = false }
 log = "0.4"
 simple_logger = "4"
-wasm-bindgen = "0.2.87"
+wasm-bindgen = "0.2.85"
 serde = "1.0.159"
 tokio = { version = "1.27.0", features = ["time"], optional = true }
 

leptos/tests/test_examples/suspense-tests/src/app.rs

@@ -53,7 +53,6 @@ pub fn App(cx: Scope) -> impl IntoView {
                         }
                     >
                         <Route path="" view=|cx| view! { cx, <Nested/> }/>
-                        <Route path="inside" view=|cx| view! { cx, <NestedResourceInside/> }/>
                         <Route path="single" view=|cx| view! { cx, <Single/> }/>
                         <Route path="parallel" view=|cx| view! { cx, <Parallel/> }/>
                         <Route path="inside-component" view=|cx| view! { cx, <InsideComponent/> }/>
@@ -70,7 +69,6 @@ pub fn App(cx: Scope) -> impl IntoView {
                         }
                     >
                         <Route path="" view=|cx| view! { cx, <Nested/> }/>
-                        <Route path="inside" view=|cx| view! { cx, <NestedResourceInside/> }/>
                         <Route path="single" view=|cx| view! { cx, <Single/> }/>
                         <Route path="parallel" view=|cx| view! { cx, <Parallel/> }/>
                         <Route path="inside-component" view=|cx| view! { cx, <InsideComponent/> }/>
@@ -87,7 +85,6 @@ pub fn App(cx: Scope) -> impl IntoView {
                         }
                     >
                         <Route path="" view=|cx| view! { cx, <Nested/> }/>
-                        <Route path="inside" view=|cx| view! { cx, <NestedResourceInside/> }/>
                         <Route path="single" view=|cx| view! { cx, <Single/> }/>
                         <Route path="parallel" view=|cx| view! { cx, <Parallel/> }/>
                         <Route path="inside-component" view=|cx| view! { cx, <InsideComponent/> }/>
@@ -104,7 +101,6 @@ fn SecondaryNav(cx: Scope) -> impl IntoView {
     view! { cx,
         <nav>
             <A href="" exact=true>"Nested"</A>
-            <A href="inside" exact=true>"Nested (resource created inside)"</A>
             <A href="single">"Single"</A>
             <A href="parallel">"Parallel"</A>
             <A href="inside-component">"Inside Component"</A>
@@ -143,43 +139,6 @@ fn Nested(cx: Scope) -> impl IntoView {
     }
 }
 
-#[component]
-fn NestedResourceInside(cx: Scope) -> impl IntoView {
-    let one_second = create_resource(cx, || (), one_second_fn);
-    let (count, set_count) = create_signal(cx, 0);
-
-    view! { cx,
-        <div>
-            <Suspense fallback=|| "Loading 1...">
-                "One Second: "
-                {move || {
-                    one_second.read(cx).map(|_| {
-                        let two_second = create_resource(cx, || (), move |_| async move {
-                            leptos::log!("creating two_second resource");
-                            two_second_fn(()).await
-                        });
-                        view! { cx,
-                            <p>{move || one_second.read(cx).map(|_| "Loaded 1!")}</p>
-                            <Suspense fallback=|| "Loading 2...">
-                                "Two Second: "
-                                {move || {
-                                    two_second.read(cx).map(|x| view! { cx,
-                                        "Loaded 2 (created inside first suspense)!: "
-                                        {format!("{x:?}")}
-                                        <button on:click=move |_| set_count.update(|n| *n += 1)>
-                                            {count}
-                                        </button>
-                                    })
-                                }}
-                            </Suspense>
-                        }
-                    })
-                }}
-            </Suspense>
-        </div>
-    }
-}
-
 #[component]
 fn Parallel(cx: Scope) -> impl IntoView {
     let one_second = create_resource(cx, || (), one_second_fn);

leptos_dom/Cargo.toml

@@ -18,7 +18,6 @@ indexmap = "1.9"
 itertools = "0.10"
 js-sys = "0.3"
 leptos_reactive = { workspace = true }
-server_fn = { workspace = true }
 once_cell = "1"
 pad-adapter = "0.1"
 paste = "1"

leptos_dom/src/components.rs

@@ -221,12 +221,6 @@ impl ComponentRepr {
             view_marker: None,
         }
     }
-
-    #[cfg(any(debug_assertions, feature = "ssr"))]
-    /// Returns the name of the component.
-    pub fn name(&self) -> &str {
-        &self.name
-    }
 }
 
 /// A user-defined `leptos` component.

leptos_dom/src/components/each.rs

@@ -653,7 +653,6 @@ fn apply_opts<K: Eq + Hash>(
         && cmds.moved.is_empty()
     {
         cmds.clear = true;
-        cmds.removed.clear();
 
         cmds.added
             .iter_mut()

leptos_dom/src/components/errors.rs

@@ -1,13 +1,12 @@
 use crate::{HydrationCtx, IntoView};
 use cfg_if::cfg_if;
 use leptos_reactive::{signal_prelude::*, use_context, RwSignal};
-use server_fn::error::Error;
-use std::{borrow::Cow, collections::HashMap};
+use std::{borrow::Cow, collections::HashMap, error::Error, sync::Arc};
 
 /// A struct to hold all the possible errors that could be provided by child Views
 #[derive(Debug, Clone, Default)]
 #[repr(transparent)]
-pub struct Errors(HashMap<ErrorKey, Error>);
+pub struct Errors(HashMap<ErrorKey, Arc<dyn Error + Send + Sync>>);
 
 /// A unique key for an error that occurs at a particular location in the user interface.
 #[derive(Debug, Default, Clone, PartialEq, Eq, Hash)]
@@ -25,7 +24,7 @@ where
 }
 
 impl IntoIterator for Errors {
-    type Item = (ErrorKey, Error);
+    type Item = (ErrorKey, Arc<dyn Error + Send + Sync>);
     type IntoIter = IntoIter;
 
     #[inline(always)]
@@ -36,10 +35,15 @@ impl IntoIterator for Errors {
 
 /// An owning iterator over all the errors contained in the [Errors] struct.
 #[repr(transparent)]
-pub struct IntoIter(std::collections::hash_map::IntoIter<ErrorKey, Error>);
+pub struct IntoIter(
+    std::collections::hash_map::IntoIter<
+        ErrorKey,
+        Arc<dyn Error + Send + Sync>,
+    >,
+);
 
 impl Iterator for IntoIter {
-    type Item = (ErrorKey, Error);
+    type Item = (ErrorKey, Arc<dyn Error + Send + Sync>);
 
     #[inline(always)]
     fn next(
@@ -51,10 +55,16 @@ impl Iterator for IntoIter {
 
 /// An iterator over all the errors contained in the [Errors] struct.
 #[repr(transparent)]
-pub struct Iter<'a>(std::collections::hash_map::Iter<'a, ErrorKey, Error>);
+pub struct Iter<'a>(
+    std::collections::hash_map::Iter<
+        'a,
+        ErrorKey,
+        Arc<dyn Error + Send + Sync>,
+    >,
+);
 
 impl<'a> Iterator for Iter<'a> {
-    type Item = (&'a ErrorKey, &'a Error);
+    type Item = (&'a ErrorKey, &'a Arc<dyn Error + Send + Sync>);
 
     #[inline(always)]
     fn next(
@@ -67,7 +77,7 @@ impl<'a> Iterator for Iter<'a> {
 impl<T, E> IntoView for Result<T, E>
 where
     T: IntoView + 'static,
-    E: Into<Error>,
+    E: Error + Send + Sync + 'static,
 {
     fn into_view(self, cx: leptos_reactive::Scope) -> crate::View {
         let id = ErrorKey(HydrationCtx::peek().fragment.to_string().into());
@@ -82,7 +92,6 @@ where
                 stuff.into_view(cx)
             }
             Err(error) => {
-                let error = error.into();
                 match errors {
                     Some(errors) => {
                         errors.update({
@@ -124,7 +133,6 @@ where
         }
     }
 }
-
 impl Errors {
     /// Returns `true` if there are no errors.
     #[inline(always)]
@@ -135,21 +143,24 @@ impl Errors {
     /// Add an error to Errors that will be processed by `<ErrorBoundary/>`
     pub fn insert<E>(&mut self, key: ErrorKey, error: E)
     where
-        E: Into<Error>,
+        E: Error + Send + Sync + 'static,
     {
-        self.0.insert(key, error.into());
+        self.0.insert(key, Arc::new(error));
     }
 
     /// Add an error with the default key for errors outside the reactive system
     pub fn insert_with_default_key<E>(&mut self, error: E)
     where
-        E: Into<Error>,
+        E: Error + Send + Sync + 'static,
     {
-        self.0.insert(Default::default(), error.into());
+        self.0.insert(Default::default(), Arc::new(error));
     }
 
     /// Remove an error to Errors that will be processed by `<ErrorBoundary/>`
-    pub fn remove(&mut self, key: &ErrorKey) -> Option<Error> {
+    pub fn remove(
+        &mut self,
+        key: &ErrorKey,
+    ) -> Option<Arc<dyn Error + Send + Sync>> {
         self.0.remove(key)
     }
 

leptos_dom/src/hydration.rs

@@ -8,7 +8,7 @@ cfg_if! {
     use wasm_bindgen::JsCast;
 
     // We can tell if we start in hydration mode by checking to see if the
-    // id "_0-1" is present in the DOM. If it is, we know we are hydrating from
+    // id "_0-0-0" is present in the DOM. If it is, we know we are hydrating from
     // the server, if not, we are starting off in CSR
     thread_local! {
       static HYDRATION_COMMENTS: LazyCell<HashMap<String, web_sys::Comment>> = LazyCell::new(|| {

leptos_dom/src/ssr.rs

@@ -221,105 +221,66 @@ pub fn render_to_stream_with_prefix_undisposed_with_context_and_block_replacemen
             blocking_fragments
                 .push(async move { (fragment_id, data.out_of_order.await) });
         } else {
-            fragments.push(Box::pin(async move {
-                (fragment_id.clone(), data.out_of_order.await)
-            })
-                as Pin<Box<dyn Future<Output = (String, String)>>>);
+            fragments
+                .push(async move { (fragment_id, data.out_of_order.await) });
         }
     }
 
-    let stream = futures::stream::once(
-        // HTML for the view function and script to store resources
-        async move {
-            let resolvers = format!(
-                "<script>__LEPTOS_PENDING_RESOURCES = \
-                 {pending_resources};__LEPTOS_RESOLVED_RESOURCES = new \
-                 Map();__LEPTOS_RESOURCE_RESOLVERS = new Map();</script>"
-            );
-
-            if replace_blocks {
-                let mut blocks = Vec::with_capacity(blocking_fragments.len());
-                while let Some((blocked_id, blocked_fragment)) =
-                    blocking_fragments.next().await
-                {
-                    blocks.push((blocked_id, blocked_fragment));
-                }
-
-                let prefix = prefix(cx);
-
-                let mut shell = shell;
-
-                for (blocked_id, blocked_fragment) in blocks {
-                    let open = format!("<!--suspense-open-{blocked_id}-->");
-                    let close = format!("<!--suspense-close-{blocked_id}-->");
-                    let (first, rest) =
-                        shell.split_once(&open).unwrap_or_default();
-                    let (_fallback, rest) =
-                        rest.split_once(&close).unwrap_or_default();
-
-                    shell = format!("{first}{blocked_fragment}{rest}").into();
-                }
-
-                format!("{prefix}{shell}{resolvers}")
-            } else {
-                let mut blocking = String::new();
-                let mut blocking_fragments =
-                    fragments_to_chunks(blocking_fragments);
-
-                while let Some(fragment) = blocking_fragments.next().await {
-                    blocking.push_str(&fragment);
-                }
-                let prefix = prefix(cx);
-                format!("{prefix}{shell}{resolvers}{blocking}")
-            }
-        },
-    )
-    .chain(ooo_body_stream_recurse(cx, fragments, serializers));
-
-    (stream, runtime, scope)
-}
-
-fn ooo_body_stream_recurse(
-    cx: Scope,
-    fragments: FuturesUnordered<PinnedFuture<(String, String)>>,
-    serializers: FuturesUnordered<PinnedFuture<(ResourceId, String)>>,
-) -> Pin<Box<dyn Stream<Item = String>>> {
     // resources and fragments
     // stream HTML for each <Suspense/> as it resolves
     let fragments = fragments_to_chunks(fragments);
     // stream data for each Resource as it resolves
     let resources = render_serializers(serializers);
 
-    Box::pin(
-        // TODO these should be combined again in a way that chains them appropriately
-        // such that individual resources can resolve before all fragments are done
-        fragments.chain(resources).chain(
-            futures::stream::once(async move {
-                let pending = cx.pending_fragments();
-                if pending.len() > 0 {
-                    let fragments = FuturesUnordered::new();
-                    let serializers = cx.serialization_resolvers();
-                    for (fragment_id, data) in pending {
-                        fragments.push(Box::pin(async move {
-                            (fragment_id.clone(), data.out_of_order.await)
-                        })
-                            as Pin<Box<dyn Future<Output = (String, String)>>>);
-                    }
-                    Box::pin(ooo_body_stream_recurse(
-                        cx,
-                        fragments,
-                        serializers,
-                    ))
-                        as Pin<Box<dyn Stream<Item = String>>>
-                } else {
-                    Box::pin(futures::stream::once(async move {
-                        Default::default()
-                    }))
-                }
-            })
-            .flatten(),
-        ),
-    )
+    // HTML for the view function and script to store resources
+    let stream = futures::stream::once(async move {
+        let resolvers = format!(
+            "<script>__LEPTOS_PENDING_RESOURCES = \
+             {pending_resources};__LEPTOS_RESOLVED_RESOURCES = new \
+             Map();__LEPTOS_RESOURCE_RESOLVERS = new Map();</script>"
+        );
+
+        if replace_blocks {
+            let mut blocks = Vec::with_capacity(blocking_fragments.len());
+            while let Some((blocked_id, blocked_fragment)) =
+                blocking_fragments.next().await
+            {
+                blocks.push((blocked_id, blocked_fragment));
+            }
+
+            let prefix = prefix(cx);
+
+            let mut shell = shell;
+
+            for (blocked_id, blocked_fragment) in blocks {
+                let open = format!("<!--suspense-open-{blocked_id}-->");
+                let close = format!("<!--suspense-close-{blocked_id}-->");
+                let (first, rest) = shell.split_once(&open).unwrap_or_default();
+                let (_fallback, rest) =
+                    rest.split_once(&close).unwrap_or_default();
+
+                shell = format!("{first}{blocked_fragment}{rest}").into();
+            }
+
+            format!("{prefix}{shell}{resolvers}")
+        } else {
+            let mut blocking = String::new();
+            let mut blocking_fragments =
+                fragments_to_chunks(blocking_fragments);
+
+            while let Some(fragment) = blocking_fragments.next().await {
+                blocking.push_str(&fragment);
+            }
+            let prefix = prefix(cx);
+            format!("{prefix}{shell}{resolvers}{blocking}")
+        }
+    })
+    // TODO these should be combined again in a way that chains them appropriately
+    // such that individual resources can resolve before all fragments are done
+    .chain(fragments)
+    .chain(resources);
+
+    (stream, runtime, scope)
 }
 
 #[cfg_attr(

leptos_dom/src/ssr_in_order.rs

@@ -94,7 +94,13 @@ pub fn render_to_stream_in_order_with_prefix_undisposed_with_context(
     let runtime = create_runtime();
 
     let (
-        (blocking_fragments_ready, chunks, prefix, pending_resources),
+        (
+            blocking_fragments_ready,
+            chunks,
+            prefix,
+            pending_resources,
+            serializers,
+        ),
         scope_id,
         _,
     ) = run_scope_undisposed(runtime, |cx| {
@@ -109,6 +115,7 @@ pub fn render_to_stream_in_order_with_prefix_undisposed_with_context(
             view.into_stream_chunks(cx),
             prefix,
             serde_json::to_string(&cx.pending_resources()).unwrap(),
+            cx.serialization_resolvers(),
         )
     });
     let cx = Scope {
@@ -123,7 +130,7 @@ pub fn render_to_stream_in_order_with_prefix_undisposed_with_context(
         let remaining_chunks = handle_blocking_chunks(tx.clone(), chunks).await;
         let prefix = prefix(cx);
         prefix_tx.send(prefix).expect("to send prefix");
-        handle_chunks(cx, tx, remaining_chunks).await;
+        handle_chunks(tx, remaining_chunks).await;
     });
 
     let stream = futures::stream::once(async move {
@@ -140,13 +147,7 @@ pub fn render_to_stream_in_order_with_prefix_undisposed_with_context(
         )
     })
     .chain(rx)
-    .chain(
-        futures::stream::once(async move {
-            let serializers = cx.serialization_resolvers();
-            render_serializers(serializers)
-        })
-        .flatten(),
-    );
+    .chain(render_serializers(serializers));
 
     (stream, runtime, scope_id)
 }
@@ -195,7 +196,6 @@ async fn handle_blocking_chunks(
 #[tracing::instrument(level = "trace", skip_all)]
 #[async_recursion(?Send)]
 async fn handle_chunks(
-    cx: Scope,
     tx: UnboundedSender<String>,
     chunks: VecDeque<StreamChunk>,
 ) {
@@ -210,7 +210,7 @@ async fn handle_chunks(
 
                 // send the inner stream
                 let suspended = chunks.await;
-                handle_chunks(cx, tx.clone(), suspended).await;
+                handle_chunks(tx.clone(), suspended).await;
             }
         }
     }

leptos_reactive/src/lib.rs

@@ -96,7 +96,6 @@ mod trigger;
 pub use context::*;
 pub use diagnostics::SpecialNonReactiveZone;
 pub use effect::*;
-pub use hydration::FragmentData;
 pub use memo::*;
 pub use resource::*;
 use runtime::*;

leptos_reactive/src/memo.rs

@@ -7,16 +7,6 @@ use crate::{
 };
 use std::{any::Any, cell::RefCell, fmt, marker::PhantomData, rc::Rc};
 
-// IMPLEMENTATION NOTE:
-// Memos are implemented "lazily," i.e., the inner computation is not run
-// when the memo is created or when its value is marked as stale, but on demand
-// when it is accessed, if the value is stale. This means that the value is stored
-// internally as Option<T>, even though it can always be accessed by the user as T.
-// This means the inner value can be unwrapped in circumstances in which we know
-// `Runtime::update_if_necessary()` has already been called, e.g., in the
-// `.try_with_no_subscription()` calls below that are unwrapped with
-// `.expect("invariant: must have already been initialized")`.
-
 /// Creates an efficient derived reactive value based on other reactive values.
 ///
 /// Unlike a "derived signal," a memo comes with two guarantees:
@@ -209,17 +199,6 @@ impl<T> PartialEq for Memo<T> {
     }
 }
 
-fn forward_ref_to<T, O, F: FnOnce(&T) -> O>(
-    f: F,
-) -> impl FnOnce(&Option<T>) -> O {
-    |maybe_value: &Option<T>| {
-        let ref_t = maybe_value
-            .as_ref()
-            .expect("invariant: must have already been initialized");
-        f(ref_t)
-    }
-}
-
 impl<T: Clone> SignalGetUntracked<T> for Memo<T> {
     #[cfg_attr(
         any(debug_assertions, feature = "ssr"),
@@ -236,11 +215,7 @@ impl<T: Clone> SignalGetUntracked<T> for Memo<T> {
     )]
     fn get_untracked(&self) -> T {
         with_runtime(self.runtime, move |runtime| {
-            let f = |maybe_value: &Option<T>| {
-                maybe_value
-                    .clone()
-                    .expect("invariant: must have already been initialized")
-            };
+            let f = move |maybe_value: &Option<T>| maybe_value.clone().unwrap();
             match self.id.try_with_no_subscription(runtime, f) {
                 Ok(t) => t,
                 Err(_) => panic_getting_dead_memo(
@@ -286,8 +261,10 @@ impl<T> SignalWithUntracked<T> for Memo<T> {
         )
     )]
     fn with_untracked<O>(&self, f: impl FnOnce(&T) -> O) -> O {
+        // Unwrapping here is fine for the same reasons as <Memo as
+        // UntrackedSignal>::get_untracked
         with_runtime(self.runtime, |runtime| {
-            match self.id.try_with_no_subscription(runtime, forward_ref_to(f)) {
+            match self.id.try_with_no_subscription(runtime, |v: &T| f(v)) {
                 Ok(t) => t,
                 Err(_) => panic_getting_dead_memo(
                     #[cfg(any(debug_assertions, feature = "ssr"))]
@@ -417,13 +394,15 @@ impl<T> SignalWith<T> for Memo<T> {
     )]
     #[track_caller]
     fn try_with<O>(&self, f: impl FnOnce(&T) -> O) -> Option<O> {
+        // memo is stored as Option<T>, but will always have T available
+        // after latest_value() called, so we can unwrap safely
+        let f = move |maybe_value: &Option<T>| f(maybe_value.as_ref().unwrap());
+
         let diagnostics = diagnostics!(self);
 
         with_runtime(self.runtime, |runtime| {
             self.id.subscribe(runtime, diagnostics);
-            self.id
-                .try_with_no_subscription(runtime, forward_ref_to(f))
-                .ok()
+            self.id.try_with_no_subscription(runtime, f).ok()
         })
         .ok()
         .flatten()

leptos_reactive/tests/memo.rs

@@ -13,32 +13,6 @@ fn basic_memo() {
     .dispose()
 }
 
-#[cfg(not(feature = "stable"))]
-#[test]
-fn signal_with_untracked() {
-    use leptos_reactive::SignalWithUntracked;
-
-    create_scope(create_runtime(), |cx| {
-        let m = create_memo(cx, move |_| 5);
-        let copied_out = m.with_untracked(|value| *value);
-        assert_eq!(copied_out, 5);
-    })
-    .dispose()
-}
-
-#[cfg(not(feature = "stable"))]
-#[test]
-fn signal_get_untracked() {
-    use leptos_reactive::SignalGetUntracked;
-
-    create_scope(create_runtime(), |cx| {
-        let m = create_memo(cx, move |_| "memo".to_owned());
-        let cloned_out = m.get_untracked();
-        assert_eq!(cloned_out, "memo".to_owned());
-    })
-    .dispose()
-}
-
 #[cfg(not(feature = "stable"))]
 #[test]
 fn memo_with_computed_value() {

leptos_server/src/action.rs

@@ -3,7 +3,7 @@ use leptos_reactive::{
     create_rw_signal, signal_prelude::*, spawn_local, store_value, ReadSignal,
     RwSignal, Scope, StoredValue,
 };
-use std::{cell::Cell, future::Future, pin::Pin, rc::Rc};
+use std::{future::Future, pin::Pin, rc::Rc};
 
 /// An action synchronizes an imperative `async` call to the synchronous reactive system.
 ///
@@ -106,30 +106,13 @@ where
         self.0.with_value(|a| a.pending.read_only())
     }
 
-    /// Updates whether the action is currently pending. If the action has been dispatched
-    /// multiple times, and some of them are still pending, it will *not* update the `pending`
-    /// signal.
+    /// Updates whether the action is currently pending.
     #[cfg_attr(
         any(debug_assertions, feature = "ssr"),
         tracing::instrument(level = "trace", skip_all,)
     )]
     pub fn set_pending(&self, pending: bool) {
-        self.0.try_with_value(|a| {
-            let pending_dispatches = &a.pending_dispatches;
-            let still_pending = {
-                pending_dispatches.set(if pending {
-                    pending_dispatches.get().wrapping_add(1)
-                } else {
-                    pending_dispatches.get().saturating_sub(1)
-                });
-                pending_dispatches.get()
-            };
-            if still_pending == 0 {
-                a.pending.set(false);
-            } else {
-                a.pending.set(true);
-            }
-        });
+        self.0.try_with_value(|a| a.pending.set(pending));
     }
 
     /// The URL associated with the action (typically as part of a server function.)
@@ -203,7 +186,6 @@ where
     I: 'static,
     O: 'static,
 {
-    cx: Scope,
     /// How many times the action has successfully resolved.
     pub version: RwSignal<usize>,
     /// The current argument that was dispatched to the `async` function.
@@ -213,8 +195,6 @@ where
     pub value: RwSignal<Option<O>>,
     pending: RwSignal<bool>,
     url: Option<String>,
-    /// How many dispatched actions are still pending.
-    pending_dispatches: Rc<Cell<usize>>,
     #[allow(clippy::complexity)]
     action_fn: Rc<dyn Fn(&I) -> Pin<Box<dyn Future<Output = O>>>>,
 }
@@ -235,23 +215,14 @@ where
         let input = self.input;
         let version = self.version;
         let pending = self.pending;
-        let pending_dispatches = Rc::clone(&self.pending_dispatches);
         let value = self.value;
-        let cx = self.cx;
         pending.set(true);
-        pending_dispatches.set(pending_dispatches.get().saturating_sub(1));
         spawn_local(async move {
             let new_value = fut.await;
-            cx.batch(move || {
-                value.set(Some(new_value));
-                input.set(None);
-                version.update(|n| *n += 1);
-                pending_dispatches
-                    .set(pending_dispatches.get().saturating_sub(1));
-                if pending_dispatches.get() == 0 {
-                    pending.set(false);
-                }
-            });
+            value.set(Some(new_value));
+            input.set(None);
+            pending.set(false);
+            version.update(|n| *n += 1);
         })
     }
 }
@@ -345,7 +316,6 @@ where
     let input = create_rw_signal(cx, None);
     let value = create_rw_signal(cx, None);
     let pending = create_rw_signal(cx, false);
-    let pending_dispatches = Rc::new(Cell::new(0));
     let action_fn = Rc::new(move |input: &I| {
         let fut = action_fn(input);
         Box::pin(fut) as Pin<Box<dyn Future<Output = O>>>
@@ -354,13 +324,11 @@ where
     Action(store_value(
         cx,
         ActionState {
-            cx,
             version,
             url: None,
             input,
             value,
             pending,
-            pending_dispatches,
             action_fn,
         },
     ))

leptos_server/src/lib.rs

@@ -116,9 +116,7 @@
 //! your app is not available.
 
 use leptos_reactive::*;
-pub use server_fn::{
-    error::ServerFnErrorErr, Encoding, Payload, ServerFnError,
-};
+pub use server_fn::{Encoding, Payload, ServerFnError};
 
 mod action;
 mod multi_action;

router/src/components/form.rs

@@ -8,7 +8,6 @@ use web_sys::RequestRedirect;
 
 type OnFormData = Rc<dyn Fn(&web_sys::FormData)>;
 type OnResponse = Rc<dyn Fn(&web_sys::Response)>;
-type OnError = Rc<dyn Fn(&gloo_net::Error)>;
 
 /// An HTML [`form`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/form) progressively
 /// enhanced to use client-side routing.
@@ -48,9 +47,6 @@ pub fn Form<A>(
     /// to a form submission.
     #[prop(optional)]
     on_response: Option<OnResponse>,
-    /// A callback will be called if the attempt to submit the form results in an error.
-    #[prop(optional)]
-    on_error: Option<OnError>,
     /// A [`NodeRef`] in which the `<form>` element should be stored.
     #[prop(optional)]
     node_ref: Option<NodeRef<html::Form>>,
@@ -72,216 +68,196 @@ where
         error: Option<RwSignal<Option<Box<dyn Error>>>>,
         on_form_data: Option<OnFormData>,
         on_response: Option<OnResponse>,
-        on_error: Option<OnError>,
         class: Option<Attribute>,
         children: Children,
         node_ref: Option<NodeRef<html::Form>>,
         attributes: Option<MaybeSignal<AdditionalAttributes>>,
     ) -> HtmlElement<html::Form> {
         let action_version = version;
-        let on_submit = {
-            move |ev: web_sys::SubmitEvent| {
-                if ev.default_prevented() {
-                    return;
-                }
-                let navigate = use_navigate(cx);
+        let on_submit = move |ev: web_sys::SubmitEvent| {
+            if ev.default_prevented() {
+                return;
+            }
+            let navigate = use_navigate(cx);
 
-                let (form, method, action, enctype) =
-                    extract_form_attributes(&ev);
+            let (form, method, action, enctype) = extract_form_attributes(&ev);
 
-                let form_data =
-                    web_sys::FormData::new_with_form(&form).unwrap_throw();
-                if let Some(on_form_data) = on_form_data.clone() {
-                    on_form_data(&form_data);
-                }
-                let params =
-                    web_sys::UrlSearchParams::new_with_str_sequence_sequence(
-                        &form_data,
-                    )
-                    .unwrap_throw();
-                let action = use_resolved_path(cx, move || action.clone())
-                    .get_untracked()
-                    .unwrap_or_default();
-                // multipart POST (setting Context-Type breaks the request)
-                if method == "post" && enctype == "multipart/form-data" {
-                    ev.prevent_default();
-                    ev.stop_propagation();
+            let form_data =
+                web_sys::FormData::new_with_form(&form).unwrap_throw();
+            if let Some(on_form_data) = on_form_data.clone() {
+                on_form_data(&form_data);
+            }
+            let params =
+                web_sys::UrlSearchParams::new_with_str_sequence_sequence(
+                    &form_data,
+                )
+                .unwrap_throw();
+            let action = use_resolved_path(cx, move || action.clone())
+                .get_untracked()
+                .unwrap_or_default();
+            // multipart POST (setting Context-Type breaks the request)
+            if method == "post" && enctype == "multipart/form-data" {
+                ev.prevent_default();
+                ev.stop_propagation();
 
-                    let on_response = on_response.clone();
-                    let on_error = on_error.clone();
-                    spawn_local(async move {
-                        let res = gloo_net::http::Request::post(&action)
-                            .header("Accept", "application/json")
-                            .redirect(RequestRedirect::Follow)
-                            .body(form_data)
-                            .send()
-                            .await;
-                        match res {
-                            Err(e) => {
-                                error!("<Form/> error while POSTing: {e:#?}");
-                                if let Some(on_error) = on_error {
-                                    on_error(&e);
-                                }
-                                if let Some(error) = error {
-                                    error.try_set(Some(Box::new(e)));
-                                }
+                let on_response = on_response.clone();
+                spawn_local(async move {
+                    let res = gloo_net::http::Request::post(&action)
+                        .header("Accept", "application/json")
+                        .redirect(RequestRedirect::Follow)
+                        .body(form_data)
+                        .send()
+                        .await;
+                    match res {
+                        Err(e) => {
+                            error!("<Form/> error while POSTing: {e:#?}");
+                            if let Some(error) = error {
+                                error.set(Some(Box::new(e)));
                             }
-                            Ok(resp) => {
-                                if let Some(version) = action_version {
-                                    version.update(|n| *n += 1);
-                                }
-                                if let Some(error) = error {
-                                    error.try_set(None);
-                                }
-                                if let Some(on_response) = on_response.clone() {
-                                    on_response(resp.as_raw());
-                                }
-                                // Check all the logical 3xx responses that might
-                                // get returned from a server function
-                                if resp.redirected() {
-                                    let resp_url = &resp.url();
-                                    match Url::try_from(resp_url.as_str()) {
-                                        Ok(url) => {
-                                            if url.origin
-                                                != window()
-                                                    .location()
-                                                    .origin()
-                                                    .unwrap_or_default()
-                                            {
-                                                _ = window()
-                                                    .location()
-                                                    .set_href(
-                                                        resp_url.as_str(),
-                                                    );
-                                            } else {
-                                                request_animation_frame(
-                                                    move || {
-                                                        if let Err(e) = navigate(
-                                                            &format!(
-                                                                "{}{}{}",
-                                                                url.pathname,
-                                                                if url
-                                                                    .search
-                                                                    .is_empty()
-                                                                {
-                                                                    ""
-                                                                } else {
-                                                                    "?"
-                                                                },
-                                                                url.search,
-                                                            ),
-                                                            Default::default(),
-                                                        ) {
-                                                            warn!("{}", e);
-                                                        }
-                                                    },
-                                                );
-                                            }
+                        }
+                        Ok(resp) => {
+                            if let Some(version) = action_version {
+                                version.update(|n| *n += 1);
+                            }
+                            if let Some(error) = error {
+                                error.set(None);
+                            }
+                            if let Some(on_response) = on_response.clone() {
+                                on_response(resp.as_raw());
+                            }
+                            // Check all the logical 3xx responses that might
+                            // get returned from a server function
+                            if resp.redirected() {
+                                let resp_url = &resp.url();
+                                match Url::try_from(resp_url.as_str()) {
+                                    Ok(url) => {
+                                        if url.origin
+                                            != window()
+                                                .location()
+                                                .origin()
+                                                .unwrap_or_default()
+                                        {
+                                            _ = window()
+                                                .location()
+                                                .set_href(resp_url.as_str());
+                                        } else {
+                                            request_animation_frame(
+                                                move || {
+                                                    if let Err(e) = navigate(
+                                                        &format!(
+                                                            "{}{}{}",
+                                                            url.pathname,
+                                                            if url
+                                                                .search
+                                                                .is_empty()
+                                                            {
+                                                                ""
+                                                            } else {
+                                                                "?"
+                                                            },
+                                                            url.search,
+                                                        ),
+                                                        Default::default(),
+                                                    ) {
+                                                        warn!("{}", e);
+                                                    }
+                                                },
+                                            );
                                         }
-                                        Err(e) => warn!("{}", e),
                                     }
+                                    Err(e) => warn!("{}", e),
                                 }
                             }
                         }
-                    });
-                }
-                // POST
-                else if method == "post" {
-                    ev.prevent_default();
-                    ev.stop_propagation();
-
-                    let on_response = on_response.clone();
-                    let on_error = on_error.clone();
-                    spawn_local(async move {
-                        let res = gloo_net::http::Request::post(&action)
-                            .header("Accept", "application/json")
-                            .header("Content-Type", &enctype)
-                            .redirect(RequestRedirect::Follow)
-                            .body(params)
-                            .send()
-                            .await;
-                        match res {
-                            Err(e) => {
-                                error!("<Form/> error while POSTing: {e:#?}");
-                                if let Some(on_error) = on_error {
-                                    on_error(&e);
-                                }
-                                if let Some(error) = error {
-                                    error.try_set(Some(Box::new(e)));
-                                }
-                            }
-                            Ok(resp) => {
-                                if let Some(version) = action_version {
-                                    version.update(|n| *n += 1);
-                                }
-                                if let Some(error) = error {
-                                    error.try_set(None);
-                                }
-                                if let Some(on_response) = on_response.clone() {
-                                    on_response(resp.as_raw());
-                                }
-                                // Check all the logical 3xx responses that might
-                                // get returned from a server function
-                                if resp.redirected() {
-                                    let resp_url = &resp.url();
-                                    match Url::try_from(resp_url.as_str()) {
-                                        Ok(url) => {
-                                            if url.origin
-                                                != window()
-                                                    .location()
-                                                    .hostname()
-                                                    .unwrap_or_default()
-                                            {
-                                                _ = window()
-                                                    .location()
-                                                    .set_href(
-                                                        resp_url.as_str(),
-                                                    );
-                                            } else {
-                                                request_animation_frame(
-                                                    move || {
-                                                        if let Err(e) = navigate(
-                                                            &format!(
-                                                                "{}{}{}",
-                                                                url.pathname,
-                                                                if url
-                                                                    .search
-                                                                    .is_empty()
-                                                                {
-                                                                    ""
-                                                                } else {
-                                                                    "?"
-                                                                },
-                                                                url.search,
-                                                            ),
-                                                            Default::default(),
-                                                        ) {
-                                                            warn!("{}", e);
-                                                        }
-                                                    },
-                                                );
-                                            }
-                                        }
-                                        Err(e) => warn!("{}", e),
-                                    }
-                                }
-                            }
-                        }
-                    });
-                }
-                // otherwise, GET
-                else {
-                    let params =
-                        params.to_string().as_string().unwrap_or_default();
-                    if navigate(
-                        &format!("{action}?{params}"),
-                        Default::default(),
-                    )
-                    .is_ok()
-                    {
-                        ev.prevent_default();
-                        ev.stop_propagation();
                     }
+                });
+            }
+            // POST
+            else if method == "post" {
+                ev.prevent_default();
+                ev.stop_propagation();
+
+                let on_response = on_response.clone();
+                spawn_local(async move {
+                    let res = gloo_net::http::Request::post(&action)
+                        .header("Accept", "application/json")
+                        .header("Content-Type", &enctype)
+                        .redirect(RequestRedirect::Follow)
+                        .body(params)
+                        .send()
+                        .await;
+                    match res {
+                        Err(e) => {
+                            error!("<Form/> error while POSTing: {e:#?}");
+                            if let Some(error) = error {
+                                error.set(Some(Box::new(e)));
+                            }
+                        }
+                        Ok(resp) => {
+                            if let Some(version) = action_version {
+                                version.update(|n| *n += 1);
+                            }
+                            if let Some(error) = error {
+                                error.set(None);
+                            }
+                            if let Some(on_response) = on_response.clone() {
+                                on_response(resp.as_raw());
+                            }
+                            // Check all the logical 3xx responses that might
+                            // get returned from a server function
+                            if resp.redirected() {
+                                let resp_url = &resp.url();
+                                match Url::try_from(resp_url.as_str()) {
+                                    Ok(url) => {
+                                        if url.origin
+                                            != window()
+                                                .location()
+                                                .hostname()
+                                                .unwrap_or_default()
+                                        {
+                                            _ = window()
+                                                .location()
+                                                .set_href(resp_url.as_str());
+                                        } else {
+                                            request_animation_frame(
+                                                move || {
+                                                    if let Err(e) = navigate(
+                                                        &format!(
+                                                            "{}{}{}",
+                                                            url.pathname,
+                                                            if url
+                                                                .search
+                                                                .is_empty()
+                                                            {
+                                                                ""
+                                                            } else {
+                                                                "?"
+                                                            },
+                                                            url.search,
+                                                        ),
+                                                        Default::default(),
+                                                    ) {
+                                                        warn!("{}", e);
+                                                    }
+                                                },
+                                            );
+                                        }
+                                    }
+                                    Err(e) => warn!("{}", e),
+                                }
+                            }
+                        }
+                    }
+                });
+            }
+            // otherwise, GET
+            else {
+                let params = params.to_string().as_string().unwrap_or_default();
+                if navigate(&format!("{action}?{params}"), Default::default())
+                    .is_ok()
+                {
+                    ev.prevent_default();
+                    ev.stop_propagation();
                 }
             }
         };
@@ -320,7 +296,6 @@ where
         error,
         on_form_data,
         on_response,
-        on_error,
         class,
         children,
         node_ref,
@@ -380,37 +355,14 @@ where
     let value = action.value();
     let input = action.input();
 
-    let on_error = Rc::new(move |e: &gloo_net::Error| {
-        cx.batch(move || {
-            action.set_pending(false);
-            let e = ServerFnError::Request(e.to_string());
-            value.try_set(Some(Err(e.clone())));
-            if let Some(error) = error {
-                error.try_set(Some(Box::new(ServerFnErrorErr::from(e))));
-            }
-        });
-    });
-
     let on_form_data = Rc::new(move |form_data: &web_sys::FormData| {
         let data = I::from_form_data(form_data);
         match data {
             Ok(data) => {
-                cx.batch(move || {
-                    input.try_set(Some(data));
-                    action.set_pending(true);
-                });
-            }
-            Err(e) => {
-                error!("{e}");
-                let e = ServerFnError::Serialization(e.to_string());
-                cx.batch(move || {
-                    value.try_set(Some(Err(e.clone())));
-                    if let Some(error) = error {
-                        error
-                            .try_set(Some(Box::new(ServerFnErrorErr::from(e))));
-                    }
-                });
+                input.set(Some(data));
+                action.set_pending(true);
             }
+            Err(e) => error!("{e}"),
         }
     });
 
@@ -418,6 +370,7 @@ where
         let resp = resp.clone().expect("couldn't get Response");
         spawn_local(async move {
             let redirected = resp.redirected();
+
             if !redirected {
                 let body = JsFuture::from(
                     resp.text().expect("couldn't get .text() from Response"),
@@ -473,7 +426,7 @@ where
                         error!("{e:?}");
                         if let Some(error) = error {
                             error.try_set(Some(Box::new(
-                                ServerFnErrorErr::Request(
+                                ServerFnError::Request(
                                     e.as_string().unwrap_or_default(),
                                 ),
                             )));
@@ -481,10 +434,8 @@ where
                     }
                 };
             }
-            cx.batch(move || {
-                input.try_set(None);
-                action.set_pending(false);
-            });
+            input.try_set(None);
+            action.set_pending(false);
         });
     });
     let class = class.map(|bx| bx.into_attribute_boxed(cx));
@@ -493,7 +444,6 @@ where
         .version(version)
         .on_form_data(on_form_data)
         .on_response(on_response)
-        .on_error(on_error)
         .method("post")
         .class(class)
         .children(children)
@@ -557,7 +507,7 @@ where
             Err(e) => {
                 error!("{e}");
                 if let Some(error) = error {
-                    error.try_set(Some(Box::new(e)));
+                    error.set(Some(Box::new(e)));
                 }
             }
             Ok(input) => {
@@ -565,7 +515,7 @@ where
                 ev.stop_propagation();
                 multi_action.dispatch(input);
                 if let Some(error) = error {
-                    error.try_set(None);
+                    error.set(None);
                 }
             }
         }

server_fn/src/error.rs

@@ -1,167 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::{error, fmt, ops, sync::Arc};
-use thiserror::Error;
-
-/// This is a result type into which any error can be converted,
-/// and which can be used directly in your `view`.
-///
-/// All errors will be stored as [`Error`].
-pub type Result<T, E = Error> = core::result::Result<T, E>;
-
-/// A generic wrapper for any error.
-#[derive(Debug, Clone)]
-#[repr(transparent)]
-pub struct Error(Arc<dyn error::Error + Send + Sync>);
-
-impl Error {
-    /// Converts the wrapper into the inner reference-counted error.
-    pub fn into_inner(self) -> Arc<dyn error::Error + Send + Sync> {
-        Arc::clone(&self.0)
-    }
-}
-
-impl ops::Deref for Error {
-    type Target = Arc<dyn error::Error + Send + Sync>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl fmt::Display for Error {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.0)
-    }
-}
-
-impl<T> From<T> for Error
-where
-    T: std::error::Error + Send + Sync + 'static,
-{
-    fn from(value: T) -> Self {
-        Error(Arc::new(value))
-    }
-}
-
-impl From<ServerFnError> for Error {
-    fn from(e: ServerFnError) -> Self {
-        Error(Arc::new(ServerFnErrorErr::from(e)))
-    }
-}
-
-/// Type for errors that can occur when using server functions.
-///
-/// Unlike [`ServerFnErrorErr`], this does not implement [`std::error::Error`].
-/// This means that other error types can easily be converted into it using the
-/// `?` operator.
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub enum ServerFnError {
-    /// Error while trying to register the server function (only occurs in case of poisoned RwLock).
-    Registration(String),
-    /// Occurs on the client if there is a network error while trying to run function on server.
-    Request(String),
-    /// Occurs when there is an error while actually running the function on the server.
-    ServerError(String),
-    /// Occurs on the client if there is an error deserializing the server's response.
-    Deserialization(String),
-    /// Occurs on the client if there is an error serializing the server function arguments.
-    Serialization(String),
-    /// Occurs on the server if there is an error deserializing one of the arguments that's been sent.
-    Args(String),
-    /// Occurs on the server if there's a missing argument.
-    MissingArg(String),
-}
-
-impl std::fmt::Display for ServerFnError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(
-            f,
-            "{}",
-            match self {
-                ServerFnError::Registration(s) => format!(
-                    "error while trying to register the server function: {s}"
-                ),
-                ServerFnError::Request(s) => format!(
-                    "error reaching server to call server function: {s}"
-                ),
-                ServerFnError::ServerError(s) =>
-                    format!("error running server function: {s}"),
-                ServerFnError::Deserialization(s) =>
-                    format!("error deserializing server function results: {s}"),
-                ServerFnError::Serialization(s) =>
-                    format!("error serializing server function arguments: {s}"),
-                ServerFnError::Args(s) => format!(
-                    "error deserializing server function arguments: {s}"
-                ),
-                ServerFnError::MissingArg(s) => format!("missing argument {s}"),
-            }
-        )
-    }
-}
-
-impl<E> From<E> for ServerFnError
-where
-    E: std::error::Error,
-{
-    fn from(e: E) -> Self {
-        ServerFnError::ServerError(e.to_string())
-    }
-}
-
-/// Type for errors that can occur when using server functions.
-///
-/// Unlike [`ServerFnErrorErr`], this implements [`std::error::Error`]. This means
-/// it can be used in situations in which the `Error` trait is required, but it’s
-/// not possible to create a blanket implementation that converts other errors into
-/// this type.
-///
-/// [`ServerFnError`] and [`ServerFnErrorErr`] mutually implement [`From`], so
-/// it is easy to convert between the two types.
-#[derive(Error, Debug, Clone, Serialize, Deserialize)]
-pub enum ServerFnErrorErr {
-    /// Error while trying to register the server function (only occurs in case of poisoned RwLock).
-    #[error("error while trying to register the server function: {0}")]
-    Registration(String),
-    /// Occurs on the client if there is a network error while trying to run function on server.
-    #[error("error reaching server to call server function: {0}")]
-    Request(String),
-    /// Occurs when there is an error while actually running the function on the server.
-    #[error("error running server function: {0}")]
-    ServerError(String),
-    /// Occurs on the client if there is an error deserializing the server's response.
-    #[error("error deserializing server function results: {0}")]
-    Deserialization(String),
-    /// Occurs on the client if there is an error serializing the server function arguments.
-    #[error("error serializing server function arguments: {0}")]
-    Serialization(String),
-    /// Occurs on the server if there is an error deserializing one of the arguments that's been sent.
-    #[error("error deserializing server function arguments: {0}")]
-    Args(String),
-    /// Occurs on the server if there's a missing argument.
-    #[error("missing argument {0}")]
-    MissingArg(String),
-}
-
-impl From<ServerFnError> for ServerFnErrorErr {
-    fn from(value: ServerFnError) -> Self {
-        match value {
-            ServerFnError::Registration(value) => {
-                ServerFnErrorErr::Registration(value)
-            }
-            ServerFnError::Request(value) => ServerFnErrorErr::Request(value),
-            ServerFnError::ServerError(value) => {
-                ServerFnErrorErr::ServerError(value)
-            }
-            ServerFnError::Deserialization(value) => {
-                ServerFnErrorErr::Deserialization(value)
-            }
-            ServerFnError::Serialization(value) => {
-                ServerFnErrorErr::Serialization(value)
-            }
-            ServerFnError::Args(value) => ServerFnErrorErr::Args(value),
-            ServerFnError::MissingArg(value) => {
-                ServerFnErrorErr::MissingArg(value)
-            }
-        }
-    }
-}

server_fn/src/lib.rs

@@ -90,17 +90,15 @@ use quote::TokenStreamExt;
 // used by the macro
 #[doc(hidden)]
 pub use serde;
-use serde::{de::DeserializeOwned, Serialize};
+use serde::{de::DeserializeOwned, Deserialize, Serialize};
 pub use server_fn_macro_default::server;
 use std::{future::Future, pin::Pin, str::FromStr};
 #[cfg(any(feature = "ssr", doc))]
 use syn::parse_quote;
+use thiserror::Error;
 // used by the macro
 #[doc(hidden)]
 pub use xxhash_rust;
-/// Error types used in server functions.
-pub mod error;
-pub use error::ServerFnError;
 
 /// Default server function registry
 pub mod default;
@@ -453,6 +451,32 @@ where
     }
 }
 
+/// Type for errors that can occur when using server functions.
+#[derive(Error, Debug, Clone, Serialize, Deserialize)]
+pub enum ServerFnError {
+    /// Error while trying to register the server function (only occurs in case of poisoned RwLock).
+    #[error("error while trying to register the server function: {0}")]
+    Registration(String),
+    /// Occurs on the client if there is a network error while trying to run function on server.
+    #[error("error reaching server to call server function: {0}")]
+    Request(String),
+    /// Occurs when there is an error while actually running the function on the server.
+    #[error("error running server function: {0}")]
+    ServerError(String),
+    /// Occurs on the client if there is an error deserializing the server's response.
+    #[error("error deserializing server function results {0}")]
+    Deserialization(String),
+    /// Occurs on the client if there is an error serializing the server function arguments.
+    #[error("error serializing server function arguments {0}")]
+    Serialization(String),
+    /// Occurs on the server if there is an error deserializing one of the arguments that's been sent.
+    #[error("error deserializing server function arguments {0}")]
+    Args(String),
+    /// Occurs on the server if there's a missing argument.
+    #[error("missing argument {0}")]
+    MissingArg(String),
+}
+
 /// Executes the HTTP call to call a server function from the client, given its URL and argument type.
 #[cfg(not(feature = "ssr"))]
 pub async fn call_server_fn<T, C: 'static>(
@@ -625,7 +649,7 @@ where
 // Lazily initialize the client to be reused for all server function calls.
 #[cfg(any(all(not(feature = "ssr"), not(target_arch = "wasm32")), doc))]
 static CLIENT: once_cell::sync::Lazy<reqwest::Client> =
-    once_cell::sync::Lazy::new(reqwest::Client::new);
+    once_cell::sync::Lazy::new(|| reqwest::Client::new());
 
 #[cfg(any(all(not(feature = "ssr"), not(target_arch = "wasm32")), doc))]
 static ROOT_URL: once_cell::sync::OnceCell<&'static str> =