fix: support complex punctuated attribute keys in attr: syntax (closes #3221)

.github/dependabot.yml

@@ -0,0 +1,12 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "cargo"
+    directories:
+      - "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 10

.github/workflows/autofix.yml

@@ -1,54 +0,0 @@
-name: autofix.ci
-on:
-  pull_request:
-  # Running this workflow on main branch pushes requires write permission to apply changes.
-  # Leave it alone for future uses.
-  # push:
-  #   branches: ["main"]
-permissions:
-  contents: read
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-env:
-  CARGO_TERM_COLOR: always
-  RUST_BACKTRACE: 1
-  DEBIAN_FRONTEND: noninteractive
-jobs:
-  autofix:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with: {toolchain: nightly, components: "rustfmt, clippy", target: "wasm32-unknown-unknown", rustflags: ""}
-      - name: Install Glib
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libglib2.0-dev
-      - name: Install jq
-        run: sudo apt-get install jq
-      - run: |
-          echo "Formatting the workspace"
-          cargo fmt --all
-
-          echo "Running Clippy against each member's features (default features included)"
-          for member in $(cargo metadata --no-deps --format-version 1 | jq -r '.packages[] | .name'); do
-              echo "Working on member $member":
-              echo -e "\tdefault-features/no-features:"
-              # this will also run on members with no features or default features
-              cargo clippy --allow-dirty --fix --lib --package "$member"
-
-              features=$(cargo metadata --no-deps --format-version 1 | jq -r ".packages[] | select(.name == \"$member\") | .features | keys[]")
-              for feature in $features; do
-                  if [ "$feature" = "default" ]; then
-                    continue
-                  fi
-                  echo -e "\tfeature $feature"
-                  cargo clippy --allow-dirty --fix --lib --package "$member" --features "$feature"
-              done
-          done
-      - uses: autofix-ci/action@v1.3.1
-        if: ${{ always() }}
-        with:
-          fail-fast: false

.github/workflows/ci-changed-examples.yml

@@ -4,12 +4,10 @@ on:
     branches:
       - main
       - leptos_0.6
-      - leptos_0.8
   pull_request:
     branches:
       - main
       - leptos_0.6
-      - leptos_0.8
 jobs:
   get-example-changed:
     uses: ./.github/workflows/get-example-changed.yml

.github/workflows/ci-examples.yml

@@ -4,12 +4,10 @@ on:
     branches:
       - main
       - leptos_0.6
-      - leptos_0.8
   pull_request:
     branches:
       - main
       - leptos_0.6
-      - leptos_0.8
 jobs:
   get-leptos-changed:
     uses: ./.github/workflows/get-leptos-changed.yml

.github/workflows/ci-semver.yml

@@ -4,30 +4,22 @@ on:
     branches:
       - main
       - leptos_0.6
-      - leptos_0.8
   pull_request:
     branches:
       - main
       - leptos_0.6
-      - leptos_0.8
-env:
-  DEBIAN_FRONTEND: noninteractive
 jobs:
   get-leptos-changed:
     uses: ./.github/workflows/get-leptos-changed.yml
   test:
     needs: [get-leptos-changed]
-    if: needs.get-leptos-changed.outputs.leptos_changed == 'true' && github.event.pull_request.labels[0].name != 'breaking'
-    name: Run semver check (nightly-2025-03-05)
+    if: github.event.pull_request.labels[0].name == 'semver' # needs.get-leptos-changed.outputs.leptos_changed == 'true' && github.event.pull_request.labels[0].name != 'breaking'
+    name: Run semver check (nightly-2024-08-01)
     runs-on: ubuntu-latest
     steps:
-      - name: Install Glib
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libglib2.0-dev
       - name: Checkout
         uses: actions/checkout@v4
       - name: Semver Checks
         uses: obi1kenobi/cargo-semver-checks-action@v2
         with:
-          rust-toolchain: nightly-2025-03-05
+          rust-toolchain: nightly-2024-08-01

.github/workflows/ci.yml

@@ -4,12 +4,10 @@ on:
     branches:
       - main
       - leptos_0.6
-      - leptos_0.8
   pull_request:
     branches:
       - main
       - leptos_0.6
-      - leptos_0.8
 jobs:
   get-leptos-changed:
     uses: ./.github/workflows/get-leptos-changed.yml
@@ -26,4 +24,4 @@ jobs:
     with:
       directory: ${{ matrix.directory }}
       cargo_make_task: "ci"
-      toolchain: nightly-2025-03-05
+      toolchain: nightly-2024-08-01

.github/workflows/run-cargo-make-task.yml

@@ -14,7 +14,6 @@ on:
 env:
   CARGO_TERM_COLOR: always
   CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
-  DEBIAN_FRONTEND: noninteractive
 jobs:
   test:
     name: Run ${{ inputs.cargo_make_task }} (${{ inputs.toolchain }})
@@ -34,10 +33,6 @@ jobs:
           echo "Disk space after cleanup:"
           df -h
       # Setup environment
-      - name: Install Glib
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libglib2.0-dev
       - uses: actions/checkout@v4
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@master
@@ -55,7 +50,7 @@ jobs:
       - name: Install wasm-bindgen
         run: cargo binstall wasm-bindgen-cli --no-confirm
       - name: Install cargo-leptos
-        run: cargo binstall cargo-leptos --locked --no-confirm
+        run: cargo binstall cargo-leptos --no-confirm
       - name: Install Trunk
         uses: jetli/trunk-action@v0.5.0
         with:

.gitignore

@@ -14,4 +14,3 @@ blob.rs
 
 .vscode
 vendor
-hash.txt

Cargo.toml

@@ -40,39 +40,36 @@ members = [
 exclude = ["benchmarks", "examples", "projects"]
 
 [workspace.package]
-version = "0.7.8"
+version = "0.7.0-rc1"
 edition = "2021"
 rust-version = "1.76"
 
 [workspace.dependencies]
-throw_error = { path = "./any_error/", version = "0.2.0" }
-any_spawner = { path = "./any_spawner/", version = "0.2.0" }
-const_str_slice_concat = { path = "./const_str_slice_concat", version = "0.1" }
-either_of = { path = "./either_of/", version = "0.1.5" }
-hydration_context = { path = "./hydration_context", version = "0.2.0" }
-itertools = "0.14.0"
-leptos = { path = "./leptos", version = "0.7.8" }
-leptos_config = { path = "./leptos_config", version = "0.7.8" }
-leptos_dom = { path = "./leptos_dom", version = "0.7.8" }
-leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.7.8" }
-leptos_integration_utils = { path = "./integrations/utils", version = "0.7.8" }
-leptos_macro = { path = "./leptos_macro", version = "0.7.8" }
-leptos_router = { path = "./router", version = "0.7.8" }
-leptos_router_macro = { path = "./router_macro", version = "0.7.8" }
-leptos_server = { path = "./leptos_server", version = "0.7.8" }
-leptos_meta = { path = "./meta", version = "0.7.8" }
-next_tuple = { path = "./next_tuple", version = "0.1.0" }
+throw_error = { path = "./any_error/", version = "0.2.0-rc1" }
+any_spawner = { path = "./any_spawner/", version = "0.1.0" }
+const_str_slice_concat = { path = "./const_str_slice_concat", version = "0.1.0" }
+either_of = { path = "./either_of/", version = "0.1.0" }
+hydration_context = { path = "./hydration_context", version = "0.2.0-rc1" }
+leptos = { path = "./leptos", version = "0.7.0-rc1" }
+leptos_config = { path = "./leptos_config", version = "0.7.0-rc1" }
+leptos_dom = { path = "./leptos_dom", version = "0.7.0-rc1" }
+leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.7.0-rc1" }
+leptos_integration_utils = { path = "./integrations/utils", version = "0.7.0-rc1" }
+leptos_macro = { path = "./leptos_macro", version = "0.7.0-rc1" }
+leptos_router = { path = "./router", version = "0.7.0-rc1" }
+leptos_router_macro = { path = "./router_macro", version = "0.7.0-rc1" }
+leptos_server = { path = "./leptos_server", version = "0.7.0-rc1" }
+leptos_meta = { path = "./meta", version = "0.7.0-rc1" }
+next_tuple = { path = "./next_tuple", version = "0.1.0-rc1" }
 oco_ref = { path = "./oco", version = "0.2.0" }
 or_poisoned = { path = "./or_poisoned", version = "0.1.0" }
-reactive_graph = { path = "./reactive_graph", version = "0.1.7" }
-reactive_stores = { path = "./reactive_stores", version = "0.1.7" }
-reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.1.7" }
-serde_json = "1.0.0"
-server_fn = { path = "./server_fn", version = "0.7.8" }
-server_fn_macro = { path = "./server_fn_macro", version = "0.7.8" }
-server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.7.8" }
-tachys = { path = "./tachys", version = "0.1.7" }
-wasm-bindgen = { version = "0.2.100" }
+reactive_graph = { path = "./reactive_graph", version = "0.1.0-rc1" }
+reactive_stores = { path = "./reactive_stores", version = "0.1.0-rc1" }
+reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.1.0-rc1" }
+server_fn = { path = "./server_fn", version = "0.7.0-rc1" }
+server_fn_macro = { path = "./server_fn_macro", version = "0.7.0-rc1" }
+server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.7.0-rc1" }
+tachys = { path = "./tachys", version = "0.1.0-rc1" }
 
 [profile.release]
 codegen-units = 1
@@ -81,9 +78,3 @@ opt-level = 'z'
 
 [workspace.metadata.cargo-all-features]
 skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]
-
-[workspace.lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = [
-  'cfg(leptos_debuginfo)',
-  'cfg(erase_components)',
-] }

README.md

@@ -5,7 +5,6 @@
 
 [![crates.io](https://img.shields.io/crates/v/leptos.svg)](https://crates.io/crates/leptos)
 [![docs.rs](https://docs.rs/leptos/badge.svg)](https://docs.rs/leptos)
-![Crates.io MSRV](https://img.shields.io/crates/msrv/leptos)
 [![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)
 
@@ -13,6 +12,8 @@
 
 You can find a list of useful libraries and example projects at [`awesome-leptos`](https://github.com/leptos-rs/awesome-leptos).
 
+# The `main` branch is currently undergoing major changes in preparation for the [0.7](https://github.com/leptos-rs/leptos/milestone/4) release. For a stable version, please use the [v0.6.13 tag](https://github.com/leptos-rs/leptos/tree/v0.6.13)
+
 # Leptos
 
 ```rust
@@ -21,7 +22,7 @@ use leptos::*;
 #[component]
 pub fn SimpleCounter(initial_value: i32) -> impl IntoView {
     // create a reactive signal with the initial value
-    let (value, set_value) = signal(initial_value);
+    let (value, set_value) = create_signal(initial_value);
 
     // create event handlers for our buttons
     // note that `value` and `set_value` are `Copy`, so it's super easy to move them into closures
@@ -46,7 +47,7 @@ pub fn SimpleCounter(initial_value: i32) -> impl IntoView {
 pub fn SimpleCounterWithBuilder(initial_value: i32) -> impl IntoView {
     use leptos::html::*;
 
-    let (value, set_value) = signal(initial_value);
+    let (value, set_value) = create_signal(initial_value);
     let clear = move |_| set_value(0);
     let decrement = move |_| set_value.update(|value| *value -= 1);
     let increment = move |_| set_value.update(|value| *value += 1);
@@ -158,7 +159,9 @@ Sure! Obviously the `view` macro is for generating DOM nodes but you can use the
 - Use event listeners to update signals
 - Create effects to update the UI
 
-The 0.7 update originally set out to create a "generic rendering" approach that would allow us to reuse most of the same view logic to do all of the above. Unfortunately, this has had to be shelved for now due to difficulties encountered by the Rust compiler when building larger-scale applications with the number of generics spread throughout the codebase that this required. It's an approach I'm looking forward to exploring again in the future; feel free to reach out if you're interested in this kind of work.
+I've put together a [very simple GTK example](https://github.com/leptos-rs/leptos/blob/main/examples/gtk/src/main.rs) so you can see what I mean.
+
+The new rendering approach being developed for 0.7 supports “universal rendering,” i.e., it can use any rendering library that supports a small set of 6-8 functions. (This is intended as a layer over typical retained-mode, OOP-style GUI toolkits like the DOM, GTK, etc.) That future rendering work will allow creating native UI in a way that is much more similar to the declarative approach used by the web framework.
 
 ### How is this different from Yew?
 
@@ -168,14 +171,14 @@ Yew is the most-used library for Rust web UI development, but there are several
 - **Performance:** This has huge performance implications: Leptos is simply much faster at both creating and updating the UI than Yew is.
 - **Server integration:** Yew was created in an era in which browser-rendered single-page apps (SPAs) were the dominant paradigm. While Leptos supports client-side rendering, it also focuses on integrating with the server side of your application via server functions and multiple modes of serving HTML, including out-of-order streaming.
 
-### How is this different from Dioxus?
+- ### How is this different from Dioxus?
 
 Like Leptos, Dioxus is a framework for building UIs using web technologies. However, there are significant differences in approach and features.
 
 - **VDOM vs. fine-grained:** While Dioxus has a performant virtual DOM (VDOM), it still uses coarse-grained/component-scoped reactivity: changing a stateful value reruns the component function and diffs the old UI against the new one. Leptos components use a different mental model, creating (and returning) actual DOM nodes and setting up a reactive system to update those DOM nodes.
 - **Web vs. desktop priorities:** Dioxus uses Leptos server functions in its fullstack mode, but does not have the same `<Suspense>`-based support for things like streaming HTML rendering, or share the same focus on holistic web performance. Leptos tends to prioritize holistic web performance (streaming HTML rendering, smaller WASM binary sizes, etc.), whereas Dioxus has an unparalleled experience when building desktop apps, because your application logic runs as a native Rust binary.
 
-### How is this different from Sycamore?
+- ### How is this different from Sycamore?
 
 Sycamore and Leptos are both heavily influenced by SolidJS. At this point, Leptos has a larger community and ecosystem and is more actively developed. Other differences:
 

any_error/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "throw_error"
-version = "0.2.0"
+version = "0.2.0-rc1"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"

any_error/src/lib.rs

@@ -9,7 +9,7 @@ use std::{
     error,
     fmt::{self, Display},
     future::Future,
-    ops,
+    mem, ops,
     pin::Pin,
     sync::Arc,
     task::{Context, Poll},
@@ -109,7 +109,7 @@ pub fn get_error_hook() -> Option<Arc<dyn ErrorHook>> {
 /// Sets the current thread-local error hook, which will be invoked when [`throw`] is called.
 pub fn set_error_hook(hook: Arc<dyn ErrorHook>) -> ResetErrorHookOnDrop {
     ResetErrorHookOnDrop(
-        ERROR_HOOK.with_borrow_mut(|this| Option::replace(this, hook)),
+        ERROR_HOOK.with_borrow_mut(|this| mem::replace(this, Some(hook))),
     )
 }
 

any_spawner/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "any_spawner"
-version = "0.2.1"
+version = "0.1.1"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
@@ -11,13 +11,13 @@ edition.workspace = true
 [dependencies]
 async-executor = { version = "1.13.1", optional = true }
 futures = "0.3.31"
-glib = { version = "0.20.6", optional = true }
+glib = { version = "0.20.5", optional = true }
 thiserror = "2.0"
 tokio = { version = "1.41", optional = true, default-features = false, features = [
   "rt",
 ] }
-tracing = { version = "0.1.41", optional = true }
-wasm-bindgen-futures = { version = "0.4.50", optional = true }
+tracing = { version = "0.1.40", optional = true }
+wasm-bindgen-futures = { version = "0.4.45", optional = true }
 
 [features]
 async-executor = ["dep:async-executor"]

benchmarks/Cargo.toml

@@ -23,7 +23,7 @@ tokio-test = "0.4.0"
 miniserde = "0.1.0"
 gloo = "0.8.0"
 uuid = { version = "1.0", features = ["serde", "v4", "wasm-bindgen"] }
-wasm-bindgen = "0.2.100"
+wasm-bindgen = "0.2.0"
 lazy_static = "1.0"
 log = "0.4.0"
 strum = "0.24.0"

either_of/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "either_of"
-version = "0.1.5"
+version = "0.1.0"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
@@ -10,9 +10,4 @@ rust-version.workspace = true
 edition.workspace = true
 
 [dependencies]
-pin-project-lite = "0.2.16"
-paste = "1.0.15"
-
-[features]
-default = ["no_std"]
-no_std = []
+pin-project-lite = "0.2.15"

either_of/src/lib.rs

@@ -1,758 +1,140 @@
-#![cfg_attr(feature = "no_std", no_std)]
+#![no_std]
 #![forbid(unsafe_code)]
 
 //! Utilities for working with enumerated types that contain one of `2..n` other types.
 
 use core::{
-    cmp::Ordering,
     fmt::Display,
     future::Future,
-    iter::{Product, Sum},
     pin::Pin,
     task::{Context, Poll},
 };
-use paste::paste;
 use pin_project_lite::pin_project;
-#[cfg(not(feature = "no_std"))]
-use std::error::Error; // TODO: replace with core::error::Error once MSRV is >= 1.81.0
+
+#[derive(Debug, Clone, Copy)]
+pub enum Either<A, B> {
+    Left(A),
+    Right(B),
+}
+
+impl<Item, A, B> Iterator for Either<A, B>
+where
+    A: Iterator<Item = Item>,
+    B: Iterator<Item = Item>,
+{
+    type Item = Item;
+
+    fn next(&mut self) -> Option<Self::Item> {
+        match self {
+            Either::Left(i) => i.next(),
+            Either::Right(i) => i.next(),
+        }
+    }
+}
+
+pin_project! {
+    #[project = EitherFutureProj]
+    pub enum EitherFuture<A, B> {
+        Left { #[pin] inner: A },
+        Right { #[pin] inner: B },
+    }
+}
+
+impl<A, B> Future for EitherFuture<A, B>
+where
+    A: Future,
+    B: Future,
+{
+    type Output = Either<A::Output, B::Output>;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
+        let this = self.project();
+        match this {
+            EitherFutureProj::Left { inner } => match inner.poll(cx) {
+                Poll::Pending => Poll::Pending,
+                Poll::Ready(inner) => Poll::Ready(Either::Left(inner)),
+            },
+            EitherFutureProj::Right { inner } => match inner.poll(cx) {
+                Poll::Pending => Poll::Pending,
+                Poll::Ready(inner) => Poll::Ready(Either::Right(inner)),
+            },
+        }
+    }
+}
 
 macro_rules! tuples {
-    ($name:ident + $fut_name:ident + $fut_proj:ident {
-        $($ty:ident => ($($rest_variant:ident),*) + <$($mapped_ty:ident),+>),+$(,)?
-    }) => {
-        tuples!($name + $fut_name + $fut_proj {
-            $($ty($ty) => ($($rest_variant),*) + <$($mapped_ty),+>),+
-        });
-    };
-    ($name:ident + $fut_name:ident + $fut_proj:ident {
-        $($variant:ident($ty:ident) => ($($rest_variant:ident),*) + <$($mapped_ty:ident),+>),+$(,)?
-    }) => {
+    ($name:ident + $fut_name:ident + $fut_proj:ident => $($ty:ident),*) => {
         #[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
-        pub enum $name<$($ty),+> {
-            $($variant ($ty),)+
+        pub enum $name<$($ty,)*> {
+            $($ty ($ty),)*
         }
 
-        impl<$($ty),+> $name<$($ty),+> {
-            paste! {
-                #[allow(clippy::too_many_arguments)]
-                pub fn map<$([<F $ty>]),+, $([<$ty 1>]),+>(self, $([<$variant:lower>]: [<F $ty>]),+) -> $name<$([<$ty 1>]),+>
-                where
-                    $([<F $ty>]: FnOnce($ty) -> [<$ty 1>],)+
-                {
-                    match self {
-                        $($name::$variant(inner) => $name::$variant([<$variant:lower>](inner)),)+
-                    }
-                }
-
-                $(
-                    pub fn [<map_ $variant:lower>]<Fun, [<$ty 1>]>(self, f: Fun) -> $name<$($mapped_ty),+>
-                    where
-                        Fun: FnOnce($ty) -> [<$ty 1>],
-                    {
-                        match self {
-                            $name::$variant(inner) => $name::$variant(f(inner)),
-                            $($name::$rest_variant(inner) => $name::$rest_variant(inner),)*
-                        }
-                    }
-
-                    pub fn [<inspect_ $variant:lower>]<Fun, [<$ty 1>]>(self, f: Fun) -> Self
-                    where
-                        Fun: FnOnce(&$ty),
-                    {
-                        if let $name::$variant(inner) = &self {
-                            f(inner);
-                        }
-                        self
-                    }
-
-                    pub fn [<is_ $variant:lower>](&self) -> bool {
-                        matches!(self, $name::$variant(_))
-                    }
-
-                    pub fn [<as_ $variant:lower>](&self) -> Option<&$ty> {
-                        match self {
-                            $name::$variant(inner) => Some(inner),
-                            _ => None,
-                        }
-                    }
-
-                    pub fn [<as_ $variant:lower _mut>](&mut self) -> Option<&mut $ty> {
-                        match self {
-                            $name::$variant(inner) => Some(inner),
-                            _ => None,
-                        }
-                    }
-
-                    pub fn [<unwrap_ $variant:lower>](self) -> $ty {
-                        match self {
-                            $name::$variant(inner) => inner,
-                            _ => panic!(concat!(
-                                "called `unwrap_", stringify!([<$variant:lower>]), "()` on a non-`", stringify!($variant), "` variant of `", stringify!($name), "`"
-                            )),
-                        }
-                    }
-
-                    pub fn [<into_ $variant:lower>](self) -> Result<$ty, Self> {
-                        match self {
-                            $name::$variant(inner) => Ok(inner),
-                            _ => Err(self),
-                        }
-                    }
-                )+
-            }
-        }
-
-        impl<$($ty),+> Display for $name<$($ty),+>
+        impl<$($ty,)*> Display for $name<$($ty,)*>
         where
-            $($ty: Display,)+
+            $($ty: Display,)*
         {
             fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
                 match self {
-                    $($name::$variant(this) => this.fmt(f),)+
+                    $($name::$ty(this) => this.fmt(f),)*
                 }
             }
         }
 
-        #[cfg(not(feature = "no_std"))]
-        impl<$($ty),+> Error for $name<$($ty),+>
+        impl<Item, $($ty,)*> Iterator for $name<$($ty,)*>
         where
-            $($ty: Error,)+
-        {
-            fn source(&self) -> Option<&(dyn Error + 'static)> {
-                match self {
-                    $($name::$variant(this) => this.source(),)+
-                }
-            }
-        }
-
-        impl<Item, $($ty),+> Iterator for $name<$($ty),+>
-        where
-            $($ty: Iterator<Item = Item>,)+
+            $($ty: Iterator<Item = Item>,)*
         {
             type Item = Item;
 
             fn next(&mut self) -> Option<Self::Item> {
                 match self {
-                    $($name::$variant(i) => i.next(),)+
-                }
-            }
-
-            fn size_hint(&self) -> (usize, Option<usize>) {
-                match self {
-                    $($name::$variant(i) => i.size_hint(),)+
-                }
-            }
-
-            fn count(self) -> usize
-            where
-                Self: Sized,
-            {
-                match self {
-                    $($name::$variant(i) => i.count(),)+
-                }
-            }
-
-            fn last(self) -> Option<Self::Item>
-            where
-                Self: Sized,
-            {
-                match self {
-                    $($name::$variant(i) => i.last(),)+
-                }
-            }
-
-            fn nth(&mut self, n: usize) -> Option<Self::Item> {
-                match self {
-                    $($name::$variant(i) => i.nth(n),)+
-                }
-            }
-
-            fn for_each<Fun>(self, f: Fun)
-            where
-                Self: Sized,
-                Fun: FnMut(Self::Item),
-            {
-                match self {
-                    $($name::$variant(i) => i.for_each(f),)+
-                }
-            }
-
-            fn collect<Col: FromIterator<Self::Item>>(self) -> Col
-            where
-                Self: Sized,
-            {
-                match self {
-                    $($name::$variant(i) => i.collect(),)+
-                }
-            }
-
-            fn partition<Col, Fun>(self, f: Fun) -> (Col, Col)
-            where
-                Self: Sized,
-                Col: Default + Extend<Self::Item>,
-                Fun: FnMut(&Self::Item) -> bool,
-            {
-                match self {
-                    $($name::$variant(i) => i.partition(f),)+
-                }
-            }
-
-            fn fold<Acc, Fun>(self, init: Acc, f: Fun) -> Acc
-            where
-                Self: Sized,
-                Fun: FnMut(Acc, Self::Item) -> Acc,
-            {
-                match self {
-                    $($name::$variant(i) => i.fold(init, f),)+
-                }
-            }
-
-            fn reduce<Fun>(self, f: Fun) -> Option<Self::Item>
-            where
-                Self: Sized,
-                Fun: FnMut(Self::Item, Self::Item) -> Self::Item,
-            {
-                match self {
-                    $($name::$variant(i) => i.reduce(f),)+
-                }
-            }
-
-            fn all<Fun>(&mut self, f: Fun) -> bool
-            where
-                Self: Sized,
-                Fun: FnMut(Self::Item) -> bool,
-            {
-                match self {
-                    $($name::$variant(i) => i.all(f),)+
-                }
-            }
-
-            fn any<Fun>(&mut self, f: Fun) -> bool
-            where
-                Self: Sized,
-                Fun: FnMut(Self::Item) -> bool,
-            {
-                match self {
-                    $($name::$variant(i) => i.any(f),)+
-                }
-            }
-
-            fn find<Pre>(&mut self, predicate: Pre) -> Option<Self::Item>
-            where
-                Self: Sized,
-                Pre: FnMut(&Self::Item) -> bool,
-            {
-                match self {
-                    $($name::$variant(i) => i.find(predicate),)+
-                }
-            }
-
-            fn find_map<Out, Fun>(&mut self, f: Fun) -> Option<Out>
-            where
-                Self: Sized,
-                Fun: FnMut(Self::Item) -> Option<Out>,
-            {
-                match self {
-                    $($name::$variant(i) => i.find_map(f),)+
-                }
-            }
-
-            fn position<Pre>(&mut self, predicate: Pre) -> Option<usize>
-            where
-                Self: Sized,
-                Pre: FnMut(Self::Item) -> bool,
-            {
-                match self {
-                    $($name::$variant(i) => i.position(predicate),)+
-                }
-            }
-
-            fn max(self) -> Option<Self::Item>
-            where
-                Self: Sized,
-                Self::Item: Ord,
-            {
-                match self {
-                    $($name::$variant(i) => i.max(),)+
-                }
-            }
-
-            fn min(self) -> Option<Self::Item>
-            where
-                Self: Sized,
-                Self::Item: Ord,
-            {
-                match self {
-                    $($name::$variant(i) => i.min(),)+
-                }
-            }
-
-            fn max_by_key<Key: Ord, Fun>(self, f: Fun) -> Option<Self::Item>
-            where
-                Self: Sized,
-                Fun: FnMut(&Self::Item) -> Key,
-            {
-                match self {
-                    $($name::$variant(i) => i.max_by_key(f),)+
-                }
-            }
-
-            fn max_by<Cmp>(self, compare: Cmp) -> Option<Self::Item>
-            where
-                Self: Sized,
-                Cmp: FnMut(&Self::Item, &Self::Item) -> Ordering,
-            {
-                match self {
-                    $($name::$variant(i) => i.max_by(compare),)+
-                }
-            }
-
-            fn min_by_key<Key: Ord, Fun>(self, f: Fun) -> Option<Self::Item>
-            where
-                Self: Sized,
-                Fun: FnMut(&Self::Item) -> Key,
-            {
-                match self {
-                    $($name::$variant(i) => i.min_by_key(f),)+
-                }
-            }
-
-            fn min_by<Cmp>(self, compare: Cmp) -> Option<Self::Item>
-            where
-                Self: Sized,
-                Cmp: FnMut(&Self::Item, &Self::Item) -> Ordering,
-            {
-                match self {
-                    $($name::$variant(i) => i.min_by(compare),)+
-                }
-            }
-
-            fn sum<Out>(self) -> Out
-            where
-                Self: Sized,
-                Out: Sum<Self::Item>,
-            {
-                match self {
-                    $($name::$variant(i) => i.sum(),)+
-                }
-            }
-
-            fn product<Out>(self) -> Out
-            where
-                Self: Sized,
-                Out: Product<Self::Item>,
-            {
-                match self {
-                    $($name::$variant(i) => i.product(),)+
-                }
-            }
-
-            fn cmp<Other>(self, other: Other) -> Ordering
-            where
-                Other: IntoIterator<Item = Self::Item>,
-                Self::Item: Ord,
-                Self: Sized,
-            {
-                match self {
-                    $($name::$variant(i) => i.cmp(other),)+
-                }
-            }
-
-            fn partial_cmp<Other>(self, other: Other) -> Option<Ordering>
-            where
-                Other: IntoIterator,
-                Self::Item: PartialOrd<Other::Item>,
-                Self: Sized,
-            {
-                match self {
-                    $($name::$variant(i) => i.partial_cmp(other),)+
-                }
-            }
-
-            // TODO: uncomment once MSRV is >= 1.82.0
-            // fn is_sorted(self) -> bool
-            // where
-            //     Self: Sized,
-            //     Self::Item: PartialOrd,
-            // {
-            //     match self {
-            //         $($name::$variant(i) => i.is_sorted(),)+
-            //     }
-            // }
-            //
-            // fn is_sorted_by<Cmp>(self, compare: Cmp) -> bool
-            // where
-            //     Self: Sized,
-            //     Cmp: FnMut(&Self::Item, &Self::Item) -> bool,
-            // {
-            //     match self {
-            //         $($name::$variant(i) => i.is_sorted_by(compare),)+
-            //     }
-            // }
-            //
-            // fn is_sorted_by_key<Fun, Key>(self, f: Fun) -> bool
-            // where
-            //     Self: Sized,
-            //     Fun: FnMut(Self::Item) -> Key,
-            //     Key: PartialOrd,
-            // {
-            //     match self {
-            //         $($name::$variant(i) => i.is_sorted_by_key(f),)+
-            //     }
-            // }
-        }
-
-        impl<Item, $($ty),+> ExactSizeIterator for $name<$($ty),+>
-        where
-            $($ty: ExactSizeIterator<Item = Item>,)+
-        {
-            fn len(&self) -> usize {
-                match self {
-                    $($name::$variant(i) => i.len(),)+
-                }
-            }
-        }
-
-        impl<Item, $($ty),+> DoubleEndedIterator for $name<$($ty),+>
-        where
-            $($ty: DoubleEndedIterator<Item = Item>,)+
-        {
-            fn next_back(&mut self) -> Option<Self::Item> {
-                match self {
-                    $($name::$variant(i) => i.next_back(),)+
-                }
-            }
-
-            fn nth_back(&mut self, n: usize) -> Option<Self::Item> {
-                match self {
-                    $($name::$variant(i) => i.nth_back(n),)+
-                }
-            }
-
-            fn rfind<Pre>(&mut self, predicate: Pre) -> Option<Self::Item>
-            where
-                Pre: FnMut(&Self::Item) -> bool,
-            {
-                match self {
-                    $($name::$variant(i) => i.rfind(predicate),)+
+                    $($name::$ty(i) => i.next(),)*
                 }
             }
         }
 
         pin_project! {
             #[project = $fut_proj]
-            pub enum $fut_name<$($ty),+> {
-                $($variant { #[pin] inner: $ty },)+
+            pub enum $fut_name<$($ty,)*> {
+                $($ty { #[pin] inner: $ty },)*
             }
         }
 
-        impl<$($ty),+> Future for $fut_name<$($ty),+>
+        impl<$($ty,)*> Future for $fut_name<$($ty,)*>
         where
-            $($ty: Future,)+
+            $($ty: Future,)*
         {
-            type Output = $name<$($ty::Output),+>;
+            type Output = $name<$($ty::Output,)*>;
 
             fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
                 let this = self.project();
                 match this {
-                    $($fut_proj::$variant { inner } => match inner.poll(cx) {
+                    $($fut_proj::$ty { inner } => match inner.poll(cx) {
                         Poll::Pending => Poll::Pending,
-                        Poll::Ready(inner) => Poll::Ready($name::$variant(inner)),
-                    },)+
+                        Poll::Ready(inner) => Poll::Ready($name::$ty(inner)),
+                    },)*
                 }
             }
         }
     }
 }
 
-tuples!(Either + EitherFuture + EitherFutureProj {
-    Left(A) => (Right) + <A1, B>,
-    Right(B) => (Left) + <A, B1>,
-});
+tuples!(EitherOf3 + EitherOf3Future + EitherOf3FutureProj => A, B, C);
+tuples!(EitherOf4 + EitherOf4Future + EitherOf4FutureProj => A, B, C, D);
+tuples!(EitherOf5 + EitherOf5Future + EitherOf5FutureProj => A, B, C, D, E);
+tuples!(EitherOf6 + EitherOf6Future + EitherOf6FutureProj => A, B, C, D, E, F);
+tuples!(EitherOf7 + EitherOf7Future + EitherOf7FutureProj => A, B, C, D, E, F, G);
+tuples!(EitherOf8 + EitherOf8Future + EitherOf8FutureProj => A, B, C, D, E, F, G, H);
+tuples!(EitherOf9 + EitherOf9Future + EitherOf9FutureProj => A, B, C, D, E, F, G, H, I);
+tuples!(EitherOf10 + EitherOf10Future + EitherOf10FutureProj => A, B, C, D, E, F, G, H, I, J);
+tuples!(EitherOf11 + EitherOf11Future + EitherOf11FutureProj => A, B, C, D, E, F, G, H, I, J, K);
+tuples!(EitherOf12 + EitherOf12Future + EitherOf12FutureProj => A, B, C, D, E, F, G, H, I, J, K, L);
+tuples!(EitherOf13 + EitherOf13Future + EitherOf13FutureProj => A, B, C, D, E, F, G, H, I, J, K, L, M);
+tuples!(EitherOf14 + EitherOf14Future + EitherOf14FutureProj => A, B, C, D, E, F, G, H, I, J, K, L, M, N);
+tuples!(EitherOf15 + EitherOf15Future + EitherOf15FutureProj => A, B, C, D, E, F, G, H, I, J, K, L, M, N, O);
+tuples!(EitherOf16 + EitherOf16Future + EitherOf16FutureProj => A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P);
 
-impl<A, B> Either<A, B> {
-    pub fn swap(self) -> Either<B, A> {
-        match self {
-            Either::Left(a) => Either::Right(a),
-            Either::Right(b) => Either::Left(b),
-        }
-    }
-}
-
-impl<A, B> From<Result<A, B>> for Either<A, B> {
-    fn from(value: Result<A, B>) -> Self {
-        match value {
-            Ok(left) => Either::Left(left),
-            Err(right) => Either::Right(right),
-        }
-    }
-}
-
-pub trait EitherOr {
-    type Left;
-    type Right;
-    fn either_or<FA, A, FB, B>(self, a: FA, b: FB) -> Either<A, B>
-    where
-        FA: FnOnce(Self::Left) -> A,
-        FB: FnOnce(Self::Right) -> B;
-}
-
-impl EitherOr for bool {
-    type Left = ();
-    type Right = ();
-
-    fn either_or<FA, A, FB, B>(self, a: FA, b: FB) -> Either<A, B>
-    where
-        FA: FnOnce(Self::Left) -> A,
-        FB: FnOnce(Self::Right) -> B,
-    {
-        if self {
-            Either::Left(a(()))
-        } else {
-            Either::Right(b(()))
-        }
-    }
-}
-
-impl<T> EitherOr for Option<T> {
-    type Left = T;
-    type Right = ();
-
-    fn either_or<FA, A, FB, B>(self, a: FA, b: FB) -> Either<A, B>
-    where
-        FA: FnOnce(Self::Left) -> A,
-        FB: FnOnce(Self::Right) -> B,
-    {
-        match self {
-            Some(t) => Either::Left(a(t)),
-            None => Either::Right(b(())),
-        }
-    }
-}
-
-impl<T, E> EitherOr for Result<T, E> {
-    type Left = T;
-    type Right = E;
-
-    fn either_or<FA, A, FB, B>(self, a: FA, b: FB) -> Either<A, B>
-    where
-        FA: FnOnce(Self::Left) -> A,
-        FB: FnOnce(Self::Right) -> B,
-    {
-        match self {
-            Ok(t) => Either::Left(a(t)),
-            Err(err) => Either::Right(b(err)),
-        }
-    }
-}
-
-impl<A, B> EitherOr for Either<A, B> {
-    type Left = A;
-    type Right = B;
-
-    #[inline]
-    fn either_or<FA, A1, FB, B1>(self, a: FA, b: FB) -> Either<A1, B1>
-    where
-        FA: FnOnce(<Self as EitherOr>::Left) -> A1,
-        FB: FnOnce(<Self as EitherOr>::Right) -> B1,
-    {
-        self.map(a, b)
-    }
-}
-
-#[test]
-fn test_either_or() {
-    let right = false.either_or(|_| 'a', |_| 12);
-    assert!(matches!(right, Either::Right(12)));
-
-    let left = true.either_or(|_| 'a', |_| 12);
-    assert!(matches!(left, Either::Left('a')));
-
-    let left = Some(12).either_or(|a| a, |_| 'a');
-    assert!(matches!(left, Either::Left(12)));
-    let right = None.either_or(|a: i32| a, |_| 'a');
-    assert!(matches!(right, Either::Right('a')));
-
-    let result: Result<_, ()> = Ok(1.2f32);
-    let left = result.either_or(|a| a * 2f32, |b| b);
-    assert!(matches!(left, Either::Left(2.4f32)));
-
-    let result: Result<i32, _> = Err("12");
-    let right = result.either_or(|a| a, |b| b.chars().next());
-    assert!(matches!(right, Either::Right(Some('1'))));
-
-    let either = Either::<i32, char>::Left(12);
-    let left = either.either_or(|a| a, |b| b);
-    assert!(matches!(left, Either::Left(12)));
-
-    let either = Either::<i32, char>::Right('a');
-    let right = either.either_or(|a| a, |b| b);
-    assert!(matches!(right, Either::Right('a')));
-}
-
-tuples!(EitherOf3 + EitherOf3Future + EitherOf3FutureProj {
-    A => (B, C) + <A1, B, C>,
-    B => (A, C) + <A, B1, C>,
-    C => (A, B) + <A, B, C1>,
-});
-tuples!(EitherOf4 + EitherOf4Future + EitherOf4FutureProj {
-    A => (B, C, D) + <A1, B, C, D>,
-    B => (A, C, D) + <A, B1, C, D>,
-    C => (A, B, D) + <A, B, C1, D>,
-    D => (A, B, C) + <A, B, C, D1>,
-});
-tuples!(EitherOf5 + EitherOf5Future + EitherOf5FutureProj {
-    A => (B, C, D, E) + <A1, B, C, D, E>,
-    B => (A, C, D, E) + <A, B1, C, D, E>,
-    C => (A, B, D, E) + <A, B, C1, D, E>,
-    D => (A, B, C, E) + <A, B, C, D1, E>,
-    E => (A, B, C, D) + <A, B, C, D, E1>,
-});
-tuples!(EitherOf6 + EitherOf6Future + EitherOf6FutureProj {
-    A => (B, C, D, E, F) + <A1, B, C, D, E, F>,
-    B => (A, C, D, E, F) + <A, B1, C, D, E, F>,
-    C => (A, B, D, E, F) + <A, B, C1, D, E, F>,
-    D => (A, B, C, E, F) + <A, B, C, D1, E, F>,
-    E => (A, B, C, D, F) + <A, B, C, D, E1, F>,
-    F => (A, B, C, D, E) + <A, B, C, D, E, F1>,
-});
-tuples!(EitherOf7 + EitherOf7Future + EitherOf7FutureProj {
-    A => (B, C, D, E, F, G) + <A1, B, C, D, E, F, G>,
-    B => (A, C, D, E, F, G) + <A, B1, C, D, E, F, G>,
-    C => (A, B, D, E, F, G) + <A, B, C1, D, E, F, G>,
-    D => (A, B, C, E, F, G) + <A, B, C, D1, E, F, G>,
-    E => (A, B, C, D, F, G) + <A, B, C, D, E1, F, G>,
-    F => (A, B, C, D, E, G) + <A, B, C, D, E, F1, G>,
-    G => (A, B, C, D, E, F) + <A, B, C, D, E, F, G1>,
-});
-tuples!(EitherOf8 + EitherOf8Future + EitherOf8FutureProj {
-    A => (B, C, D, E, F, G, H) + <A1, B, C, D, E, F, G, H>,
-    B => (A, C, D, E, F, G, H) + <A, B1, C, D, E, F, G, H>,
-    C => (A, B, D, E, F, G, H) + <A, B, C1, D, E, F, G, H>,
-    D => (A, B, C, E, F, G, H) + <A, B, C, D1, E, F, G, H>,
-    E => (A, B, C, D, F, G, H) + <A, B, C, D, E1, F, G, H>,
-    F => (A, B, C, D, E, G, H) + <A, B, C, D, E, F1, G, H>,
-    G => (A, B, C, D, E, F, H) + <A, B, C, D, E, F, G1, H>,
-    H => (A, B, C, D, E, F, G) + <A, B, C, D, E, F, G, H1>,
-});
-tuples!(EitherOf9 + EitherOf9Future + EitherOf9FutureProj {
-    A => (B, C, D, E, F, G, H, I) + <A1, B, C, D, E, F, G, H, I>,
-    B => (A, C, D, E, F, G, H, I) + <A, B1, C, D, E, F, G, H, I>,
-    C => (A, B, D, E, F, G, H, I) + <A, B, C1, D, E, F, G, H, I>,
-    D => (A, B, C, E, F, G, H, I) + <A, B, C, D1, E, F, G, H, I>,
-    E => (A, B, C, D, F, G, H, I) + <A, B, C, D, E1, F, G, H, I>,
-    F => (A, B, C, D, E, G, H, I) + <A, B, C, D, E, F1, G, H, I>,
-    G => (A, B, C, D, E, F, H, I) + <A, B, C, D, E, F, G1, H, I>,
-    H => (A, B, C, D, E, F, G, I) + <A, B, C, D, E, F, G, H1, I>,
-    I => (A, B, C, D, E, F, G, H) + <A, B, C, D, E, F, G, H, I1>,
-});
-tuples!(EitherOf10 + EitherOf10Future + EitherOf10FutureProj {
-    A => (B, C, D, E, F, G, H, I, J) + <A1, B, C, D, E, F, G, H, I, J>,
-    B => (A, C, D, E, F, G, H, I, J) + <A, B1, C, D, E, F, G, H, I, J>,
-    C => (A, B, D, E, F, G, H, I, J) + <A, B, C1, D, E, F, G, H, I, J>,
-    D => (A, B, C, E, F, G, H, I, J) + <A, B, C, D1, E, F, G, H, I, J>,
-    E => (A, B, C, D, F, G, H, I, J) + <A, B, C, D, E1, F, G, H, I, J>,
-    F => (A, B, C, D, E, G, H, I, J) + <A, B, C, D, E, F1, G, H, I, J>,
-    G => (A, B, C, D, E, F, H, I, J) + <A, B, C, D, E, F, G1, H, I, J>,
-    H => (A, B, C, D, E, F, G, I, J) + <A, B, C, D, E, F, G, H1, I, J>,
-    I => (A, B, C, D, E, F, G, H, J) + <A, B, C, D, E, F, G, H, I1, J>,
-    J => (A, B, C, D, E, F, G, H, I) + <A, B, C, D, E, F, G, H, I, J1>,
-});
-tuples!(EitherOf11 + EitherOf11Future + EitherOf11FutureProj {
-    A => (B, C, D, E, F, G, H, I, J, K) + <A1, B, C, D, E, F, G, H, I, J, K>,
-    B => (A, C, D, E, F, G, H, I, J, K) + <A, B1, C, D, E, F, G, H, I, J, K>,
-    C => (A, B, D, E, F, G, H, I, J, K) + <A, B, C1, D, E, F, G, H, I, J, K>,
-    D => (A, B, C, E, F, G, H, I, J, K) + <A, B, C, D1, E, F, G, H, I, J, K>,
-    E => (A, B, C, D, F, G, H, I, J, K) + <A, B, C, D, E1, F, G, H, I, J, K>,
-    F => (A, B, C, D, E, G, H, I, J, K) + <A, B, C, D, E, F1, G, H, I, J, K>,
-    G => (A, B, C, D, E, F, H, I, J, K) + <A, B, C, D, E, F, G1, H, I, J, K>,
-    H => (A, B, C, D, E, F, G, I, J, K) + <A, B, C, D, E, F, G, H1, I, J, K>,
-    I => (A, B, C, D, E, F, G, H, J, K) + <A, B, C, D, E, F, G, H, I1, J, K>,
-    J => (A, B, C, D, E, F, G, H, I, K) + <A, B, C, D, E, F, G, H, I, J1, K>,
-    K => (A, B, C, D, E, F, G, H, I, J) + <A, B, C, D, E, F, G, H, I, J, K1>,
-});
-tuples!(EitherOf12 + EitherOf12Future + EitherOf12FutureProj {
-    A => (B, C, D, E, F, G, H, I, J, K, L) + <A1, B, C, D, E, F, G, H, I, J, K, L>,
-    B => (A, C, D, E, F, G, H, I, J, K, L) + <A, B1, C, D, E, F, G, H, I, J, K, L>,
-    C => (A, B, D, E, F, G, H, I, J, K, L) + <A, B, C1, D, E, F, G, H, I, J, K, L>,
-    D => (A, B, C, E, F, G, H, I, J, K, L) + <A, B, C, D1, E, F, G, H, I, J, K, L>,
-    E => (A, B, C, D, F, G, H, I, J, K, L) + <A, B, C, D, E1, F, G, H, I, J, K, L>,
-    F => (A, B, C, D, E, G, H, I, J, K, L) + <A, B, C, D, E, F1, G, H, I, J, K, L>,
-    G => (A, B, C, D, E, F, H, I, J, K, L) + <A, B, C, D, E, F, G1, H, I, J, K, L>,
-    H => (A, B, C, D, E, F, G, I, J, K, L) + <A, B, C, D, E, F, G, H1, I, J, K, L>,
-    I => (A, B, C, D, E, F, G, H, J, K, L) + <A, B, C, D, E, F, G, H, I1, J, K, L>,
-    J => (A, B, C, D, E, F, G, H, I, K, L) + <A, B, C, D, E, F, G, H, I, J1, K, L>,
-    K => (A, B, C, D, E, F, G, H, I, J, L) + <A, B, C, D, E, F, G, H, I, J, K1, L>,
-    L => (A, B, C, D, E, F, G, H, I, J, K) + <A, B, C, D, E, F, G, H, I, J, K, L1>,
-});
-tuples!(EitherOf13 + EitherOf13Future + EitherOf13FutureProj {
-    A => (B, C, D, E, F, G, H, I, J, K, L, M) + <A1, B, C, D, E, F, G, H, I, J, K, L, M>,
-    B => (A, C, D, E, F, G, H, I, J, K, L, M) + <A, B1, C, D, E, F, G, H, I, J, K, L, M>,
-    C => (A, B, D, E, F, G, H, I, J, K, L, M) + <A, B, C1, D, E, F, G, H, I, J, K, L, M>,
-    D => (A, B, C, E, F, G, H, I, J, K, L, M) + <A, B, C, D1, E, F, G, H, I, J, K, L, M>,
-    E => (A, B, C, D, F, G, H, I, J, K, L, M) + <A, B, C, D, E1, F, G, H, I, J, K, L, M>,
-    F => (A, B, C, D, E, G, H, I, J, K, L, M) + <A, B, C, D, E, F1, G, H, I, J, K, L, M>,
-    G => (A, B, C, D, E, F, H, I, J, K, L, M) + <A, B, C, D, E, F, G1, H, I, J, K, L, M>,
-    H => (A, B, C, D, E, F, G, I, J, K, L, M) + <A, B, C, D, E, F, G, H1, I, J, K, L, M>,
-    I => (A, B, C, D, E, F, G, H, J, K, L, M) + <A, B, C, D, E, F, G, H, I1, J, K, L, M>,
-    J => (A, B, C, D, E, F, G, H, I, K, L, M) + <A, B, C, D, E, F, G, H, I, J1, K, L, M>,
-    K => (A, B, C, D, E, F, G, H, I, J, L, M) + <A, B, C, D, E, F, G, H, I, J, K1, L, M>,
-    L => (A, B, C, D, E, F, G, H, I, J, K, M) + <A, B, C, D, E, F, G, H, I, J, K, L1, M>,
-    M => (A, B, C, D, E, F, G, H, I, J, K, L) + <A, B, C, D, E, F, G, H, I, J, K, L, M1>,
-});
-tuples!(EitherOf14 + EitherOf14Future + EitherOf14FutureProj {
-    A => (B, C, D, E, F, G, H, I, J, K, L, M, N) + <A1, B, C, D, E, F, G, H, I, J, K, L, M, N>,
-    B => (A, C, D, E, F, G, H, I, J, K, L, M, N) + <A, B1, C, D, E, F, G, H, I, J, K, L, M, N>,
-    C => (A, B, D, E, F, G, H, I, J, K, L, M, N) + <A, B, C1, D, E, F, G, H, I, J, K, L, M, N>,
-    D => (A, B, C, E, F, G, H, I, J, K, L, M, N) + <A, B, C, D1, E, F, G, H, I, J, K, L, M, N>,
-    E => (A, B, C, D, F, G, H, I, J, K, L, M, N) + <A, B, C, D, E1, F, G, H, I, J, K, L, M, N>,
-    F => (A, B, C, D, E, G, H, I, J, K, L, M, N) + <A, B, C, D, E, F1, G, H, I, J, K, L, M, N>,
-    G => (A, B, C, D, E, F, H, I, J, K, L, M, N) + <A, B, C, D, E, F, G1, H, I, J, K, L, M, N>,
-    H => (A, B, C, D, E, F, G, I, J, K, L, M, N) + <A, B, C, D, E, F, G, H1, I, J, K, L, M, N>,
-    I => (A, B, C, D, E, F, G, H, J, K, L, M, N) + <A, B, C, D, E, F, G, H, I1, J, K, L, M, N>,
-    J => (A, B, C, D, E, F, G, H, I, K, L, M, N) + <A, B, C, D, E, F, G, H, I, J1, K, L, M, N>,
-    K => (A, B, C, D, E, F, G, H, I, J, L, M, N) + <A, B, C, D, E, F, G, H, I, J, K1, L, M, N>,
-    L => (A, B, C, D, E, F, G, H, I, J, K, M, N) + <A, B, C, D, E, F, G, H, I, J, K, L1, M, N>,
-    M => (A, B, C, D, E, F, G, H, I, J, K, L, N) + <A, B, C, D, E, F, G, H, I, J, K, L, M1, N>,
-    N => (A, B, C, D, E, F, G, H, I, J, K, L, M) + <A, B, C, D, E, F, G, H, I, J, K, L, M, N1>,
-});
-tuples!(EitherOf15 + EitherOf15Future + EitherOf15FutureProj {
-    A => (B, C, D, E, F, G, H, I, J, K, L, M, N, O) + <A1, B, C, D, E, F, G, H, I, J, K, L, M, N, O>,
-    B => (A, C, D, E, F, G, H, I, J, K, L, M, N, O) + <A, B1, C, D, E, F, G, H, I, J, K, L, M, N, O>,
-    C => (A, B, D, E, F, G, H, I, J, K, L, M, N, O) + <A, B, C1, D, E, F, G, H, I, J, K, L, M, N, O>,
-    D => (A, B, C, E, F, G, H, I, J, K, L, M, N, O) + <A, B, C, D1, E, F, G, H, I, J, K, L, M, N, O>,
-    E => (A, B, C, D, F, G, H, I, J, K, L, M, N, O) + <A, B, C, D, E1, F, G, H, I, J, K, L, M, N, O>,
-    F => (A, B, C, D, E, G, H, I, J, K, L, M, N, O) + <A, B, C, D, E, F1, G, H, I, J, K, L, M, N, O>,
-    G => (A, B, C, D, E, F, H, I, J, K, L, M, N, O) + <A, B, C, D, E, F, G1, H, I, J, K, L, M, N, O>,
-    H => (A, B, C, D, E, F, G, I, J, K, L, M, N, O) + <A, B, C, D, E, F, G, H1, I, J, K, L, M, N, O>,
-    I => (A, B, C, D, E, F, G, H, J, K, L, M, N, O) + <A, B, C, D, E, F, G, H, I1, J, K, L, M, N, O>,
-    J => (A, B, C, D, E, F, G, H, I, K, L, M, N, O) + <A, B, C, D, E, F, G, H, I, J1, K, L, M, N, O>,
-    K => (A, B, C, D, E, F, G, H, I, J, L, M, N, O) + <A, B, C, D, E, F, G, H, I, J, K1, L, M, N, O>,
-    L => (A, B, C, D, E, F, G, H, I, J, K, M, N, O) + <A, B, C, D, E, F, G, H, I, J, K, L1, M, N, O>,
-    M => (A, B, C, D, E, F, G, H, I, J, K, L, N, O) + <A, B, C, D, E, F, G, H, I, J, K, L, M1, N, O>,
-    N => (A, B, C, D, E, F, G, H, I, J, K, L, M, O) + <A, B, C, D, E, F, G, H, I, J, K, L, M, N1, O>,
-    O => (A, B, C, D, E, F, G, H, I, J, K, L, M, N) + <A, B, C, D, E, F, G, H, I, J, K, L, M, N, O1>,
-});
-tuples!(EitherOf16 + EitherOf16Future + EitherOf16FutureProj {
-    A => (B, C, D, E, F, G, H, I, J, K, L, M, N, O, P) + <A1, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P>,
-    B => (A, C, D, E, F, G, H, I, J, K, L, M, N, O, P) + <A, B1, C, D, E, F, G, H, I, J, K, L, M, N, O, P>,
-    C => (A, B, D, E, F, G, H, I, J, K, L, M, N, O, P) + <A, B, C1, D, E, F, G, H, I, J, K, L, M, N, O, P>,
-    D => (A, B, C, E, F, G, H, I, J, K, L, M, N, O, P) + <A, B, C, D1, E, F, G, H, I, J, K, L, M, N, O, P>,
-    E => (A, B, C, D, F, G, H, I, J, K, L, M, N, O, P) + <A, B, C, D, E1, F, G, H, I, J, K, L, M, N, O, P>,
-    F => (A, B, C, D, E, G, H, I, J, K, L, M, N, O, P) + <A, B, C, D, E, F1, G, H, I, J, K, L, M, N, O, P>,
-    G => (A, B, C, D, E, F, H, I, J, K, L, M, N, O, P) + <A, B, C, D, E, F, G1, H, I, J, K, L, M, N, O, P>,
-    H => (A, B, C, D, E, F, G, I, J, K, L, M, N, O, P) + <A, B, C, D, E, F, G, H1, I, J, K, L, M, N, O, P>,
-    I => (A, B, C, D, E, F, G, H, J, K, L, M, N, O, P) + <A, B, C, D, E, F, G, H, I1, J, K, L, M, N, O, P>,
-    J => (A, B, C, D, E, F, G, H, I, K, L, M, N, O, P) + <A, B, C, D, E, F, G, H, I, J1, K, L, M, N, O, P>,
-    K => (A, B, C, D, E, F, G, H, I, J, L, M, N, O, P) + <A, B, C, D, E, F, G, H, I, J, K1, L, M, N, O, P>,
-    L => (A, B, C, D, E, F, G, H, I, J, K, M, N, O, P) + <A, B, C, D, E, F, G, H, I, J, K, L1, M, N, O, P>,
-    M => (A, B, C, D, E, F, G, H, I, J, K, L, N, O, P) + <A, B, C, D, E, F, G, H, I, J, K, L, M1, N, O, P>,
-    N => (A, B, C, D, E, F, G, H, I, J, K, L, M, O, P) + <A, B, C, D, E, F, G, H, I, J, K, L, M, N1, O, P>,
-    O => (A, B, C, D, E, F, G, H, I, J, K, L, M, N, P) + <A, B, C, D, E, F, G, H, I, J, K, L, M, N, O1, P>,
-    P => (A, B, C, D, E, F, G, H, I, J, K, L, M, N, O) + <A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P1>,
-});
-
-/// Matches over the first expression and returns an either ([`Either`], [`EitherOf3`], ... [`EitherOf8`])
+/// Matches over the first expression and returns an either ([`Either`], [`EitherOf3`], ... [`EitherOf6`])
 /// composed of the values returned by the match arms.
 ///
 /// The pattern syntax is exactly the same as found in a match arm.
@@ -815,93 +197,40 @@ macro_rules! either {
             $e_pattern => $crate::EitherOf6::E($e_expression),
             $f_pattern => $crate::EitherOf6::F($f_expression),
         }
-    };
-    ($match:expr, $a_pattern:pat => $a_expression:expr, $b_pattern:pat => $b_expression:expr, $c_pattern:pat => $c_expression:expr, $d_pattern:pat => $d_expression:expr, $e_pattern:pat => $e_expression:expr, $f_pattern:pat => $f_expression:expr, $g_pattern:pat => $g_expression:expr,) => {
-        match $match {
-            $a_pattern => $crate::EitherOf7::A($a_expression),
-            $b_pattern => $crate::EitherOf7::B($b_expression),
-            $c_pattern => $crate::EitherOf7::C($c_expression),
-            $d_pattern => $crate::EitherOf7::D($d_expression),
-            $e_pattern => $crate::EitherOf7::E($e_expression),
-            $f_pattern => $crate::EitherOf7::F($f_expression),
-            $g_pattern => $crate::EitherOf7::G($g_expression),
-        }
-    };
-    ($match:expr, $a_pattern:pat => $a_expression:expr, $b_pattern:pat => $b_expression:expr, $c_pattern:pat => $c_expression:expr, $d_pattern:pat => $d_expression:expr, $e_pattern:pat => $e_expression:expr, $f_pattern:pat => $f_expression:expr, $g_pattern:pat => $g_expression:expr, $h_pattern:pat => $h_expression:expr,) => {
-        match $match {
-            $a_pattern => $crate::EitherOf8::A($a_expression),
-            $b_pattern => $crate::EitherOf8::B($b_expression),
-            $c_pattern => $crate::EitherOf8::C($c_expression),
-            $d_pattern => $crate::EitherOf8::D($d_expression),
-            $e_pattern => $crate::EitherOf8::E($e_expression),
-            $f_pattern => $crate::EitherOf8::F($f_expression),
-            $g_pattern => $crate::EitherOf8::G($g_expression),
-            $h_pattern => $crate::EitherOf8::H($h_expression),
-        }
     }; // if you need more eithers feel free to open a PR ;-)
 }
 
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    // compile time test
-    #[test]
-    fn either_macro() {
-        let _: Either<&str, f64> = either!(12,
-            12 => "12",
-            _ => 0.0,
-        );
-        let _: EitherOf3<&str, f64, i32> = either!(12,
-            12 => "12",
-            13 => 0.0,
-            _ => 12,
-        );
-        let _: EitherOf4<&str, f64, char, i32> = either!(12,
-            12 => "12",
-            13 => 0.0,
-            14 => ' ',
-            _ => 12,
-        );
-        let _: EitherOf5<&str, f64, char, f32, i32> = either!(12,
-            12 => "12",
-            13 => 0.0,
-            14 => ' ',
-            15 => 0.0f32,
-            _ => 12,
-        );
-        let _: EitherOf6<&str, f64, char, f32, u8, i32> = either!(12,
-            12 => "12",
-            13 => 0.0,
-            14 => ' ',
-            15 => 0.0f32,
-            16 => 24u8,
-            _ => 12,
-        );
-        let _: EitherOf7<&str, f64, char, f32, u8, i8, i32> = either!(12,
-            12 => "12",
-            13 => 0.0,
-            14 => ' ',
-            15 => 0.0f32,
-            16 => 24u8,
-            17 => 2i8,
-            _ => 12,
-        );
-        let _: EitherOf8<&str, f64, char, f32, u8, i8, u32, i32> = either!(12,
-            12 => "12",
-            13 => 0.0,
-            14 => ' ',
-            15 => 0.0f32,
-            16 => 24u8,
-            17 => 2i8,
-            18 => 42u32,
-            _ => 12,
-        );
-    }
-
-    #[test]
-    #[should_panic]
-    fn unwrap_wrong_either() {
-        Either::<i32, &str>::Left(0).unwrap_right();
-    }
+// compile time test
+#[test]
+fn either_macro() {
+    let _: Either<&str, f64> = either!(12,
+        12 => "12",
+        _ => 0.0,
+    );
+    let _: EitherOf3<&str, f64, i32> = either!(12,
+        12 => "12",
+        13 => 0.0,
+        _ => 12,
+    );
+    let _: EitherOf4<&str, f64, char, i32> = either!(12,
+        12 => "12",
+        13 => 0.0,
+        14 => ' ',
+        _ => 12,
+    );
+    let _: EitherOf5<&str, f64, char, f32, i32> = either!(12,
+        12 => "12",
+        13 => 0.0,
+        14 => ' ',
+        15 => 0.0f32,
+        _ => 12,
+    );
+    let _: EitherOf6<&str, f64, char, f32, u8, i32> = either!(12,
+        12 => "12",
+        13 => 0.0,
+        14 => ' ',
+        15 => 0.0f32,
+        16 => 24u8,
+        _ => 12,
+    );
 }

examples/axum_js_ssr/node_modules/@highlightjs/cdn-assets/es/highlight.min.js

@@ -1227,4 +1227,4 @@ begin:"\\b[0-9]{4}(-[0-9][0-9]){0,2}([Tt \\t][0-9][0-9]?(:[0-9][0-9]){2})?(\\.[0
 ;return c.pop(),c.push(i),r.contains=c,{name:"YAML",case_insensitive:!0,
 aliases:["yml"],contains:l}}});const Ke=te;for(const e of Object.keys(Pe)){
 const n=e.replace("grmr_","").replace("_","-");Ke.registerLanguage(n,Pe[e])}
-export{Ke as defaultMod};
+export{Ke as default};

examples/axum_js_ssr/src/hljs.rs

@@ -13,13 +13,13 @@ mod csr {
     extern "C" {
         type HighlightOptions;
 
-        #[wasm_bindgen(catch, js_namespace = defaultMod, js_name = highlight)]
+        #[wasm_bindgen(catch, js_namespace = default, js_name = highlight)]
         fn highlight_lang(
             code: String,
             options: Object,
         ) -> Result<Object, JsValue>;
 
-        #[wasm_bindgen(js_namespace = defaultMod, js_name = highlightAll)]
+        #[wasm_bindgen(js_namespace = default, js_name = highlightAll)]
         pub fn highlight_all();
     }
 

examples/cargo-make/cargo-leptos.toml

@@ -1,6 +1,5 @@
 [tasks.install-cargo-leptos]
 install_crate = { crate_name = "cargo-leptos", binary = "cargo-leptos", test_arg = "--help" }
-args = ["--locked"]
 
 [tasks.cargo-leptos-e2e]
 command = "cargo"

examples/hackernews_islands_axum/Cargo.toml

@@ -12,7 +12,7 @@ lto = true
 
 [dependencies]
 console_error_panic_hook = "0.1.7"
-leptos = { path = "../../leptos", features = ["islands"] }
+leptos = { path = "../../leptos", features = ["experimental-islands"] }
 leptos_axum = { path = "../../integrations/axum", optional = true }
 leptos_meta = { path = "../../meta" }
 leptos_router = { path = "../../router" }

examples/islands/Cargo.toml

@@ -12,7 +12,7 @@ futures = "0.3.30"
 http = "1.1"
 leptos = { path = "../../leptos", features = [
   "tracing",
-  "islands",
+  "experimental-islands",
 ] }
 server_fn = { path = "../../server_fn", features = ["serde-lite"] }
 leptos_axum = { path = "../../integrations/axum", optional = true }

examples/islands_router/Cargo.toml

@@ -12,7 +12,7 @@ futures = "0.3.30"
 http = "1.1"
 leptos = { path = "../../leptos", features = [
   "tracing",
-  "islands",
+  "experimental-islands",
 ] }
 leptos_router = { path = "../../router" }
 server_fn = { path = "../../server_fn", features = ["serde-lite"] }

examples/islands_router/public/routing.js

@@ -44,8 +44,8 @@ window.addEventListener("click", async (ev) => {
 	// TODO parse from the request stream instead?
     const doc = parser.parseFromString(htmlString, 'text/html');
 
-	// The 'doc' variable now contains the parsed DOM
-	const transition = async () => {
+	// The 'doc' variable now contains the parsed DOM 
+	const transition = document.startViewTransition(async () => {
 		const oldDocWalker = document.createTreeWalker(document);
 		const newDocWalker = doc.createTreeWalker(doc);
 		let oldNode = oldDocWalker.currentNode;
@@ -128,13 +128,8 @@ window.addEventListener("click", async (ev) => {
 					}
 				} 			}
 		}
-	};
-	// Not all browsers support startViewTransition; see https://caniuse.com/?search=startViewTransition
-	if (document.startViewTransition) {
-		await document.startViewTransition(transition);
-	} else {
-		await transition()
-	}
+	});
+	await transition;
 	window.history.pushState(undefined, null, url);
 });
 

examples/router/src/lib.rs

@@ -25,7 +25,7 @@ pub fn RouterExample() -> impl IntoView {
     // contexts are passed down through the route tree
     provide_context(ExampleContext(0));
 
-    // this signal will be used to set whether we are allowed to access a protected route
+    // this signal will be ued to set whether we are allowed to access a protected route
     let (logged_in, set_logged_in) = signal(true);
     let (is_routing, set_is_routing) = signal(false);
 

examples/server_fns_axum/Cargo.toml

@@ -22,20 +22,20 @@ log = "0.4.22"
 simple_logger = "5.0"
 serde = { version = "1.0", features = ["derive"] }
 axum = { version = "0.7.5", optional = true }
-tower = { version = "0.5.2", optional = true }
-tower-http = { version = "0.6.2", features = [
+tower = { version = "0.4.13", optional = true }
+tower-http = { version = "0.5.2", features = [
   "fs",
   "tracing",
   "trace",
 ], optional = true }
 tokio = { version = "1.39", features = ["full"], optional = true }
-thiserror = "2.0.11"
+thiserror = "1.0"
 wasm-bindgen = "0.2.93"
 serde_toml = "0.0.1"
 toml = "0.8.19"
 web-sys = { version = "0.3.70", features = ["FileList", "File"] }
-strum = { version = "0.27.1", features = ["strum_macros", "derive"] }
-notify = { version = "8.0", optional = true }
+strum = { version = "0.26.3", features = ["strum_macros", "derive"] }
+notify = { version = "6.1", optional = true }
 pin-project-lite = "0.2.14"
 dashmap = { version = "6.0", optional = true }
 once_cell = { version = "1.19", optional = true }

examples/spread/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2025-03-05"
+channel = "nightly-2024-01-29"

examples/suspense_tests/Cargo.toml

@@ -10,7 +10,7 @@ crate-type = ["cdylib", "rlib"]
 actix-files = { version = "0.6.6", optional = true }
 actix-web = { version = "4.8", optional = true, features = ["macros"] }
 console_error_panic_hook = "0.1.7"
-js-sys = { version = "0.3.72" }
+js-sys = { version = "0.3.70", optional = true }
 leptos = { path = "../../leptos" }
 leptos_actix = { path = "../../integrations/actix", optional = true }
 leptos_router = { path = "../../router" }
@@ -21,7 +21,7 @@ tokio = { version = "1.39", features = ["time", "rt"], optional = true }
 
 [features]
 hydrate = [
-
+  "dep:js-sys",
   "leptos/hydrate",
 ]
 ssr = [

examples/suspense_tests/e2e/features/check_aria_current.feature

@@ -1,121 +0,0 @@
-@check_aria_current
-Feature: Check aria-current being applied to make links bolded
-
-    Background:
-
-        Given I see the app
-
-    Scenario: Should see the base case working
-        Then I see the Out-of-Order link being bolded
-        And I see the following links being bolded
-            | Out-of-Order |
-            | Nested       |
-        And I see the In-Order link not being bolded
-        And I see the following links not being bolded
-            | In-Order     |
-            | Single       |
-
-    Scenario: Should see client-side render the correct bolded links
-        When I select the link In-Order
-        And I select the link Single
-        Then I see the following links being bolded
-            | In-Order     |
-            | Single       |
-        And I see the following links not being bolded
-            | Out-of-Order |
-            | Nested       |
-
-    Scenario: Should see server-side render the correct bolded links
-        When I select the link In-Order
-        And I select the link Single
-        And I reload the page
-        Then I see the following links being bolded
-            | In-Order     |
-            | Single       |
-        And I see the following links not being bolded
-            | Out-of-Order |
-            | Nested       |
-
-    Scenario: Check that the base nested route links are working
-        When I select the link Instrumented
-        Then I see the Instrumented link being bolded
-        And I see the Item Listing link not being bolded
-
-    Scenario: Should see going deep down into nested routes bold links
-        When I select the link Instrumented
-        And I select the link Target 421
-        Then I see the following links being bolded
-            | Instrumented |
-            | Item Listing |
-            | Target 4##   |
-            | Target 42#   |
-            | Target 421   |
-            | field1       |
-
-    Scenario: Should see going deep down into nested routes in SSR bold links
-        When I select the link Instrumented
-        And I select the link Target 421
-        And I reload the page
-        Then I see the following links being bolded
-            | Instrumented |
-            | Item Listing |
-            | Target 4##   |
-            | Target 42#   |
-            | Target 421   |
-            | field1       |
-
-    Scenario: Going deep down navigate around nested links bold correctly
-        When I select the link Instrumented
-        And I select the link Target 421
-        And I select the link Inspect path2/field3
-        Then I see the following links being bolded
-            | Instrumented |
-            | Item Listing |
-            | Target 4##   |
-            | Target 42#   |
-            | field3       |
-        And I see the following links not being bolded
-            | Target 421   |
-            | field1       |
-
-    Scenario: Going deep down navigate around nested links bold correctly, SSR
-        When I select the link Instrumented
-        And I select the link Target 421
-        And I select the link Inspect path2/field3
-        And I reload the page
-        Then I see the following links being bolded
-            | Instrumented |
-            | Item Listing |
-            | Target 4##   |
-            | Target 42#   |
-            | field3       |
-        And I see the following links not being bolded
-            | Target 421   |
-            | field1       |
-
-    Scenario: Going deep down back out nested routes reset bolded states
-        When I select the link Instrumented
-        And I select the link Target 421
-        And I select the link Counters
-        Then I see the following links being bolded
-            | Instrumented |
-            | Counters     |
-        And I see the following links not being bolded
-            | Item Listing |
-            | Target 4##   |
-            | Target 42#   |
-            | Target 421   |
-
-    Scenario: Going deep down back out nested routes reset bolded states, SSR
-        When I select the link Instrumented
-        And I select the link Target 421
-        And I select the link Counters
-        And I reload the page
-        Then I see the following links being bolded
-            | Instrumented |
-            | Counters     |
-        And I see the following links not being bolded
-            | Item Listing |
-            | Target 4##   |
-            | Target 42#   |
-            | Target 421   |

examples/suspense_tests/e2e/features/check_instrumented_issue_3719.feature

@@ -1,99 +0,0 @@
-@check_instrumented_issue_3719
-Feature: Using instrumented counters to test regression from #3502.
-    Check that the suspend/suspense and the underlying resources are
-    called with the expected number of times.  If this was already in
-    place by #3502 (5c43c18) it should have caught this regression.
-    For a better minimum demonstration see #3719.
-
-    Background:
-
-        Given I see the app
-        And I select the mode Instrumented
-
-    Scenario: follow all paths via CSR avoids #3502
-        Given I select the following links
-            | Item Listing         |
-            | Item 1               |
-            | Inspect path2        |
-            | Inspect path2/field3 |
-        And I click on Reset CSR Counters
-        When I select the following links
-            | Inspect path2/field1 |
-            | Inspect path2/field2 |
-        And I go check the Counters
-        Then I see the following counters under section
-            | Suspend Calls      |   |
-            | item_listing       | 0 |
-            | item_overview      | 0 |
-            | item_inspect       | 2 |
-        And the following counters under section
-            | Server Calls (CSR) |   |
-            | list_items         | 0 |
-            | get_item           | 0 |
-            | inspect_item_root  | 0 |
-            | inspect_item_field | 2 |
-
-    # To show that starting directly from within a param will simply
-    # cause the problem.
-    Scenario: Quicker way to demonstrate regression caused by #3502
-        Given I select the link Target 123
-        # And I click on Reset CSR Counters
-        When I select the following links
-            | Inspect path2/field1 |
-            | Inspect path2/field2 |
-        And I go check the Counters
-        Then I see the following counters under section
-            | Suspend Calls      |   |
-            | item_listing       | 0 |
-            | item_overview      | 0 |
-            | item_inspect       | 3 |
-        And the following counters under section
-            | Server Calls (CSR) |   |
-            | list_items         | 1 |
-            | get_item           | 1 |
-            | inspect_item_root  | 0 |
-            | inspect_item_field | 4 |
-
-    Scenario: Follow paths ordinarily down to a target
-        Given I select the following links
-            | Item Listing         |
-            | Item 1               |
-        And I click on Reset CSR Counters
-        When I select the following links
-            | Target 4## |
-            | Target 3## |
-        And I go check the Counters
-        Then I see the following counters under section
-            | Suspend Calls      |   |
-            | item_listing       | 0 |
-            | item_overview      | 2 |
-            | item_inspect       | 0 |
-        And the following counters under section
-            | Server Calls (CSR) |   |
-            | list_items         | 0 |
-            | get_item           | 2 |
-            | inspect_item_root  | 0 |
-            | inspect_item_field | 0 |
-
-    Scenario: Same as above, but add a refresh to test hydration
-        Given I select the following links
-            | Item Listing         |
-            | Item 1               |
-        And I refresh the page
-        And I click on Reset CSR Counters
-        When I select the following links
-            | Target 4## |
-            | Target 3## |
-        And I go check the Counters
-        Then I see the following counters under section
-            | Suspend Calls      |   |
-            | item_listing       | 0 |
-            | item_overview      | 2 |
-            | item_inspect       | 0 |
-        And the following counters under section
-            | Server Calls (CSR) |   |
-            | list_items         | 0 |
-            | get_item           | 2 |
-            | inspect_item_root  | 0 |
-            | inspect_item_field | 0 |
-

examples/suspense_tests/e2e/tests/app_suite.rs

@@ -3,28 +3,12 @@ mod fixtures;
 use anyhow::Result;
 use cucumber::World;
 use fixtures::world::AppWorld;
-use std::{ffi::OsStr, fs::read_dir};
 
 #[tokio::main]
 async fn main() -> Result<()> {
-    // Normally the below is done, but it's now gotten to the point of
-    // having a sufficient number of tests where the resource contention
-    // of the concurrently running browsers will cause failures on CI.
-    // AppWorld::cucumber()
-    //     .fail_on_skipped()
-    //     .run_and_exit("./features")
-    //     .await;
-
-    // Mitigate the issue by manually stepping through each feature,
-    // rather than letting cucumber glob them and dispatch all at once.
-    for entry in read_dir("./features")? {
-        let path = entry?.path();
-        if path.extension() == Some(OsStr::new("feature")) {
-            AppWorld::cucumber()
-                .fail_on_skipped()
-                .run_and_exit(path)
-                .await;
-        }
-    }
+    AppWorld::cucumber()
+        .fail_on_skipped()
+        .run_and_exit("./features")
+        .await;
     Ok(())
 }

examples/suspense_tests/e2e/tests/fixtures/check.rs

@@ -81,20 +81,3 @@ pub async fn instrumented_counts(
 
     Ok(())
 }
-
-pub async fn link_text_is_aria_current(client: &Client, text: &str) -> Result<()> {
-    let link = find::link_with_text(client, text).await?;
-
-    link.attr("aria-current").await?
-        .expect(format!("aria-current missing for {text}").as_str());
-
-    Ok(())
-}
-
-pub async fn link_text_is_not_aria_current(client: &Client, text: &str) -> Result<()> {
-    let link = find::link_with_text(client, text).await?;
-
-    link.attr("aria-current").await?
-        .map(|_| anyhow::bail!("aria-current mistakenly set for {text}"))
-        .unwrap_or(Ok(()))
-}

examples/suspense_tests/e2e/tests/fixtures/find.rs

@@ -124,12 +124,3 @@ async fn component_message(client: &Client, id: &str) -> Result<String> {
 
     Ok(text)
 }
-
-pub async fn link_with_text(client: &Client, text: &str) -> Result<Element> {
-    let link = client
-        .wait()
-        .for_element(Locator::LinkText(text))
-        .await
-        .expect(format!("Link not found by `{}`", text).as_str());
-    Ok(link)
-}

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

@@ -80,58 +80,6 @@ async fn i_see_the_second_count_is(
     Ok(())
 }
 
-#[then(regex = r"^I see the (.*) link being bolded$")]
-async fn i_see_the_link_being_bolded(
-    world: &mut AppWorld,
-    text: String,
-) -> Result<()> {
-    let client = &world.client;
-    check::link_text_is_aria_current(client, &text).await?;
-
-    Ok(())
-}
-
-#[then(expr = "I see the following links being bolded")]
-async fn i_see_the_following_links_being_bolded(
-    world: &mut AppWorld,
-    step: &Step,
-) -> Result<()> {
-    let client = &world.client;
-    if let Some(table) = step.table.as_ref() {
-        for row in table.rows.iter() {
-            check::link_text_is_aria_current(client, &row[0]).await?;
-        }
-    }
-
-    Ok(())
-}
-
-#[then(regex = r"^I see the (.*) link not being bolded$")]
-async fn i_see_the_link_being_not_bolded(
-    world: &mut AppWorld,
-    text: String,
-) -> Result<()> {
-    let client = &world.client;
-    check::link_text_is_not_aria_current(client, &text).await?;
-
-    Ok(())
-}
-
-#[then(expr = "I see the following links not being bolded")]
-async fn i_see_the_following_links_not_being_bolded(
-    world: &mut AppWorld,
-    step: &Step,
-) -> Result<()> {
-    let client = &world.client;
-    if let Some(table) = step.table.as_ref() {
-        for row in table.rows.iter() {
-            check::link_text_is_not_aria_current(client, &row[0]).await?;
-        }
-    }
-
-    Ok(())
-}
-
 #[then(expr = "I see the following counters under section")]
 #[then(expr = "the following counters under section")]
 async fn i_see_the_following_counters_under_section(

examples/suspense_tests/src/instrumented.rs

@@ -4,7 +4,7 @@ use leptos_router::{
     hooks::use_params,
     nested_router::Outlet,
     params::Params,
-    ParamSegment, SsrMode, StaticSegment, WildcardSegment,
+    MatchNestedRoutes, ParamSegment, SsrMode, StaticSegment, WildcardSegment,
 };
 
 #[cfg(feature = "ssr")]
@@ -21,7 +21,6 @@ pub(super) mod counter {
     pub struct Counter(AtomicU32);
 
     impl Counter {
-        #[allow(dead_code)]
         pub const fn new() -> Self {
             Self(AtomicU32::new(0))
         }
@@ -204,20 +203,20 @@ pub struct SuspenseCounters {
 }
 
 #[component]
-pub fn InstrumentedRoutes() -> impl leptos_router::MatchNestedRoutes + Clone {
+pub fn InstrumentedRoutes() -> impl MatchNestedRoutes + Clone {
     // TODO should make this mode configurable via feature flag?
     let ssr = SsrMode::Async;
     view! {
         <ParentRoute path=StaticSegment("instrumented") view=InstrumentedRoot ssr>
-            <Route path=StaticSegment("/") view=InstrumentedTop />
+            <Route path=StaticSegment("/") view=InstrumentedTop/>
             <ParentRoute path=StaticSegment("item") view=ItemRoot>
-                <Route path=StaticSegment("/") view=ItemListing />
+                <Route path=StaticSegment("/") view=ItemListing/>
                 <ParentRoute path=ParamSegment("id") view=ItemTop>
-                    <Route path=StaticSegment("/") view=ItemOverview />
-                    <Route path=WildcardSegment("path") view=ItemInspect />
+                    <Route path=StaticSegment("/") view=ItemOverview/>
+                    <Route path=WildcardSegment("path") view=ItemInspect/>
                 </ParentRoute>
             </ParentRoute>
-            <Route path=StaticSegment("counters") view=ShowCounters />
+            <Route path=StaticSegment("counters") view=ShowCounters/>
         </ParentRoute>
     }
     .into_inner()
@@ -280,41 +279,32 @@ fn InstrumentedRoot() -> impl IntoView {
         <section id="instrumented">
             <nav>
                 <a href="/">"Site Root"</a>
-                <A href="./" exact=true>
-                    "Instrumented Root"
-                </A>
-                <A href="item/" strict_trailing_slash=true>
-                    "Item Listing"
-                </A>
-                <A href="counters" strict_trailing_slash=true>
-                    "Counters"
-                </A>
+                <A href="./" exact=true>"Instrumented Root"</A>
+                <A href="item/" strict_trailing_slash=true>"Item Listing"</A>
+                <A href="counters" strict_trailing_slash=true>"Counters"</A>
             </nav>
-            <FieldNavPortlet />
-            <Outlet />
-            <Suspense>
-                {move || Suspend::new(async move {
+            <FieldNavPortlet/>
+            <Outlet/>
+            <Suspense>{
+                move || Suspend::new(async move {
                     let clear_suspense_counters = move |_| {
                         counters.update(|c| *c = SuspenseCounters::default());
                     };
-                    csr_ticket
-                        .get()
-                        .map(|ticket| {
-                            let ticket = ticket.0;
-                            view! {
-                                <ActionForm action=reset_counters>
-                                    <input type="hidden" name="ticket" value=format!("{ticket}") />
-                                    <input
-                                        id="reset-csr-counters"
-                                        type="submit"
-                                        value="Reset CSR Counters"
-                                        on:click=clear_suspense_counters
-                                    />
-                                </ActionForm>
-                            }
-                        })
-                })}
-            </Suspense>
+                    csr_ticket.get().map(|ticket| {
+                        let ticket = ticket.0;
+                        view! {
+                            <ActionForm action=reset_counters>
+                                <input type="hidden" name="ticket" value=format!("{ticket}") />
+                                <input
+                                    id="reset-csr-counters"
+                                    type="submit"
+                                    value="Reset CSR Counters"
+                                    on:click=clear_suspense_counters/>
+                            </ActionForm>
+                        }
+                    })
+                })
+            }</Suspense>
             <footer>
                 <nav>
                     <A href="item/3/">"Target 3##"</A>
@@ -333,17 +323,11 @@ fn InstrumentedRoot() -> impl IntoView {
 fn InstrumentedTop() -> impl IntoView {
     view! {
         <h1>"Instrumented Tests"</h1>
-        <p>
-            "These tests validates the number of invocations of server functions and suspenses per access."
-        </p>
+        <p>"These tests validates the number of invocations of server functions and suspenses per access."</p>
         <ul>
             // not using `A` because currently some bugs with artix
-            <li>
-                <a href="item/">"Item Listing"</a>
-            </li>
-            <li>
-                <a href="item/4/path1/">"Target 41#"</a>
-            </li>
+            <li><a href="item/">"Item Listing"</a></li>
+            <li><a href="item/4/path1/">"Target 41#"</a></li>
         </ul>
     }
 }
@@ -358,7 +342,7 @@ fn ItemRoot() -> impl IntoView {
 
     view! {
         <h2>"<ItemRoot/>"</h2>
-        <Outlet />
+        <Outlet/>
     }
 }
 
@@ -376,9 +360,7 @@ fn ItemListing() -> impl IntoView {
                 // adding an extra `/` in artix; manually construct `a` instead.
                 // <li><A href=format!("./{item}/")>"Item "{item}</A></li>
                 view! {
-                    <li>
-                        <a href=format!("/instrumented/item/{item}/")>"Item "{item}</a>
-                    </li>
+                    <li><a href=format!("/instrumented/item/{item}/")>"Item "{item}</a></li>
                 }
             )
             .collect_view()
@@ -391,7 +373,9 @@ fn ItemListing() -> impl IntoView {
     view! {
         <h3>"<ItemListing/>"</h3>
         <ul>
-            <Suspense>{item_listing}</Suspense>
+        <Suspense>
+            {item_listing}
+        </Suspense>
         </ul>
     }
 }
@@ -418,7 +402,7 @@ fn ItemTop() -> impl IntoView {
     ));
     view! {
         <h4>"<ItemTop/>"</h4>
-        <Outlet />
+        <Outlet/>
     }
 }
 
@@ -428,29 +412,24 @@ fn ItemOverview() -> impl IntoView {
     let resource = expect_context::<Resource<Option<GetItemResult>>>();
     let item_view = move || {
         Suspend::new(async move {
-            let result = resource.await.map(|GetItemResult(item, names)| {
-                view! {
-                    <p>{format!("Viewing {item:?}")}</p>
-                    <ul>
-                        {names
-                            .into_iter()
-                            .map(|name| {
-                                let id = item.id;
-                                // FIXME seems like relative link isn't working, it is currently
-                                // adding an extra `/` in artix; manually construct `a` instead.
-                                // <li><A href=format!("./{name}/")>{format!("Inspect {name}")}</A></li>
-                                view! {
-                                    <li>
-                                        <a href=format!(
-                                            "/instrumented/item/{id}/{name}/",
-                                        )>"Inspect "{name.clone()}</a>
-                                    </li>
-                                }
-                            })
-                            .collect_view()}
-                    </ul>
-                }
-            });
+            let result = resource.await.map(|GetItemResult(item, names)| view! {
+            <p>{format!("Viewing {item:?}")}</p>
+            <ul>{
+                names.into_iter()
+                    .map(|name| {
+                        // FIXME seems like relative link isn't working, it is currently
+                        // adding an extra `/` in artix; manually construct `a` instead.
+                        // <li><A href=format!("./{name}/")>{format!("Inspect {name}")}</A></li>
+                        let id = item.id;
+                        view! {
+                            <li><a href=format!("/instrumented/item/{id}/{name}/")>
+                                "Inspect "{name.clone()}
+                            </a></li>
+                        }
+                    })
+                    .collect_view()
+            }</ul>
+        });
             suspense_counters.update_untracked(|c| c.item_overview += 1);
             result
         })
@@ -458,7 +437,9 @@ fn ItemOverview() -> impl IntoView {
 
     view! {
         <h5>"<ItemOverview/>"</h5>
-        <Suspense>{item_view}</Suspense>
+        <Suspense>
+            {item_view}
+        </Suspense>
     }
 }
 
@@ -492,9 +473,8 @@ fn ItemInspect() -> impl IntoView {
             // result
         },
     );
-    let ws = use_context::<WriteSignal<Option<FieldNavCtx>>>();
-    on_cleanup(move || {
-        if let Some(c) = ws {
+    on_cleanup(|| {
+        if let Some(c) = use_context::<WriteSignal<Option<FieldNavCtx>>>() {
             c.set(None);
         }
     });
@@ -516,26 +496,23 @@ fn ItemInspect() -> impl IntoView {
                 ));
                 view! {
                     <p>{format!("Inspecting {item:?}")}</p>
-                    <ul>
-                        {fields
-                            .iter()
+                    <ul>{
+                        fields.iter()
                             .map(|field| {
                                 // FIXME seems like relative link to root for a wildcard isn't
                                 // working as expected, so manually construct `a` instead.
                                 // let text = format!("Inspect {name}/{field}");
                                 // view! {
-                                // <li><A href=format!("{field}")>{text}</A></li>
+                                //     <li><A href=format!("{field}")>{text}</A></li>
                                 // }
                                 view! {
-                                    <li>
-                                        <a href=format!(
-                                            "/instrumented/item/{id}/{name}/{field}",
-                                        )>{format!("Inspect {name}/{field}")}</a>
-                                    </li>
+                                    <li><a href=format!("/instrumented/item/{id}/{name}/{field}")>{
+                                        format!("Inspect {name}/{field}")
+                                    }</a></li>
                                 }
                             })
-                            .collect_view()}
-                    </ul>
+                            .collect_view()
+                    }</ul>
                 }
             });
             suspense_counters.update_untracked(|c| c.item_inspect += 1);
@@ -550,7 +527,9 @@ fn ItemInspect() -> impl IntoView {
 
     view! {
         <h5>"<ItemInspect/>"</h5>
-        <Suspense>{inspect_view}</Suspense>
+        <Suspense>
+            {inspect_view}
+        </Suspense>
     }
 }
 
@@ -611,8 +590,7 @@ fn ShowCounters() -> impl IntoView {
                             id="reset-counters"
                             type="submit"
                             value="Reset Counters"
-                            on:click=clear_suspense_counters
-                        />
+                            on:click=clear_suspense_counters/>
                     </ActionForm>
                 }
             })
@@ -623,23 +601,20 @@ fn ShowCounters() -> impl IntoView {
         <h2>"Counters"</h2>
 
         <h3 id="suspend-calls">"Suspend Calls"</h3>
-        {move || {
-            suspense_counters
-                .with(|c| {
-                    view! {
-                        <dl>
-                            <dt>"item_listing"</dt>
-                            <dd id="item_listing">{c.item_listing}</dd>
-                            <dt>"item_overview"</dt>
-                            <dd id="item_overview">{c.item_overview}</dd>
-                            <dt>"item_inspect"</dt>
-                            <dd id="item_inspect">{c.item_inspect}</dd>
-                        </dl>
-                    }
-                })
-        }}
+        {move || suspense_counters.with(|c| view! {
+            <dl>
+                <dt>"item_listing"</dt>
+                <dd id="item_listing">{c.item_listing}</dd>
+                <dt>"item_overview"</dt>
+                <dd id="item_overview">{c.item_overview}</dd>
+                <dt>"item_inspect"</dt>
+                <dd id="item_inspect">{c.item_inspect}</dd>
+            </dl>
+        })}
 
-        <Suspense>{counter_view}</Suspense>
+        <Suspense>
+            {counter_view}
+        </Suspense>
     }
 }
 
@@ -667,17 +642,17 @@ pub fn FieldNavPortlet() -> impl IntoView {
             view! {
                 <div id="FieldNavPortlet">
                     <span>"FieldNavPortlet:"</span>
-                    <nav>
-                        {ctx
-                            .0
-                            .map(|ctx| {
-                                ctx.into_iter()
-                                    .map(|FieldNavItem { href, text }| {
-                                        view! { <A href=href>{text}</A> }
-                                    })
-                                    .collect_view()
-                            })}
-                    </nav>
+                    <nav>{
+                        ctx.0.map(|ctx| {
+                            ctx.into_iter()
+                                .map(|FieldNavItem { href, text }| {
+                                    view! {
+                                        <A href=href>{text}</A>
+                                    }
+                                })
+                                .collect_view()
+                        })
+                    }</nav>
                 </div>
             }
         })

examples/tailwind_actix/style/tailwind.css

@@ -1 +1,3 @@
-@import "tailwindcss";
+@tailwind base;
+@tailwind components;
+@tailwind utilities;

examples/tailwind_axum/style/tailwind.css

@@ -1 +1,3 @@
-@import "tailwindcss";
+@tailwind base;
+@tailwind components;
+@tailwind utilities;

examples/todo_app_sqlite_csr/src/todo.rs

@@ -4,6 +4,25 @@ use leptos::prelude::*;
 use serde::{Deserialize, Serialize};
 use server_fn::ServerFnError;
 
+pub fn shell(leptos_options: &LeptosOptions) -> impl IntoView {
+    view! {
+        <!DOCTYPE html>
+        <html lang="en">
+            <head>
+                <meta charset="utf-8"/>
+                <meta name="viewport" content="width=device-width, initial-scale=1"/>
+                <AutoReload options=leptos_options.clone() />
+                <HydrationScripts options=leptos_options.clone()/>
+                <link rel="stylesheet" id="leptos" href="/pkg/todo_app_sqlite_csr.css"/>
+                <link rel="shortcut icon" type="image/ico" href="/favicon.ico"/>
+            </head>
+            <body>
+                <TodoApp/>
+            </body>
+        </html>
+    }
+}
+
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[cfg_attr(feature = "ssr", derive(sqlx::FromRow))]
 pub struct Todo {

hydration_context/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hydration_context"
-version = "0.2.1"
+version = "0.2.0-rc1"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
@@ -14,8 +14,8 @@ throw_error = { workspace = true }
 or_poisoned = { workspace = true }
 futures = "0.3.31"
 serde = { version = "1.0", features = ["derive"] }
-wasm-bindgen = { version = "0.2.100", optional = true }
-js-sys = { version = "0.3.74", optional = true }
+wasm-bindgen = { version = "0.2.95", optional = true }
+js-sys = { version = "0.3.72", optional = true }
 once_cell = "1.20"
 pin-project-lite = "0.2.15"
 
@@ -25,6 +25,3 @@ browser = ["dep:wasm-bindgen", "dep:js-sys"]
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(leptos_debuginfo)'] }

hydration_context/src/hydrate.rs

@@ -1,8 +1,3 @@
-// #[wasm_bindgen(thread_local)] is deprecated in wasm-bindgen 0.2.96
-// but the replacement is also only shipped in that version
-// as a result, we'll just allow deprecated for now
-#![allow(deprecated)]
-
 use super::{SerializedDataId, SharedContext};
 use crate::{PinnedFuture, PinnedStream};
 use core::fmt::Debug;

hydration_context/src/lib.rs

@@ -83,14 +83,15 @@ pub trait SharedContext: Debug {
 
     /// Reads the current value of some data from the shared context, if it has been
     /// sent from the server. This returns the serialized data as a `String` that should
-    /// be deserialized.
+    /// be deserialized using [`Serializable::de`].
     ///
     /// On the server and in client-side rendered implementations, this should
     /// always return [`None`].
     fn read_data(&self, id: &SerializedDataId) -> Option<String>;
 
     /// Returns a [`Future`] that resolves with a `String` that should
-    /// be deserialized once the given piece of server data has resolved.
+    /// be deserialized using [`Serializable::de`] once the given piece of server
+    /// data has resolved.
     ///
     /// On the server and in client-side rendered implementations, this should
     /// return a [`Future`] that is immediately ready with [`None`].
@@ -147,8 +148,8 @@ pub trait SharedContext: Debug {
 
     /// Adds a `Future` to the set of “blocking resources” that should prevent the server’s
     /// response stream from beginning until all are resolved. The `Future` returned by
-    /// blocking resources will not resolve until every `Future` added by this method
-    /// has resolved.
+    /// [`blocking_resources`](Self::blocking_resources) will not resolve until every `Future`
+    /// added by this method has resolved.
     ///
     /// In browser implementations, this should be a no-op.
     fn defer_stream(&self, wait_for: PinnedFuture<()>);

integrations/actix/Cargo.toml

@@ -18,13 +18,13 @@ hydration_context = { workspace = true }
 leptos = { workspace = true, features = ["nonce", "ssr"] }
 leptos_integration_utils = { workspace = true }
 leptos_macro = { workspace = true, features = ["actix"] }
-leptos_meta = { workspace = true, features = ["nonce"] }
+leptos_meta = { workspace = true }
 leptos_router = { workspace = true, features = ["ssr"] }
 server_fn = { workspace = true, features = ["actix"] }
-serde_json = { workspace = true }
+serde_json = "1.0"
 parking_lot = "0.12.3"
 tracing = { version = "0.1", optional = true }
-tokio = { version = "1.43", features = ["rt", "fs"] }
+tokio = { version = "1.41", features = ["rt", "fs"] }
 send_wrapper = "0.6.0"
 dashmap = "6"
 once_cell = "1"

integrations/actix/src/lib.rs

@@ -1,5 +1,4 @@
 #![forbid(unsafe_code)]
-#![deny(missing_docs)]
 
 //! Provides functions to easily integrate Leptos with Actix.
 //!
@@ -10,6 +9,7 @@
 use actix_files::NamedFile;
 use actix_http::header::{HeaderName, HeaderValue, ACCEPT, LOCATION, REFERER};
 use actix_web::{
+    body::BoxBody,
     dev::{ServiceFactory, ServiceRequest},
     http::header,
     test,
@@ -56,10 +56,8 @@ use std::{
 /// Typically contained inside of a ResponseOptions. Setting this is useful for cookies and custom responses.
 #[derive(Debug, Clone, Default)]
 pub struct ResponseParts {
-    /// If provided, this will overwrite any other status code for this response.
-    pub status: Option<StatusCode>,
-    /// The map of headers that should be added to the response.
     pub headers: header::HeaderMap,
+    pub status: Option<StatusCode>,
 }
 
 impl ResponseParts {
@@ -82,18 +80,16 @@ impl ResponseParts {
     }
 }
 
-/// A wrapper for an Actix [`HttpRequest`] that allows it to be used in an
+/// A wrapper for an Actix [`HttpRequest`](actix_web::HttpRequest) that allows it to be used in an
 /// `Send`/`Sync` setting like Leptos's Context API.
 #[derive(Debug, Clone)]
 pub struct Request(SendWrapper<HttpRequest>);
 
 impl Request {
-    /// Wraps an existing Actix request.
     pub fn new(req: &HttpRequest) -> Self {
         Self(SendWrapper::new(req.clone()))
     }
 
-    /// Consumes the wrapper and returns the inner Actix request.
     pub fn into_inner(self) -> HttpRequest {
         self.0.take()
     }
@@ -274,13 +270,14 @@ pub fn redirect(path: &str) {
 ///
 /// This can then be set up at an appropriate route in your application:
 ///
-/// ```no_run
+/// ```
 /// use actix_web::*;
 ///
 /// fn register_server_functions() {
 ///   // call ServerFn::register() for each of the server functions you've defined
 /// }
 ///
+/// # if false { // don't actually try to run a server in a doctest...
 /// #[actix_web::main]
 /// async fn main() -> std::io::Result<()> {
 ///     // make sure you actually register your server functions
@@ -296,12 +293,13 @@ pub fn redirect(path: &str) {
 ///     .run()
 ///     .await
 /// }
+/// # }
 /// ```
 ///
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
 /// - [ResponseOptions]
-/// - [Request]
+/// - [HttpRequest](actix_web::HttpRequest)
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(level = "trace", fields(error), skip_all)
@@ -328,7 +326,7 @@ pub fn handle_server_fns() -> Route {
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
 /// - [ResponseOptions]
-/// - [Request]
+/// - [HttpRequest](actix_web::HttpRequest)
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(level = "trace", fields(error), skip_all)
@@ -373,8 +371,8 @@ pub fn handle_server_fns_with_context(
                                     .take(),
                             );
 
-                            // if it accepts text/html (i.e., is a plain form post) and doesn't already have a
-                            // Location set, then redirect to the Referer
+                            // it it accepts text/html (i.e., is a plain form post) and doesn't already have a
+                            // Location set, then redirect to to Referer
                             if accepts_html {
                                 if let Some(referrer) = referrer {
                                     let has_location =
@@ -388,20 +386,7 @@ pub fn handle_server_fns_with_context(
                                 }
                             }
 
-                            // the Location header may have been set to Referer, so any redirection by the
-                            // user must overwrite it
-                            {
-                                let mut res_options = res_options.0.write();
-                                let headers = res.0.headers_mut();
-
-                                for location in
-                                    res_options.headers.remove(header::LOCATION)
-                                {
-                                    headers.insert(header::LOCATION, location);
-                                }
-                            }
-
-                            // apply status code and headers if user changed them
+                            // apply status code and headers if used changed them
                             res.extend_response(&res_options);
                             res.0
                         })
@@ -430,8 +415,14 @@ pub fn handle_server_fns_with_context(
 /// will include fallback content for any `<Suspense/>` nodes, and be immediately interactive,
 /// but requires some client-side JavaScript.
 ///
+/// The provides a [MetaContext] and a [RouterIntegrationContext] to app’s context before
+/// rendering it, and includes any meta tags injected using [leptos_meta].
+///
+/// The HTML stream is rendered using [render_to_stream](leptos::ssr::render_to_stream), and
+/// includes everything described in the documentation for that function.
+///
 /// This can then be set up at an appropriate route in your application:
-/// ```no_run
+/// ```
 /// use actix_web::{App, HttpServer};
 /// use leptos::prelude::*;
 /// use leptos_router::Method;
@@ -442,6 +433,7 @@ pub fn handle_server_fns_with_context(
 ///     view! { <main>"Hello, world!"</main> }
 /// }
 ///
+/// # if false { // don't actually try to run a server in a doctest...
 /// #[actix_web::main]
 /// async fn main() -> std::io::Result<()> {
 ///     let conf = get_configuration(Some("Cargo.toml")).unwrap();
@@ -461,13 +453,15 @@ pub fn handle_server_fns_with_context(
 ///     .run()
 ///     .await
 /// }
+/// # }
 /// ```
 ///
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
 /// - [ResponseOptions]
-/// - [Request]
+/// - [HttpRequest](actix_web::HttpRequest)
 /// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(level = "trace", fields(error), skip_all)
@@ -487,8 +481,15 @@ where
 /// This stream will pause at each `<Suspense/>` node and wait for it to resolve before
 /// sending down its HTML. The app will become interactive once it has fully loaded.
 ///
+/// The provides a [MetaContext] and a [RouterIntegrationContext] to app’s context before
+/// rendering it, and includes any meta tags injected using [leptos_meta].
+///
+/// The HTML stream is rendered using
+/// [render_to_stream_in_order](leptos::ssr::render_to_stream_in_order),
+/// and includes everything described in the documentation for that function.
+///
 /// This can then be set up at an appropriate route in your application:
-/// ```no_run
+/// ```
 /// use actix_web::{App, HttpServer};
 /// use leptos::prelude::*;
 /// use leptos_router::Method;
@@ -499,6 +500,7 @@ where
 ///     view! { <main>"Hello, world!"</main> }
 /// }
 ///
+/// # if false { // don't actually try to run a server in a doctest...
 /// #[actix_web::main]
 /// async fn main() -> std::io::Result<()> {
 ///     let conf = get_configuration(Some("Cargo.toml")).unwrap();
@@ -521,12 +523,15 @@ where
 ///     .run()
 ///     .await
 /// }
+/// # }
 /// ```
 ///
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
 /// - [ResponseOptions]
-/// - [Request]
+/// - [HttpRequest](actix_web::HttpRequest)
+/// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(level = "trace", fields(error), skip_all)
@@ -543,10 +548,16 @@ where
 
 /// Returns an Actix [struct@Route](actix_web::Route) that listens for a `GET` request and tries
 /// to route it using [leptos_router], asynchronously rendering an HTML page after all
-/// `async` resources have loaded.
+/// `async` [Resource](leptos::Resource)s have loaded.
+///
+/// The provides a [MetaContext] and a [RouterIntegrationContext] to the app’s context before
+/// rendering it, and includes any meta tags injected using [leptos_meta].
+///
+/// The HTML stream is rendered using [render_to_string_async](leptos::ssr::render_to_string_async), and
+/// includes everything described in the documentation for that function.
 ///
 /// This can then be set up at an appropriate route in your application:
-/// ```no_run
+/// ```
 /// use actix_web::{App, HttpServer};
 /// use leptos::prelude::*;
 /// use leptos_router::Method;
@@ -557,6 +568,7 @@ where
 ///     view! { <main>"Hello, world!"</main> }
 /// }
 ///
+/// # if false { // don't actually try to run a server in a doctest...
 /// #[actix_web::main]
 /// async fn main() -> std::io::Result<()> {
 ///     let conf = get_configuration(Some("Cargo.toml")).unwrap();
@@ -576,12 +588,15 @@ where
 ///     .run()
 ///     .await
 /// }
+/// # }
 /// ```
 ///
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
 /// - [ResponseOptions]
-/// - [Request]
+/// - [HttpRequest](actix_web::HttpRequest)
+/// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(level = "trace", fields(error), skip_all)
@@ -605,7 +620,9 @@ where
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
 /// - [ResponseOptions]
-/// - [Request]
+/// - [HttpRequest](actix_web::HttpRequest)
+/// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(level = "trace", fields(error), skip_all)
@@ -640,7 +657,9 @@ where
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
 /// - [ResponseOptions]
-/// - [Request]
+/// - [HttpRequest](actix_web::HttpRequest)
+/// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(level = "trace", fields(error), skip_all)
@@ -672,8 +691,9 @@ where
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
 /// - [ResponseOptions]
-/// - [Request]
+/// - [HttpRequest](actix_web::HttpRequest)
 /// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(level = "trace", fields(error), skip_all)
@@ -696,7 +716,7 @@ where
 
 /// Returns an Actix [struct@Route](actix_web::Route) that listens for a `GET` request and tries
 /// to route it using [leptos_router], asynchronously serving the page once all `async`
-/// resources have loaded.
+/// [Resource](leptos::Resource)s have loaded.
 ///
 /// This function allows you to provide additional information to Leptos for your route.
 /// It could be used to pass in Path Info, Connection Info, or anything your heart desires.
@@ -704,7 +724,9 @@ where
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
 /// - [ResponseOptions]
-/// - [Request]
+/// - [HttpRequest](actix_web::HttpRequest)
+/// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(level = "trace", fields(error), skip_all)
@@ -1297,12 +1319,14 @@ where
     web::get().to(handler)
 }
 
+pub enum DataResponse<T> {
+    Data(T),
+    Response(actix_web::dev::Response<BoxBody>),
+}
+
 /// This trait allows one to pass a list of routes and a render function to Actix's router, letting us avoid
 /// having to use wildcards or manually define all routes in multiple places.
 pub trait LeptosRoutes {
-    /// Adds routes to the Axum router that have either
-    /// 1) been generated by `leptos_router`, or
-    /// 2) handle a server function.
     fn leptos_routes<IV>(
         self,
         paths: Vec<ActixRouteListing>,
@@ -1311,12 +1335,6 @@ pub trait LeptosRoutes {
     where
         IV: IntoView + 'static;
 
-    /// Adds routes to the Axum router that have either
-    /// 1) been generated by `leptos_router`, or
-    /// 2) handle a server function.
-    ///
-    /// Runs `additional_context` to provide additional data to the reactive system via context,
-    /// when handling a route.
     fn leptos_routes_with_context<IV>(
         self,
         paths: Vec<ActixRouteListing>,

integrations/axum/Cargo.toml

@@ -11,7 +11,7 @@ edition.workspace = true
 [dependencies]
 any_spawner = { workspace = true, features = ["tokio"] }
 hydration_context = { workspace = true }
-axum = { version = "0.7.9", default-features = false, features = [
+axum = { version = "0.7.7", default-features = false, features = [
   "matched-path",
 ] }
 dashmap = "6"
@@ -19,19 +19,19 @@ futures = "0.3.31"
 leptos = { workspace = true, features = ["nonce", "ssr"] }
 server_fn = { workspace = true, features = ["axum-no-default"] }
 leptos_macro = { workspace = true, features = ["axum"] }
-leptos_meta = { workspace = true, features = ["ssr", "nonce"] }
+leptos_meta = { workspace = true, features = ["ssr"] }
 leptos_router = { workspace = true, features = ["ssr"] }
 leptos_integration_utils = { workspace = true }
 once_cell = "1"
 parking_lot = "0.12.3"
-tokio = { version = "1.43", default-features = false }
+tokio = { version = "1.41", default-features = false }
 tower = { version = "0.5.1", features = ["util"] }
-tower-http = "0.6.2"
-tracing = { version = "0.1.41", optional = true }
+tower-http = "0.6.1"
+tracing = { version = "0.1.40", optional = true }
 
 [dev-dependencies]
-axum = "0.7.9"
-tokio = { version = "1.43", features = ["net", "rt-multi-thread"] }
+axum = "0.7.7"
+tokio = { version = "1.41", features = ["net", "rt-multi-thread"] }
 
 [features]
 wasm = []

integrations/axum/src/lib.rs

@@ -1,7 +1,4 @@
 #![forbid(unsafe_code)]
-#![deny(missing_docs)]
-#![allow(clippy::type_complexity)]
-
 //! Provides functions to easily integrate Leptos with Axum.
 //!
 //! ## JS Fetch Integration
@@ -17,6 +14,7 @@
 //! - `default`: supports running in a typical native Tokio/Axum environment
 //! - `wasm`: with `default-features = false`, supports running in a JS Fetch-based
 //!   environment
+//! - `experimental-islands`: activates Leptos [islands mode](https://leptos-rs.github.io/leptos/islands.html)
 //!
 //! ### Important Note
 //! Prior to 0.5, using `default-features = false` on `leptos_axum` simply did nothing. Now, it actively
@@ -65,9 +63,10 @@ use leptos_meta::ServerMetaContext;
 #[cfg(feature = "default")]
 use leptos_router::static_routes::ResolvedStaticPath;
 use leptos_router::{
-    components::provide_server_redirect, location::RequestUrl,
-    static_routes::RegenerationFn, ExpandOptionals, PathSegment, RouteList,
-    RouteListing, SsrMode,
+    components::provide_server_redirect,
+    location::RequestUrl,
+    static_routes::{RegenerationFn, StaticParamsMap},
+    ExpandOptionals, PathSegment, RouteList, RouteListing, SsrMode,
 };
 #[cfg(feature = "default")]
 use once_cell::sync::Lazy;
@@ -86,9 +85,7 @@ use tower_http::services::ServeDir;
 /// Typically contained inside of a ResponseOptions. Setting this is useful for cookies and custom responses.
 #[derive(Debug, Clone, Default)]
 pub struct ResponseParts {
-    /// If provided, this will overwrite any other status code for this response.
     pub status: Option<StatusCode>,
-    /// The map of headers that should be added to the response.
     pub headers: HeaderMap,
 }
 
@@ -197,9 +194,9 @@ impl ExtendResponse for AxumResponse {
 /// 2. A server function that is called from WASM running in the client (e.g., a dispatched action
 ///    or a spawned `Future`).
 /// 3. A `<form>` submitted to the server function endpoint using default browser APIs (often due
-///    to using [`ActionForm`] without JS/WASM present.)
+///    to using [`ActionForm`](leptos::form::ActionForm) without JS/WASM present.)
 ///
-/// Using it with a non-blocking [`Resource`] will not work if you are using streaming rendering,
+/// Using it with a non-blocking [`Resource`](leptos::server::Resource) will not work if you are using streaming rendering,
 /// as the response's headers will already have been sent by the time the server function calls `redirect()`.
 ///
 /// ### Implementation
@@ -279,11 +276,12 @@ pub fn generate_request_and_parts(
 ///
 /// This can then be set up at an appropriate route in your application:
 ///
-/// ```no_run
+/// ```
 /// use axum::{handler::Handler, routing::post, Router};
 /// use leptos::prelude::*;
 /// use std::net::SocketAddr;
 ///
+/// # if false { // don't actually try to run a server in a doctest...
 /// #[cfg(feature = "default")]
 /// #[tokio::main]
 /// async fn main() {
@@ -299,9 +297,7 @@ pub fn generate_request_and_parts(
 ///         .await
 ///         .unwrap();
 /// }
-///
-/// # #[cfg(not(feature = "default"))]
-/// # fn main() { }
+/// # }
 /// ```
 /// Leptos provides a generic implementation of `handle_server_fns`. If access to more specific parts of the Request is desired,
 /// you can specify your own server fn handler based on this one and give it it's own route in the server macro.
@@ -400,8 +396,8 @@ async fn handle_server_fns_inner(
                     // actually run the server fn
                     let mut res = AxumResponse(service.run(req).await);
 
-                    // if it accepts text/html (i.e., is a plain form post) and doesn't already have a
-                    // Location set, then redirect to the Referer
+                    // it it accepts text/html (i.e., is a plain form post) and doesn't already have a
+                    // Location set, then redirect to to Referer
                     if accepts_html {
                         if let Some(referrer) = referrer {
                             let has_location =
@@ -413,7 +409,7 @@ async fn handle_server_fns_inner(
                         }
                     }
 
-                    // apply status code and headers if user changed them
+                    // apply status code and headers if used changed them
                     res.extend_response(&res_options);
                     Ok(res.0)
                 })
@@ -436,15 +432,20 @@ async fn handle_server_fns_inner(
     .expect("could not build Response")
 }
 
-/// A stream of bytes of HTML.
 pub type PinnedHtmlStream =
     Pin<Box<dyn Stream<Item = io::Result<Bytes>> + Send>>;
 
 /// Returns an Axum [Handler](axum::handler::Handler) that listens for a `GET` request and tries
 /// to route it using [leptos_router], serving an HTML stream of your application.
 ///
+/// The provides a [MetaContext] and a [RouterIntegrationContext] to app’s context before
+/// rendering it, and includes any meta tags injected using [leptos_meta].
+///
+/// The HTML stream is rendered using [render_to_stream](leptos::ssr::render_to_stream), and
+/// includes everything described in the documentation for that function.
+///
 /// This can then be set up at an appropriate route in your application:
-/// ```no_run
+/// ```
 /// use axum::{handler::Handler, Router};
 /// use leptos::{config::get_configuration, prelude::*};
 /// use std::{env, net::SocketAddr};
@@ -454,6 +455,7 @@ pub type PinnedHtmlStream =
 ///     view! { <main>"Hello, world!"</main> }
 /// }
 ///
+/// # if false { // don't actually try to run a server in a doctest...
 /// #[cfg(feature = "default")]
 /// #[tokio::main]
 /// async fn main() {
@@ -472,16 +474,15 @@ pub type PinnedHtmlStream =
 ///         .await
 ///         .unwrap();
 /// }
-///
-/// # #[cfg(not(feature = "default"))]
-/// # fn main() { }
+/// # }
 /// ```
 ///
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
 /// - [`Parts`]
 /// - [`ResponseOptions`]
-/// - [`ServerMetaContext`]
+/// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
+/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(level = "trace", fields(error), skip_all)
@@ -532,8 +533,14 @@ where
 /// This stream will pause at each `<Suspense/>` node and wait for it to resolve before
 /// sending down its HTML. The app will become interactive once it has fully loaded.
 ///
+/// The provides a [MetaContext] and a [RouterIntegrationContext] to app’s context before
+/// rendering it, and includes any meta tags injected using [leptos_meta].
+///
+/// The HTML stream is rendered using [render_to_stream_in_order], and includes everything described in
+/// the documentation for that function.
+///
 /// This can then be set up at an appropriate route in your application:
-/// ```no_run
+/// ```
 /// use axum::{handler::Handler, Router};
 /// use leptos::{config::get_configuration, prelude::*};
 /// use std::{env, net::SocketAddr};
@@ -543,6 +550,7 @@ where
 ///     view! { <main>"Hello, world!"</main> }
 /// }
 ///
+/// # if false { // don't actually try to run a server in a doctest...
 /// #[cfg(feature = "default")]
 /// #[tokio::main]
 /// async fn main() {
@@ -561,16 +569,15 @@ where
 ///         .await
 ///         .unwrap();
 /// }
-///
-/// # #[cfg(not(feature = "default"))]
-/// # fn main() { }
+/// # }
 /// ```
 ///
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
 /// - [`Parts`]
 /// - [`ResponseOptions`]
-/// - [`ServerMetaContext`]
+/// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
+/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(level = "trace", fields(error), skip_all)
@@ -623,7 +630,8 @@ where
 /// This function always provides context values including the following types:
 /// - [`Parts`]
 /// - [`ResponseOptions`]
-/// - [`ServerMetaContext`]
+/// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
+/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(level = "trace", fields(error), skip_all)
@@ -754,7 +762,8 @@ where
 /// This function always provides context values including the following types:
 /// - [`Parts`]
 /// - [`ResponseOptions`]
-/// - [`ServerMetaContext`]
+/// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
+/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(level = "trace", fields(error), skip_all)
@@ -821,7 +830,8 @@ where
 /// This function always provides context values including the following types:
 /// - [`Parts`]
 /// - [`ResponseOptions`]
-/// - [`ServerMetaContext`]
+/// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
+/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(level = "trace", fields(error), skip_all)
@@ -938,10 +948,16 @@ fn provide_contexts(
 
 /// Returns an Axum [Handler](axum::handler::Handler) that listens for a `GET` request and tries
 /// to route it using [leptos_router], asynchronously rendering an HTML page after all
-/// `async` resources have loaded.
+/// `async` [Resource](leptos::Resource)s have loaded.
+///
+/// The provides a [MetaContext] and a [RouterIntegrationContext] to app’s context before
+/// rendering it, and includes any meta tags injected using [leptos_meta].
+///
+/// The HTML stream is rendered using [render_to_string_async], and includes everything described in
+/// the documentation for that function.
 ///
 /// This can then be set up at an appropriate route in your application:
-/// ```no_run
+/// ```
 /// use axum::{handler::Handler, Router};
 /// use leptos::{config::get_configuration, prelude::*};
 /// use std::{env, net::SocketAddr};
@@ -951,6 +967,7 @@ fn provide_contexts(
 ///     view! { <main>"Hello, world!"</main> }
 /// }
 ///
+/// # if false { // don't actually try to run a server in a doctest...
 /// #[cfg(feature = "default")]
 /// #[tokio::main]
 /// async fn main() {
@@ -970,16 +987,15 @@ fn provide_contexts(
 ///         .await
 ///         .unwrap();
 /// }
-///
-/// # #[cfg(not(feature = "default"))]
-/// # fn main() { }
+/// # }
 /// ```
 ///
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
 /// - [`Parts`]
 /// - [`ResponseOptions`]
-/// - [`ServerMetaContext`]
+/// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
+/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(level = "trace", fields(error), skip_all)
@@ -1000,7 +1016,7 @@ where
 
 /// Returns an Axum [Handler](axum::handler::Handler) that listens for a `GET` request and tries
 /// to route it using [leptos_router], asynchronously rendering an HTML page after all
-/// `async` resources have loaded.
+/// `async` [Resource](leptos::Resource)s have loaded.
 ///
 /// This version allows us to pass Axum State/Extension/Extractor or other infro from Axum or network
 /// layers above Leptos itself. To use it, you'll need to write your own handler function that provides
@@ -1033,7 +1049,8 @@ where
 /// This function always provides context values including the following types:
 /// - [`Parts`]
 /// - [`ResponseOptions`]
-/// - [`ServerMetaContext`]
+/// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
+/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(level = "trace", fields(error), skip_all)
@@ -1067,7 +1084,7 @@ where
 
 /// Returns an Axum [Handler](axum::handler::Handler) that listens for a `GET` request and tries
 /// to route it using [leptos_router], asynchronously rendering an HTML page after all
-/// `async` resources have loaded.
+/// `async` [Resource](leptos::Resource)s have loaded.
 ///
 /// This version allows us to pass Axum State/Extension/Extractor or other infro from Axum or network
 /// layers above Leptos itself. To use it, you'll need to write your own handler function that provides
@@ -1100,7 +1117,8 @@ where
 /// This function always provides context values including the following types:
 /// - [`Parts`]
 /// - [`ResponseOptions`]
-/// - [`ServerMetaContext`]
+/// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
+/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
 #[cfg_attr(
     feature = "tracing",
     tracing::instrument(level = "trace", fields(error), skip_all)
@@ -1189,6 +1207,32 @@ where
     generate_route_list_with_exclusions_and_ssg(app_fn, excluded_routes).0
 }
 
+/// Builds all routes that have been defined using [`StaticRoute`].
+#[allow(unused)]
+pub async fn build_static_routes<IV>(
+    options: &LeptosOptions,
+    app_fn: impl Fn() -> IV + 'static + Send + Clone,
+    routes: &[RouteListing],
+    static_data_map: StaticParamsMap,
+) where
+    IV: IntoView + 'static,
+{
+    todo!()
+    /*
+    let options = options.clone();
+    let routes = routes.to_owned();
+    spawn_task!(async move {
+        leptos_router::build_static_routes(
+            &options,
+            app_fn,
+            &routes,
+            &static_data_map,
+        )
+        .await
+        .expect("could not build static routes")
+    });*/
+}
+
 /// Generates a list of all routes defined in Leptos's Router in your app. We can then use this to automatically
 /// create routes in Axum's Router without having to use wildcard matching or fallbacks. Takes in your root app Element
 /// as an argument so it can walk you app tree. This version is tailored to generate Axum compatible paths. Adding excluded_routes
@@ -1639,9 +1683,6 @@ where
     S: Clone + Send + Sync + 'static,
     LeptosOptions: FromRef<S>,
 {
-    /// Adds routes to the Axum router that have either
-    /// 1) been generated by `leptos_router`, or
-    /// 2) handle a server function.
     fn leptos_routes<IV>(
         self,
         options: &S,
@@ -1651,12 +1692,6 @@ where
     where
         IV: IntoView + 'static;
 
-    /// Adds routes to the Axum router that have either
-    /// 1) been generated by `leptos_router`, or
-    /// 2) handle a server function.
-    ///
-    /// Runs `additional_context` to provide additional data to the reactive system via context,
-    /// when handling a route.
     fn leptos_routes_with_context<IV>(
         self,
         options: &S,
@@ -1667,8 +1702,6 @@ where
     where
         IV: IntoView + 'static;
 
-    /// Extends the Axum router with the given paths, and handles the requests with the given
-    /// handler.
     fn leptos_routes_with_handler<H, T>(
         self,
         paths: Vec<AxumRouteListing>,
@@ -1981,71 +2014,6 @@ where
         .map_err(|e| ServerFnError::ServerError(format!("{e:?}")))
 }
 
-/// A reasonable handler for serving static files (like JS/WASM/CSS) and 404 errors.
-///
-/// This is provided as a convenience, but is a fairly simple function. If you need to adapt it,
-/// simply reuse the source code of this function in your own application.
-#[cfg(feature = "default")]
-pub fn file_and_error_handler_with_context<S, IV>(
-    additional_context: impl Fn() + 'static + Clone + Send,
-    shell: fn(LeptosOptions) -> IV,
-) -> impl Fn(
-    Uri,
-    State<S>,
-    Request<Body>,
-) -> Pin<Box<dyn Future<Output = Response<Body>> + Send + 'static>>
-       + Clone
-       + Send
-       + 'static
-where
-    IV: IntoView + 'static,
-    S: Send + Sync + Clone + 'static,
-    LeptosOptions: FromRef<S>,
-{
-    move |uri: Uri, State(state): State<S>, req: Request<Body>| {
-        Box::pin({
-            let additional_context = additional_context.clone();
-            async move {
-                let options = LeptosOptions::from_ref(&state);
-                let res =
-                    get_static_file(uri, &options.site_root, req.headers());
-                let res = res.await.unwrap();
-
-                if res.status() == StatusCode::OK {
-                    res.into_response()
-                } else {
-                    let mut res = handle_response_inner(
-                        move || {
-                            additional_context();
-                            provide_context(state.clone());
-                        },
-                        move || shell(options),
-                        req,
-                        |app, chunks| {
-                            Box::pin(async move {
-                                let app = app
-                                    .to_html_stream_in_order()
-                                    .collect::<String>()
-                                    .await;
-                                let chunks = chunks();
-                                Box::pin(once(async move { app }).chain(chunks))
-                                    as PinnedStream<String>
-                            })
-                        },
-                    )
-                    .await;
-                    *res.status_mut() = StatusCode::NOT_FOUND;
-                    res
-                }
-            }
-        })
-    }
-}
-
-/// A reasonable handler for serving static files (like JS/WASM/CSS) and 404 errors.
-///
-/// This is provided as a convenience, but is a fairly simple function. If you need to adapt it,
-/// simply reuse the source code of this function in your own application.
 #[cfg(feature = "default")]
 pub fn file_and_error_handler<S, IV>(
     shell: fn(LeptosOptions) -> IV,
@@ -2059,10 +2027,40 @@ pub fn file_and_error_handler<S, IV>(
        + 'static
 where
     IV: IntoView + 'static,
-    S: Send + Sync + Clone + 'static,
+    S: Send + 'static,
     LeptosOptions: FromRef<S>,
 {
-    file_and_error_handler_with_context(move || (), shell)
+    move |uri: Uri, State(options): State<S>, req: Request<Body>| {
+        Box::pin(async move {
+            let options = LeptosOptions::from_ref(&options);
+            let res = get_static_file(uri, &options.site_root, req.headers());
+            let res = res.await.unwrap();
+
+            if res.status() == StatusCode::OK {
+                res.into_response()
+            } else {
+                let mut res = handle_response_inner(
+                    || {},
+                    move || shell(options),
+                    req,
+                    |app, chunks| {
+                        Box::pin(async move {
+                            let app = app
+                                .to_html_stream_in_order()
+                                .collect::<String>()
+                                .await;
+                            let chunks = chunks();
+                            Box::pin(once(async move { app }).chain(chunks))
+                                as PinnedStream<String>
+                        })
+                    },
+                )
+                .await;
+                *res.status_mut() = StatusCode::NOT_FOUND;
+                res
+            }
+        })
+    }
 }
 
 #[cfg(feature = "default")]

integrations/utils/src/lib.rs

@@ -40,28 +40,15 @@ pub trait ExtendResponse: Sized {
             let (owner, stream) =
                 build_response(app_fn, additional_context, stream_builder);
 
-            let sc = owner.shared_context().unwrap();
-
             let stream = stream.await.ready_chunks(32).map(|n| n.join(""));
 
+            let sc = owner.shared_context().unwrap();
             while let Some(pending) = sc.await_deferred() {
                 pending.await;
             }
 
-            let mut stream = Box::pin(
-                meta_context.inject_meta_context(stream).await.then({
-                    let sc = Arc::clone(&sc);
-                    move |chunk| {
-                        let sc = Arc::clone(&sc);
-                        async move {
-                            while let Some(pending) = sc.await_deferred() {
-                                pending.await;
-                            }
-                            chunk
-                        }
-                    }
-                }),
-            );
+            let mut stream =
+                Box::pin(meta_context.inject_meta_context(stream).await);
 
             // wait for the first chunk of the stream, then set the status and headers
             let first_chunk = stream.next().await.unwrap_or_default();

leptos/Cargo.toml

@@ -11,10 +11,7 @@ edition.workspace = true
 
 [dependencies]
 throw_error = { workspace = true }
-any_spawner = { workspace = true, features = [
-  "wasm-bindgen",
-  "futures-executor",
-] }
+any_spawner = { workspace = true, features = ["wasm-bindgen", "futures-executor"] }
 base64 = { version = "0.22.1", optional = true }
 cfg-if = "1.0"
 hydration_context = { workspace = true }
@@ -31,13 +28,9 @@ paste = "1.0"
 rand = { version = "0.8.5", optional = true }
 reactive_graph = { workspace = true, features = ["serde"] }
 rustc-hash = "2.0"
-tachys = { workspace = true, features = [
-  "reactive_graph",
-  "reactive_stores",
-  "oco",
-] }
+tachys = { workspace = true, features = ["reactive_graph", "reactive_stores", "oco"] }
 thiserror = "2.0"
-tracing = { version = "0.1.41", optional = true }
+tracing = { version = "0.1.40", optional = true }
 typed-builder = "0.20.0"
 typed-builder-macro = "0.20.0"
 serde = "1.0"
@@ -52,7 +45,7 @@ web-sys = { version = "0.3.72", features = [
   "ShadowRootInit",
   "ShadowRootMode",
 ] }
-wasm-bindgen = { workspace = true }
+wasm-bindgen = "0.2.95"
 serde_qs = "0.13.0"
 slotmap = "1.0"
 futures = "0.3.31"
@@ -63,7 +56,7 @@ hydration = [
   "reactive_graph/hydration",
   "leptos_server/hydration",
   "hydration_context/browser",
-  "leptos_dom/hydration",
+  "leptos_dom/hydration"
 ]
 csr = ["leptos_macro/csr", "reactive_graph/effects"]
 hydrate = [
@@ -82,7 +75,7 @@ ssr = [
   "tachys/ssr",
 ]
 nightly = ["leptos_macro/nightly", "reactive_graph/nightly", "tachys/nightly"]
-rkyv = ["server_fn/rkyv", "leptos_server/rkyv"]
+rkyv = ["server_fn/rkyv"]
 tracing = [
   "dep:tracing",
   "reactive_graph/tracing",
@@ -93,10 +86,10 @@ tracing = [
 ]
 nonce = ["base64", "rand"]
 spin = ["leptos-spin-macro"]
-islands = ["leptos_macro/islands", "dep:serde_json"]
+experimental-islands = ["leptos_macro/experimental-islands", "dep:serde_json"]
 trace-component-props = [
   "leptos_macro/trace-component-props",
-  "leptos_dom/trace-component-props",
+  "leptos_dom/trace-component-props"
 ]
 delegation = ["tachys/delegation"]
 
@@ -108,56 +101,23 @@ denylist = [
   "rustls",
   "default-tls",
   "wasm-bindgen",
-  "rkyv",                  # was causing clippy issues on nightly
+  "rkyv", # was causing clippy issues on nightly
   "trace-component-props",
   "spin",
-  "islands",
+  "experimental-islands",
 ]
 skip_feature_sets = [
-  [
-    "csr",
-    "ssr",
-  ],
-  [
-    "csr",
-    "hydrate",
-  ],
-  [
-    "ssr",
-    "hydrate",
-  ],
-  [
-    "serde",
-    "serde-lite",
-  ],
-  [
-    "serde-lite",
-    "miniserde",
-  ],
-  [
-    "serde",
-    "miniserde",
-  ],
-  [
-    "serde",
-    "rkyv",
-  ],
-  [
-    "miniserde",
-    "rkyv",
-  ],
-  [
-    "serde-lite",
-    "rkyv",
-  ],
-  [
-    "default-tls",
-    "rustls",
-  ],
+  ["csr", "ssr"],
+  ["csr", "hydrate"],
+  ["ssr", "hydrate"],
+  ["serde", "serde-lite"],
+  ["serde-lite", "miniserde"],
+  ["serde", "miniserde"],
+  ["serde", "rkyv"],
+  ["miniserde", "rkyv"],
+  ["serde-lite", "rkyv"],
+  ["default-tls", "rustls"],
 ]
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--generate-link-to-definition"]
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(leptos_debuginfo)'] }

leptos/src/attribute_interceptor.rs

@@ -1,150 +0,0 @@
-use crate::attr::{
-    any_attribute::{AnyAttribute, IntoAnyAttribute},
-    Attribute, NextAttribute,
-};
-use leptos::prelude::*;
-
-/// Function stored to build/rebuild the wrapped children when attributes are added.
-type ChildBuilder<T> = dyn Fn(AnyAttribute) -> T + Send + Sync + 'static;
-
-/// Intercepts attributes passed to your component, allowing passing them to any element.
-///
-/// By default, Leptos passes any attributes passed to your component (e.g. `<MyComponent
-/// attr:class="some-class"/>`) to the top-level element in the view returned by your component.
-/// [`AttributeInterceptor`] allows you to intercept this behavior and pass it onto any element in
-/// your component instead.
-///
-/// Must be the top level element in your component's view.
-///
-/// ## Example
-///
-/// Any attributes passed to MyComponent will be passed to the #inner element.
-///
-/// ```
-/// # use leptos::prelude::*;
-/// use leptos::attribute_interceptor::AttributeInterceptor;
-///
-/// #[component]
-/// pub fn MyComponent() -> impl IntoView {
-///     view! {
-///         <AttributeInterceptor let:attrs>
-///             <div id="wrapper">
-///                 <div id="inner" {..attrs} />
-///             </div>
-///         </AttributeInterceptor>
-///     }
-/// }
-/// ```
-#[component(transparent)]
-pub fn AttributeInterceptor<Chil, T>(
-    /// The elements that will be rendered, with the attributes this component received as a
-    /// parameter.
-    children: Chil,
-) -> impl IntoView
-where
-    Chil: Fn(AnyAttribute) -> T + Send + Sync + 'static,
-    T: IntoView,
-{
-    AttributeInterceptorInner::new(children)
-}
-
-/// Wrapper to intercept attributes passed to a component so you can apply them to a different
-/// element.
-struct AttributeInterceptorInner<T: IntoView, A> {
-    children_builder: Box<ChildBuilder<T>>,
-    children: T,
-    attributes: A,
-}
-
-impl<T: IntoView> AttributeInterceptorInner<T, ()> {
-    /// Use this as the returned view from your component to collect the attributes that are passed
-    /// to your component so you can manually handle them.
-    pub fn new<F>(children: F) -> Self
-    where
-        F: Fn(AnyAttribute) -> T + Send + Sync + 'static,
-    {
-        let children_builder = Box::new(children);
-        let children = children_builder(().into_any_attr());
-
-        Self {
-            children_builder,
-            children,
-            attributes: (),
-        }
-    }
-}
-
-impl<T: IntoView, A: Attribute> Render for AttributeInterceptorInner<T, A> {
-    type State = <T as Render>::State;
-
-    fn build(self) -> Self::State {
-        self.children.build()
-    }
-
-    fn rebuild(self, state: &mut Self::State) {
-        self.children.rebuild(state);
-    }
-}
-
-impl<T: IntoView, A> AddAnyAttr for AttributeInterceptorInner<T, A>
-where
-    A: Attribute,
-{
-    type Output<SomeNewAttr: leptos::attr::Attribute> =
-        AttributeInterceptorInner<T, <<A as NextAttribute>::Output<SomeNewAttr> as Attribute>::CloneableOwned>;
-
-    fn add_any_attr<NewAttr: leptos::attr::Attribute>(
-        self,
-        attr: NewAttr,
-    ) -> Self::Output<NewAttr>
-    where
-        Self::Output<NewAttr>: RenderHtml,
-    {
-        let attributes =
-            self.attributes.add_any_attr(attr).into_cloneable_owned();
-
-        let children =
-            (self.children_builder)(attributes.clone().into_any_attr());
-
-        AttributeInterceptorInner {
-            children_builder: self.children_builder,
-            children,
-            attributes,
-        }
-    }
-}
-
-impl<T: IntoView, A: Attribute> RenderHtml for AttributeInterceptorInner<T, A> {
-    type AsyncOutput = T::AsyncOutput;
-
-    const MIN_LENGTH: usize = T::MIN_LENGTH;
-
-    fn dry_resolve(&mut self) {
-        self.children.dry_resolve()
-    }
-
-    fn resolve(
-        self,
-    ) -> impl std::future::Future<Output = Self::AsyncOutput> + Send {
-        self.children.resolve()
-    }
-
-    fn to_html_with_buf(
-        self,
-        buf: &mut String,
-        position: &mut leptos::tachys::view::Position,
-        escape: bool,
-        mark_branches: bool,
-    ) {
-        self.children
-            .to_html_with_buf(buf, position, escape, mark_branches)
-    }
-
-    fn hydrate<const FROM_SERVER: bool>(
-        self,
-        cursor: &leptos::tachys::hydration::Cursor,
-        position: &leptos::tachys::view::PositionState,
-    ) -> Self::State {
-        self.children.hydrate::<FROM_SERVER>(cursor, position)
-    }
-}

leptos/src/callback.rs

@@ -31,13 +31,13 @@
 //! *Notes*:
 //! - The `render_number` prop can receive any type that implements `Fn(i32) -> String`.
 //! - Callbacks are most useful when you want optional generic props.
-//! - All callbacks implement the [`Callable`](leptos::callback::Callable) trait, and can be invoked with `my_callback.run(input)`.
+//! - All callbacks implement the [`Callable`] trait, and can be invoked with `my_callback.run(input)`.
 //! - The callback types implement [`Copy`], so they can easily be moved into and out of other closures, just like signals.
 //!
 //! # Types
 //! This modules implements 2 callback types:
-//! - [`Callback`](leptos::callback::Callback)
-//! - [`UnsyncCallback`](leptos::callback::UnsyncCallback)
+//! - [`Callback`]
+//! - [`UnsyncCallback`]
 //!
 //! Use `SyncCallback` if the function is not `Sync` and `Send`.
 
@@ -80,16 +80,6 @@ impl<In, Out> UnsyncCallback<In, Out> {
     {
         Self(StoredValue::new_local(Rc::new(f)))
     }
-
-    /// Returns `true` if both callbacks wrap the same underlying function pointer.
-    #[inline]
-    pub fn matches(&self, other: &Self) -> bool {
-        self.0.with_value(|self_value| {
-            other
-                .0
-                .with_value(|other_value| Rc::ptr_eq(self_value, other_value))
-        })
-    }
 }
 
 impl<In: 'static, Out: 'static> Callable<In, Out> for UnsyncCallback<In, Out> {
@@ -222,19 +212,6 @@ impl<In: 'static, Out: 'static> Callback<In, Out> {
     {
         Self(StoredValue::new(Arc::new(fun)))
     }
-
-    /// Returns `true` if both callbacks wrap the same underlying function pointer.
-    #[inline]
-    pub fn matches(&self, other: &Self) -> bool {
-        self.0
-            .try_with_value(|self_value| {
-                other.0.try_with_value(|other_value| {
-                    Arc::ptr_eq(self_value, other_value)
-                })
-            })
-            .flatten()
-            .unwrap_or(false)
-    }
 }
 
 #[cfg(test)]
@@ -246,14 +223,14 @@ mod tests {
     #[test]
     fn clone_callback() {
         let callback = Callback::new(move |_no_clone: NoClone| NoClone {});
-        let _cloned = callback;
+        let _cloned = callback.clone();
     }
 
     #[test]
     fn clone_unsync_callback() {
         let callback =
             UnsyncCallback::new(move |_no_clone: NoClone| NoClone {});
-        let _cloned = callback;
+        let _cloned = callback.clone();
     }
 
     #[test]
@@ -269,32 +246,4 @@ mod tests {
         let _callback: UnsyncCallback<(i32, String), String> =
             (|num, s| format!("{num} {s}")).into();
     }
-
-    #[test]
-    fn callback_matches_same() {
-        let callback1 = Callback::new(|x: i32| x * 2);
-        let callback2 = callback1;
-        assert!(callback1.matches(&callback2));
-    }
-
-    #[test]
-    fn callback_matches_different() {
-        let callback1 = Callback::new(|x: i32| x * 2);
-        let callback2 = Callback::new(|x: i32| x + 1);
-        assert!(!callback1.matches(&callback2));
-    }
-
-    #[test]
-    fn unsync_callback_matches_same() {
-        let callback1 = UnsyncCallback::new(|x: i32| x * 2);
-        let callback2 = callback1;
-        assert!(callback1.matches(&callback2));
-    }
-
-    #[test]
-    fn unsync_callback_matches_different() {
-        let callback1 = UnsyncCallback::new(|x: i32| x * 2);
-        let callback2 = UnsyncCallback::new(|x: i32| x + 1);
-        assert!(!callback1.matches(&callback2));
-    }
 }

leptos/src/children.rs

@@ -85,7 +85,7 @@ type BoxedChildrenFn = Box<dyn Fn() -> AnyView + Send>;
 ///     )
 /// }
 pub trait ToChildren<F> {
-    /// Convert the provided type (generally a closure) to Self (generally a "children" type,
+    /// Convert the provided type to (generally a closure) to Self (generally a "children" type,
     /// e.g., [Children]). See the implementations to see exactly which input types are supported
     /// and which "children" type they are converted to.
     fn to_children(f: F) -> Self;
@@ -228,7 +228,6 @@ impl ViewFnOnce {
 pub struct TypedChildren<T>(Box<dyn FnOnce() -> View<T> + Send>);
 
 impl<T> TypedChildren<T> {
-    /// Extracts the inner `children` function.
     pub fn into_inner(self) -> impl FnOnce() -> View<T> + Send {
         self.0
     }
@@ -246,7 +245,7 @@ where
     }
 }
 
-/// A typed equivalent to [`ChildrenFnMut`], which takes a generic but preserves type information to
+/// A typed equivalent to [`ChildrenMut`], which takes a generic but preserves type information to
 /// allow the compiler to optimize the view more effectively.
 pub struct TypedChildrenMut<T>(Box<dyn FnMut() -> View<T> + Send>);
 
@@ -257,7 +256,6 @@ impl<T> Debug for TypedChildrenMut<T> {
 }
 
 impl<T> TypedChildrenMut<T> {
-    /// Extracts the inner `children` function.
     pub fn into_inner(self) -> impl FnMut() -> View<T> + Send {
         self.0
     }
@@ -285,15 +283,7 @@ impl<T> Debug for TypedChildrenFn<T> {
     }
 }
 
-impl<T> Clone for TypedChildrenFn<T> {
-    // Manual implementation to avoid the `T: Clone` bound.
-    fn clone(&self) -> Self {
-        Self(self.0.clone())
-    }
-}
-
 impl<T> TypedChildrenFn<T> {
-    /// Extracts the inner `children` function.
     pub fn into_inner(self) -> Arc<dyn Fn() -> View<T> + Send + Sync> {
         self.0
     }

leptos/src/for_loop.rs

@@ -44,67 +44,6 @@ use tachys::{reactive_graph::OwnedView, view::keyed::keyed};
 ///   }
 /// }
 /// ```
-///
-/// For convenience, you can also choose to write template code directly in the `<For>`
-/// component, using the `let` syntax:
-///
-/// ```
-/// # use leptos::prelude::*;
-///
-/// # #[derive(Copy, Clone, Debug, PartialEq, Eq)]
-/// # struct Counter {
-/// #   id: usize,
-/// #   count: RwSignal<i32>
-/// # }
-/// #
-/// # #[component]
-/// # fn Counters() -> impl IntoView {
-/// #   let (counters, set_counters) = create_signal::<Vec<Counter>>(vec![]);
-/// #
-///   view! {
-///     <div>
-///         <For
-///           each=move || counters.get()
-///           key=|counter| counter.id
-///           let(counter)
-///         >
-///             <button>"Value: " {move || counter.count.get()}</button>
-///         </For>
-///     </div>
-///   }
-/// # }
-/// ```
-///
-/// The `let` syntax also supports destructuring the pattern of your data.
-/// `let((one, two))` in the case of tuples, and `let(Struct { field_one, field_two })`
-/// in the case of structs.
-///
-/// ```
-/// # use leptos::prelude::*;
-///
-/// # #[derive(Copy, Clone, Debug, PartialEq, Eq)]
-/// # struct Counter {
-/// #   id: usize,
-/// #   count: RwSignal<i32>
-/// # }
-/// #
-/// # #[component]
-/// # fn Counters() -> impl IntoView {
-/// #   let (counters, set_counters) = create_signal::<Vec<Counter>>(vec![]);
-/// #
-///   view! {
-///     <div>
-///         <For
-///           each=move || counters.get()
-///           key=|counter| counter.id
-///           let(Counter { id, count })
-///         >
-///             <button>"Value: " {move || count.get()}</button>
-///         </For>
-///     </div>
-///   }
-/// # }
-/// ```
 #[cfg_attr(feature = "tracing", tracing::instrument(level = "trace", skip_all))]
 #[component]
 pub fn For<IF, I, T, EF, N, KF, K>(

leptos/src/form.rs

@@ -72,7 +72,9 @@ use web_sys::{
 #[cfg_attr(feature = "tracing", tracing::instrument(level = "trace", skip_all))]
 #[component]
 pub fn ActionForm<ServFn>(
-    /// The action from which to build the form.
+    /// The action from which to build the form. This should include a URL, which can be generated
+    /// by default using [`create_server_action`](leptos_server::create_server_action) or added
+    /// manually using [`using_server_fn`](leptos_server::Action::using_server_fn).
     action: ServerAction<ServFn>,
     /// A [`NodeRef`] in which the `<form>` element should be stored.
     #[prop(optional)]
@@ -147,7 +149,9 @@ where
 /// progressively enhanced to use client-side routing.
 #[component]
 pub fn MultiActionForm<ServFn>(
-    /// The action from which to build the form.
+    /// The action from which to build the form. This should include a URL, which can be generated
+    /// by default using [create_server_action](leptos_server::create_server_action) or added
+    /// manually using [leptos_server::Action::using_server_fn].
     action: ServerMultiAction<ServFn>,
     /// A [`NodeRef`] in which the `<form>` element should be stored.
     #[prop(optional)]
@@ -247,16 +251,12 @@ where
     ) -> Result<Self, serde_qs::Error>;
 }
 
-/// Errors that can arise when coverting from an HTML event or form into a Rust data type.
 #[derive(Error, Debug)]
 pub enum FromFormDataError {
-    /// Could not find a `<form>` connected to the event.
     #[error("Could not find <form> connected to event.")]
     MissingForm(Event),
-    /// Could not create `FormData` from the form.
     #[error("Could not create FormData from <form>: {0:?}")]
     FormData(JsValue),
-    /// Failed to deserialize this Rust type from the form data.
     #[error("Deserialization error: {0:?}")]
     Deserialization(serde_qs::Error),
 }

leptos/src/hydration/hydration_script.js

@@ -1,7 +1,7 @@
 (function (root, pkg_path, output_name, wasm_output_name) {
 	import(`${root}/${pkg_path}/${output_name}.js`)
 		.then(mod => {
-			mod.default({module_or_path: `${root}/${pkg_path}/${wasm_output_name}.wasm`}).then(() => {
+			mod.default(`${root}/${pkg_path}/${wasm_output_name}.wasm`).then(() => {
 				mod.hydrate();
 			});
 		})

leptos/src/hydration/island_script.js

@@ -1,6 +1,4 @@
 ((root, pkg_path, output_name, wasm_output_name) => {
-	let MOST_RECENT_CHILDREN_CB;
-
 	function idle(c) {
 		if ("requestIdleCallback" in window) {
 			window.requestIdleCallback(c);
@@ -8,49 +6,55 @@
 			c();
 		}
 	}
-	function hydrateIslands(rootNode, mod) {
-		function traverse(node) {
+	function islandTree(rootNode) {
+		const tree = [];
+
+		function traverse(node, parent) {
 			if (node.nodeType === Node.ELEMENT_NODE) {
-				const tag = node.tagName.toLowerCase();
-				if(tag === 'leptos-island') {
+				if(node.tagName.toLowerCase() === 'leptos-island') {
 					const children = [];
 					const id = node.dataset.component || null;
-
-					hydrateIsland(node, id, mod);
+					const data = { id, node, children };
 					
 					for(const child of node.children) {
 						traverse(child, children);
 					}
+
+					(parent || tree).push(data);
 				} else {
-					if(tag === 'leptos-children') {
-						MOST_RECENT_CHILDREN_CB = node.$$on_hydrate;
-					}
 					for(const child of node.children) {
-						traverse(child);
+						traverse(child, parent);
 					};
 				}
 			}
 		}
 
-		traverse(rootNode);
+		traverse(rootNode, null);
+
+		return { el: null, id: null, children: tree };
 	}
 	function hydrateIsland(el, id, mod) {
 		const islandFn = mod[id];
 		if (islandFn) {
-			if (MOST_RECENT_CHILDREN_CB) {
-				MOST_RECENT_CHILDREN_CB();
-			}
 			islandFn(el);
 		} else {
 			console.warn(`Could not find WASM function for the island ${id}.`);
 		}
 	}
+	function hydrateIslands(entry, mod) {
+		if(entry.node) {
+			hydrateIsland(entry.node, entry.id, mod);
+		}
+		for (const island of entry.children) {
+			hydrateIslands(island, mod);
+		}
+	}
 	idle(() => {
 		import(`${root}/${pkg_path}/${output_name}.js`)
 			.then(mod => {
 				mod.default(`${root}/${pkg_path}/${wasm_output_name}.wasm`).then(() => {
 					mod.hydrate();
-					hydrateIslands(document.body, mod);
+					hydrateIslands(islandTree(document.body, null), mod);
 				});
 			})
 	});

leptos/src/hydration/mod.rs

@@ -4,15 +4,9 @@ use crate::prelude::*;
 use leptos_config::LeptosOptions;
 use leptos_macro::{component, view};
 
-/// Inserts auto-reloading code used in `cargo-leptos`.
-///
-/// This should be included in the `<head>` of your application shell during development.
 #[component]
 pub fn AutoReload(
-    /// Whether the file-watching feature should be disabled.
-    #[prop(optional)]
-    disable_watch: bool,
-    /// Configuration options for this project.
+    #[prop(optional)] disable_watch: bool,
     options: LeptosOptions,
 ) -> impl IntoView {
     (!disable_watch && std::env::var("LEPTOS_WATCH").is_ok()).then(|| {
@@ -40,16 +34,10 @@ pub fn AutoReload(
     })
 }
 
-/// Inserts hydration scripts that add interactivity to your server-rendered HTML.
-///
-/// This should be included in the `<head>` of your application shell.
 #[component]
 pub fn HydrationScripts(
-    /// Configuration options for this project.
     options: LeptosOptions,
-    /// Should be `true` to hydrate in `islands` mode.
-    #[prop(optional)]
-    islands: bool,
+    #[prop(optional)] islands: bool,
     /// A base url, not including a trailing slash
     #[prop(optional, into)]
     root: Option<String>,

leptos/src/into_view.rs

@@ -9,7 +9,6 @@ use tachys::{
     },
 };
 
-/// A wrapper for any kind of view.
 #[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct View<T>
 where
@@ -21,7 +20,6 @@ where
 }
 
 impl<T> View<T> {
-    /// Wraps the view.
     pub fn new(inner: T) -> Self {
         Self {
             inner,
@@ -30,12 +28,10 @@ impl<T> View<T> {
         }
     }
 
-    /// Unwraps the view, returning the inner type.
     pub fn into_inner(self) -> T {
         self.inner
     }
 
-    /// Adds a view marker, which is used for hot-reloading and debug purposes.
     #[inline(always)]
     pub fn with_view_marker(
         #[allow(unused_mut)] // used in debug
@@ -51,12 +47,10 @@ impl<T> View<T> {
     }
 }
 
-/// A trait that is implemented for types that can be rendered.
 pub trait IntoView
 where
     Self: Sized + Render + RenderHtml + Send,
 {
-    /// Wraps the inner type.
     fn into_view(self) -> View<Self>;
 }
 
@@ -194,15 +188,9 @@ impl<T: AddAnyAttr> AddAnyAttr for View<T> {
     }
 }
 
-/// Collects some iterator of views into a list, so they can be rendered.
-///
-/// This is a shorthand for `.collect::<Vec<_>>()`, and allows any iterator of renderable
-/// items to be collected into a renderable collection.
 pub trait CollectView {
-    /// The inner view type.
     type View: IntoView;
 
-    /// Collects the iterator into a list of views.
     fn collect_view(self) -> Vec<Self::View>;
 }
 

leptos/src/lib.rs

@@ -1,6 +1,5 @@
-#![deny(missing_docs)]
+#!rdeny(missing_docs)]
 #![forbid(unsafe_code)]
-
 //! # About Leptos
 //!
 //! Leptos is a full-stack framework for building web applications in Rust. You can use it to build
@@ -39,7 +38,7 @@
 //!   server actions, forms, and server-sent events (SSE).
 //! - **[`todomvc`]** shows the basics of building an isomorphic web app. Both the server and the client import the same app code.
 //!   The server renders the app directly to an HTML string, and the client hydrates that HTML to make it interactive.
-//!   You might also want to see how we use [`Effect::new`](leptos::prelude::Effect) to
+//!   You might also want to see how we use [`Effect::new`](leptos::prelude::Effect::new) to
 //!   [serialize JSON to `localStorage`](https://github.com/leptos-rs/leptos/blob/20af4928b2fffe017408d3f4e7330db22cf68277/examples/todomvc/src/lib.rs#L191-L209)
 //!   and [reactively call DOM methods](https://github.com/leptos-rs/leptos/blob/16f084a71268ac325fbc4a5e50c260df185eadb6/examples/todomvc/src/lib.rs#L292-L296)
 //!   on [references to elements](https://github.com/leptos-rs/leptos/blob/20af4928b2fffe017408d3f4e7330db22cf68277/examples/todomvc/src/lib.rs#L228).
@@ -78,7 +77,7 @@
 //!   + `async` interop: [`Resource`](leptos::prelude::Resource) for loading data using `async` functions
 //!     and [`Action`](leptos::prelude::Action) to mutate data or imperatively call `async` functions.
 //!   + reactions: [`Effect`](leptos::prelude::Effect) and [`RenderEffect`](leptos::prelude::RenderEffect).
-//! - **Templating/Views**: the [`view`] macro and [`IntoView`] trait.
+//! - **Templating/Views**: the [`view`] macro and [`IntoView`](leptos::IntoView) trait.
 //! - **Routing**: the [`leptos_router`](https://docs.rs/leptos_router/latest/leptos_router/) crate
 //! - **Server Functions**: the [`server`](macro@leptos::prelude::server) macro and [`ServerAction`](leptos::prelude::ServerAction).
 //!
@@ -192,9 +191,6 @@ pub mod callback;
 /// Types that can be passed as the `children` prop of a component.
 pub mod children;
 
-/// Wrapper for intercepting component attributes.
-pub mod attribute_interceptor;
-
 #[doc(hidden)]
 /// Traits used to implement component constructors.
 pub mod component;
@@ -291,9 +287,8 @@ pub mod logging {
     pub use leptos_dom::{debug_warn, error, log, warn};
 }
 
-/// Utilities for working with asynchronous tasks.
 pub mod task {
-    pub use any_spawner::{self, CustomExecutor, Executor};
+    pub use any_spawner::Executor;
     use std::future::Future;
 
     /// Spawns a thread-safe [`Future`].
@@ -321,10 +316,10 @@ pub mod task {
 }
 
 // these reexports are used in islands
-#[cfg(feature = "islands")]
+#[cfg(feature = "experimental-islands")]
 #[doc(hidden)]
 pub use serde;
-#[cfg(feature = "islands")]
+#[cfg(feature = "experimental-islands")]
 #[doc(hidden)]
 pub use serde_json;
 #[cfg(feature = "tracing")]

leptos/src/nonce.rs

@@ -51,13 +51,6 @@ use tachys::html::attribute::AttributeValue;
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub struct Nonce(pub(crate) Arc<str>);
 
-impl Nonce {
-    /// Returns a reference to the inner reference-counted string slice representing the nonce.
-    pub fn as_inner(&self) -> &Arc<str> {
-        &self.0
-    }
-}
-
 impl Deref for Nonce {
     type Target = str;
 

leptos/src/suspense_component.rs

@@ -16,7 +16,6 @@ use reactive_graph::{
     traits::{Dispose, Get, Read, Track, With},
 };
 use slotmap::{DefaultKey, SlotMap};
-use std::sync::Arc;
 use tachys::{
     either::Either,
     html::attribute::Attribute,
@@ -88,12 +87,7 @@ use throw_error::ErrorHookFuture;
 /// ```
 #[component]
 pub fn Suspense<Chil>(
-    /// A function that returns a fallback that will be shown while resources are still loading.
-    /// By default this is an empty view.
-    #[prop(optional, into)]
-    fallback: ViewFnOnce,
-    /// Children will be rendered once initially to catch any resource reads, then hidden until all
-    /// data have loaded.
+    #[prop(optional, into)] fallback: ViewFnOnce,
     children: TypedChildren<Chil>,
 ) -> impl IntoView
 where
@@ -133,18 +127,6 @@ where
     })
 }
 
-fn nonce_or_not() -> Option<Arc<str>> {
-    #[cfg(feature = "nonce")]
-    {
-        use crate::nonce::Nonce;
-        use_context::<Nonce>().map(|n| n.0)
-    }
-    #[cfg(not(feature = "nonce"))]
-    {
-        None
-    }
-}
-
 pub(crate) struct SuspenseBoundary<const TRANSITION: bool, Fal, Chil> {
     pub id: SerializedDataId,
     pub none_pending: ArcMemo<bool>,
@@ -303,13 +285,11 @@ where
         let eff = reactive_graph::effect::Effect::new_isomorphic({
             move |_| {
                 tasks.track();
-                if let Some(tasks) = tasks.try_read() {
-                    if tasks.is_empty() {
-                        if let Some(tx) = tasks_tx.take() {
-                            // If the receiver has dropped, it means the ScopedFuture has already
-                            // dropped, so it doesn't matter if we manage to send this.
-                            _ = tx.send(());
-                        }
+                if tasks.read().is_empty() {
+                    if let Some(tx) = tasks_tx.take() {
+                        // If the receiver has dropped, it means the ScopedFuture has already
+                        // dropped, so it doesn't matter if we manage to send this.
+                        _ = tx.send(());
                     }
                 }
             }
@@ -394,12 +374,7 @@ where
                         &mut fallback_position,
                         mark_branches,
                     );
-                    buf.push_async_out_of_order_with_nonce(
-                        fut,
-                        position,
-                        mark_branches,
-                        nonce_or_not(),
-                    );
+                    buf.push_async_out_of_order(fut, position, mark_branches);
                 } else {
                     buf.push_async({
                         let mut position = *position;

leptos/src/text_prop.rs

@@ -1,6 +1,5 @@
 use oco_ref::Oco;
 use std::sync::Arc;
-use tachys::prelude::IntoAttributeValue;
 
 /// Describes a value that is either a static or a reactive string, i.e.,
 /// a [`String`], a [`&str`], or a reactive `Fn() -> String`.
@@ -74,11 +73,3 @@ impl Default for TextProp {
         Self(Arc::new(|| Oco::Borrowed("")))
     }
 }
-
-impl IntoAttributeValue for TextProp {
-    type Output = Oco<'static, str>;
-
-    fn into_attribute_value(self) -> Self::Output {
-        self.get()
-    }
-}

leptos/src/transition.rs

@@ -85,44 +85,41 @@ pub fn Transition<Chil>(
 where
     Chil: IntoView + Send + 'static,
 {
-    let owner = Owner::new();
-    owner.with(|| {
-        let (starts_local, id) = {
-            Owner::current_shared_context()
-                .map(|sc| {
-                    let id = sc.next_id();
-                    (sc.get_incomplete_chunk(&id), id)
-                })
-                .unwrap_or_else(|| (false, Default::default()))
-        };
-        let fallback = fallback.run();
-        let children = children.into_inner()();
-        let tasks = ArcRwSignal::new(SlotMap::<DefaultKey, ()>::new());
-        provide_context(SuspenseContext {
-            tasks: tasks.clone(),
-        });
-        let none_pending = ArcMemo::new(move |prev: Option<&bool>| {
-            tasks.track();
-            if prev.is_none() && starts_local {
-                false
-            } else {
-                tasks.with(SlotMap::is_empty)
+    let (starts_local, id) = {
+        Owner::current_shared_context()
+            .map(|sc| {
+                let id = sc.next_id();
+                (sc.get_incomplete_chunk(&id), id)
+            })
+            .unwrap_or_else(|| (false, Default::default()))
+    };
+    let fallback = fallback.run();
+    let children = children.into_inner()();
+    let tasks = ArcRwSignal::new(SlotMap::<DefaultKey, ()>::new());
+    provide_context(SuspenseContext {
+        tasks: tasks.clone(),
+    });
+    let none_pending = ArcMemo::new(move |prev: Option<&bool>| {
+        tasks.track();
+        if prev.is_none() && starts_local {
+            false
+        } else {
+            tasks.with(SlotMap::is_empty)
+        }
+    });
+    if let Some(set_pending) = set_pending {
+        Effect::new_isomorphic({
+            let none_pending = none_pending.clone();
+            move |_| {
+                set_pending.set(!none_pending.get());
             }
         });
-        if let Some(set_pending) = set_pending {
-            Effect::new_isomorphic({
-                let none_pending = none_pending.clone();
-                move |_| {
-                    set_pending.set(!none_pending.get());
-                }
-            });
-        }
+    }
 
-        OwnedView::new(SuspenseBoundary::<true, _, _> {
-            id,
-            none_pending,
-            fallback,
-            children,
-        })
+    OwnedView::new(SuspenseBoundary::<true, _, _> {
+        id,
+        none_pending,
+        fallback,
+        children,
     })
 }

leptos_config/Cargo.toml

@@ -10,7 +10,7 @@ rust-version.workspace = true
 edition.workspace = true
 
 [dependencies]
-config = { version = "0.15.8", default-features = false, features = [
+config = { version = "0.14.1", default-features = false, features = [
   "toml",
   "convert-case",
 ] }
@@ -20,12 +20,9 @@ thiserror = "2.0"
 typed-builder = "0.20.0"
 
 [dev-dependencies]
-tokio = { version = "1.43", features = ["rt", "macros"] }
-tempfile = "3.14"
+tokio = { version = "1.41", features = ["rt", "macros"] }
+tempfile = "3.13"
 temp-env = { version = "0.3.6", features = ["async_closure"] }
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--generate-link-to-definition"]
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(leptos_debuginfo)'] }

leptos_config/src/tests.rs

@@ -30,14 +30,14 @@ fn ws_from_str_test() {
 
 #[test]
 fn env_w_default_test() {
-    temp_env::with_var("LEPTOS_CONFIG_ENV_TEST", Some("custom"), || {
+    _ = temp_env::with_var("LEPTOS_CONFIG_ENV_TEST", Some("custom"), || {
         assert_eq!(
             env_w_default("LEPTOS_CONFIG_ENV_TEST", "default").unwrap(),
             String::from("custom")
         );
     });
 
-    temp_env::with_var_unset("LEPTOS_CONFIG_ENV_TEST", || {
+    _ = temp_env::with_var_unset("LEPTOS_CONFIG_ENV_TEST", || {
         assert_eq!(
             env_w_default("LEPTOS_CONFIG_ENV_TEST", "default").unwrap(),
             String::from("default")
@@ -47,14 +47,14 @@ fn env_w_default_test() {
 
 #[test]
 fn env_wo_default_test() {
-    temp_env::with_var("LEPTOS_CONFIG_ENV_TEST", Some("custom"), || {
+    _ = temp_env::with_var("LEPTOS_CONFIG_ENV_TEST", Some("custom"), || {
         assert_eq!(
             env_wo_default("LEPTOS_CONFIG_ENV_TEST").unwrap(),
             Some(String::from("custom"))
         );
     });
 
-    temp_env::with_var_unset("LEPTOS_CONFIG_ENV_TEST", || {
+    _ = temp_env::with_var_unset("LEPTOS_CONFIG_ENV_TEST", || {
         assert_eq!(env_wo_default("LEPTOS_CONFIG_ENV_TEST").unwrap(), None);
     });
 }

leptos_dom/Cargo.toml

@@ -12,10 +12,10 @@ edition.workspace = true
 tachys = { workspace = true }
 reactive_graph = { workspace = true }
 or_poisoned = { workspace = true }
-js-sys = "0.3.74"
+js-sys = "0.3.72"
 send_wrapper = "0.6.0"
-tracing = { version = "0.1.41", optional = true }
-wasm-bindgen = { workspace = true }
+tracing = { version = "0.1.40", optional = true }
+wasm-bindgen = "0.2.95"
 serde_json = { version = "1.0", optional = true }
 serde = { version = "1.0", optional = true }
 
@@ -37,6 +37,3 @@ rustdoc-args = ["--generate-link-to-definition"]
 
 [package.metadata.cargo-all-features]
 denylist = ["tracing"]
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(leptos_debuginfo)'] }

leptos_dom/src/helpers.rs

@@ -131,10 +131,6 @@ impl AnimationFrameRequestHandle {
 
 /// Runs the given function between the next repaint using
 /// [`Window.requestAnimationFrame`](https://developer.mozilla.org/en-US/docs/Web/API/window/requestAnimationFrame).
-///
-/// ### Note about Context
-///
-/// The callback is called outside of the reactive ownership tree. This means that it does not have access to context via [`use_context`](reactive_graph::owner::use_context). If you want to use context inside the callback, you should either call `use_context` in the body of the component, and move the value into the callback, or access the current owner inside the component body using [`Owner::current`](reactive_graph::owner::Owner::current) and reestablish it in the callback with [`Owner::with`](reactive_graph::owner::Owner::with).
 #[cfg_attr(feature = "tracing", instrument(level = "trace", skip_all))]
 #[inline(always)]
 pub fn request_animation_frame(cb: impl FnOnce() + 'static) {
@@ -163,10 +159,6 @@ fn closure_once(cb: impl FnOnce() + 'static) -> JsValue {
 /// Runs the given function between the next repaint using
 /// [`Window.requestAnimationFrame`](https://developer.mozilla.org/en-US/docs/Web/API/window/requestAnimationFrame),
 /// returning a cancelable handle.
-///
-/// ### Note about Context
-///
-/// The callback is called outside of the reactive ownership tree. This means that it does not have access to context via [`use_context`](reactive_graph::owner::use_context). If you want to use context inside the callback, you should either call `use_context` in the body of the component, and move the value into the callback, or access the current owner inside the component body using [`Owner::current`](reactive_graph::owner::Owner::current) and reestablish it in the callback with [`Owner::with`](reactive_graph::owner::Owner::with).
 #[cfg_attr(feature = "tracing", instrument(level = "trace", skip_all))]
 #[inline(always)]
 pub fn request_animation_frame_with_handle(
@@ -205,10 +197,6 @@ impl IdleCallbackHandle {
 
 /// Queues the given function during an idle period using
 /// [`Window.requestIdleCallback`](https://developer.mozilla.org/en-US/docs/Web/API/window/requestIdleCallback).
-///
-/// ### Note about Context
-///
-/// The callback is called outside of the reactive ownership tree. This means that it does not have access to context via [`use_context`](reactive_graph::owner::use_context). If you want to use context inside the callback, you should either call `use_context` in the body of the component, and move the value into the callback, or access the current owner inside the component body using [`Owner::current`](reactive_graph::owner::Owner::current) and reestablish it in the callback with [`Owner::with`](reactive_graph::owner::Owner::with).
 #[cfg_attr(feature = "tracing", instrument(level = "trace", skip_all))]
 #[inline(always)]
 pub fn request_idle_callback(cb: impl Fn() + 'static) {
@@ -218,10 +206,6 @@ pub fn request_idle_callback(cb: impl Fn() + 'static) {
 /// Queues the given function during an idle period using
 /// [`Window.requestIdleCallback`](https://developer.mozilla.org/en-US/docs/Web/API/window/requestIdleCallback),
 /// returning a cancelable handle.
-///
-/// ### Note about Context
-///
-/// The callback is called outside of the reactive ownership tree. This means that it does not have access to context via [`use_context`](reactive_graph::owner::use_context). If you want to use context inside the callback, you should either call `use_context` in the body of the component, and move the value into the callback, or access the current owner inside the component body using [`Owner::current`](reactive_graph::owner::Owner::current) and reestablish it in the callback with [`Owner::with`](reactive_graph::owner::Owner::with).
 #[cfg_attr(feature = "tracing", instrument(level = "trace", skip_all))]
 #[inline(always)]
 pub fn request_idle_callback_with_handle(
@@ -255,8 +239,6 @@ pub fn request_idle_callback_with_handle(
 /// to perform final cleanup or other just-before-rendering tasks.
 ///
 /// [MDN queueMicrotask](https://developer.mozilla.org/en-US/docs/Web/API/queueMicrotask)
-///
-/// <div class="warning">The task is called outside of the ownership tree, this means that if you want to access for example the context you need to reestablish the owner.</div>
 pub fn queue_microtask(task: impl FnOnce() + 'static) {
     use js_sys::{Function, Reflect};
 
@@ -283,10 +265,6 @@ impl TimeoutHandle {
 
 /// Executes the given function after the given duration of time has passed.
 /// [`setTimeout()`](https://developer.mozilla.org/en-US/docs/Web/API/setTimeout).
-///
-/// ### Note about Context
-///
-/// The callback is called outside of the reactive ownership tree. This means that it does not have access to context via [`use_context`](reactive_graph::owner::use_context). If you want to use context inside the callback, you should either call `use_context` in the body of the component, and move the value into the callback, or access the current owner inside the component body using [`Owner::current`](reactive_graph::owner::Owner::current) and reestablish it in the callback with [`Owner::with`](reactive_graph::owner::Owner::with).
 #[cfg_attr(
   feature = "tracing",
   instrument(level = "trace", skip_all, fields(duration = ?duration))
@@ -297,10 +275,6 @@ pub fn set_timeout(cb: impl FnOnce() + 'static, duration: Duration) {
 
 /// Executes the given function after the given duration of time has passed, returning a cancelable handle.
 /// [`setTimeout()`](https://developer.mozilla.org/en-US/docs/Web/API/setTimeout).
-///
-/// ### Note about Context
-///
-/// The callback is called outside of the reactive ownership tree. This means that it does not have access to context via [`use_context`](reactive_graph::owner::use_context). If you want to use context inside the callback, you should either call `use_context` in the body of the component, and move the value into the callback, or access the current owner inside the component body using [`Owner::current`](reactive_graph::owner::Owner::current) and reestablish it in the callback with [`Owner::with`](reactive_graph::owner::Owner::with).
 #[cfg_attr(
   feature = "tracing",
   instrument(level = "trace", skip_all, fields(duration = ?duration))
@@ -357,10 +331,6 @@ pub fn set_timeout_with_handle(
 ///     }
 /// }
 /// ```
-///
-/// ### Note about Context
-///
-/// The callback is called outside of the reactive ownership tree. This means that it does not have access to context via [`use_context`](reactive_graph::owner::use_context). If you want to use context inside the callback, you should either call `use_context` in the body of the component, and move the value into the callback, or access the current owner inside the component body using [`Owner::current`](reactive_graph::owner::Owner::current) and reestablish it in the callback with [`Owner::with`](reactive_graph::owner::Owner::with).
 pub fn debounce<T: 'static>(
     delay: Duration,
     mut cb: impl FnMut(T) + 'static,
@@ -428,10 +398,6 @@ impl IntervalHandle {
 
 /// Repeatedly calls the given function, with a delay of the given duration between calls.
 /// See [`setInterval()`](https://developer.mozilla.org/en-US/docs/Web/API/setInterval).
-///
-/// ### Note about Context
-///
-/// The callback is called outside of the reactive ownership tree. This means that it does not have access to context via [`use_context`](reactive_graph::owner::use_context). If you want to use context inside the callback, you should either call `use_context` in the body of the component, and move the value into the callback, or access the current owner inside the component body using [`Owner::current`](reactive_graph::owner::Owner::current) and reestablish it in the callback with [`Owner::with`](reactive_graph::owner::Owner::with).
 #[cfg_attr(
   feature = "tracing",
   instrument(level = "trace", skip_all, fields(duration = ?duration))
@@ -443,10 +409,6 @@ pub fn set_interval(cb: impl Fn() + 'static, duration: Duration) {
 /// Repeatedly calls the given function, with a delay of the given duration between calls,
 /// returning a cancelable handle.
 /// See [`setInterval()`](https://developer.mozilla.org/en-US/docs/Web/API/setInterval).
-///
-/// ### Note about Context
-///
-/// The callback is called outside of the reactive ownership tree. This means that it does not have access to context via [`use_context`](reactive_graph::owner::use_context). If you want to use context inside the callback, you should either call `use_context` in the body of the component, and move the value into the callback, or access the current owner inside the component body using [`Owner::current`](reactive_graph::owner::Owner::current) and reestablish it in the callback with [`Owner::with`](reactive_graph::owner::Owner::with).
 #[cfg_attr(
   feature = "tracing",
   instrument(level = "trace", skip_all, fields(duration = ?duration))
@@ -489,10 +451,6 @@ pub fn set_interval_with_handle(
 
 /// Adds an event listener to the `Window`, typed as a generic `Event`,
 /// returning a cancelable handle.
-///
-/// ### Note about Context
-///
-/// The callback is called outside of the reactive ownership tree. This means that it does not have access to context via [`use_context`](reactive_graph::owner::use_context). If you want to use context inside the callback, you should either call `use_context` in the body of the component, and move the value into the callback, or access the current owner inside the component body using [`Owner::current`](reactive_graph::owner::Owner::current) and reestablish it in the callback with [`Owner::with`](reactive_graph::owner::Owner::with).
 #[cfg_attr(
   feature = "tracing",
   instrument(level = "trace", skip_all, fields(event_name = %event_name))
@@ -561,10 +519,6 @@ pub fn window_event_listener_untyped(
 ///     on_cleanup(move || handle.remove());
 /// }
 /// ```
-///
-/// ### Note about Context
-///
-/// The callback is called outside of the reactive ownership tree. This means that it does not have access to context via [`use_context`](reactive_graph::owner::use_context). If you want to use context inside the callback, you should either call `use_context` in the body of the component, and move the value into the callback, or access the current owner inside the component body using [`Owner::current`](reactive_graph::owner::Owner::current) and reestablish it in the callback with [`Owner::with`](reactive_graph::owner::Owner::with).
 pub fn window_event_listener<E: EventDescriptor + 'static>(
     event: E,
     cb: impl Fn(E::EventType) + 'static,

leptos_dom/src/logging.rs

@@ -29,9 +29,14 @@ macro_rules! error {
 macro_rules! debug_warn {
     ($($x:tt)*) => {
         {
-            if cfg!(debug_assertions) {
+            #[cfg(debug_assertions)]
+            {
                 $crate::warn!($($x)*)
             }
+            #[cfg(not(debug_assertions))]
+            {
+                ($($x)*)
+            }
         }
     }
 }

leptos_macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_macro"
-version = { workspace = true }
+version = "0.7.0-rc1"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
@@ -13,10 +13,10 @@ edition.workspace = true
 proc-macro = true
 
 [dependencies]
-attribute-derive = { version = "0.10.3", features = ["syn-full"] }
+attribute-derive = { version = "0.10.2", features = ["syn-full"] }
 cfg-if = "1.0"
 html-escape = "0.2.13"
-itertools = { workspace = true }
+itertools = "0.13.0"
 prettyplease = "0.2.25"
 proc-macro-error2 = { version = "2.0", default-features = false }
 proc-macro2 = "1.0"
@@ -25,16 +25,15 @@ syn = { version = "2.0", features = ["full"] }
 rstml = "0.12.0"
 leptos_hot_reload = { workspace = true }
 server_fn_macro = { workspace = true }
-convert_case = "0.7"
+convert_case = "0.6.0"
 uuid = { version = "1.11", features = ["v4"] }
-tracing = { version = "0.1.41", optional = true }
+tracing = { version = "0.1.40", optional = true }
 
 [dev-dependencies]
 log = "0.4.22"
 typed-builder = "0.20.0"
 trybuild = "1.0"
 leptos = { path = "../leptos" }
-leptos_router = { path = "../router", features = ["ssr"] }
 server_fn = { path = "../server_fn", features = ["cbor"] }
 insta = "1.41"
 serde = "1.0"
@@ -45,8 +44,7 @@ hydrate = []
 ssr = ["server_fn_macro/ssr", "leptos/ssr"]
 nightly = ["server_fn_macro/nightly"]
 tracing = ["dep:tracing"]
-islands = []
-trace-components = []
+experimental-islands = []
 trace-component-props = []
 actix = ["server_fn_macro/actix"]
 axum = ["server_fn_macro/axum"]
@@ -55,37 +53,34 @@ generic = ["server_fn_macro/generic"]
 [package.metadata.cargo-all-features]
 denylist = ["nightly", "tracing", "trace-component-props"]
 skip_feature_sets = [
-  [
-    "csr",
-    "hydrate",
-  ],
-  [
-    "hydrate",
-    "csr",
-  ],
-  [
-    "hydrate",
-    "ssr",
-  ],
-  [
-    "actix",
-    "axum",
-  ],
-  [
-    "actix",
-    "generic",
-  ],
-  [
-    "generic",
-    "axum",
-  ],
+	[
+		"csr",
+		"hydrate",
+	],
+	[
+		"hydrate",
+		"csr",
+	],
+	[
+		"hydrate",
+		"ssr",
+	],
+	[
+		"actix",
+		"axum",
+	],
+	[
+		"actix",
+		"generic",
+	],
+	[
+		"generic",
+		"axum",
+	],
 ]
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--generate-link-to-definition"]
 
 [lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = [
-  'cfg(leptos_debuginfo)',
-  'cfg(erase_components)',
-] }
+unexpected_cfgs = { level = "warn", check-cfg = ['cfg(erase_components)'] }

leptos_macro/Makefile.toml

@@ -11,13 +11,13 @@ dependencies = [
 [tasks.test-leptos_macro-example]
 description = "Tests the leptos_macro/example to check if macro handles doc comments correctly"
 command = "cargo"
-args = ["+nightly-2025-03-05", "test", "--doc"]
+args = ["+nightly-2024-08-01", "test", "--doc"]
 cwd = "example"
 install_crate = false
 
 [tasks.doc-leptos_macro-example]
 description = "Docs the leptos_macro/example to check if macro handles doc comments correctly"
 command = "cargo"
-args = ["+nightly-2025-03-05", "doc"]
+args = ["+nightly-2024-08-01", "doc"]
 cwd = "example"
 install_crate = false

leptos_macro/src/component.rs

@@ -144,6 +144,8 @@ impl ToTokens for Model {
         let (impl_generics, generics, where_clause) =
             body.sig.generics.split_for_impl();
 
+        let lifetimes = body.sig.generics.lifetimes();
+
         let props_name = format_ident!("{name}Props");
         let props_builder_name = format_ident!("{name}PropsBuilder");
         let props_serialized_name = format_ident!("{name}PropsSerialized");
@@ -199,35 +201,13 @@ impl ToTokens for Model {
         ) = {
             #[cfg(feature = "tracing")]
             {
-                /* TODO for 0.8: fix this
-                 *
-                 * The problem is that cargo now warns about an expected "tracing" cfg if
-                 * you don't have a "tracing" feature in your actual crate
-                 *
-                 * However, until https://github.com/tokio-rs/tracing/pull/1819 is merged
-                 * (?), you can't provide an alternate path for `tracing` (for example,
-                 * ::leptos::tracing), which means that if you're going to use the macro
-                 * you *must* have `tracing` in your Cargo.toml.
-                 *
-                 * Including the feature-check here causes cargo warnings on
-                 * previously-working projects.
-                 *
-                 * Removing the feature-check here breaks any project that uses leptos with
-                 * the tracing feature turned on, but without a tracing dependency in its
-                 * Cargo.toml.
-                 * /
-                 */
-                let instrument = cfg!(feature = "trace-components").then(|| quote! {
-                    #[cfg_attr(
-                        feature = "tracing",
-                        ::leptos::tracing::instrument(level = "info", name = #trace_name, skip_all)
-                    )]
-                });
-
                 (
                     quote! {
                         #[allow(clippy::let_with_type_underscore)]
-                        #instrument
+                        #[cfg_attr(
+                            feature = "tracing",
+                            ::leptos::tracing::instrument(level = "info", name = #trace_name, skip_all)
+                        )]
                     },
                     quote! {
                         let __span = ::leptos::tracing::Span::current();
@@ -280,12 +260,8 @@ impl ToTokens for Model {
         let body_name = unmodified_fn_name_from_fn_name(&body_name);
         let body_expr = if is_island {
             quote! {
-                ::leptos::reactive::owner::Owner::new().with(|| {
-                    ::leptos::reactive::owner::Owner::with_hydration(move || {
-                        ::leptos::tachys::reactive_graph::OwnedView::new({
-                            #body_name(#prop_names)
-                        })
-                    })
+                ::leptos::reactive::owner::Owner::with_hydration(move || {
+                    #body_name(#prop_names)
                 })
             }
         } else {
@@ -299,7 +275,7 @@ impl ToTokens for Model {
         } else if cfg!(erase_components) {
             quote! {
                 ::leptos::prelude::IntoAny::into_any(
-                    ::leptos::reactive::graph::untrack_with_diagnostics(
+                    ::leptos::prelude::untrack(
                         move || {
                             #tracing_guard_expr
                             #tracing_props_expr
@@ -310,7 +286,7 @@ impl ToTokens for Model {
             }
         } else {
             quote! {
-                ::leptos::reactive::graph::untrack_with_diagnostics(
+                ::leptos::prelude::untrack(
                     move || {
                         #tracing_guard_expr
                         #tracing_props_expr
@@ -325,8 +301,8 @@ impl ToTokens for Model {
             let hydrate_fn_name = hydrate_fn_name.as_ref().unwrap();
             quote! {
                 {
-                    if ::leptos::context::use_context::<::leptos::reactive::owner::IsHydrating>()
-                        .map(|h| h.0)
+                    if ::leptos::reactive::owner::Owner::current_shared_context()
+                        .map(|sc| sc.get_is_hydrating())
                         .unwrap_or(false) {
                         ::leptos::either::Either::Left(
                             #component
@@ -363,23 +339,9 @@ impl ToTokens for Model {
                     let children = Box::new(|| {
                         let sc = ::leptos::reactive::owner::Owner::current_shared_context().unwrap();
                         let prev = sc.get_is_hydrating();
-                        let owner = ::leptos::reactive::owner::Owner::new();
-                        let value = owner.clone().with(|| {
-                            ::leptos::reactive::owner::Owner::with_no_hydration(move || {
-                                ::leptos::tachys::reactive_graph::OwnedView::new({
-                                    ::leptos::tachys::html::islands::IslandChildren::new_with_on_hydrate(
-                                        children(),
-                                        {
-                                            let owner = owner.clone();
-                                            move || {
-                                                owner.set()
-                                            }
-                                        }
-
-                                    )
-                                }).into_any()
-                            })
-                        });
+                        let value = ::leptos::reactive::owner::Owner::with_no_hydration(||
+                            ::leptos::tachys::html::islands::IslandChildren::new(children()).into_any()
+                        );
                         sc.set_is_hydrating(prev);
                         value
                     });
@@ -462,21 +424,20 @@ impl ToTokens for Model {
                     };
                 let children = if is_island_with_children {
                     quote! {
-                        .children({
-                            let owner = leptos::reactive::owner::Owner::current();
-                            Box::new(move || {
+                        .children({Box::new(|| {
                             use leptos::tachys::view::any_view::IntoAny;
-                            ::leptos::tachys::html::islands::IslandChildren::new_with_on_hydrate(
-                                (),
-                                {
-                                    let owner = owner.clone();
-                                    move || {
-                                        if let Some(owner) = &owner {
-                                            owner.set()
-                                        }
-                                    }
-                                }
+                            ::leptos::tachys::html::islands::IslandChildren::new(
+                                // TODO owner restoration for context
+                                ()
                             ).into_any()})})
+                        //.children(children)
+                        /*.children(Box::new(|| {
+                            use leptos::tachys::view::any_view::IntoAny;
+                            ::leptos::tachys::html::islands::IslandChildren::new(
+                                // TODO owner restoration for context
+                                ()
+                            ).into_any()
+                        }))*/
                     }
                 } else {
                     quote! {}
@@ -568,7 +529,7 @@ impl ToTokens for Model {
             #tracing_instrument_attr
             #vis fn #name #impl_generics (
                 #props_arg
-            ) #ret
+            ) #ret #(+ #lifetimes)*
             #where_clause
             {
                 #body
@@ -694,44 +655,14 @@ impl Prop {
                 abort!(e.span(), e.to_string());
             });
 
-        let name = match *typed.pat {
-            Pat::Ident(i) => {
-                if let Some(name) = &prop_opts.name {
-                    PatIdent {
-                        attrs: vec![],
-                        by_ref: None,
-                        mutability: None,
-                        ident: Ident::new(name, i.span()),
-                        subpat: None,
-                    }
-                } else {
-                    i
-                }
-            }
-            Pat::Struct(_) | Pat::Tuple(_) | Pat::TupleStruct(_) => {
-                if let Some(name) = &prop_opts.name {
-                    PatIdent {
-                        attrs: vec![],
-                        by_ref: None,
-                        mutability: None,
-                        ident: Ident::new(name, typed.pat.span()),
-                        subpat: None,
-                    }
-                } else {
-                    abort!(
-                        typed.pat,
-                        "destructured props must be given a name e.g. \
-                         #[prop(name = \"data\")]"
-                    );
-                }
-            }
-            _ => {
-                abort!(
-                    typed.pat,
-                    "only `prop: bool` style types are allowed within the \
-                     `#[component]` macro"
-                );
-            }
+        let name = if let Pat::Ident(i) = *typed.pat {
+            i
+        } else {
+            abort!(
+                typed.pat,
+                "only `prop: bool` style types are allowed within the \
+                 `#[component]` macro"
+            );
         };
 
         Self {
@@ -934,7 +865,6 @@ struct PropOpt {
     default: Option<syn::Expr>,
     into: bool,
     attrs: bool,
-    name: Option<String>,
 }
 
 struct TypedBuilderOpts {

leptos_macro/src/lazy.rs

@@ -1,32 +0,0 @@
-use convert_case::{Case, Casing};
-use proc_macro::TokenStream;
-use proc_macro2::Ident;
-use proc_macro_error2::abort;
-use quote::quote;
-use syn::{spanned::Spanned, ItemFn};
-
-pub fn lazy_impl(
-    _args: proc_macro::TokenStream,
-    s: TokenStream,
-) -> TokenStream {
-    let fun = syn::parse::<ItemFn>(s).unwrap_or_else(|e| {
-        abort!(e.span(), "`lazy` can only be used on a function")
-    });
-    if fun.sig.asyncness.is_none() {
-        abort!(
-            fun.sig.asyncness.span(),
-            "`lazy` can only be used on an async function"
-        )
-    }
-
-    let converted_name = Ident::new(
-        &fun.sig.ident.to_string().to_case(Case::Snake),
-        fun.sig.ident.span(),
-    );
-
-    quote! {
-        #[cfg_attr(feature = "split", wasm_split::wasm_split(#converted_name))]
-        #fun
-    }
-    .into()
-}

leptos_macro/src/lib.rs

@@ -1,5 +1,3 @@
-//! Macros for use with the Leptos framework.
-
 #![cfg_attr(feature = "nightly", feature(proc_macro_span))]
 #![forbid(unsafe_code)]
 // to prevent warnings from popping up when a nightly feature is stabilized
@@ -7,7 +5,6 @@
 // FIXME? every use of quote! {} is warning here -- false positive?
 #![allow(unknown_lints)]
 #![allow(private_macro_use)]
-#![deny(missing_docs)]
 
 #[macro_use]
 extern crate proc_macro_error2;
@@ -23,7 +20,6 @@ mod params;
 mod view;
 use crate::component::unmodified_fn_name_from_fn_name;
 mod component;
-mod lazy;
 mod memo;
 mod slice;
 mod slot;
@@ -273,8 +269,8 @@ pub fn view(tokens: TokenStream) -> TokenStream {
     view_macro_impl(tokens, false)
 }
 
-/// The `template` macro behaves like [`view`](view!), except that it wraps the entire tree in a
-/// [`ViewTemplate`](https://docs.rs/leptos/0.7.0-gamma3/leptos/prelude/struct.ViewTemplate.html). This optimizes creation speed by rendering
+/// The `template` macro behaves like [`view`], except that it wraps the entire tree in a
+/// [`ViewTemplate`](leptos::prelude::ViewTemplate). This optimizes creation speed by rendering
 /// most of the view into a `<template>` tag with HTML rendered at compile time, then hydrating it.
 /// In exchange, there is a small binary size overhead.
 #[proc_macro_error2::proc_macro_error]
@@ -367,7 +363,7 @@ fn normalized_call_site(site: proc_macro::Span) -> Option<String> {
     }
 }
 
-/// This behaves like the [`view`](view!) macro, but loads the view from an external file instead of
+/// This behaves like the [`view`] macro, but loads the view from an external file instead of
 /// parsing it inline.
 ///
 /// This is designed to allow editing views in a separate file, if this improves a user's workflow.
@@ -560,10 +556,10 @@ pub fn component(args: proc_macro::TokenStream, s: TokenStream) -> TokenStream {
 }
 
 /// Defines a component as an interactive island when you are using the
-/// `islands` feature of Leptos. Apart from the macro name,
+/// `experimental-islands` feature of Leptos. Apart from the macro name,
 /// the API is the same as the [`component`](macro@component) macro.
 ///
-/// When you activate the `islands` feature, every `#[component]`
+/// When you activate the `experimental-islands` feature, every `#[component]`
 /// is server-only by default. This "default to server" behavior is important:
 /// you opt into shipping code to the client, rather than opting out. You can
 /// opt into client-side interactivity for any given component by changing from
@@ -640,7 +636,7 @@ pub fn island(args: proc_macro::TokenStream, s: TokenStream) -> TokenStream {
             abort!(
                 transparent,
                 "only `transparent` is supported";
-                help = "try `#[island(transparent)]` or `#[island]`"
+                help = "try `#[component(transparent)]` or `#[component]`"
             );
         }
 
@@ -677,21 +673,17 @@ fn component_macro(
             #[allow(non_snake_case, dead_code, clippy::too_many_arguments, clippy::needless_lifetimes)]
             #unexpanded
         }
-    } else {
-        match dummy {
-            Ok(mut dummy) => {
-                dummy.sig.ident = unmodified_fn_name_from_fn_name(&dummy.sig.ident);
-                quote! {
-                    #[doc(hidden)]
-                    #[allow(non_snake_case, dead_code, clippy::too_many_arguments, clippy::needless_lifetimes)]
-                    #dummy
-                }
-            }
-            Err(e) => {
-                proc_macro_error2::abort!(e.span(), e);
-            }
+    } else if let Ok(mut dummy) = dummy {
+        dummy.sig.ident = unmodified_fn_name_from_fn_name(&dummy.sig.ident);
+        quote! {
+            #[doc(hidden)]
+            #[allow(non_snake_case, dead_code, clippy::too_many_arguments, clippy::needless_lifetimes)]
+            #dummy
         }
-    }.into()
+    } else {
+        quote! {}
+    }
+    .into()
 }
 
 /// Annotates a struct so that it can be used with your Component as a `slot`.
@@ -1007,17 +999,3 @@ pub fn slice(input: TokenStream) -> TokenStream {
 pub fn memo(input: TokenStream) -> TokenStream {
     memo::memo_impl(input)
 }
-
-/// The `#[lazy]` macro marks an `async` function as a function that can be lazy-loaded from a
-/// separate (WebAssembly) binary.
-///
-/// The first time the function is called, calling the function will first load that other binary,
-/// then call the function. On subsequent call it will be called immediately, but still return
-/// asynchronously to maintain the same API.
-///
-/// All parameters and output types should be concrete types, with no generics.
-#[proc_macro_attribute]
-#[proc_macro_error]
-pub fn lazy(args: proc_macro::TokenStream, s: TokenStream) -> TokenStream {
-    lazy::lazy_impl(args, s)
-}

leptos_macro/src/params.rs

@@ -13,13 +13,7 @@ pub fn params_impl(ast: &syn::DeriveInput) -> proc_macro::TokenStream {
             .named
             .iter()
             .map(|field| {
-				let field_name_string = &field
-                    .ident
-                    .as_ref()
-                    .expect("expected named struct fields")
-                    .to_string()
-                    .trim_start_matches("r#")
-                    .to_owned();
+				let field_name_string = &field.ident.as_ref().expect("expected named struct fields").to_string();
 				let ident = &field.ident;
 				let ty = &field.ty;
 				let span = field.span();

leptos_macro/src/view/component_builder.rs

@@ -108,12 +108,9 @@ pub(crate) fn component_to_tokens(
             let KeyedAttributeValue::Binding(binding) = &attr.possible_value
             else {
                 if let Some(ident) = attr.key.to_string().strip_prefix("let:") {
-                    let span = match &attr.key {
-                        NodeName::Punctuated(path) => path[1].span(),
-                        _ => unreachable!(),
-                    };
-                    let ident1 = format_ident!("{ident}", span = span);
-                    return Some(quote_spanned! { span => #ident1 });
+                    let ident1 =
+                        format_ident!("{ident}", span = attr.key.span());
+                    return Some(quote! { #ident1 });
                 } else {
                     return None;
                 }
@@ -171,7 +168,7 @@ pub(crate) fn component_to_tokens(
 
     let spreads = (!(spreads.is_empty())).then(|| {
         quote! {
-            .add_any_attr((#(#spreads,)*).into_attr())
+            .add_any_attr((#(#spreads,)*))
         }
     });
 

leptos_macro/src/view/mod.rs

@@ -154,12 +154,7 @@ fn is_inert_element(orig_node: &Node<impl CustomNode>) -> bool {
                                         Some(value) => {
                                             matches!(&value.value, KVAttributeValue::Expr(expr) if {
                                                 if let Expr::Lit(lit) = expr {
-                                                    let key = attr.key.to_string();
-                                                    if key.starts_with("style:") || key.starts_with("prop:") || key.starts_with("on:") || key.starts_with("use:") || key.starts_with("bind") {
-                                                        false
-                                                    } else {
-                                                        matches!(&lit.lit, Lit::Str(_))
-                                                    }
+                                                    matches!(&lit.lit, Lit::Str(_))
                                                 } else {
                                                     false
                                                 }
@@ -202,7 +197,7 @@ enum InertElementBuilder<'a> {
     },
 }
 
-impl ToTokens for InertElementBuilder<'_> {
+impl<'a> ToTokens for InertElementBuilder<'a> {
     fn to_tokens(&self, tokens: &mut TokenStream) {
         match self {
             InertElementBuilder::GlobalClass { strs, .. } => {
@@ -224,7 +219,7 @@ enum GlobalClassItem<'a> {
     String(String),
 }
 
-impl ToTokens for GlobalClassItem<'_> {
+impl<'a> ToTokens for GlobalClassItem<'a> {
     fn to_tokens(&self, tokens: &mut TokenStream) {
         let addl_tokens = match self {
             GlobalClassItem::Global(v) => v.to_token_stream(),
@@ -657,18 +652,6 @@ pub(crate) fn element_to_tokens(
             },
             _ => None,
         };
-
-        if let NodeAttribute::Attribute(a) = a {
-            if let Some(Tuple(_)) = a.value() {
-                return Ordering::Greater;
-            }
-        }
-        if let NodeAttribute::Attribute(b) = b {
-            if let Some(Tuple(_)) = b.value() {
-                return Ordering::Less;
-            }
-        }
-
         match (key_a.as_deref(), key_b.as_deref()) {
             (Some("class"), Some("class")) | (Some("style"), Some("style")) => {
                 Ordering::Equal
@@ -772,7 +755,7 @@ pub(crate) fn element_to_tokens(
             let name = node.name().to_string();
             // link custom ident to name span for IDE docs
             let custom = Ident::new("custom", name.span());
-            quote_spanned! { node.name().span() => ::leptos::tachys::html::element::#custom(#name) }
+            quote! { ::leptos::tachys::html::element::#custom(#name) }
         } else if is_svg_element(&tag) {
             parent_type = TagType::Svg;
             let name = if tag == "use" || tag == "use_" {
@@ -780,33 +763,33 @@ pub(crate) fn element_to_tokens(
             } else {
                 name.to_token_stream()
             };
-            quote_spanned! { node.name().span() => ::leptos::tachys::svg::#name() }
+            quote! { ::leptos::tachys::svg::#name() }
         } else if is_math_ml_element(&tag) {
             parent_type = TagType::Math;
-            quote_spanned! { node.name().span() => ::leptos::tachys::mathml::#name() }
+            quote! { ::leptos::tachys::mathml::#name() }
         } else if is_ambiguous_element(&tag) {
             match parent_type {
                 TagType::Unknown => {
                     // We decided this warning was too aggressive, but I'll leave it here in case we want it later
                     /* proc_macro_error2::emit_warning!(name.span(), "The view macro is assuming this is an HTML element, \
                     but it is ambiguous; if it is an SVG or MathML element, prefix with svg:: or math::"); */
-                    quote_spanned! { node.name().span() =>
+                    quote! {
                         ::leptos::tachys::html::element::#name()
                     }
                 }
                 TagType::Html => {
-                    quote_spanned! { node.name().span() => ::leptos::tachys::html::element::#name() }
+                    quote! { ::leptos::tachys::html::element::#name() }
                 }
                 TagType::Svg => {
-                    quote_spanned! { node.name().span() => ::leptos::tachys::svg::#name() }
+                    quote! { ::leptos::tachys::svg::#name() }
                 }
                 TagType::Math => {
-                    quote_spanned! { node.name().span() => ::leptos::tachys::math::#name() }
+                    quote! { ::leptos::tachys::math::#name() }
                 }
             }
         } else {
             parent_type = TagType::Html;
-            quote_spanned! { name.span() => ::leptos::tachys::html::element::#name() }
+            quote! { ::leptos::tachys::html::element::#name() }
         };
 
         /* TODO restore this
@@ -1018,11 +1001,7 @@ pub(crate) fn attribute_absolute(
 ) -> Option<TokenStream> {
     let key = node.key.to_string();
     let contains_dash = key.contains('-');
-    let attr_colon = key.starts_with("attr:")
-        || key.starts_with("style:")
-        || key.starts_with("class:")
-        || key.starts_with("prop:")
-        || key.starts_with("use:");
+    let attr_colon = key.starts_with("attr:");
     // anything that follows the x:y pattern
     match &node.key {
         NodeName::Punctuated(parts) if !contains_dash || attr_colon => {
@@ -1134,11 +1113,6 @@ pub(crate) fn attribute_absolute(
                     ::leptos::tachys::html::attribute::custom::custom_attribute(#name, #value)
                 }
             }
-            else if name == "node_ref" {
-                quote! {
-                    ::leptos::tachys::html::node_ref::#key(#value)
-                }
-            }
             else {
                 quote! {
                     ::leptos::tachys::html::attribute::#key(#value)
@@ -1157,14 +1131,8 @@ pub(crate) fn two_way_binding_to_tokens(
     let ident =
         format_ident!("{}", name.to_case(UpperCamel), span = node.key.span());
 
-    if name == "group" {
-        quote! {
-            .bind(leptos::tachys::reactive_graph::bind::#ident, #value)
-        }
-    } else {
-        quote! {
-            .bind(::leptos::attr::#ident, #value)
-        }
+    quote! {
+        .bind(::leptos::attr::#ident, #value)
     }
 }
 
@@ -1185,7 +1153,8 @@ pub(crate) fn event_type_and_handler(
 ) -> (TokenStream, TokenStream, TokenStream) {
     let handler = attribute_value(node, false);
 
-    let (event_type, is_custom, options) = parse_event_name(name);
+    let (event_type, is_custom, is_force_undelegated, is_targeted) =
+        parse_event_name(name);
 
     let event_name_ident = match &node.key {
         NodeName::Punctuated(parts) => {
@@ -1203,17 +1172,11 @@ pub(crate) fn event_type_and_handler(
         }
         _ => unreachable!(),
     };
-    let capture_ident = match &node.key {
-        NodeName::Punctuated(parts) => {
-            parts.iter().find(|part| part.to_string() == "capture")
-        }
-        _ => unreachable!(),
-    };
     let on = match &node.key {
         NodeName::Punctuated(parts) => &parts[0],
         _ => unreachable!(),
     };
-    let on = if options.targeted {
+    let on = if is_targeted {
         Ident::new("on_target", on.span()).to_token_stream()
     } else {
         on.to_token_stream()
@@ -1226,29 +1189,15 @@ pub(crate) fn event_type_and_handler(
         event_type
     };
 
-    let event_type = quote! {
-        ::leptos::tachys::html::event::#event_type
-    };
-    let event_type = if options.captured {
-        let capture = if let Some(capture) = capture_ident {
-            quote! { #capture }
-        } else {
-            quote! { capture }
-        };
-        quote! { ::leptos::tachys::html::event::#capture(#event_type) }
-    } else {
-        event_type
-    };
-
-    let event_type = if options.undelegated {
+    let event_type = if is_force_undelegated {
         let undelegated = if let Some(undelegated) = undelegated_ident {
             quote! { #undelegated }
         } else {
             quote! { undelegated }
         };
-        quote! { ::leptos::tachys::html::event::#undelegated(#event_type) }
+        quote! { ::leptos::tachys::html::event::#undelegated(::leptos::tachys::html::event::#event_type) }
     } else {
-        event_type
+        quote! { ::leptos::tachys::html::event::#event_type }
     };
 
     (on, event_type, handler)
@@ -1454,22 +1403,13 @@ fn is_ambiguous_element(tag: &str) -> bool {
     tag == "a" || tag == "script" || tag == "title"
 }
 
-fn parse_event(event_name: &str) -> (String, EventNameOptions) {
-    let undelegated = event_name.contains(":undelegated");
-    let targeted = event_name.contains(":target");
-    let captured = event_name.contains(":capture");
+fn parse_event(event_name: &str) -> (String, bool, bool) {
+    let is_undelegated = event_name.contains(":undelegated");
+    let is_targeted = event_name.contains(":target");
     let event_name = event_name
         .replace(":undelegated", "")
-        .replace(":target", "")
-        .replace(":capture", "");
-    (
-        event_name,
-        EventNameOptions {
-            undelegated,
-            targeted,
-            captured,
-        },
-    )
+        .replace(":target", "");
+    (event_name, is_undelegated, is_targeted)
 }
 
 /// Escapes Rust keywords that are also HTML attribute names
@@ -1661,17 +1601,8 @@ const TYPED_EVENTS: [&str; 126] = [
 
 const CUSTOM_EVENT: &str = "Custom";
 
-#[derive(Debug)]
-pub(crate) struct EventNameOptions {
-    undelegated: bool,
-    targeted: bool,
-    captured: bool,
-}
-
-pub(crate) fn parse_event_name(
-    name: &str,
-) -> (TokenStream, bool, EventNameOptions) {
-    let (name, options) = parse_event(name);
+pub(crate) fn parse_event_name(name: &str) -> (TokenStream, bool, bool, bool) {
+    let (name, is_force_undelegated, is_targeted) = parse_event(name);
 
     let (event_type, is_custom) = TYPED_EVENTS
         .binary_search(&name.as_str())
@@ -1687,7 +1618,7 @@ pub(crate) fn parse_event_name(
     } else {
         event_type
     };
-    (event_type, is_custom, options)
+    (event_type, is_custom, is_force_undelegated, is_targeted)
 }
 
 fn convert_to_snake_case(name: String) -> String {
@@ -1704,7 +1635,7 @@ pub(crate) fn ident_from_tag_name(tag_name: &NodeName) -> Ident {
             .path
             .segments
             .iter()
-            .next_back()
+            .last()
             .map(|segment| segment.ident.clone())
             .expect("element needs to have a name"),
         NodeName::Block(_) => {
@@ -1775,7 +1706,7 @@ fn tuple_name(name: &str, node: &KeyedAttribute) -> TupleName {
     TupleName::None
 }
 
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug)]
 enum TupleName {
     None,
     Str(String),

leptos_macro/tests/component.rs

@@ -1,15 +1,6 @@
 use core::num::NonZeroUsize;
 use leptos::prelude::*;
 
-#[derive(PartialEq, Debug)]
-struct UserInfo {
-    user_id: String,
-    email: String,
-}
-
-#[derive(PartialEq, Debug)]
-struct Admin(bool);
-
 #[component]
 fn Component(
     #[prop(optional)] optional: bool,
@@ -19,10 +10,6 @@ fn Component(
     #[prop(default = NonZeroUsize::new(10).unwrap())] default: NonZeroUsize,
     #[prop(into)] into: String,
     impl_trait: impl Fn() -> i32 + 'static,
-    #[prop(name = "data")] UserInfo { email, user_id }: UserInfo,
-    #[prop(name = "tuple")] (name, id): (String, i32),
-    #[prop(name = "tuple_struct")] Admin(is_admin): Admin,
-    #[prop(name = "outside_name")] inside_name: i32,
 ) -> impl IntoView {
     _ = optional;
     _ = optional_into;
@@ -31,12 +18,6 @@ fn Component(
     _ = default;
     _ = into;
     _ = impl_trait;
-    _ = email;
-    _ = user_id;
-    _ = id;
-    _ = name;
-    _ = is_admin;
-    _ = inside_name;
 }
 
 #[test]
@@ -45,13 +26,6 @@ fn component() {
         .into("")
         .strip_option(9)
         .impl_trait(|| 42)
-        .data(UserInfo {
-            email: "em@il".into(),
-            user_id: "1".into(),
-        })
-        .tuple(("Joe".into(), 12))
-        .tuple_struct(Admin(true))
-        .outside_name(1)
         .build();
     assert!(!cp.optional);
     assert_eq!(cp.optional_into, None);
@@ -60,16 +34,6 @@ fn component() {
     assert_eq!(cp.default, NonZeroUsize::new(10).unwrap());
     assert_eq!(cp.into, "");
     assert_eq!((cp.impl_trait)(), 42);
-    assert_eq!(
-        cp.data,
-        UserInfo {
-            email: "em@il".into(),
-            user_id: "1".into(),
-        }
-    );
-    assert_eq!(cp.tuple, ("Joe".into(), 12));
-    assert_eq!(cp.tuple_struct, Admin(true));
-    assert_eq!(cp.outside_name, 1);
 }
 
 #[test]
@@ -81,41 +45,12 @@ fn component_nostrip() {
             strip_option=9
             into=""
             impl_trait=|| 42
-            data=UserInfo {
-                email: "em@il".into(),
-                user_id: "1".into(),
-            }
-            tuple=("Joe".into(), 12)
-            tuple_struct=Admin(true)
-            outside_name=1
         />
         <Component
             nostrip:optional_into=Some("foo")
             strip_option=9
             into=""
             impl_trait=|| 42
-            data=UserInfo {
-                email: "em@il".into(),
-                user_id: "1".into(),
-            }
-            tuple=("Joe".into(), 12)
-            tuple_struct=Admin(true)
-            outside_name=1
         />
     };
 }
-
-#[component]
-fn WithLifetime<'a>(data: &'a str) -> impl IntoView {
-    _ = data;
-    "static lifetime"
-}
-
-#[test]
-fn returns_static_lifetime() {
-    #[allow(unused)]
-    fn can_return_impl_intoview_from_body() -> impl IntoView {
-        let val = String::from("non_static_lifetime");
-        WithLifetime(WithLifetimeProps::builder().data(&val).build())
-    }
-}

leptos_macro/tests/params.rs

@@ -1,28 +0,0 @@
-use leptos::prelude::*;
-use leptos_router::params::Params;
-
-#[derive(PartialEq, Debug, Params)]
-struct UserInfo {
-    user_id: Option<String>,
-    email: Option<String>,
-    r#type: Option<i32>,
-    not_found: Option<i32>,
-}
-
-#[test]
-fn params_test() {
-    let mut map = leptos_router::params::ParamsMap::new();
-    map.insert("user_id", "12".to_owned());
-    map.insert("email", "em@il".to_owned());
-    map.insert("type", "12".to_owned());
-    let user_info = UserInfo::from_map(&map).unwrap();
-    assert_eq!(
-        UserInfo {
-            email: Some("em@il".to_owned()),
-            user_id: Some("12".to_owned()),
-            r#type: Some(12),
-            not_found: None,
-        },
-        user_info
-    );
-}

leptos_macro/tests/ui/component.rs

@@ -44,10 +44,4 @@ fn default_with_invalid_value(
     _ = default;
 }
 
-#[component]
-fn destructure_without_name((default, value): (bool, i32)) -> impl IntoView {
-    _ = default;
-    _ = value;
-}
-
 fn main() {}

leptos_macro/tests/ui/component.stderr

@@ -1,4 +1,4 @@
-error: supported fields are `optional`, `optional_no_strip`, `strip_option`, `default`, `into`, `attrs` and `name`
+error: supported fields are `optional`, `optional_no_strip`, `strip_option`, `default`, `into` and `attrs`
   --> tests/ui/component.rs:10:31
    |
 10 | fn unknown_prop_option(#[prop(hello)] test: bool) -> impl IntoView {
@@ -41,9 +41,3 @@ error: unexpected end of input, expected one of: identifier, `::`, `<`, `_`, lit
    | ^^^^^^^^^^^^
    |
    = note: this error originates in the attribute macro `component` (in Nightly builds, run with -Z macro-backtrace for more info)
-
-error: destructured props must be given a name e.g. #[prop(name = "data")]
-  --> tests/ui/component.rs:48:29
-   |
-48 | fn destructure_without_name((default, value): (bool, i32)) -> impl IntoView {
-   |                             ^^^^^^^^^^^^^^^^

leptos_macro/tests/ui/component_absolute.stderr

@@ -1,4 +1,4 @@
-error: supported fields are `optional`, `optional_no_strip`, `strip_option`, `default`, `into`, `attrs` and `name`
+error: supported fields are `optional`, `optional_no_strip`, `strip_option`, `default`, `into` and `attrs`
  --> tests/ui/component_absolute.rs:5:31
   |
 5 | fn unknown_prop_option(#[prop(hello)] test: bool) -> impl ::leptos::IntoView {

leptos_server/Cargo.toml

@@ -11,11 +11,11 @@ edition.workspace = true
 
 [dependencies]
 base64 = "0.22.1"
-codee = { version = "0.3.0", features = ["json_serde"] }
+codee = { version = "0.2.0", features = ["json_serde"] }
 hydration_context = { workspace = true }
 reactive_graph = { workspace = true, features = ["hydration"] }
 server_fn = { workspace = true }
-tracing = { version = "0.1.41", optional = true }
+tracing = { version = "0.1.40", optional = true }
 futures = "0.3.31"
 
 any_spawner = { workspace = true }
@@ -25,9 +25,9 @@ send_wrapper = "0.6"
 
 # serialization formats
 serde = { version = "1.0" }
-js-sys = { version = "0.3.74", optional = true }
-wasm-bindgen = { version = "0.2.100", optional = true }
-serde_json = { workspace = true }
+js-sys = { version = "0.3.72", optional = true }
+wasm-bindgen = { version = "0.2.95", optional = true }
+serde_json = { version = "1.0" }
 
 [features]
 ssr = []
@@ -44,6 +44,3 @@ denylist = ["tracing"]
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--generate-link-to-definition"]
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(leptos_debuginfo)'] }

leptos_server/src/action.rs

@@ -6,10 +6,6 @@ use reactive_graph::{
 use server_fn::{error::ServerFnErrorSerde, ServerFn, ServerFnError};
 use std::{ops::Deref, panic::Location, sync::Arc};
 
-/// An error that can be caused by a server action.
-///
-/// This is used for propagating errors from the server to the client when JS/WASM are not
-/// supported.
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct ServerActionError {
     path: Arc<str>,
@@ -17,7 +13,6 @@ pub struct ServerActionError {
 }
 
 impl ServerActionError {
-    /// Creates a new error associated with the given path.
     pub fn new(path: &str, err: &str) -> Self {
         Self {
             path: path.into(),
@@ -25,25 +20,22 @@ impl ServerActionError {
         }
     }
 
-    /// The path with which this error is associated.
     pub fn path(&self) -> &str {
         &self.path
     }
 
-    /// The error message.
     pub fn err(&self) -> &str {
         &self.err
     }
 }
 
-/// An [`ArcAction`] that can be used to call a server function.
 pub struct ArcServerAction<S>
 where
     S: ServerFn + 'static,
     S::Output: 'static,
 {
     inner: ArcAction<S, Result<S::Output, ServerFnError<S::Error>>>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -53,7 +45,6 @@ where
     S::Output: Send + Sync + 'static,
     S::Error: Send + Sync + 'static,
 {
-    /// Creates a new [`ArcAction`] that will call the server function `S` when dispatched.
     #[track_caller]
     pub fn new() -> Self {
         let err = use_context::<ServerActionError>().and_then(|error| {
@@ -65,7 +56,7 @@ where
             inner: ArcAction::new_with_value(err, |input: &S| {
                 S::run_on_client(input.clone())
             }),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -91,7 +82,7 @@ where
     fn clone(&self) -> Self {
         Self {
             inner: self.inner.clone(),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: self.defined_at,
         }
     }
@@ -114,25 +105,24 @@ where
     S::Output: 'static,
 {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
     }
 }
 
-/// An [`Action`] that can be used to call a server function.
 pub struct ServerAction<S>
 where
     S: ServerFn + 'static,
     S::Output: 'static,
 {
     inner: Action<S, Result<S::Output, ServerFnError<S::Error>>>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -142,7 +132,6 @@ where
     S::Output: Send + Sync + 'static,
     S::Error: Send + Sync + 'static,
 {
-    /// Creates a new [`Action`] that will call the server function `S` when dispatched.
     pub fn new() -> Self {
         let err = use_context::<ServerActionError>().and_then(|error| {
             (error.path() == S::PATH)
@@ -153,7 +142,7 @@ where
             inner: Action::new_with_value(err, |input: &S| {
                 S::run_on_client(input.clone())
             }),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -217,11 +206,11 @@ where
     S::Output: 'static,
 {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }

leptos_server/src/lib.rs

@@ -1,6 +1,4 @@
-//! Utilities for communicating between the server and the client with Leptos.
-
-#![deny(missing_docs)]
+//#![deny(missing_docs)]
 #![forbid(unsafe_code)]
 
 mod action;
@@ -15,25 +13,135 @@ pub use once_resource::*;
 mod resource;
 pub use resource::*;
 mod shared;
+////! # Leptos Server Functions
+////!
+////! This package is based on a simple idea: sometimes it’s useful to write functions
+////! that will only run on the server, and call them from the client.
+////!
+////! If you’re creating anything beyond a toy app, you’ll need to do this all the time:
+////! reading from or writing to a database that only runs on the server, running expensive
+////! computations using libraries you don’t want to ship down to the client, accessing
+////! APIs that need to be called from the server rather than the client for CORS reasons
+////! or because you need a secret API key that’s stored on the server and definitely
+////! shouldn’t be shipped down to a user’s browser.
+////!
+////! Traditionally, this is done by separating your server and client code, and by setting
+////! up something like a REST API or GraphQL API to allow your client to fetch and mutate
+////! data on the server. This is fine, but it requires you to write and maintain your code
+////! in multiple separate places (client-side code for fetching, server-side functions to run),
+////! as well as creating a third thing to manage, which is the API contract between the two.
+////!
+////! This package provides two simple primitives that allow you instead to write co-located,
+////! isomorphic server functions. (*Co-located* means you can write them in your app code so
+////! that they are “located alongside” the client code that calls them, rather than separating
+////! the client and server sides. *Isomorphic* means you can call them from the client as if
+////! you were simply calling a function; the function call has the “same shape” on the client
+////! as it does on the server.)
+////!
+////! ### `#[server]`
+////!
+////! The [`#[server]`](https://docs.rs/leptos/latest/leptos/attr.server.html) macro allows you to annotate a function to
+////! indicate that it should only run on the server (i.e., when you have an `ssr` feature in your
+////! crate that is enabled).
+////!
+////! ```rust,ignore
+////! use leptos::prelude::*;
+////! #[server(ReadFromDB)]
+////! async fn read_posts(how_many: usize, query: String) -> Result<Vec<Posts>, ServerFnError> {
+////!   // do some server-only work here to access the database
+////!   let posts = todo!();;
+////!   Ok(posts)
+////! }
+////!
+////! // call the function
+////! spawn_local(async {
+////!   let posts = read_posts(3, "my search".to_string()).await;
+////!   log::debug!("posts = {posts:#?}");
+////! });
+////! ```
+////!
+////! If you call this function from the client, it will serialize the function arguments and `POST`
+////! them to the server as if they were the inputs in `<form method="POST">`.
+////!
+////! Here’s what you need to remember:
+////! - **Server functions must be `async`.** Even if the work being done inside the function body
+////!   can run synchronously on the server, from the client’s perspective it involves an asynchronous
+////!   function call.
+////! - **Server functions must return `Result<T, ServerFnError>`.** Even if the work being done
+////!   inside the function body can’t fail, the processes of serialization/deserialization and the
+////!   network call are fallible.
+////! - **Return types must be [Serializable](leptos_reactive::Serializable).**
+////!   This should be fairly obvious: we have to serialize arguments to send them to the server, and we
+////!   need to deserialize the result to return it to the client.
+////! - **Arguments must be implement [serde::Serialize].** They are serialized as an `application/x-www-form-urlencoded`
+////!   form data using [`serde_qs`](https://docs.rs/serde_qs/latest/serde_qs/) or as `application/cbor`
+////!   using [`cbor`](https://docs.rs/cbor/latest/cbor/). **Note**: You should explicitly include `serde` with the
+////!   `derive` feature enabled in your `Cargo.toml`. You can do this by running `cargo add serde --features=derive`.
+////! - Context comes from the server. [`use_context`](leptos_reactive::use_context) can be used to access specific
+////!   server-related data, as documented in the server integrations. This allows accessing things like HTTP request
+////!   headers as needed. However, server functions *not* have access to reactive state that exists in the client.
+////!
+////! ## Server Function Encodings
+////!
+////! By default, the server function call is a `POST` request that serializes the arguments as URL-encoded form data in the body
+////! of the request. But there are a few other methods supported. Optionally, we can provide another argument to the `#[server]`
+////! macro to specify an alternate encoding:
+////!
+////! ```rust,ignore
+////! #[server(AddTodo, "/api", "Url")]
+////! #[server(AddTodo, "/api", "GetJson")]
+////! #[server(AddTodo, "/api", "Cbor")]
+////! #[server(AddTodo, "/api", "GetCbor")]
+////! ```
+////!
+////! The four options use different combinations of HTTP verbs and encoding methods:
+////!
+////! | Name              | Method | Request     | Response |
+////! | ----------------- | ------ | ----------- | -------- |
+////! | **Url** (default) | POST   | URL encoded | JSON     |
+////! | **GetJson**       | GET    | URL encoded | JSON     |
+////! | **Cbor**          | POST   | CBOR        | CBOR     |
+////! | **GetCbor**       | GET    | URL encoded | CBOR     |
+////!
+////! In other words, you have two choices:
+////!
+////! - `GET` or `POST`? This has implications for things like browser or CDN caching; while `POST` requests should not be cached,
+////! `GET` requests can be.
+////! - Plain text (arguments sent with URL/form encoding, results sent as JSON) or a binary format (CBOR, encoded as a base64
+////! string)?
+////!
+////! ## Why not `PUT` or `DELETE`? Why URL/form encoding, and not JSON?**
+////!
+////! These are reasonable questions. Much of the web is built on REST API patterns that encourage the use of semantic HTTP
+////! methods like `DELETE` to delete an item from a database, and many devs are accustomed to sending data to APIs in the
+////! JSON format.
+////!
+////! The reason we use `POST` or `GET` with URL-encoded data by default is the `<form>` support. For better or for worse,
+////! HTML forms don’t support `PUT` or `DELETE`, and they don’t support sending JSON. This means that if you use anything
+////! but a `GET` or `POST` request with URL-encoded data, it can only work once WASM has loaded.
+////!
+////! The CBOR encoding is supported for historical reasons; an earlier version of server functions used a URL encoding that
+////! didn’t support nested objects like structs or vectors as server function arguments, which CBOR did. But note that the
+////! CBOR forms encounter the same issue as `PUT`, `DELETE`, or JSON: they do not degrade gracefully if the WASM version of
+////! your app is not available.
 
+//pub use server_fn::{error::ServerFnErrorErr, ServerFnError};
+
+//mod action;
+//mod multi_action;
+//pub use action::*;
+//pub use multi_action::*;
+//extern crate tracing;
 use base64::{engine::general_purpose::STANDARD_NO_PAD, DecodeError, Engine};
 pub use shared::*;
-
-/// Encodes data into a string.
 pub trait IntoEncodedString {
-    /// Encodes the data.
     fn into_encoded_string(self) -> String;
 }
 
-/// Decodes data from a string.
 pub trait FromEncodedStr {
-    /// The decoded data.
     type DecodedType<'a>: Borrow<Self>;
-
-    /// The type of an error encountered during decoding.
     type DecodingError;
 
-    /// Decodes the string.
     fn from_encoded_str(
         data: &str,
     ) -> Result<Self::DecodedType<'_>, Self::DecodingError>;

leptos_server/src/local_resource.rs

@@ -8,13 +8,8 @@ use reactive_graph::{
         ToAnySource, ToAnySubscriber,
     },
     owner::use_context,
-    signal::{
-        guards::{AsyncPlain, ReadGuard},
-        ArcRwSignal, RwSignal,
-    },
-    traits::{
-        DefinedAt, IsDisposed, ReadUntracked, Track, Update, With, Write,
-    },
+    signal::guards::{AsyncPlain, ReadGuard},
+    traits::{DefinedAt, IsDisposed, ReadUntracked},
 };
 use send_wrapper::SendWrapper;
 use std::{
@@ -22,11 +17,9 @@ use std::{
     panic::Location,
 };
 
-/// A reference-counted resource that only loads its data locally on the client.
 pub struct ArcLocalResource<T> {
     data: ArcAsyncDerived<SendWrapper<T>>,
-    refetch: ArcRwSignal<usize>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -34,18 +27,13 @@ impl<T> Clone for ArcLocalResource<T> {
     fn clone(&self) -> Self {
         Self {
             data: self.data.clone(),
-            refetch: self.refetch.clone(),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: self.defined_at,
         }
     }
 }
 
 impl<T> ArcLocalResource<T> {
-    /// Creates the resource.
-    ///
-    /// This will only begin loading data if you are on the client (i.e., if you do not have the
-    /// `ssr` feature activated).
     #[track_caller]
     pub fn new<Fut>(fetcher: impl Fn() -> Fut + 'static) -> Self
     where
@@ -72,55 +60,15 @@ impl<T> ArcLocalResource<T> {
             }
         };
         let fetcher = SendWrapper::new(fetcher);
-        let refetch = ArcRwSignal::new(0);
-        let data = {
-            let refetch = refetch.clone();
-            ArcAsyncDerived::new(move || {
-                refetch.track();
+        Self {
+            data: ArcAsyncDerived::new(move || {
                 let fut = fetcher();
                 SendWrapper::new(async move { SendWrapper::new(fut.await) })
-            })
-        };
-        Self {
-            data,
-            refetch,
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            }),
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
-
-    /// Re-runs the async function.
-    pub fn refetch(&self) {
-        *self.refetch.write() += 1;
-    }
-
-    /// Synchronously, reactively reads the current value of the resource and applies the function
-    /// `f` to its value if it is `Some(_)`.
-    #[track_caller]
-    pub fn map<U>(&self, f: impl FnOnce(&SendWrapper<T>) -> U) -> Option<U>
-    where
-        T: 'static,
-    {
-        self.data.try_with(|n| n.as_ref().map(f))?
-    }
-}
-
-impl<T, E> ArcLocalResource<Result<T, E>>
-where
-    T: 'static,
-    E: Clone + 'static,
-{
-    /// Applies the given function when a resource that returns `Result<T, E>`
-    /// has resolved and loaded an `Ok(_)`, rather than requiring nested `.map()`
-    /// calls over the `Option<Result<_, _>>` returned by the resource.
-    ///
-    /// This is useful when used with features like server functions, in conjunction
-    /// with `<ErrorBoundary/>` and `<Suspense/>`, when these other components are
-    /// left to handle the `None` and `Err(_)` states.
-    #[track_caller]
-    pub fn and_then<U>(&self, f: impl FnOnce(&T) -> U) -> Option<Result<U, E>> {
-        self.map(|data| data.as_ref().map(f).map_err(|e| e.clone()))
-    }
 }
 
 impl<T> IntoFuture for ArcLocalResource<T>
@@ -151,11 +99,11 @@ where
 
 impl<T> DefinedAt for ArcLocalResource<T> {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -172,6 +120,12 @@ where
     fn try_read_untracked(&self) -> Option<Self::Value> {
         if let Some(mut notifier) = use_context::<LocalResourceNotifier>() {
             notifier.notify();
+        } else if cfg!(feature = "ssr") {
+            panic!(
+                "Reading from a LocalResource outside Suspense in `ssr` mode \
+                 will cause the response to hang, because LocalResources are \
+                 always pending on the server."
+            );
         }
         self.data.try_read_untracked()
     }
@@ -238,11 +192,9 @@ impl<T> Subscriber for ArcLocalResource<T> {
     }
 }
 
-/// A resource that only loads its data locally on the client.
 pub struct LocalResource<T> {
     data: AsyncDerived<SendWrapper<T>>,
-    refetch: RwSignal<usize>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -255,10 +207,6 @@ impl<T> Clone for LocalResource<T> {
 impl<T> Copy for LocalResource<T> {}
 
 impl<T> LocalResource<T> {
-    /// Creates the resource.
-    ///
-    /// This will only begin loading data if you are on the client (i.e., if you do not have the
-    /// `ssr` feature activated).
     #[track_caller]
     pub fn new<Fut>(fetcher: impl Fn() -> Fut + 'static) -> Self
     where
@@ -284,7 +232,6 @@ impl<T> LocalResource<T> {
                 }
             }
         };
-        let refetch = RwSignal::new(0);
 
         Self {
             data: if cfg!(feature = "ssr") {
@@ -292,21 +239,14 @@ impl<T> LocalResource<T> {
             } else {
                 let fetcher = SendWrapper::new(fetcher);
                 AsyncDerived::new(move || {
-                    refetch.track();
                     let fut = fetcher();
                     SendWrapper::new(async move { SendWrapper::new(fut.await) })
                 })
             },
-            refetch,
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
-
-    /// Re-runs the async function.
-    pub fn refetch(&self) {
-        self.refetch.try_update(|n| *n += 1);
-    }
 }
 
 impl<T> IntoFuture for LocalResource<T>
@@ -337,11 +277,11 @@ where
 
 impl<T> DefinedAt for LocalResource<T> {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -358,6 +298,12 @@ where
     fn try_read_untracked(&self) -> Option<Self::Value> {
         if let Some(mut notifier) = use_context::<LocalResourceNotifier>() {
             notifier.notify();
+        } else if cfg!(feature = "ssr") {
+            panic!(
+                "Reading from a LocalResource outside Suspense in `ssr` mode \
+                 will cause the response to hang, because LocalResources are \
+                 always pending on the server."
+            );
         }
         self.data.try_read_untracked()
     }
@@ -442,8 +388,7 @@ impl<T: 'static> From<ArcLocalResource<T>> for LocalResource<T> {
     fn from(arc: ArcLocalResource<T>) -> Self {
         Self {
             data: arc.data.into(),
-            refetch: arc.refetch.into(),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: arc.defined_at,
         }
     }
@@ -453,8 +398,7 @@ impl<T: 'static> From<LocalResource<T>> for ArcLocalResource<T> {
     fn from(local: LocalResource<T>) -> Self {
         Self {
             data: local.data.into(),
-            refetch: local.refetch.into(),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: local.defined_at,
         }
     }

leptos_server/src/multi_action.rs

@@ -5,14 +5,13 @@ use reactive_graph::{
 use server_fn::{ServerFn, ServerFnError};
 use std::{ops::Deref, panic::Location};
 
-/// An [`ArcMultiAction`] that can be used to call a server function.
 pub struct ArcServerMultiAction<S>
 where
     S: ServerFn + 'static,
     S::Output: 'static,
 {
     inner: ArcMultiAction<S, Result<S::Output, ServerFnError<S::Error>>>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -22,14 +21,13 @@ where
     S::Output: Send + Sync + 'static,
     S::Error: Send + Sync + 'static,
 {
-    /// Creates a new [`ArcMultiAction`] which, when dispatched, will call the server function `S`.
     #[track_caller]
     pub fn new() -> Self {
         Self {
             inner: ArcMultiAction::new(|input: &S| {
                 S::run_on_client(input.clone())
             }),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -55,7 +53,7 @@ where
     fn clone(&self) -> Self {
         Self {
             inner: self.inner.clone(),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: self.defined_at,
         }
     }
@@ -78,25 +76,24 @@ where
     S::Output: 'static,
 {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
     }
 }
 
-/// A [`MultiAction`] that can be used to call a server function.
 pub struct ServerMultiAction<S>
 where
     S: ServerFn + 'static,
     S::Output: 'static,
 {
     inner: MultiAction<S, Result<S::Output, ServerFnError<S::Error>>>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -117,13 +114,12 @@ where
     S::Output: Send + Sync + 'static,
     S::Error: Send + Sync + 'static,
 {
-    /// Creates a new [`MultiAction`] which, when dispatched, will call the server function `S`.
     pub fn new() -> Self {
         Self {
             inner: MultiAction::new(|input: &S| {
                 S::run_on_client(input.clone())
             }),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -176,11 +172,11 @@ where
     S::Output: 'static,
 {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }

leptos_server/src/multi_action_old.rs

@@ -0,0 +1,344 @@
+use leptos_reactive::{
+    is_suppressing_resource_load, signal_prelude::*, spawn_local, store_value,
+    untrack, StoredValue,
+};
+use server_fn::{ServerFn, ServerFnError};
+use std::{future::Future, pin::Pin, rc::Rc};
+
+/// An action that synchronizes multiple imperative `async` calls to the reactive system,
+/// tracking the progress of each one.
+///
+/// Where an [Action](crate::Action) fires a single call, a `MultiAction` allows you to
+/// keep track of multiple in-flight actions.
+///
+/// If you’re trying to load data by running an `async` function reactively, you probably
+/// want to use a [Resource](leptos_reactive::Resource) instead. If you’re trying to occasionally
+/// run an `async` function in response to something like a user adding a task to a todo list,
+/// you’re in the right place.
+///
+/// ```rust
+/// # use leptos::*;
+/// # let runtime = create_runtime();
+/// async fn send_new_todo_to_api(task: String) -> usize {
+///   // do something...
+///   // return a task id
+///   42
+/// }
+/// let add_todo = create_multi_action(|task: &String| {
+///   // `task` is given as `&String` because its value is available in `input`
+///   send_new_todo_to_api(task.clone())
+/// });
+///
+/// # if false {
+/// add_todo.dispatch("Buy milk".to_string());
+/// add_todo.dispatch("???".to_string());
+/// add_todo.dispatch("Profit!!!".to_string());
+/// # }
+///
+/// # runtime.dispose();
+/// ```
+///
+/// The input to the `async` function should always be a single value,
+/// but it can be of any type. The argument is always passed by reference to the
+/// function, because it is stored in [Submission::input] as well.
+///
+/// ```rust
+/// # use leptos::*;
+/// # let runtime = create_runtime();
+/// // if there's a single argument, just use that
+/// let action1 = create_multi_action(|input: &String| {
+///     let input = input.clone();
+///     async move { todo!() }
+/// });
+///
+/// // if there are no arguments, use the unit type `()`
+/// let action2 = create_multi_action(|input: &()| async { todo!() });
+///
+/// // if there are multiple arguments, use a tuple
+/// let action3 =
+///     create_multi_action(|input: &(usize, String)| async { todo!() });
+/// # runtime.dispose();
+/// ```
+pub struct MultiAction<I, O>(StoredValue<MultiActionState<I, O>>)
+where
+    I: 'static,
+    O: 'static;
+
+impl<I, O> MultiAction<I, O>
+where
+    I: 'static,
+    O: 'static,
+{
+}
+
+impl<I, O> Clone for MultiAction<I, O>
+where
+    I: 'static,
+    O: 'static,
+{
+    fn clone(&self) -> Self {
+        *self
+    }
+}
+
+impl<I, O> Copy for MultiAction<I, O>
+where
+    I: 'static,
+    O: 'static,
+{
+}
+
+impl<I, O> MultiAction<I, O>
+where
+    I: 'static,
+    O: 'static,
+{
+    /// Calls the `async` function with a reference to the input type as its argument.
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(level = "trace", skip_all)
+    )]
+    pub fn dispatch(&self, input: I) {
+        self.0.with_value(|a| a.dispatch(input))
+    }
+
+    /// The set of all submissions to this multi-action.
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(level = "trace", skip_all)
+    )]
+    pub fn submissions(&self) -> ReadSignal<Vec<Submission<I, O>>> {
+        self.0.with_value(|a| a.submissions())
+    }
+
+    /// The URL associated with the action (typically as part of a server function.)
+    /// This enables integration with the `MultiActionForm` component in `leptos_router`.
+    pub fn url(&self) -> Option<String> {
+        self.0.with_value(|a| a.url.as_ref().cloned())
+    }
+
+    /// How many times an action has successfully resolved.
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(level = "trace", skip_all)
+    )]
+    pub fn version(&self) -> RwSignal<usize> {
+        self.0.with_value(|a| a.version)
+    }
+
+    /// Associates the URL of the given server function with this action.
+    /// This enables integration with the `MultiActionForm` component in `leptos_router`.
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(level = "trace", skip_all)
+    )]
+    pub fn using_server_fn<T: ServerFn>(self) -> Self {
+        self.0.update_value(|a| {
+            a.url = Some(T::url().to_string());
+        });
+
+        self
+    }
+}
+
+struct MultiActionState<I, O>
+where
+    I: 'static,
+    O: 'static,
+{
+    /// How many times an action has successfully resolved.
+    pub version: RwSignal<usize>,
+    submissions: RwSignal<Vec<Submission<I, O>>>,
+    url: Option<String>,
+    #[allow(clippy::complexity)]
+    action_fn: Rc<dyn Fn(&I) -> Pin<Box<dyn Future<Output = O>>>>,
+}
+
+/// An action that has been submitted by dispatching it to a [MultiAction](crate::MultiAction).
+pub struct Submission<I, O>
+where
+    I: 'static,
+    O: 'static,
+{
+    /// The current argument that was dispatched to the `async` function.
+    /// `Some` while we are waiting for it to resolve, `None` if it has resolved.
+    pub input: RwSignal<Option<I>>,
+    /// The most recent return value of the `async` function.
+    pub value: RwSignal<Option<O>>,
+    pub(crate) pending: RwSignal<bool>,
+    /// Controls this submission has been canceled.
+    pub canceled: RwSignal<bool>,
+}
+
+impl<I, O> Clone for Submission<I, O> {
+    fn clone(&self) -> Self {
+        *self
+    }
+}
+
+impl<I, O> Copy for Submission<I, O> {}
+
+impl<I, O> Submission<I, O>
+where
+    I: 'static,
+    O: 'static,
+{
+    /// Whether this submission is currently waiting to resolve.
+    pub fn pending(&self) -> ReadSignal<bool> {
+        self.pending.read_only()
+    }
+
+    /// Cancels the submission, preventing it from resolving.
+    pub fn cancel(&self) {
+        self.canceled.set(true);
+    }
+}
+
+impl<I, O> MultiActionState<I, O>
+where
+    I: 'static,
+    O: 'static,
+{
+    /// Calls the `async` function with a reference to the input type as its argument.
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(level = "trace", skip_all)
+    )]
+    pub fn dispatch(&self, input: I) {
+        if !is_suppressing_resource_load() {
+            let fut = (self.action_fn)(&input);
+
+            let submission = Submission {
+                input: create_rw_signal(Some(input)),
+                value: create_rw_signal(None),
+                pending: create_rw_signal(true),
+                canceled: create_rw_signal(false),
+            };
+
+            self.submissions.update(|subs| subs.push(submission));
+
+            let canceled = submission.canceled;
+            let input = submission.input;
+            let pending = submission.pending;
+            let value = submission.value;
+            let version = self.version;
+
+            spawn_local(async move {
+                let new_value = fut.await;
+                let canceled = untrack(move || canceled.get());
+                if !canceled {
+                    value.set(Some(new_value));
+                }
+                input.set(None);
+                pending.set(false);
+                version.update(|n| *n += 1);
+            })
+        }
+    }
+
+    /// The set of all submissions to this multi-action.
+    pub fn submissions(&self) -> ReadSignal<Vec<Submission<I, O>>> {
+        self.submissions.read_only()
+    }
+}
+
+/// Creates an [MultiAction] to synchronize an imperative `async` call to the synchronous reactive system.
+///
+/// If you’re trying to load data by running an `async` function reactively, you probably
+/// want to use a [create_resource](leptos_reactive::create_resource) instead. If you’re trying
+/// to occasionally run an `async` function in response to something like a user clicking a button,
+/// you're in the right place.
+///
+/// ```rust
+/// # use leptos::*;
+/// # let runtime = create_runtime();
+/// async fn send_new_todo_to_api(task: String) -> usize {
+///   // do something...
+///   // return a task id
+///   42
+/// }
+/// let add_todo = create_multi_action(|task: &String| {
+///   // `task` is given as `&String` because its value is available in `input`
+///   send_new_todo_to_api(task.clone())
+/// });
+/// # if false {
+///
+/// add_todo.dispatch("Buy milk".to_string());
+/// add_todo.dispatch("???".to_string());
+/// add_todo.dispatch("Profit!!!".to_string());
+///
+/// assert_eq!(add_todo.submissions().get().len(), 3);
+/// # }
+/// # runtime.dispose();
+/// ```
+///
+/// The input to the `async` function should always be a single value,
+/// but it can be of any type. The argument is always passed by reference to the
+/// function, because it is stored in [Submission::input] as well.
+///
+/// ```rust
+/// # use leptos::*;
+/// # let runtime = create_runtime();
+/// // if there's a single argument, just use that
+/// let action1 = create_multi_action(|input: &String| {
+///     let input = input.clone();
+///     async move { todo!() }
+/// });
+///
+/// // if there are no arguments, use the unit type `()`
+/// let action2 = create_multi_action(|input: &()| async { todo!() });
+///
+/// // if there are multiple arguments, use a tuple
+/// let action3 =
+///     create_multi_action(|input: &(usize, String)| async { todo!() });
+/// # runtime.dispose();
+/// ```
+#[cfg_attr(feature = "tracing", tracing::instrument(level = "trace", skip_all))]
+pub fn create_multi_action<I, O, F, Fu>(action_fn: F) -> MultiAction<I, O>
+where
+    I: 'static,
+    O: 'static,
+    F: Fn(&I) -> Fu + 'static,
+    Fu: Future<Output = O> + 'static,
+{
+    let version = create_rw_signal(0);
+    let submissions = create_rw_signal(Vec::new());
+    let action_fn = Rc::new(move |input: &I| {
+        let fut = action_fn(input);
+        Box::pin(fut) as Pin<Box<dyn Future<Output = O>>>
+    });
+
+    MultiAction(store_value(MultiActionState {
+        version,
+        submissions,
+        url: None,
+        action_fn,
+    }))
+}
+
+/// Creates an [MultiAction] that can be used to call a server function.
+///
+/// ```rust,ignore
+/// # use leptos::*;
+///
+/// #[server(MyServerFn)]
+/// async fn my_server_fn() -> Result<(), ServerFnError> {
+///     todo!()
+/// }
+///
+/// # let runtime = create_runtime();
+/// let my_server_multi_action = create_server_multi_action::<MyServerFn>();
+/// # runtime.dispose();
+/// ```
+#[cfg_attr(feature = "tracing", tracing::instrument(level = "trace", skip_all))]
+pub fn create_server_multi_action<S>(
+) -> MultiAction<S, Result<S::Output, ServerFnError<S::Error>>>
+where
+    S: Clone + ServerFn,
+{
+    #[cfg(feature = "ssr")]
+    let c = move |args: &S| S::run_body(args.clone());
+    #[cfg(not(feature = "ssr"))]
+    let c = move |args: &S| S::run_on_client(args.clone());
+    create_multi_action(c).using_server_fn::<S>()
+}

leptos_server/src/once_resource.rs

@@ -43,15 +43,6 @@ use std::{
     task::{Context, Poll, Waker},
 };
 
-/// A reference-counted resource that only loads once.
-///
-/// Resources allow asynchronously loading data and serializing it from the server to the client,
-/// so that it loads on the server, and is then deserialized on the client. This improves
-/// performance by beginning data loading on the server when the request is made, rather than
-/// beginning it on the client after WASM has been loaded.
-///
-/// You can access the value of the resource either synchronously using `.get()` or asynchronously
-/// using `.await`.
 #[derive(Debug)]
 pub struct ArcOnceResource<T, Ser = JsonSerdeCodec> {
     trigger: ArcTrigger,
@@ -60,7 +51,7 @@ pub struct ArcOnceResource<T, Ser = JsonSerdeCodec> {
     suspenses: Arc<RwLock<Vec<SuspenseContext>>>,
     loading: Arc<AtomicBool>,
     ser: PhantomData<fn() -> Ser>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -73,7 +64,7 @@ impl<T, Ser> Clone for ArcOnceResource<T, Ser> {
             suspenses: self.suspenses.clone(),
             loading: self.loading.clone(),
             ser: self.ser,
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: self.defined_at,
         }
     }
@@ -89,12 +80,6 @@ where
     <Ser as Encoder<T>>::Encoded: IntoEncodedString,
     <Ser as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a new resource with the encoding `Ser`. If `blocking` is `true`, this is a blocking
-    /// resource.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_with_options(
         fut: impl Future<Output = T> + Send + 'static,
@@ -140,7 +125,7 @@ where
             wakers,
             suspenses,
             ser: PhantomData,
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         };
 
@@ -168,41 +153,6 @@ where
 
         data
     }
-
-    /// Synchronously, reactively reads the current value of the resource and applies the function
-    /// `f` to its value if it is `Some(_)`.
-    #[track_caller]
-    pub fn map<U>(&self, f: impl FnOnce(&T) -> U) -> Option<U>
-    where
-        T: Send + Sync + 'static,
-    {
-        self.try_with(|n| n.as_ref().map(f))?
-    }
-}
-
-impl<T, E, Ser> ArcOnceResource<Result<T, E>, Ser>
-where
-    Ser: Encoder<Result<T, E>> + Decoder<Result<T, E>>,
-    <Ser as Encoder<Result<T, E>>>::Error: Debug,
-    <Ser as Decoder<Result<T, E>>>::Error: Debug,
-    <<Ser as Decoder<Result<T, E>>>::Encoded as FromEncodedStr>::DecodingError:
-        Debug,
-    <Ser as Encoder<Result<T, E>>>::Encoded: IntoEncodedString,
-    <Ser as Decoder<Result<T, E>>>::Encoded: FromEncodedStr,
-    T: Send + Sync + 'static,
-    E: Send + Sync + Clone + 'static,
-{
-    /// Applies the given function when a resource that returns `Result<T, E>`
-    /// has resolved and loaded an `Ok(_)`, rather than requiring nested `.map()`
-    /// calls over the `Option<Result<_, _>>` returned by the resource.
-    ///
-    /// This is useful when used with features like server functions, in conjunction
-    /// with `<ErrorBoundary/>` and `<Suspense/>`, when these other components are
-    /// left to handle the `None` and `Err(_)` states.
-    #[track_caller]
-    pub fn and_then<U>(&self, f: impl FnOnce(&T) -> U) -> Option<Result<U, E>> {
-        self.map(|data| data.as_ref().map(f).map_err(|e| e.clone()))
-    }
 }
 
 impl<T, Ser> ArcOnceResource<T, Ser> {
@@ -218,11 +168,11 @@ impl<T, Ser> ArcOnceResource<T, Ser> {
 
 impl<T, Ser> DefinedAt for ArcOnceResource<T, Ser> {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
@@ -288,8 +238,7 @@ where
     }
 }
 
-/// A [`Future`] that is ready when an
-/// [`ArcAsyncDerived`](reactive_graph::computed::ArcAsyncDerived) is finished loading or reloading,
+/// A [`Future`] that is ready when an [`ArcAsyncDerived`] is finished loading or reloading,
 /// and contains its value. `.await`ing this clones the value `T`.
 pub struct OnceResourceFuture<T> {
     source: AnySource,
@@ -307,7 +256,7 @@ where
 
     #[track_caller]
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         let _guard = SpecialNonReactiveZone::enter();
         let waker = cx.waker();
         self.source.track();
@@ -338,17 +287,11 @@ where
     <JsonSerdeCodec as Encoder<T>>::Encoded: IntoEncodedString,
     <JsonSerdeCodec as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a resource using [`JsonSerdeCodec`] for encoding/decoding the value.
     #[track_caller]
     pub fn new(fut: impl Future<Output = T> + Send + 'static) -> Self {
         ArcOnceResource::new_with_options(fut, false)
     }
 
-    /// Creates a blocking resource using [`JsonSerdeCodec`] for encoding/decoding the value.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_blocking(fut: impl Future<Output = T> + Send + 'static) -> Self {
         ArcOnceResource::new_with_options(fut, true)
@@ -364,7 +307,6 @@ T: Send + Sync + 'static,
     <FromToStringCodec as Encoder<T>>::Encoded: IntoEncodedString,
     <FromToStringCodec as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a resource using [`FromToStringCodec`] for encoding/decoding the value.
     pub fn new_str(
         fut: impl Future<Output = T> + Send + 'static
     ) -> Self
@@ -372,11 +314,6 @@ T: Send + Sync + 'static,
         ArcOnceResource::new_with_options(fut, false)
     }
 
-    /// Creates a blocking resource using [`FromToStringCodec`] for encoding/decoding the value.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     pub fn new_str_blocking(
         fut: impl Future<Output = T> + Send + 'static
     ) -> Self
@@ -395,7 +332,6 @@ T: Send + Sync + 'static,
     <JsonSerdeWasmCodec as Encoder<T>>::Encoded: IntoEncodedString,
     <JsonSerdeWasmCodec as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a resource using [`JsonSerdeWasmCodec`] for encoding/decoding the value.
     #[track_caller]
     pub fn new_serde_wb(
 fut: impl Future<Output = T> + Send + 'static
@@ -404,11 +340,6 @@ fut: impl Future<Output = T> + Send + 'static
         ArcOnceResource::new_with_options(fut, false)
     }
 
-    /// Creates a blocking resource using [`JsonSerdeWasmCodec`] for encoding/decoding the value.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_serde_wb_blocking(
 fut: impl Future<Output = T> + Send + 'static
@@ -429,7 +360,6 @@ where
     <MiniserdeCodec as Encoder<T>>::Encoded: IntoEncodedString,
     <MiniserdeCodec as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a resource using [`MiniserdeCodec`] for encoding/decoding the value.
     #[track_caller]
     pub fn new_miniserde(
         fut: impl Future<Output = T> + Send + 'static,
@@ -437,11 +367,6 @@ where
         ArcOnceResource::new_with_options(fut, false)
     }
 
-    /// Creates a blocking resource using [`MiniserdeCodec`] for encoding/decoding the value.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_miniserde_blocking(
         fut: impl Future<Output = T> + Send + 'static,
@@ -460,7 +385,6 @@ T: Send + Sync + 'static,
     <SerdeLite<JsonSerdeCodec> as Encoder<T>>::Encoded: IntoEncodedString,
     <SerdeLite<JsonSerdeCodec> as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a resource using [`SerdeLite`] for encoding/decoding the value.
     #[track_caller]
     pub fn new_serde_lite(
 fut: impl Future<Output = T> + Send + 'static
@@ -469,11 +393,6 @@ fut: impl Future<Output = T> + Send + 'static
         ArcOnceResource::new_with_options(fut, false)
     }
 
-    /// Creates a blocking resource using [`SerdeLite`] for encoding/decoding the value.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_serde_lite_blocking(
 fut: impl Future<Output = T> + Send + 'static
@@ -495,17 +414,11 @@ where
     <RkyvCodec as Encoder<T>>::Encoded: IntoEncodedString,
     <RkyvCodec as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a resource using [`RkyvCodec`] for encoding/decoding the value.
     #[track_caller]
     pub fn new_rkyv(fut: impl Future<Output = T> + Send + 'static) -> Self {
         ArcOnceResource::new_with_options(fut, false)
     }
 
-    /// Creates a blocking resource using [`RkyvCodec`] for encoding/decoding the value.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_rkyv_blocking(
         fut: impl Future<Output = T> + Send + 'static,
@@ -514,19 +427,10 @@ where
     }
 }
 
-/// A resource that only loads once.
-///
-/// Resources allow asynchronously loading data and serializing it from the server to the client,
-/// so that it loads on the server, and is then deserialized on the client. This improves
-/// performance by beginning data loading on the server when the request is made, rather than
-/// beginning it on the client after WASM has been loaded.
-///
-/// You can access the value of the resource either synchronously using `.get()` or asynchronously
-/// using `.await`.
 #[derive(Debug)]
 pub struct OnceResource<T, Ser = JsonSerdeCodec> {
     inner: ArenaItem<ArcOnceResource<T, Ser>>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -548,58 +452,21 @@ where
     <Ser as Encoder<T>>::Encoded: IntoEncodedString,
     <Ser as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a new resource with the encoding `Ser`. If `blocking` is `true`, this is a blocking
-    /// resource.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_with_options(
         fut: impl Future<Output = T> + Send + 'static,
         blocking: bool,
     ) -> Self {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         let defined_at = Location::caller();
         Self {
             inner: ArenaItem::new(ArcOnceResource::new_with_options(
                 fut, blocking,
             )),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at,
         }
     }
-
-    /// Synchronously, reactively reads the current value of the resource and applies the function
-    /// `f` to its value if it is `Some(_)`.
-    pub fn map<U>(&self, f: impl FnOnce(&T) -> U) -> Option<U> {
-        self.try_with(|n| n.as_ref().map(|n| Some(f(n))))?.flatten()
-    }
-}
-
-impl<T, E, Ser> OnceResource<Result<T, E>, Ser>
-where
-    Ser: Encoder<Result<T, E>> + Decoder<Result<T, E>>,
-    <Ser as Encoder<Result<T, E>>>::Error: Debug,
-    <Ser as Decoder<Result<T, E>>>::Error: Debug,
-    <<Ser as Decoder<Result<T, E>>>::Encoded as FromEncodedStr>::DecodingError:
-        Debug,
-    <Ser as Encoder<Result<T, E>>>::Encoded: IntoEncodedString,
-    <Ser as Decoder<Result<T, E>>>::Encoded: FromEncodedStr,
-    T: Send + Sync + 'static,
-    E: Send + Sync + Clone + 'static,
-{
-    /// Applies the given function when a resource that returns `Result<T, E>`
-    /// has resolved and loaded an `Ok(_)`, rather than requiring nested `.map()`
-    /// calls over the `Option<Result<_, _>>` returned by the resource.
-    ///
-    /// This is useful when used with features like server functions, in conjunction
-    /// with `<ErrorBoundary/>` and `<Suspense/>`, when these other components are
-    /// left to handle the `None` and `Err(_)` states.
-    #[track_caller]
-    pub fn and_then<U>(&self, f: impl FnOnce(&T) -> U) -> Option<Result<U, E>> {
-        self.map(|data| data.as_ref().map(f).map_err(|e| e.clone()))
-    }
 }
 
 impl<T, Ser> OnceResource<T, Ser>
@@ -617,11 +484,11 @@ where
 
 impl<T, Ser> DefinedAt for OnceResource<T, Ser> {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
@@ -700,17 +567,11 @@ where
     <JsonSerdeCodec as Encoder<T>>::Encoded: IntoEncodedString,
     <JsonSerdeCodec as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a resource using [`JsonSerdeCodec`] for encoding/decoding the value.
     #[track_caller]
     pub fn new(fut: impl Future<Output = T> + Send + 'static) -> Self {
         OnceResource::new_with_options(fut, false)
     }
 
-    /// Creates a blocking resource using [`JsonSerdeCodec`] for encoding/decoding the value.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_blocking(fut: impl Future<Output = T> + Send + 'static) -> Self {
         OnceResource::new_with_options(fut, true)
@@ -726,7 +587,6 @@ T: Send + Sync + 'static,
     <FromToStringCodec as Encoder<T>>::Encoded: IntoEncodedString,
     <FromToStringCodec as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a resource using [`FromToStringCodec`] for encoding/decoding the value.
     pub fn new_str(
         fut: impl Future<Output = T> + Send + 'static
     ) -> Self
@@ -734,11 +594,6 @@ T: Send + Sync + 'static,
         OnceResource::new_with_options(fut, false)
     }
 
-    /// Creates a blocking resource using [`FromToStringCodec`] for encoding/decoding the value.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     pub fn new_str_blocking(
         fut: impl Future<Output = T> + Send + 'static
     ) -> Self
@@ -757,7 +612,6 @@ T: Send + Sync + 'static,
     <JsonSerdeWasmCodec as Encoder<T>>::Encoded: IntoEncodedString,
     <JsonSerdeWasmCodec as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a resource using [`JsonSerdeWasmCodec`] for encoding/decoding the value.
     #[track_caller]
     pub fn new_serde_wb(
 fut: impl Future<Output = T> + Send + 'static
@@ -766,11 +620,6 @@ fut: impl Future<Output = T> + Send + 'static
         OnceResource::new_with_options(fut, false)
     }
 
-    /// Creates a blocking resource using [`JsonSerdeWasmCodec`] for encoding/decoding the value.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_serde_wb_blocking(
 fut: impl Future<Output = T> + Send + 'static
@@ -791,7 +640,6 @@ where
     <MiniserdeCodec as Encoder<T>>::Encoded: IntoEncodedString,
     <MiniserdeCodec as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a resource using [`MiniserdeCodec`] for encoding/decoding the value.
     #[track_caller]
     pub fn new_miniserde(
         fut: impl Future<Output = T> + Send + 'static,
@@ -799,11 +647,6 @@ where
         OnceResource::new_with_options(fut, false)
     }
 
-    /// Creates a blocking resource using [`MiniserdeCodec`] for encoding/decoding the value.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_miniserde_blocking(
         fut: impl Future<Output = T> + Send + 'static,
@@ -822,7 +665,6 @@ T: Send + Sync + 'static,
     <SerdeLite<JsonSerdeCodec> as Encoder<T>>::Encoded: IntoEncodedString,
     <SerdeLite<JsonSerdeCodec> as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a resource using [`SerdeLite`] for encoding/decoding the value.
     #[track_caller]
     pub fn new_serde_lite(
 fut: impl Future<Output = T> + Send + 'static
@@ -831,11 +673,6 @@ fut: impl Future<Output = T> + Send + 'static
         OnceResource::new_with_options(fut, false)
     }
 
-    /// Creates a blocking resource using [`SerdeLite`] for encoding/decoding the value.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_serde_lite_blocking(
 fut: impl Future<Output = T> + Send + 'static
@@ -857,17 +694,11 @@ where
     <RkyvCodec as Encoder<T>>::Encoded: IntoEncodedString,
     <RkyvCodec as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a resource using [`RkyvCodec`] for encoding/decoding the value.
     #[track_caller]
     pub fn new_rkyv(fut: impl Future<Output = T> + Send + 'static) -> Self {
         OnceResource::new_with_options(fut, false)
     }
 
-    /// Creates a blocking resource using [`RkyvCodec`] for encoding/decoding the value.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_rkyv_blocking(
         fut: impl Future<Output = T> + Send + 'static,

leptos_server/src/resource.rs

@@ -37,12 +37,9 @@ use std::{
 pub(crate) static IS_SUPPRESSING_RESOURCE_LOAD: AtomicBool =
     AtomicBool::new(false);
 
-/// Used to prevent resources from actually loading, in environments (like server route generation)
-/// where they are not needed.
 pub struct SuppressResourceLoad;
 
 impl SuppressResourceLoad {
-    /// Prevents resources from loading until this is dropped.
     pub fn new() -> Self {
         IS_SUPPRESSING_RESOURCE_LOAD.store(true, Ordering::Relaxed);
         Self
@@ -61,20 +58,11 @@ impl Drop for SuppressResourceLoad {
     }
 }
 
-/// A reference-counted asynchronous resource.
-///
-/// Resources allow asynchronously loading data and serializing it from the server to the client,
-/// so that it loads on the server, and is then deserialized on the client. This improves
-/// performance by beginning data loading on the server when the request is made, rather than
-/// beginning it on the client after WASM has been loaded.
-///
-/// You can access the value of the resource either synchronously using `.get()` or asynchronously
-/// using `.await`.
 pub struct ArcResource<T, Ser = JsonSerdeCodec> {
     ser: PhantomData<Ser>,
     refetch: ArcRwSignal<usize>,
     data: ArcAsyncDerived<T>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -82,7 +70,7 @@ impl<T, Ser> Debug for ArcResource<T, Ser> {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let mut d = f.debug_struct("ArcResource");
         d.field("ser", &self.ser).field("data", &self.data);
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         d.field("defined_at", self.defined_at);
         d.finish_non_exhaustive()
     }
@@ -98,7 +86,7 @@ where
             ser: PhantomData,
             data: arc_resource.data.into(),
             refetch: arc_resource.refetch.into(),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -114,7 +102,7 @@ where
             ser: PhantomData,
             data: resource.data.into(),
             refetch: resource.refetch.into(),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
@@ -122,11 +110,11 @@ where
 
 impl<T, Ser> DefinedAt for ArcResource<T, Ser> {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -139,7 +127,7 @@ impl<T, Ser> Clone for ArcResource<T, Ser> {
             ser: self.ser,
             refetch: self.refetch.clone(),
             data: self.data.clone(),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: self.defined_at,
         }
     }
@@ -206,21 +194,6 @@ where
     <Ser as Encoder<T>>::Encoded: IntoEncodedString,
     <Ser as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a new resource with the encoding `Ser`.
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
-    ///
-    /// If `blocking` is `true`, this is a blocking resource.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_with_options<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
@@ -300,13 +273,11 @@ where
             ser: PhantomData,
             data,
             refetch,
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
 
-    /// Synchronously, reactively reads the current value of the resource and applies the function
-    /// `f` to its value if it is `Some(_)`.
     #[track_caller]
     pub fn map<U>(&self, f: impl FnOnce(&T) -> U) -> Option<U>
     where
@@ -380,13 +351,6 @@ where
     T: Send + Sync + 'static,
     E: Send + Sync + Clone + 'static,
 {
-    /// Applies the given function when a resource that returns `Result<T, E>`
-    /// has resolved and loaded an `Ok(_)`, rather than requiring nested `.map()`
-    /// calls over the `Option<Result<_, _>>` returned by the resource.
-    ///
-    /// This is useful when used with features like server functions, in conjunction
-    /// with `<ErrorBoundary/>` and `<Suspense/>`, when these other components are
-    /// left to handle the `None` and `Err(_)` states.
     #[track_caller]
     pub fn and_then<U>(&self, f: impl FnOnce(&T) -> U) -> Option<Result<U, E>> {
         self.map(|data| data.as_ref().map(f).map_err(|e| e.clone()))
@@ -403,15 +367,6 @@ where
     <JsonSerdeCodec as Encoder<T>>::Encoded: IntoEncodedString,
     <JsonSerdeCodec as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a new resource with the encoding [`JsonSerdeCodec`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
     #[track_caller]
     pub fn new<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
@@ -425,19 +380,6 @@ where
         ArcResource::new_with_options(source, fetcher, false)
     }
 
-    /// Creates a new blocking resource with the encoding [`JsonSerdeCodec`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_blocking<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
@@ -460,15 +402,6 @@ where
     <FromToStringCodec as Encoder<T>>::Encoded: IntoEncodedString,
     <FromToStringCodec as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a new resource with the encoding [`FromToStringCodec`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
     pub fn new_str<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
         fetcher: impl Fn(S) -> Fut + Send + Sync + 'static,
@@ -481,19 +414,6 @@ where
         ArcResource::new_with_options(source, fetcher, false)
     }
 
-    /// Creates a new blocking resource with the encoding [`FromToStringCodec`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     pub fn new_str_blocking<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
         fetcher: impl Fn(S) -> Fut + Send + Sync + 'static,
@@ -516,15 +436,6 @@ where
     <JsonSerdeWasmCodec as Encoder<T>>::Encoded: IntoEncodedString,
     <JsonSerdeWasmCodec as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a new resource with the encoding [`JsonSerdeWasmCodec`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
     #[track_caller]
     pub fn new_serde_wb<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
@@ -538,19 +449,6 @@ where
         ArcResource::new_with_options(source, fetcher, false)
     }
 
-    /// Creates a new blocking resource with the encoding [`JsonSerdeWasmCodec`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_serde_wb_blocking<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
@@ -575,15 +473,6 @@ where
     <MiniserdeCodec as Encoder<T>>::Encoded: IntoEncodedString,
     <MiniserdeCodec as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a new resource with the encoding [`MiniserdeCodec`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
     #[track_caller]
     pub fn new_miniserde<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
@@ -597,19 +486,6 @@ where
         ArcResource::new_with_options(source, fetcher, false)
     }
 
-    /// Creates a new blocking resource with the encoding [`MiniserdeCodec`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_miniserde_blocking<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
@@ -633,15 +509,6 @@ where
     <SerdeLite<JsonSerdeCodec> as Encoder<T>>::Encoded: IntoEncodedString,
     <SerdeLite<JsonSerdeCodec> as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a new resource with the encoding [`SerdeLite`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
     #[track_caller]
     pub fn new_serde_lite<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
@@ -655,19 +522,6 @@ where
         ArcResource::new_with_options(source, fetcher, false)
     }
 
-    /// Creates a new blocking resource with the encoding [`SerdeLite`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_serde_lite_blocking<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
@@ -693,15 +547,6 @@ where
     <RkyvCodec as Encoder<T>>::Encoded: IntoEncodedString,
     <RkyvCodec as Decoder<T>>::Encoded: FromEncodedStr,
 {
-    /// Creates a new resource with the encoding [`RkyvCodec`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
     #[track_caller]
     pub fn new_rkyv<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
@@ -715,19 +560,6 @@ where
         ArcResource::new_with_options(source, fetcher, false)
     }
 
-    /// Creates a new blocking resource with the encoding [`RkyvCodec`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_rkyv_blocking<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
@@ -758,22 +590,11 @@ impl<T, Ser> ArcResource<T, Ser>
 where
     T: 'static,
 {
-    /// Returns a new [`Future`] that is ready when the resource has loaded, and accesses its inner
-    /// value by reference.
     pub fn by_ref(&self) -> AsyncDerivedRefFuture<T> {
         self.data.by_ref()
     }
 }
 
-/// An asynchronous resource.
-///
-/// Resources allow asynchronously loading data and serializing it from the server to the client,
-/// so that it loads on the server, and is then deserialized on the client. This improves
-/// performance by beginning data loading on the server when the request is made, rather than
-/// beginning it on the client after WASM has been loaded.
-///
-/// You can access the value of the resource either synchronously using `.get()` or asynchronously
-/// using `.await`.
 pub struct Resource<T, Ser = JsonSerdeCodec>
 where
     T: Send + Sync + 'static,
@@ -781,7 +602,7 @@ where
     ser: PhantomData<Ser>,
     data: AsyncDerived<T>,
     refetch: RwSignal<usize>,
-    #[cfg(any(debug_assertions, leptos_debuginfo))]
+    #[cfg(debug_assertions)]
     defined_at: &'static Location<'static>,
 }
 
@@ -792,7 +613,7 @@ where
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let mut d = f.debug_struct("ArcResource");
         d.field("ser", &self.ser).field("data", &self.data);
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         d.field("defined_at", self.defined_at);
         d.finish_non_exhaustive()
     }
@@ -803,11 +624,11 @@ where
     T: Send + Sync + 'static,
 {
     fn defined_at(&self) -> Option<&'static Location<'static>> {
-        #[cfg(any(debug_assertions, leptos_debuginfo))]
+        #[cfg(debug_assertions)]
         {
             Some(self.defined_at)
         }
-        #[cfg(not(any(debug_assertions, leptos_debuginfo)))]
+        #[cfg(not(debug_assertions))]
         {
             None
         }
@@ -886,15 +707,6 @@ where
     <FromToStringCodec as Decoder<T>>::Encoded: FromEncodedStr,
     T: Send + Sync,
 {
-    /// Creates a new resource with the encoding [`FromToStringCodec`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
     #[track_caller]
     pub fn new_str<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
@@ -908,19 +720,6 @@ where
         Resource::new_with_options(source, fetcher, false)
     }
 
-    /// Creates a new blocking resource with the encoding [`FromToStringCodec`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_str_blocking<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
@@ -946,15 +745,6 @@ where
     <JsonSerdeCodec as Decoder<T>>::Encoded: FromEncodedStr,
     T: Send + Sync,
 {
-    /// Creates a new resource with the encoding [`JsonSerdeCodec`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
     #[track_caller]
     pub fn new<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
@@ -968,19 +758,6 @@ where
         Resource::new_with_options(source, fetcher, false)
     }
 
-    /// Creates a new blocking resource with the encoding [`JsonSerdeCodec`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_blocking<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
@@ -1005,15 +782,6 @@ where
     <JsonSerdeWasmCodec as Decoder<T>>::Encoded: FromEncodedStr,
     T: Send + Sync,
 {
-    /// Creates a new resource with the encoding [`JsonSerdeWasmCodec`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
     pub fn new_serde_wb<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
         fetcher: impl Fn(S) -> Fut + Send + Sync + 'static,
@@ -1026,19 +794,6 @@ where
         Resource::new_with_options(source, fetcher, false)
     }
 
-    /// Creates a new blocking resource with the encoding [`JsonSerdeWasmCodec`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     pub fn new_serde_wb_blocking<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
         fetcher: impl Fn(S) -> Fut + Send + Sync + 'static,
@@ -1064,15 +819,6 @@ where
     <MiniserdeCodec as Decoder<T>>::Encoded: FromEncodedStr,
     T: Send + Sync,
 {
-    /// Creates a new resource with the encoding [`MiniserdeCodec`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
     pub fn new_miniserde<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
         fetcher: impl Fn(S) -> Fut + Send + Sync + 'static,
@@ -1084,31 +830,6 @@ where
     {
         Resource::new_with_options(source, fetcher, false)
     }
-
-    /// Creates a new blocking resource with the encoding [`MiniserdeCodec`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
-    pub fn new_miniserde_blocking<S, Fut>(
-        source: impl Fn() -> S + Send + Sync + 'static,
-        fetcher: impl Fn(S) -> Fut + Send + Sync + 'static,
-    ) -> Self
-    where
-        S: PartialEq + Clone + Send + Sync + 'static,
-        T: Send + Sync + 'static,
-        Fut: Future<Output = T> + Send + 'static,
-    {
-        Resource::new_with_options(source, fetcher, true)
-    }
 }
 
 #[cfg(feature = "serde-lite")]
@@ -1122,15 +843,6 @@ where
     <SerdeLite<JsonSerdeCodec> as Decoder<T>>::Encoded: FromEncodedStr,
     T: Send + Sync,
 {
-    /// Creates a new resource with the encoding [`SerdeLite`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
     pub fn new_serde_lite<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
         fetcher: impl Fn(S) -> Fut + Send + Sync + 'static,
@@ -1143,19 +855,6 @@ where
         Resource::new_with_options(source, fetcher, false)
     }
 
-    /// Creates a new blocking resource with the encoding [`SerdeLite`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     pub fn new_serde_lite_blocking<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
         fetcher: impl Fn(S) -> Fut + Send + Sync + 'static,
@@ -1181,15 +880,6 @@ where
     <RkyvCodec as Decoder<T>>::Encoded: FromEncodedStr,
     T: Send + Sync,
 {
-    /// Creates a new resource with the encoding [`RkyvCodec`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
     pub fn new_rkyv<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
         fetcher: impl Fn(S) -> Fut + Send + Sync + 'static,
@@ -1202,19 +892,6 @@ where
         Resource::new_with_options(source, fetcher, false)
     }
 
-    /// Creates a new blocking resource with the encoding [`RkyvCodec`].
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     pub fn new_rkyv_blocking<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
         fetcher: impl Fn(S) -> Fut + Send + Sync + 'static,
@@ -1238,21 +915,6 @@ where
     <Ser as Decoder<T>>::Encoded: FromEncodedStr,
     T: Send + Sync,
 {
-    /// Creates a new resource with the encoding `Ser`.
-    ///
-    /// This takes a `source` function and a `fetcher`. The resource memoizes and reactively tracks
-    /// the value returned by `source`. Whenever that value changes, it will run the `fetcher` to
-    /// generate a new [`Future`] to load data.
-    ///
-    /// On creation, if you are on the server, this will run the `fetcher` once to generate
-    /// a `Future` whose value will be serialized from the server to the client. If you are on
-    /// the client, the initial value will be deserialized without re-running that async task.
-    ///
-    /// If `blocking` is `true`, this is a blocking resource.
-    ///
-    /// Blocking resources prevent any of the HTTP response from being sent until they have loaded.
-    /// This is useful if you need their data to set HTML document metadata or information that
-    /// needs to appear in HTTP headers.
     #[track_caller]
     pub fn new_with_options<S, Fut>(
         source: impl Fn() -> S + Send + Sync + 'static,
@@ -1270,13 +932,11 @@ where
             ser: PhantomData,
             data: data.into(),
             refetch: refetch.into(),
-            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            #[cfg(debug_assertions)]
             defined_at: Location::caller(),
         }
     }
 
-    /// Synchronously, reactively reads the current value of the resource and applies the function
-    /// `f` to its value if it is `Some(_)`.
     pub fn map<U>(&self, f: impl FnOnce(&T) -> U) -> Option<U> {
         self.data
             .try_with(|n| n.as_ref().map(|n| Some(f(n))))?
@@ -1301,13 +961,6 @@ where
     T: Send + Sync,
     E: Send + Sync + Clone,
 {
-    /// Applies the given function when a resource that returns `Result<T, E>`
-    /// has resolved and loaded an `Ok(_)`, rather than requiring nested `.map()`
-    /// calls over the `Option<Result<_, _>>` returned by the resource.
-    ///
-    /// This is useful when used with features like server functions, in conjunction
-    /// with `<ErrorBoundary/>` and `<Suspense/>`, when these other components are
-    /// left to handle the `None` and `Err(_)` states.
     #[track_caller]
     pub fn and_then<U>(&self, f: impl FnOnce(&T) -> U) -> Option<Result<U, E>> {
         self.map(|data| data.as_ref().map(f).map_err(|e| e.clone()))
@@ -1331,8 +984,6 @@ impl<T, Ser> Resource<T, Ser>
 where
     T: Send + Sync + 'static,
 {
-    /// Returns a new [`Future`] that is ready when the resource has loaded, and accesses its inner
-    /// value by reference.
     pub fn by_ref(&self) -> AsyncDerivedRefFuture<T> {
         self.data.by_ref()
     }

leptos_server/src/shared.rs

@@ -31,7 +31,6 @@ pub struct SharedValue<T, Ser = JsonSerdeCodec> {
 }
 
 impl<T, Ser> SharedValue<T, Ser> {
-    /// Returns the inner value.
     pub fn into_inner(self) -> T {
         self.value
     }
@@ -47,12 +46,6 @@ where
     <<JsonSerdeCodec as codee::Decoder<T>>::Encoded as FromEncodedStr>::DecodingError:
         Debug,
 {
-    /// Wraps the initial value.
-    ///
-    /// If this is on the server, the function will be invoked and the value serialized. When it runs
-    /// on the client, it will be deserialized without running the function again.
-    ///
-    /// This uses the [`JsonSerdeCodec`] encoding.
     pub fn new(initial: impl FnOnce() -> T) -> Self {
         SharedValue::new_with_encoding(initial)
     }
@@ -68,12 +61,6 @@ where
     <<FromToStringCodec as codee::Decoder<T>>::Encoded as FromEncodedStr>::DecodingError:
         Debug,
 {
-    /// Wraps the initial value.
-    ///
-    /// If this is on the server, the function will be invoked and the value serialized. When it runs
-    /// on the client, it will be deserialized without running the function again.
-    ///
-    /// This uses the [`FromToStringCodec`] encoding.
     pub fn new_str(initial: impl FnOnce() -> T) -> Self {
         SharedValue::new_with_encoding(initial)
     }
@@ -90,13 +77,7 @@ where
     <<SerdeLite<JsonSerdeCodec> as codee::Decoder<T>>::Encoded as FromEncodedStr>::DecodingError:
         Debug,
 {
-    /// Wraps the initial value.
-    ///
-    /// If this is on the server, the function will be invoked and the value serialized. When it runs
-    /// on the client, it will be deserialized without running the function again.
-    ///
-    /// This uses the [`SerdeLite`] encoding.
-    pub fn new_serde_lite(initial: impl FnOnce() -> T) -> Self {
+    pub fn new(initial: impl FnOnce() -> T) -> Self {
         SharedValue::new_with_encoding(initial)
     }
 }
@@ -112,13 +93,7 @@ where
     <<JsonSerdeWasmCodec as codee::Decoder<T>>::Encoded as FromEncodedStr>::DecodingError:
         Debug,
 {
-    /// Wraps the initial value.
-    ///
-    /// If this is on the server, the function will be invoked and the value serialized. When it runs
-    /// on the client, it will be deserialized without running the function again.
-    ///
-    /// This uses the [`JsonSerdeWasmCodec`] encoding.
-    pub fn new_serde_wb(initial: impl FnOnce() -> T) -> Self {
+    pub fn new(initial: impl FnOnce() -> T) -> Self {
         SharedValue::new_with_encoding(initial)
     }
 }
@@ -134,13 +109,7 @@ where
     <<MiniserdeCodec as codee::Decoder<T>>::Encoded as FromEncodedStr>::DecodingError:
         Debug,
 {
-    /// Wraps the initial value.
-    ///
-    /// If this is on the server, the function will be invoked and the value serialized. When it runs
-    /// on the client, it will be deserialized without running the function again.
-    ///
-    /// This uses the [`MiniserdeCodec`] encoding.
-    pub fn new_miniserde(initial: impl FnOnce() -> T) -> Self {
+    pub fn new(initial: impl FnOnce() -> T) -> Self {
         SharedValue::new_with_encoding(initial)
     }
 }
@@ -156,13 +125,7 @@ where
     <<RkyvCodec as codee::Decoder<T>>::Encoded as FromEncodedStr>::DecodingError:
         Debug,
 {
-    /// Wraps the initial value.
-    ///
-    /// If this is on the server, the function will be invoked and the value serialized. When it runs
-    /// on the client, it will be deserialized without running the function again.
-    ///
-    /// This uses the [`RkyvCodec`] encoding.
-    pub fn new_rkyv(initial: impl FnOnce() -> T) -> Self {
+    pub fn new(initial: impl FnOnce() -> T) -> Self {
         SharedValue::new_with_encoding(initial)
     }
 }
@@ -177,12 +140,6 @@ where
     <<Ser as codee::Decoder<T>>::Encoded as FromEncodedStr>::DecodingError:
         Debug,
 {
-    /// Wraps the initial value.
-    ///
-    /// If this is on the server, the function will be invoked and the value serialized. When it runs
-    /// on the client, it will be deserialized without running the function again.
-    ///
-    /// This uses `Ser` as an encoding.
     pub fn new_with_encoding(initial: impl FnOnce() -> T) -> Self {
         let value: T;
         #[cfg(feature = "hydration")]
@@ -215,11 +172,16 @@ where
                                 None
                             }
                             Ok(encoded) => {
-                                let decoded = Ser::decode(encoded.borrow());
-                                #[cfg(feature = "tracing")]
-                                let decoded = decoded
-                                    .inspect_err(|e| tracing::error!("{e:?}"));
-                                decoded.ok()
+                                match Ser::decode(encoded.borrow()) {
+                                    #[allow(unused_variables)]
+                                    // used in tracing
+                                    Err(e) => {
+                                        #[cfg(feature = "tracing")]
+                                        tracing::error!("{e:?}");
+                                        None
+                                    }
+                                    Ok(value) => Some(value),
+                                }
                             }
                         }
                     }

meta/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_meta"
-version = "0.7.8"
+version = "0.7.0-rc1"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
@@ -14,8 +14,8 @@ once_cell = "1.20"
 or_poisoned = { workspace = true }
 indexmap = "2.6"
 send_wrapper = "0.6.0"
-tracing = { version = "0.1.41", optional = true }
-wasm-bindgen = { workspace = true }
+tracing = { version = "0.1.40", optional = true }
+wasm-bindgen = "0.2.95"
 futures = "0.3.31"
 
 [dependencies.web-sys]
@@ -26,13 +26,9 @@ features = ["HtmlLinkElement", "HtmlMetaElement", "HtmlTitleElement"]
 default = []
 ssr = []
 tracing = ["dep:tracing"]
-nonce = ["leptos/nonce"]
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--generate-link-to-definition"]
 
 [package.metadata.cargo-all-features]
 denylist = ["tracing"]
-
-[lints.rust]
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(leptos_debuginfo)'] }

meta/src/lib.rs

@@ -7,7 +7,8 @@
 //! using the [`Leptos`](https://github.com/leptos-rs/leptos) web framework.
 //!
 //! Document metadata is updated automatically when running in the browser. For server-side
-//! rendering, after the component tree is rendered to HTML, [`ServerMetaContextOutput::inject_meta_context`] will inject meta tags into a stream of HTML inside the `<head>`.
+//! rendering, after the component tree is rendered to HTML, [`MetaContext::dehydrate`] can generate
+//! HTML that should be injected into the `<head>` of the HTML document being rendered.
 //!
 //! ```
 //! use leptos::prelude::*;
@@ -37,17 +38,20 @@
 //! }
 //! ```
 //! # Feature Flags
+//! - `csr` Client-side rendering: Generate DOM nodes in the browser
 //! - `ssr` Server-side rendering: Generate an HTML string (typically on the server)
-//! - `tracing` Adds integration with the `tracing` crate.
+//! - `hydrate` Hydration: use this to add interactivity to an SSRed Leptos app
+//! - `stable` By default, Leptos requires `nightly` Rust, which is what allows the ergonomics
+//!   of calling signals as functions. Enable this feature to support `stable` Rust.
 //!
-//! **Important Note:** If you’re using server-side rendering, you should enable `ssr`.
+//! **Important Note:** You must enable one of `csr`, `hydrate`, or `ssr` to tell Leptos
+//! which mode your app is operating in.
 
 use futures::{Stream, StreamExt};
 use leptos::{
     attr::NextAttribute,
     component,
     logging::debug_warn,
-    oco::Oco,
     reactive::owner::{provide_context, use_context},
     tachys::{
         dom::document,
@@ -323,13 +327,37 @@ pub(crate) fn register<E, At, Ch>(
 where
     HtmlElement<E, At, Ch>: RenderHtml,
 {
+    #[allow(unused_mut)] // used for `ssr`
+    let mut el = Some(el);
+
+    #[cfg(feature = "ssr")]
+    if let Some(cx) = use_context::<ServerMetaContext>() {
+        let mut buf = String::new();
+        el.take().unwrap().to_html_with_buf(
+            &mut buf,
+            &mut Position::NextChild,
+            false,
+            false,
+        );
+        _ = cx.elements.send(buf); // fails only if the receiver is already dropped
+    } else {
+        let msg = "tried to use a leptos_meta component without \
+                   `ServerMetaContext` provided";
+
+        #[cfg(feature = "tracing")]
+        tracing::warn!("{}", msg);
+
+        #[cfg(not(feature = "tracing"))]
+        eprintln!("{}", msg);
+    }
+
     RegisteredMetaTag { el }
 }
 
 struct RegisteredMetaTag<E, At, Ch> {
     // this is `None` if we've already taken it out to render to HTML on the server
     // we don't render it in place in RenderHtml, so it's fine
-    el: HtmlElement<E, At, Ch>,
+    el: Option<HtmlElement<E, At, Ch>>,
 }
 
 struct RegisteredMetaTagState<E, At, Ch>
@@ -367,12 +395,12 @@ where
     type State = RegisteredMetaTagState<E, At, Ch>;
 
     fn build(self) -> Self::State {
-        let state = self.el.build();
+        let state = self.el.unwrap().build();
         RegisteredMetaTagState { state }
     }
 
     fn rebuild(self, state: &mut Self::State) {
-        self.el.rebuild(&mut state.state);
+        self.el.unwrap().rebuild(&mut state.state);
     }
 }
 
@@ -393,7 +421,7 @@ where
         Self::Output<NewAttr>: RenderHtml,
     {
         RegisteredMetaTag {
-            el: self.el.add_any_attr(attr),
+            el: self.el.map(|inner| inner.add_any_attr(attr)),
         }
     }
 }
@@ -425,26 +453,6 @@ where
     ) {
         // meta tags are rendered into the buffer stored into the context
         // the value has already been taken out, when we're on the server
-        #[cfg(feature = "ssr")]
-        if let Some(cx) = use_context::<ServerMetaContext>() {
-            let mut buf = String::new();
-            self.el.to_html_with_buf(
-                &mut buf,
-                &mut Position::NextChild,
-                false,
-                false,
-            );
-            _ = cx.elements.send(buf); // fails only if the receiver is already dropped
-        } else {
-            let msg = "tried to use a leptos_meta component without \
-                       `ServerMetaContext` provided";
-
-            #[cfg(feature = "tracing")]
-            tracing::warn!("{}", msg);
-
-            #[cfg(not(feature = "tracing"))]
-            eprintln!("{}", msg);
-        }
     }
 
     fn hydrate<const FROM_SERVER: bool>(
@@ -458,7 +466,7 @@ where
                  MetaContext provided",
             )
             .cursor;
-        let state = self.el.hydrate::<FROM_SERVER>(
+        let state = self.el.unwrap().hydrate::<FROM_SERVER>(
             &cursor,
             &PositionState::new(Position::NextChild),
         );
@@ -563,25 +571,3 @@ impl RenderHtml for MetaTagsView {
     ) -> Self::State {
     }
 }
-
-pub(crate) trait OrDefaultNonce {
-    fn or_default_nonce(self) -> Option<Oco<'static, str>>;
-}
-
-impl OrDefaultNonce for Option<Oco<'static, str>> {
-    fn or_default_nonce(self) -> Option<Oco<'static, str>> {
-        #[cfg(feature = "nonce")]
-        {
-            use leptos::nonce::use_nonce;
-
-            match self {
-                Some(nonce) => Some(nonce),
-                None => use_nonce().map(|n| Arc::clone(n.as_inner()).into()),
-            }
-        }
-        #[cfg(not(feature = "nonce"))]
-        {
-            self
-        }
-    }
-}

meta/src/script.rs

@@ -1,4 +1,4 @@
-use crate::{register, OrDefaultNonce};
+use crate::register;
 use leptos::{
     component, oco::Oco, prelude::*, tachys::html::element::script, IntoView,
 };
@@ -74,7 +74,7 @@ pub fn Script(
             .fetchpriority(fetchpriority)
             .integrity(integrity)
             .nomodule(nomodule)
-            .nonce(nonce.or_default_nonce())
+            .nonce(nonce)
             .referrerpolicy(referrerpolicy)
             .src(src)
             .r#type(type_)

meta/src/style.rs

@@ -1,4 +1,4 @@
-use crate::{register, OrDefaultNonce};
+use crate::register;
 use leptos::{
     component, oco::Oco, prelude::*, tachys::html::element::style, IntoView,
 };
@@ -48,7 +48,7 @@ pub fn Style(
         style()
             .id(id)
             .media(media)
-            .nonce(nonce.or_default_nonce())
+            .nonce(nonce)
             .title(title)
             .blocking(blocking)
             .child(children.map(|c| c())),

next_tuple/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "next_tuple"
-version = "0.1.0"
+version = "0.1.0-rc1"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"

next_tuple/src/lib.rs

@@ -1,10 +1,6 @@
-//! Defines a trait that allows you to extend a tuple, by returning
-//! a new tuple with an element of an arbitrary type added.
-
 #![no_std]
 #![allow(non_snake_case)]
 #![forbid(unsafe_code)]
-#![deny(missing_docs)]
 
 /// Allows extending a tuple, or creating a new tuple, by adding the next value.
 pub trait NextTuple {

oco/Cargo.toml

@@ -13,4 +13,4 @@ serde = "1.0"
 thiserror = "2.0"
 
 [dev-dependencies]
-serde_json = { workspace = true }
+serde_json = "1.0"

oco/src/lib.rs

@@ -70,7 +70,7 @@ pub enum Oco<'a, T: ?Sized + ToOwned + 'a> {
     Owned(<T as ToOwned>::Owned),
 }
 
-impl<T: ?Sized + ToOwned> Oco<'_, T> {
+impl<'a, T: ?Sized + ToOwned> Oco<'a, T> {
     /// Converts the value into an owned value.
     pub fn into_owned(self) -> <T as ToOwned>::Owned {
         match self {
@@ -339,7 +339,7 @@ where
     }
 }
 
-impl<'b, A: ?Sized, B: ?Sized> PartialEq<Oco<'b, B>> for Oco<'_, A>
+impl<'a, 'b, A: ?Sized, B: ?Sized> PartialEq<Oco<'b, B>> for Oco<'a, A>
 where
     A: PartialEq<B>,
     A: ToOwned,
@@ -352,7 +352,7 @@ where
 
 impl<T: ?Sized + ToOwned + Eq> Eq for Oco<'_, T> {}
 
-impl<'b, A: ?Sized, B: ?Sized> PartialOrd<Oco<'b, B>> for Oco<'_, A>
+impl<'a, 'b, A: ?Sized, B: ?Sized> PartialOrd<Oco<'b, B>> for Oco<'a, A>
 where
     A: PartialOrd<B>,
     A: ToOwned,
@@ -551,7 +551,7 @@ impl_slice_eq!(['a, 'b, T: PartialEq] (where [T]: ToOwned), Oco<'a, [T]>, &'b [T
 impl_slice_eq!([T: PartialEq] (where [T]: ToOwned), Oco<'_, [T]>, Vec<T>);
 impl_slice_eq!(['a, 'b, T: PartialEq] (where [T]: ToOwned), Oco<'a, [T]>, Cow<'b, [T]>);
 
-impl<'b> Add<&'b str> for Oco<'_, str> {
+impl<'a, 'b> Add<&'b str> for Oco<'a, str> {
     type Output = Oco<'static, str>;
 
     fn add(self, rhs: &'b str) -> Self::Output {
@@ -559,7 +559,7 @@ impl<'b> Add<&'b str> for Oco<'_, str> {
     }
 }
 
-impl<'b> Add<Cow<'b, str>> for Oco<'_, str> {
+impl<'a, 'b> Add<Cow<'b, str>> for Oco<'a, str> {
     type Output = Oco<'static, str>;
 
     fn add(self, rhs: Cow<'b, str>) -> Self::Output {
@@ -567,7 +567,7 @@ impl<'b> Add<Cow<'b, str>> for Oco<'_, str> {
     }
 }
 
-impl<'b> Add<Oco<'b, str>> for Oco<'_, str> {
+impl<'a, 'b> Add<Oco<'b, str>> for Oco<'a, str> {
     type Output = Oco<'static, str>;
 
     fn add(self, rhs: Oco<'b, str>) -> Self::Output {

or_poisoned/src/lib.rs

@@ -35,7 +35,7 @@ pub trait OrPoisoned {
     fn or_poisoned(self) -> Self::Inner;
 }
 
-impl<'a, T: ?Sized> OrPoisoned
+impl<'a, T> OrPoisoned
     for Result<RwLockReadGuard<'a, T>, PoisonError<RwLockReadGuard<'a, T>>>
 {
     type Inner = RwLockReadGuard<'a, T>;
@@ -45,7 +45,7 @@ impl<'a, T: ?Sized> OrPoisoned
     }
 }
 
-impl<'a, T: ?Sized> OrPoisoned
+impl<'a, T> OrPoisoned
     for Result<RwLockWriteGuard<'a, T>, PoisonError<RwLockWriteGuard<'a, T>>>
 {
     type Inner = RwLockWriteGuard<'a, T>;
@@ -55,7 +55,7 @@ impl<'a, T: ?Sized> OrPoisoned
     }
 }
 
-impl<'a, T: ?Sized> OrPoisoned for LockResult<MutexGuard<'a, T>> {
+impl<'a, T> OrPoisoned for LockResult<MutexGuard<'a, T>> {
     type Inner = MutexGuard<'a, T>;
 
     fn or_poisoned(self) -> Self::Inner {

projects/bevy3d_ui/Cargo.toml

@@ -8,19 +8,19 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-leptos = { version = "0.7.8", features = ["csr"] }
-leptos_meta = { version = "0.7.8" }
-leptos_router = { version = "0.7.8" }
+leptos = { version = "0.6.13", features = ["csr"] }
+leptos_meta = { version = "0.6.13", features = ["csr"] }
+leptos_router = { version = "0.6.13", features = ["csr"] }
 console_log = "1.0"
 log = "0.4.22"
 console_error_panic_hook = "0.1.7"
-bevy = "0.15.2"
+bevy = "0.14.1"
 crossbeam-channel = "0.5.13"
 
 [dev-dependencies]
-wasm-bindgen = "0.2.100"
-wasm-bindgen-test = "0.3.50"
-web-sys = "0.3.77"
+wasm-bindgen = "0.2.92"
+wasm-bindgen-test = "0.3.42"
+web-sys = "0.3.69"
 
 [workspace]
 # The empty workspace here is to keep rust-analyzer satisfied

projects/bevy3d_ui/src/demos/bevydemo1/eventqueue/plugin.rs

@@ -17,7 +17,7 @@ impl DuplexEventsPlugin {
         let (bevy_sender, client_receiver) = crossbeam_channel::bounded(50);
         // For sending message from the client to bevy
         let (client_sender, bevy_receiver) = crossbeam_channel::bounded(50);
-        DuplexEventsPlugin {
+        let instance = DuplexEventsPlugin {
             client_processor: EventProcessor {
                 sender: client_sender,
                 receiver: client_receiver,
@@ -26,7 +26,8 @@ impl DuplexEventsPlugin {
                 sender: bevy_sender,
                 receiver: bevy_receiver,
             },
-        }
+        };
+        instance
     }
 
     /// Get the client event processor