fix Suspense to use the old, Effect-like scheduling after fixing RenderEffect

Co-authored-by: Oliver Nordh <oliver.nordh@proton.me>

.github/dependabot.yml

@@ -0,0 +1,13 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "cargo"
+    directories:
+      - "/"
+      - "/examples/*"
+      - "/benchmarks"
+    schedule:
+      interval: "daily"

.github/workflows/ci-semver.yml

@@ -14,8 +14,8 @@ jobs:
 
   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-2024-04-14)
+    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:
@@ -25,4 +25,4 @@ jobs:
       - name: Semver Checks
         uses: obi1kenobi/cargo-semver-checks-action@v2
         with:
-          rust-toolchain: nightly-2024-04-14
+          rust-toolchain: nightly-2024-08-01

.github/workflows/ci.yml

@@ -49,4 +49,4 @@ jobs:
     with:
       directory: ${{ matrix.directory }}
       cargo_make_task: "ci"
-      toolchain: nightly-2024-04-14
+      toolchain: nightly-2024-08-01

.github/workflows/get-changed-examples-matrix.yml

@@ -26,7 +26,7 @@ jobs:
 
       - name: Get example project directories that changed
         id: changed-dirs
-        uses: tj-actions/changed-files@v41
+        uses: tj-actions/changed-files@v45
         with:
           dir_names: true
           dir_names_max_depth: "2"

.github/workflows/get-example-changed.yml

@@ -21,7 +21,7 @@ jobs:
 
       - name: Get example files that changed
         id: changed-files
-        uses: tj-actions/changed-files@v43
+        uses: tj-actions/changed-files@v45
         with:
           files: |
             examples/**

.github/workflows/get-leptos-changed.yml

@@ -21,7 +21,7 @@ jobs:
 
       - name: Get source files that changed
         id: changed-source
-        uses: tj-actions/changed-files@v43
+        uses: tj-actions/changed-files@v45
         with:
           files: |
             any_error/**

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

@@ -64,7 +64,7 @@ jobs:
         with:
           node-version: 20
 
-      - uses: pnpm/action-setup@v3
+      - uses: pnpm/action-setup@v4
         name: Install pnpm
         id: pnpm-install
         with:

Cargo.toml

@@ -37,37 +37,39 @@ members = [
   "router_macro",
   "any_error",
 ]
-exclude = ["benchmarks", "examples"]
+exclude = ["benchmarks", "examples", "projects"]
 
 [workspace.package]
-version = "0.7.0-alpha"
-rust-version = "1.75"
+version = "0.7.0-beta2"
+edition = "2021"
+rust-version = "1.76"
 
 [workspace.dependencies]
-throw_error = { path = "./any_error/", version = "0.1" }
-any_spawner = { path = "./any_spawner/", version = "0.1" }
-const_str_slice_concat = { path = "./const_str_slice_concat", version = "0.1" }
-either_of = { path = "./either_of/", version = "0.1" }
-hydration_context = { path = "./hydration_context", version = "0.2.0-alpha" }
-leptos = { path = "./leptos", version = "0.7.0-alpha" }
-leptos_config = { path = "./leptos_config", version = "0.7.0-alpha" }
-leptos_dom = { path = "./leptos_dom", version = "0.7.0-alpha" }
-leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.7.0-alpha" }
-leptos_integration_utils = { path = "./integrations/utils", version = "0.7.0-alpha" }
-leptos_macro = { path = "./leptos_macro", version = "0.7.0-alpha" }
-leptos_router = { path = "./router", version = "0.7.0-alpha" }
-leptos_server = { path = "./leptos_server", version = "0.7.0-alpha" }
-leptos_meta = { path = "./meta", version = "0.7.0-alpha" }
-next_tuple = { path = "./next_tuple", version = "0.1.0-alpha" }
-oco_ref = { path = "./oco", version = "0.2" }
-or_poisoned = { path = "./or_poisoned", version = "0.1" }
-reactive_graph = { path = "./reactive_graph", version = "0.1.0-alpha" }
-reactive_stores = { path = "./reactive_stores", version = "0.1.0-alpha" }
-reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.1.0-alpha" }
-server_fn = { path = "./server_fn", version = "0.7.0-alpha" }
-server_fn_macro = { path = "./server_fn_macro", version = "0.7.0-alpha" }
-server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.7.0-alpha" }
-tachys = { path = "./tachys", version = "0.1.0-alpha" }
+throw_error = { path = "./any_error/", version = "0.2.0-beta2" }
+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-beta2" }
+leptos = { path = "./leptos", version = "0.7.0-beta2" }
+leptos_config = { path = "./leptos_config", version = "0.7.0-beta2" }
+leptos_dom = { path = "./leptos_dom", version = "0.7.0-beta2" }
+leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.7.0-beta2" }
+leptos_integration_utils = { path = "./integrations/utils", version = "0.7.0-beta2" }
+leptos_macro = { path = "./leptos_macro", version = "0.7.0-beta2" }
+leptos_router = { path = "./router", version = "0.7.0-beta2" }
+leptos_router_macro = { path = "./router_macro", version = "0.7.0-beta2" }
+leptos_server = { path = "./leptos_server", version = "0.7.0-beta2" }
+leptos_meta = { path = "./meta", version = "0.7.0-beta2" }
+next_tuple = { path = "./next_tuple", version = "0.1.0-beta2" }
+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.0-beta2" }
+reactive_stores = { path = "./reactive_stores", version = "0.1.0-beta2" }
+reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.1.0-beta2" }
+server_fn = { path = "./server_fn", version = "0.7.0-beta2" }
+server_fn_macro = { path = "./server_fn_macro", version = "0.7.0-beta2" }
+server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.7.0-beta2" }
+tachys = { path = "./tachys", version = "0.1.0-beta2" }
 
 [profile.release]
 codegen-units = 1

README.md

@@ -12,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

any_error/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "throw_error"
-edition = "2021"
-version = "0.1.0"
+version = "0.2.0-beta2"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Utilities for wrapping, throwing, and catching errors."
 rust-version.workspace = true
+edition.workspace = true
 
 [dependencies]
-pin-project-lite = "0.2"
+pin-project-lite = "0.2.14"

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},
@@ -92,9 +92,25 @@ thread_local! {
     static ERROR_HOOK: RefCell<Option<Arc<dyn ErrorHook>>> = RefCell::new(None);
 }
 
+/// Resets the error hook to its previous state when dropped.
+pub struct ResetErrorHookOnDrop(Option<Arc<dyn ErrorHook>>);
+
+impl Drop for ResetErrorHookOnDrop {
+    fn drop(&mut self) {
+        ERROR_HOOK.with_borrow_mut(|this| *this = self.0.take())
+    }
+}
+
+/// Returns the current error hook.
+pub fn get_error_hook() -> Option<Arc<dyn ErrorHook>> {
+    ERROR_HOOK.with_borrow(Clone::clone)
+}
+
 /// Sets the current thread-local error hook, which will be invoked when [`throw`] is called.
-pub fn set_error_hook(hook: Arc<dyn ErrorHook>) {
-    ERROR_HOOK.with_borrow_mut(|this| *this = Some(hook))
+pub fn set_error_hook(hook: Arc<dyn ErrorHook>) -> ResetErrorHookOnDrop {
+    ResetErrorHookOnDrop(
+        ERROR_HOOK.with_borrow_mut(|this| mem::replace(this, Some(hook))),
+    )
 }
 
 /// Invokes the error hook set by [`set_error_hook`] with the given error.
@@ -140,9 +156,10 @@ where
 
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.project();
-        if let Some(hook) = &this.hook {
-            set_error_hook(Arc::clone(hook))
-        }
+        let _hook = this
+            .hook
+            .as_ref()
+            .map(|hook| set_error_hook(Arc::clone(hook)));
         this.inner.poll(cx)
     }
 }

any_spawner/Cargo.toml

@@ -1,22 +1,22 @@
 [package]
 name = "any_spawner"
-edition = "2021"
 version = "0.1.1"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Spawn asynchronous tasks in an executor-independent way."
+edition.workspace = true
 
 [dependencies]
-futures = "0.3"
-glib = { version = "0.19", optional = true }
-thiserror = "1"
-tokio = { version = "1", optional = true, default-features = false, features = [
-	"rt",
+futures = "0.3.30"
+glib = { version = "0.20.0", optional = true }
+thiserror = "1.0"
+tokio = { version = "1.39", optional = true, default-features = false, features = [
+  "rt",
 ] }
-tracing = { version = "0.1", optional = true }
-wasm-bindgen-futures = { version = "0.4", optional = true }
+tracing = { version = "0.1.40", optional = true }
+wasm-bindgen-futures = { version = "0.4.42", optional = true }
 
 [features]
 tracing = ["dep:tracing"]
@@ -28,3 +28,6 @@ futures-executor = ["futures/thread-pool", "futures/executor"]
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
+
+[package.metadata.cargo-all-features]
+denylist = ["tracing"]

benchmarks/Cargo.toml

@@ -6,31 +6,31 @@ rust-version.workspace = true
 
 [dependencies]
 l0410 = { package = "leptos", version = "0.4.10", features = [
-	"nightly",
-	"ssr",
+  "nightly",
+  "ssr",
 ] }
 leptos = { path = "../leptos", features = ["ssr", "nightly"] }
 leptos_reactive = { path = "../leptos_reactive", features = ["ssr", "nightly"] }
 tachydom = { git = "https://github.com/gbj/tachys", features = [
-	"nightly",
-	"leptos",
+  "nightly",
+  "leptos",
 ] }
 tachy_maccy = { git = "https://github.com/gbj/tachys", features = ["nightly"] }
-sycamore = { version = "0.8", features = ["ssr"] }
-yew = { version = "0.20", features = ["ssr"] }
-tokio-test = "0.4"
-miniserde = "0.1"
-gloo = "0.8"
-uuid = { version = "1", features = ["serde", "v4", "wasm-bindgen"] }
-wasm-bindgen = "0.2"
-lazy_static = "1"
-log = "0.4"
-strum = "0.24"
-strum_macros = "0.24"
-serde = { version = "1", features = ["derive", "rc"] }
-serde_json = "1"
-tera = "1"
+sycamore = { version = "0.8.0", features = ["ssr"] }
+yew = { version = "0.20.0", features = ["ssr"] }
+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.0"
+lazy_static = "1.0"
+log = "0.4.0"
+strum = "0.24.0"
+strum_macros = "0.24.0"
+serde = { version = "1.0", features = ["derive", "rc"] }
+serde_json = "1.0"
+tera = "1.0"
 
 [dependencies.web-sys]
-version = "0.3"
+version = "0.3.0"
 features = ["Window", "Document", "HtmlElement", "HtmlInputElement"]

const_str_slice_concat/Cargo.toml

@@ -1,6 +1,5 @@
 [package]
 name = "const_str_slice_concat"
-edition = "2021"
 version = "0.1.0"
 authors = ["Greg Johnston"]
 license = "MIT"
@@ -8,5 +7,6 @@ readme = "../README.md"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Utilities for const concatenation of string slices."
 rust-version.workspace = true
+edition.workspace = true
 
 [dependencies]

either_of/Cargo.toml

@@ -1,6 +1,5 @@
 [package]
 name = "either_of"
-edition = "2021"
 version = "0.1.0"
 authors = ["Greg Johnston"]
 license = "MIT"
@@ -8,6 +7,7 @@ readme = "../README.md"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Utilities for working with enumerated types that contain one of 2..n other types."
 rust-version.workspace = true
+edition.workspace = true
 
 [dependencies]
-pin-project-lite = "0.2"
+pin-project-lite = "0.2.14"

examples/action-form-error-handling/Cargo.toml

@@ -7,19 +7,18 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-actix-files = { version = "0.6", optional = true }
-actix-web = { version = "4", optional = true, features = ["macros"] }
-console_error_panic_hook = "0.1"
-cfg-if = "1"
+actix-files = { version = "0.6.6", optional = true }
+actix-web = { version = "4.8", optional = true, features = ["macros"] }
+console_error_panic_hook = "0.1.7"
+cfg-if = "1.0"
 leptos = { path = "../../leptos" }
 leptos_meta = { path = "../../meta" }
 leptos_actix = { path = "../../integrations/actix", optional = true }
 leptos_router = { path = "../../router" }
-wasm-bindgen = "0.2"
-serde = { version = "1", features = ["derive"] }
+wasm-bindgen = "0.2.93"
+serde = { version = "1.0", features = ["derive"] }
 
 [features]
-csr = ["leptos/csr"]
 hydrate = ["leptos/hydrate"]
 ssr = [
   "dep:actix-files",

examples/action-form-error-handling/README.md

@@ -1,68 +1,9 @@
-<picture>
-    <source srcset="https://raw.githubusercontent.com/leptos-rs/leptos/main/docs/logos/Leptos_logo_Solid_White.svg" media="(prefers-color-scheme: dark)">
-    <img src="https://raw.githubusercontent.com/leptos-rs/leptos/main/docs/logos/Leptos_logo_RGB.svg" alt="Leptos Logo">
-</picture>
+# Action Form Error Handling Example
 
-# Leptos Starter Template
+## Getting Started
 
-This is a template for use with the [Leptos](https://github.com/leptos-rs/leptos) web framework and the [cargo-leptos](https://github.com/akesson/cargo-leptos) tool.
+See the [Examples README](../README.md) for setup and run instructions.
 
-## Creating your template repo
+## Quick Start
 
-If you don't have `cargo-leptos` installed you can install it with
-
-`cargo install cargo-leptos`
-
-Then run
-
-`cargo leptos new --git leptos-rs/start`
-
-to generate a new project template (you will be prompted to enter a project name).
-
-`cd {projectname}`
-
-to go to your newly created project.
-
-Of course, you should explore around the project structure, but the best place to start with your application code is in `src/app.rs`.
-
-## Running your project
-
-`cargo leptos watch`  
-By default, you can access your local project at `http://localhost:3000`
-
-## Installing Additional Tools
-
-By default, `cargo-leptos` uses `nightly` Rust, `cargo-generate`, and `sass`. If you run into any trouble, you may need to install one or more of these tools.
-
-1. `rustup toolchain install nightly --allow-downgrade` - make sure you have Rust nightly
-2. `rustup target add wasm32-unknown-unknown` - add the ability to compile Rust to WebAssembly
-3. `cargo install cargo-generate` - install `cargo-generate` binary (should be installed automatically in future)
-4. `npm install -g sass` - install `dart-sass` (should be optional in future)
-
-## Executing a Server on a Remote Machine Without the Toolchain
-After running a `cargo leptos build --release` the minimum files needed are:
-
-1. The server binary located in `target/server/release`
-2. The `site` directory and all files within located in `target/site`
-
-Copy these files to your remote server. The directory structure should be:
-```text
-leptos_start
-site/
-```
-Set the following environment variables (updating for your project as needed):
-```sh
-export LEPTOS_OUTPUT_NAME="leptos_start"
-export LEPTOS_SITE_ROOT="site"
-export LEPTOS_SITE_PKG_DIR="pkg"
-export LEPTOS_SITE_ADDR="127.0.0.1:3000"
-export LEPTOS_RELOAD_PORT="3001"
-```
-Finally, run the server binary.
-
-## Notes about CSR and Trunk:
-Although it is not recommended, you can also run your project without server integration using the feature `csr` and `trunk serve`:
-
-`trunk serve --open --features csr`
-
-This may be useful for integrating external tools which require a static site, e.g. `tauri`.
+Execute `cargo leptos watch` to run this example.

examples/action-form-error-handling/src/main.rs

@@ -52,23 +52,10 @@ async fn main() -> std::io::Result<()> {
     .await
 }
 
-#[cfg(not(any(feature = "ssr", feature = "csr")))]
+#[cfg(not(feature = "ssr"))]
 pub fn main() {
     // no client-side main function
     // unless we want this to work with e.g., Trunk for pure client-side testing
     // see lib.rs for hydration function instead
     // see optional feature `csr` instead
 }
-
-#[cfg(all(not(feature = "ssr"), feature = "csr"))]
-pub fn main() {
-    // a client-side main function is required for using `trunk serve`
-    // prefer using `cargo leptos serve` instead
-    // to run: `trunk serve --open --features csr`
-    use action_form_error_handling::app::*;
-    use leptos::prelude::*;
-
-    console_error_panic_hook::set_once();
-
-    mount_to_body(App);
-}

examples/counter/Cargo.toml

@@ -10,12 +10,12 @@ lto = true
 
 [dependencies]
 leptos = { path = "../../leptos", features = ["csr"] }
-console_log = "1"
-log = "0.4"
+console_log = "1.0"
+log = "0.4.22"
 console_error_panic_hook = "0.1.7"
 gloo-timers = { version = "0.3.0", features = ["futures"] }
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
-web-sys = "0.3"
+wasm-bindgen = "0.2.93"
+wasm-bindgen-test = "0.3.42"
+web-sys = "0.3.70"

examples/counter_isomorphic/Cargo.toml

@@ -11,34 +11,34 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-actix-files = { version = "0.6", optional = true }
-actix-web = { version = "4", optional = true, features = ["macros"] }
-broadcaster = "1"
-console_log = "1"
-console_error_panic_hook = "0.1"
-futures = "0.3"
-lazy_static = "1"
+actix-files = { version = "0.6.6", optional = true }
+actix-web = { version = "4.8", optional = true, features = ["macros"] }
+broadcaster = "1.0"
+console_log = "1.0"
+console_error_panic_hook = "0.1.7"
+futures = "0.3.30"
+lazy_static = "1.5"
 leptos = { path = "../../leptos" }
 leptos_actix = { path = "../../integrations/actix", optional = true }
 leptos_router = { path = "../../router" }
-log = "0.4"
-once_cell = "1.18"
-gloo-net = { git = "https://github.com/rustwasm/gloo" }
-wasm-bindgen = "0.2"
-serde = { version = "1", features = ["derive"] }
-simple_logger = "4.3"
-tracing = { version = "0.1", optional = true }
+log = "0.4.22"
+once_cell = "1.19"
+gloo-net = { version = "0.6.0" }
+wasm-bindgen = "0.2.93"
+serde = { version = "1.0", features = ["derive"] }
+simple_logger = "5.0"
+tracing = { version = "0.1.40", optional = true }
 send_wrapper = "0.6.0"
 
 [features]
 hydrate = ["leptos/hydrate"]
 ssr = [
-	"dep:actix-files",
-	"dep:actix-web",
-	"dep:tracing",
-	"leptos/ssr",
-	"leptos_actix",
-	"leptos_router/ssr",
+  "dep:actix-files",
+  "dep:actix-web",
+  "dep:tracing",
+  "leptos/ssr",
+  "leptos_actix",
+  "leptos_router/ssr",
 ]
 
 [package.metadata.cargo-all-features]

examples/counter_isomorphic/src/counters.rs

@@ -113,10 +113,10 @@ pub fn Counter() -> impl IntoView {
             </p>
             <ErrorBoundary fallback=|errors| move || format!("Error: {:#?}", errors.get())>
                 <div>
-                    <button on:click=move |_| clear.dispatch(())>"Clear"</button>
-                    <button on:click=move |_| dec.dispatch(())>"-1"</button>
+                    <button on:click=move |_| { clear.dispatch(()); }>"Clear"</button>
+                    <button on:click=move |_| { dec.dispatch(()); }>"-1"</button>
                     <span>"Value: " <Suspense>{counter} "!"</Suspense></span>
-                    <button on:click=move |_| inc.dispatch(())>"+1"</button>
+                    <button on:click=move |_| { inc.dispatch(()); }>"+1"</button>
                 </div>
             </ErrorBoundary>
         </div>
@@ -224,12 +224,12 @@ pub fn MultiuserCounter() -> impl IntoView {
                 "This one uses server-sent events (SSE) to live-update when other users make changes."
             </p>
             <div>
-                <button on:click=move |_| clear.dispatch(())>"Clear"</button>
-                <button on:click=move |_| dec.dispatch(())>"-1"</button>
+                <button on:click=move |_| { clear.dispatch(()); }>"Clear"</button>
+                <button on:click=move |_| { dec.dispatch(()); }>"-1"</button>
                 <span>
                     "Multiplayer Value: " {move || multiplayer_value.get().unwrap_or_default()}
                 </span>
-                <button on:click=move |_| inc.dispatch(())>"+1"</button>
+                <button on:click=move |_| { inc.dispatch(()); }>"+1"</button>
             </div>
         </div>
     }

examples/counter_url_query/Cargo.toml

@@ -13,6 +13,6 @@ leptos_router = { path = "../../router", features = [] }
 console_error_panic_hook = "0.1.7"
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
-web-sys = "0.3"
+wasm-bindgen = "0.2.93"
+wasm-bindgen-test = "0.3.42"
+web-sys = "0.3.70"

examples/counter_without_macros/Cargo.toml

@@ -14,10 +14,10 @@ console_error_panic_hook = "0.1.7"
 
 [dev-dependencies]
 wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.34"
-pretty_assertions = "1.3.0"
-rstest = "0.17.0"
+wasm-bindgen-test = "0.3.42"
+pretty_assertions = "1.4"
+rstest = "0.22.0"
 
 [dev-dependencies.web-sys]
 features = ["HtmlElement", "XPathResult"]
-version = "0.3.61"
+version = "0.3.70"

examples/counters/.gitignore

@@ -0,0 +1,6 @@
+# Support playwright testing
+node_modules/
+test-results/
+end2end/playwright-report/
+playwright/.cache/
+pnpm-lock.yaml

examples/counters/Cargo.toml

@@ -4,10 +4,10 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { path = "../../leptos", features = ["csr"]  }
+leptos = { path = "../../leptos", features = ["csr"] }
 console_error_panic_hook = "0.1.7"
 
 [dev-dependencies]
-wasm-bindgen-test = "0.3.0"
-wasm-bindgen = "0.2"
-web-sys = "0.3"
+wasm-bindgen-test = "0.3.42"
+wasm-bindgen = "0.2.93"
+web-sys = "0.3.70"

examples/counters/Makefile.toml

@@ -2,4 +2,5 @@ extend = [
     { path = "../cargo-make/main.toml" },
     { path = "../cargo-make/wasm-test.toml" },
     { path = "../cargo-make/trunk_server.toml" },
+    { path = "../cargo-make/playwright-trunk-test.toml" },
 ]

examples/counters/e2e/.gitignore

@@ -0,0 +1,4 @@
+node_modules/
+/test-results/
+/playwright-report/
+/playwright/.cache/

examples/counters/e2e/package-lock.json

@@ -0,0 +1,83 @@
+{
+  "name": "grip",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "grip",
+      "devDependencies": {
+        "@playwright/test": "^1.35.1"
+      }
+    },
+    "node_modules/.pnpm/@playwright+test@1.33.0": {
+      "extraneous": true
+    },
+    "node_modules/.pnpm/@types+node@20.2.1/node_modules/@types/node": {
+      "version": "20.2.1",
+      "extraneous": true,
+      "license": "MIT"
+    },
+    "node_modules/.pnpm/playwright-core@1.33.0/node_modules/playwright-core": {
+      "version": "1.33.0",
+      "extraneous": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=14"
+      }
+    },
+    "node_modules/@playwright/test": {
+      "version": "1.35.1",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.35.1.tgz",
+      "integrity": "sha512-b5YoFe6J9exsMYg0pQAobNDR85T1nLumUYgUTtKm4d21iX2L7WqKq9dW8NGJ+2vX0etZd+Y7UeuqsxDXm9+5ZA==",
+      "dev": true,
+      "dependencies": {
+        "@types/node": "*",
+        "playwright-core": "1.35.1"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=16"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "20.3.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.3.1.tgz",
+      "integrity": "sha512-EhcH/wvidPy1WeML3TtYFGR83UzjxeWRen9V402T8aUGYsCHOmfoisV3ZSg03gAFIbLq8TnWOJ0f4cALtnSEUg==",
+      "dev": true
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/playwright-core": {
+      "version": "1.35.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.35.1.tgz",
+      "integrity": "sha512-pNXb6CQ7OqmGDRspEjlxE49w+4YtR6a3X6mT1hZXeJHWmsEz7SunmvZeiG/+y1yyMZdHnnn73WKYdtV1er0Xyg==",
+      "dev": true,
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=16"
+      }
+    }
+  }
+}

examples/counters/e2e/package.json

@@ -0,0 +1,10 @@
+{
+  "private": "true",
+  "scripts": {},
+  "devDependencies": {
+    "@playwright/test": "^1.46.1"
+  },
+  "dependencies": {
+    "pnpm": "^9.7.1"
+  }
+}

examples/counters/e2e/playwright.config.ts

@@ -0,0 +1,77 @@
+import { defineConfig, devices } from "@playwright/test";
+
+/**
+ * Read environment variables from file.
+ * https://github.com/motdotla/dotenv
+ */
+// require('dotenv').config();
+
+/**
+ * See https://playwright.dev/docs/test-configuration.
+ */
+export default defineConfig({
+  testDir: "./tests",
+  /* Run tests in files in parallel */
+  fullyParallel: true,
+  /* Fail the build on CI if you accidentally left test.only in the source code. */
+  forbidOnly: !process.env.DEV,
+  /* Retry on CI only */
+  retries: process.env.DEV ? 0 : 10,
+  /* Opt out of parallel tests on CI. */
+  workers: process.env.DEV ? 1 : 1,
+  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+  reporter: [["html", { open: "never" }], ["list"]],
+  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
+  use: {
+    /* Base URL to use in actions like `await page.goto('/')`. */
+    baseURL: "http://127.0.0.1:8080",
+
+    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+    trace: "on-first-retry",
+  },
+
+  /* Configure projects for major browsers */
+  projects: [
+    {
+      name: "chromium",
+      use: { ...devices["Desktop Chrome"] },
+    },
+
+    // {
+    //   name: "firefox",
+    //   use: { ...devices["Desktop Firefox"] },
+    // },
+
+    // {
+    //   name: "webkit",
+    //   use: { ...devices["Desktop Safari"] },
+    // },
+
+    /* Test against mobile viewports. */
+    // {
+    //   name: 'Mobile Chrome',
+    //   use: { ...devices['Pixel 5'] },
+    // },
+    // {
+    //   name: 'Mobile Safari',
+    //   use: { ...devices['iPhone 12'] },
+    // },
+
+    /* Test against branded browsers. */
+    // {
+    //   name: 'Microsoft Edge',
+    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
+    // },
+    // {
+    //   name: 'Google Chrome',
+    //   use: { ..devices['Desktop Chrome'], channel: 'chrome' },
+    // },
+  ],
+
+  /* Run your local dev server before starting the tests */
+  // webServer: {
+  //   command: "cd ../ && trunk serve",
+  //   url: "http://127.0.0.1:8080",
+  //   reuseExistingServer: false, //!process.env.CI,
+  // },
+});

examples/counters/e2e/tests/add_1k_counters.spec.ts

@@ -0,0 +1,19 @@
+import { test, expect } from "@playwright/test";
+import { CountersPage } from "./fixtures/counters_page";
+
+test.describe("Add 1000 Counters", () => {
+  test("should increase the number of counters", async ({ page }) => {
+    const ui = new CountersPage(page);
+
+    await Promise.all([
+      await ui.goto(),
+      await ui.addOneThousandCountersButton.waitFor(),
+    ]);
+
+    await ui.addOneThousandCounters();
+    await ui.addOneThousandCounters();
+    await ui.addOneThousandCounters();
+
+    await expect(ui.counters).toHaveText("3000");
+  });
+});

examples/counters/e2e/tests/add_counter.spec.ts

@@ -0,0 +1,15 @@
+import { test, expect } from "@playwright/test";
+import { CountersPage } from "./fixtures/counters_page";
+
+test.describe("Add Counter", () => {
+  test("should increase the number of counters", async ({ page }) => {
+    const ui = new CountersPage(page);
+    await ui.goto();
+
+    await ui.addCounter();
+    await ui.addCounter();
+    await ui.addCounter();
+
+    await expect(ui.counters).toHaveText("3");
+  });
+});

examples/counters/e2e/tests/clear_counters.spec.ts

@@ -0,0 +1,18 @@
+import { test, expect } from "@playwright/test";
+import { CountersPage } from "./fixtures/counters_page";
+
+test.describe("Clear Counters", () => {
+  test("should reset the counts", async ({ page }) => {
+    const ui = new CountersPage(page);
+    await ui.goto();
+
+    await ui.addCounter();
+    await ui.addCounter();
+    await ui.addCounter();
+
+    await ui.clearCounters();
+
+    await expect(ui.total).toHaveText("0");
+    await expect(ui.counters).toHaveText("0");
+  });
+});

examples/counters/e2e/tests/decrement_count.spec.ts

@@ -0,0 +1,16 @@
+import { test, expect } from "@playwright/test";
+import { CountersPage } from "./fixtures/counters_page";
+
+test.describe("Decrement Count", () => {
+  test("should decrease the total count", async ({ page }) => {
+    const ui = new CountersPage(page);
+    await ui.goto();
+    await ui.addCounter();
+
+    await ui.decrementCount();
+    await ui.decrementCount();
+    await ui.decrementCount();
+
+    await expect(ui.total).toHaveText("-3");
+  });
+});

examples/counters/e2e/tests/enter_count.spec.ts

@@ -0,0 +1,30 @@
+import { test, expect } from "@playwright/test";
+import { CountersPage } from "./fixtures/counters_page";
+
+test.describe("Enter Count", () => {
+  test("should increase the total count", async ({ page }) => {
+    const ui = new CountersPage(page);
+    await ui.goto();
+    await ui.addCounter();
+
+    await ui.enterCount("5");
+
+    await expect(ui.total).toHaveText("5");
+    await expect(ui.counters).toHaveText("1");
+  });
+
+  test("should decrease the total count", async ({ page }) => {
+    const ui = new CountersPage(page);
+    await ui.goto();
+    await ui.addCounter();
+    await ui.addCounter();
+    await ui.addCounter();
+
+    await ui.enterCount("100");
+    await ui.enterCount("100", 1);
+    await ui.enterCount("100", 2);
+    await ui.enterCount("50", 1);
+
+    await expect(ui.total).toHaveText("250");
+  });
+});

examples/counters/e2e/tests/fixtures/counters_page.ts

@@ -0,0 +1,98 @@
+import { expect, Locator, Page } from "@playwright/test";
+
+export class CountersPage {
+  readonly page: Page;
+  readonly addCounterButton: Locator;
+  readonly addOneThousandCountersButton: Locator;
+  readonly clearCountersButton: Locator;
+
+  readonly incrementCountButton: Locator;
+  readonly counterInput: Locator;
+  readonly decrementCountButton: Locator;
+  readonly removeCountButton: Locator;
+
+  readonly total: Locator;
+  readonly counters: Locator;
+
+  constructor(page: Page) {
+    this.page = page;
+
+    this.addCounterButton = page.locator("button", { hasText: "Add Counter" });
+
+    this.addOneThousandCountersButton = page.locator("button", {
+      hasText: "Add 1000 Counters",
+    });
+
+    this.clearCountersButton = page.locator("button", {
+      hasText: "Clear Counters",
+    });
+
+    this.decrementCountButton = page.locator("button", {
+      hasText: "-1",
+    });
+
+    this.incrementCountButton = page.locator("button", {
+      hasText: "+1",
+    });
+
+    this.removeCountButton = page.locator("button", {
+      hasText: "x",
+    });
+
+    this.total = page.getByTestId("total");
+
+    this.counters = page.getByTestId("counters");
+
+    this.counterInput = page.getByRole("textbox");
+  }
+
+  async goto() {
+    await this.page.goto("/");
+  }
+
+  async addCounter() {
+    await Promise.all([
+      this.addCounterButton.waitFor(),
+      this.addCounterButton.click(),
+    ]);
+  }
+
+  async addOneThousandCounters() {
+    this.addOneThousandCountersButton.click();
+  }
+
+  async decrementCount(index: number = 0) {
+    await Promise.all([
+      this.decrementCountButton.nth(index).waitFor(),
+      this.decrementCountButton.nth(index).click(),
+    ]);
+  }
+
+  async incrementCount(index: number = 0) {
+    await Promise.all([
+      this.incrementCountButton.nth(index).waitFor(),
+      this.incrementCountButton.nth(index).click(),
+    ]);
+  }
+
+  async clearCounters() {
+    await Promise.all([
+      this.clearCountersButton.waitFor(),
+      this.clearCountersButton.click(),
+    ]);
+  }
+
+  async enterCount(count: string, index: number = 0) {
+    await Promise.all([
+      this.counterInput.nth(index).waitFor(),
+      this.counterInput.nth(index).fill(count),
+    ]);
+  }
+
+  async removeCounter(index: number = 0) {
+    await Promise.all([
+      this.removeCountButton.nth(index).waitFor(),
+      this.removeCountButton.nth(index).click(),
+    ]);
+  }
+}

examples/counters/e2e/tests/increment_count.spec.ts

@@ -0,0 +1,16 @@
+import { test, expect } from "@playwright/test";
+import { CountersPage } from "./fixtures/counters_page";
+
+test.describe("Increment Count", () => {
+  test("should increase the total count", async ({ page }) => {
+    const ui = new CountersPage(page);
+    await ui.goto();
+    await ui.addCounter();
+
+    await ui.incrementCount();
+    await ui.incrementCount();
+    await ui.incrementCount();
+
+    await expect(ui.total).toHaveText("3");
+  });
+});

examples/counters/e2e/tests/remove_counter.spec.ts

@@ -0,0 +1,17 @@
+import { test, expect } from "@playwright/test";
+import { CountersPage } from "./fixtures/counters_page";
+
+test.describe("Remove Counter", () => {
+  test("should decrement the number of counters", async ({ page }) => {
+    const ui = new CountersPage(page);
+    await ui.goto();
+
+    await ui.addCounter();
+    await ui.addCounter();
+    await ui.addCounter();
+
+    await ui.removeCounter(1);
+
+    await expect(ui.counters).toHaveText("2");
+  });
+});

examples/counters/e2e/tests/view_counters.spec.ts

@@ -0,0 +1,19 @@
+import { test, expect } from "@playwright/test";
+import { CountersPage } from "./fixtures/counters_page";
+
+test.describe("View Counters", () => {
+  test("should see the title", async ({ page }) => {
+    const ui = new CountersPage(page);
+    await ui.goto();
+
+    await expect(page).toHaveTitle("Counters");
+  });
+
+  test("should see the initial counts", async ({ page }) => {
+    const counters = new CountersPage(page);
+    await counters.goto();
+
+    await expect(counters.total).toHaveText("0");
+    await expect(counters.counters).toHaveText("0");
+  });
+});

examples/counters/index.html

@@ -2,6 +2,7 @@
 <html>
 	<head>
 		<link data-trunk rel="rust" data-wasm-opt="z" data-weak-refs/>
+		<title>Counters</title>
 	</head>
 	<body></body>
-</html>
+</html>

examples/counters/src/lib.rs

@@ -44,12 +44,13 @@ pub fn Counters() -> impl IntoView {
             <button on:click=clear_counters>"Clear Counters"</button>
             <p>
                 "Total: "
-                <span>
+                <span data-testid="total">
                     {move || {
                         counters.get().iter().map(|(_, count)| count.get()).sum::<i32>().to_string()
                     }}
 
-                </span> " from " <span>{move || counters.get().len().to_string()}</span>
+                </span> " from "
+                <span data-testid="counters">{move || counters.get().len().to_string()}</span>
                 " counters."
             </p>
             <ul>

examples/counters/tests/web.rs

@@ -23,7 +23,7 @@ async fn inc() {
         div.inner_html(),
         "<button>Add Counter</button><button>Add 1000 \
          Counters</button><button>Clear Counters</button><p>Total: \
-         <span>0</span> from <span>0</span> counters.</p><ul><!----></ul>"
+         <span data-testid=\"total\">0</span> from <span data-testid=\"counters\">0</span> counters.</p><ul><!----></ul>"
     );
 
     // add 3 counters
@@ -38,7 +38,7 @@ async fn inc() {
         div.inner_html(),
         "<button>Add Counter</button><button>Add 1000 \
          Counters</button><button>Clear Counters</button><p>Total: \
-         <span>0</span> from <span>3</span> \
+         <span data-testid=\"total\">0</span> from <span data-testid=\"counters\">3</span> \
          counters.</p><ul><li><button>-1</button><input \
          type=\"text\"><span>0</span><button>+1</button><button>x</button></\
          li><li><button>-1</button><input \
@@ -80,7 +80,7 @@ async fn inc() {
         div.inner_html(),
         "<button>Add Counter</button><button>Add 1000 \
          Counters</button><button>Clear Counters</button><p>Total: \
-         <span>6</span> from <span>3</span> \
+         <span data-testid=\"total\">6</span> from <span data-testid=\"counters\">3</span> \
          counters.</p><ul><li><button>-1</button><input \
          type=\"text\"><span>1</span><button>+1</button><button>x</button></\
          li><li><button>-1</button><input \
@@ -105,7 +105,7 @@ async fn inc() {
         div.inner_html(),
         "<button>Add Counter</button><button>Add 1000 \
          Counters</button><button>Clear Counters</button><p>Total: \
-         <span>5</span> from <span>2</span> \
+         <span data-testid=\"total\">5</span> from <span data-testid=\"counters\">2</span> \
          counters.</p><ul><li><button>-1</button><input \
          type=\"text\"><span>2</span><button>+1</button><button>x</button></\
          li><li><button>-1</button><input \

examples/directives/Cargo.toml

@@ -5,12 +5,12 @@ edition = "2021"
 
 [dependencies]
 leptos = { path = "../../leptos", features = ["csr"] }
-log = "0.4"
-console_log = "1"
+log = "0.4.22"
+console_log = "1.0"
 console_error_panic_hook = "0.1.7"
-web-sys = { version = "0.3", features = ["Clipboard", "Navigator"] }
+web-sys = { version = "0.3.70", features = ["Clipboard", "Navigator"] }
 
 [dev-dependencies]
-wasm-bindgen-test = "0.3.0"
-wasm-bindgen = "0.2"
-web-sys = { version = "0.3", features = ["NodeList"] }
+wasm-bindgen-test = "0.3.42"
+wasm-bindgen = "0.2.93"
+web-sys = { version = "0.3.70", features = ["NodeList"] }

examples/directives/src/lib.rs

@@ -24,11 +24,7 @@ pub fn copy_to_clipboard(el: Element, content: &str) {
         evt.prevent_default();
         evt.stop_propagation();
 
-        let _ = window()
-            .navigator()
-            .clipboard()
-            .expect("navigator.clipboard to be available")
-            .write_text(&content);
+        let _ = window().navigator().clipboard().write_text(&content);
 
         el.set_inner_html(&format!("Copied \"{}\"", &content));
     });
@@ -53,7 +49,6 @@ impl From<()> for Amount {
     }
 }
 
-// .into() will automatically be called on the parameter
 pub fn add_dot(el: Element, amount: Amount) {
     use leptos::wasm_bindgen::JsCast;
     let el = el.unchecked_into::<web_sys::HtmlElement>();
@@ -82,12 +77,17 @@ pub fn App() -> impl IntoView {
     let data = "Hello World!";
 
     view! {
-        <a href="#" use:copy_to_clipboard=data>"Copy \"" {data} "\" to clipboard"</a>
+        <a href="#" use:copy_to_clipboard=data>
+            "Copy \""
+            {data}
+            "\" to clipboard"
+        </a>
         // automatically applies the directive to every root element in `SomeComponent`
-        <SomeComponent use:highlight />
+        <SomeComponent use:highlight/>
         // no value will default to `().into()`
         <button use:add_dot>"Add a dot"</button>
-        // `5.into()` automatically called
-        <button use:add_dot=5>"Add 5 dots"</button>
+        // can manually call `.into()` to convert to the correct type
+        // (automatically calling `.into()` prevents using generics in directive functions)
+        <button use:add_dot=5.into()>"Add 5 dots"</button>
     }
 }

examples/error_boundary/Cargo.toml

@@ -9,6 +9,6 @@ lto = true
 
 [dependencies]
 leptos = { path = "../../leptos", features = ["csr"] }
-console_log = "1"
-log = "0.4"
+console_log = "1.0"
+log = "0.4.22"
 console_error_panic_hook = "0.1.7"

examples/errors_axum/Cargo.toml

@@ -7,19 +7,19 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-console_error_panic_hook = "0.1"
+console_error_panic_hook = "0.1.7"
 leptos = { path = "../../leptos" }
 leptos_axum = { path = "../../integrations/axum", optional = true }
 leptos_meta = { path = "../../meta" }
 leptos_router = { path = "../../router" }
-serde = { version = "1", features = ["derive"] }
-axum = { version = "0.7", optional = true }
-tower = { version = "0.4", optional = true }
-tower-http = { version = "0.5", features = ["fs"], optional = true }
-tokio = { version = "1", features = ["full"], optional = true }
-http = { version = "1.0" }
+serde = { version = "1.0", features = ["derive"] }
+axum = { version = "0.7.5", optional = true }
+tower = { version = "0.4.13", optional = true }
+tower-http = { version = "0.5.2", features = ["fs"], optional = true }
+tokio = { version = "1.39", features = ["full"], optional = true }
+http = { version = "1.1" }
 thiserror = "1.0"
-wasm-bindgen = "0.2"
+wasm-bindgen = "0.2.93"
 
 [features]
 hydrate = ["leptos/hydrate"]

examples/fetch/Cargo.toml

@@ -9,16 +9,16 @@ lto = true
 
 [dependencies]
 leptos = { path = "../../leptos", features = ["csr", "tracing"] }
-reqwasm = "0.5"
-gloo-timers = { version = "0.3", features = ["futures"] }
-serde = { version = "1", features = ["derive"] }
-log = "0.4"
-console_log = "1"
-console_error_panic_hook = "0.1"
-thiserror = "1"
-tracing = "0.1"
-tracing-subscriber = "0.3"
-tracing-subscriber-wasm = "0.1"
+reqwasm = "0.5.0"
+gloo-timers = { version = "0.3.0", features = ["futures"] }
+serde = { version = "1.0", features = ["derive"] }
+log = "0.4.22"
+console_log = "1.0"
+console_error_panic_hook = "0.1.7"
+thiserror = "1.0"
+tracing = "0.1.40"
+tracing-subscriber = "0.3.18"
+tracing-subscriber-wasm = "0.1.0"
 
 [dev-dependencies]
-wasm-bindgen-test = "0.3"
+wasm-bindgen-test = "0.3.42"

examples/gtk/Cargo.toml

@@ -4,15 +4,15 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { path = "../../leptos", features = ["csr"] }
+leptos = { path = "../../leptos" }
 throw_error = { path = "../../any_error/" }
-any_spawner = { path = "../../any_spawner/" }
+
+# these are used to build the integration
+gtk = { version = "0.9.0", package = "gtk4" }
 next_tuple = { path = "../../next_tuple/" }
-gtk = { version = "0.8.0", package = "gtk4", optional = true }
-paste = "1.0.14"
+paste = "1.0"
 
-console_error_panic_hook = { version = "0.1", optional = true }
-
-[features]
-gtk = ["dep:gtk", "any_spawner/glib"]
-wasm = ["any_spawner/wasm-bindgen", "dep:console_error_panic_hook"]
+# we want to support using glib for the reactive runtime event loop
+any_spawner = { path = "../../any_spawner/", features = ["glib"] }
+# yes, we want effects to run: this is a "frontend," not a backend
+reactive_graph = { path = "../../reactive_graph", features = ["effects"] }

examples/gtk/src/leptos_gtk.rs

@@ -56,11 +56,12 @@ impl Mountable<LeptosGtk> for Element {
             .insert_before(&parent.0, marker.as_ref().map(|m| &m.0));
     }
 
-    fn insert_before_this(&self, 
-        child: &mut dyn Mountable<LeptosGtk>,
-    ) -> bool {
-        child.mount(parent, Some(self.as_ref()));
-        true
+    fn insert_before_this(&self, child: &mut dyn Mountable<LeptosGtk>) -> bool {
+        if let Some(parent) = self.0.parent() {
+            child.mount(&Element(parent), Some(self));
+            return true;
+        }
+        false
     }
 }
 
@@ -79,11 +80,8 @@ impl Mountable<LeptosGtk> for Text {
             .insert_before(&parent.0, marker.as_ref().map(|m| &m.0));
     }
 
-    fn insert_before_this(&self, 
-        child: &mut dyn Mountable<LeptosGtk>,
-    ) -> bool {
-        child.mount(parent, Some(self.as_ref()));
-        true
+    fn insert_before_this(&self, child: &mut dyn Mountable<LeptosGtk>) -> bool {
+        self.0.insert_before_this(child)
     }
 }
 
@@ -332,16 +330,12 @@ where
         parent: &<LeptosGtk as Renderer>::Element,
         marker: Option<&<LeptosGtk as Renderer>::Node>,
     ) {
-        println!("mounting {}", std::any::type_name::<Widg>());
         self.children.mount(&self.widget, None);
         LeptosGtk::insert_node(parent, &self.widget, marker);
     }
 
-    fn insert_before_this(&self, 
-        child: &mut dyn Mountable<LeptosGtk>,
-    ) -> bool {
-        child.mount(parent, Some(self.widget.as_ref()));
-        true
+    fn insert_before_this(&self, child: &mut dyn Mountable<LeptosGtk>) -> bool {
+        self.widget.insert_before_this(child)
     }
 }
 

examples/gtk/src/main.rs

@@ -1,20 +1,8 @@
-#[cfg(feature = "gtk")]
-use gtk::{
-    glib::Value, prelude::*, Application, ApplicationWindow, Orientation,
-    Widget,
-};
-#[cfg(feature = "wasm")]
-use leptos::tachys::{dom::body, html::element, html::event as ev};
-use leptos::{
-    logging,
-    prelude::*,
-    reactive_graph::{effect::Effect, owner::Owner, signal::RwSignal},
-    Executor, For, ForProps,
-};
-#[cfg(feature = "gtk")]
-use leptos_gtk::{Element, LGtkWidget, LeptosGtk};
+use any_spawner::Executor;
+use gtk::{prelude::*, Application, ApplicationWindow, Orientation};
+use leptos::prelude::*;
+use leptos_gtk::LeptosGtk;
 use std::{mem, thread, time::Duration};
-#[cfg(feature = "gtk")]
 mod leptos_gtk;
 
 const APP_ID: &str = "dev.leptos.Counter";
@@ -22,59 +10,39 @@ const APP_ID: &str = "dev.leptos.Counter";
 // Basic GTK app setup from https://gtk-rs.org/gtk4-rs/stable/latest/book/hello_world.html
 fn main() {
     // use the glib event loop to power the reactive system
-    #[cfg(feature = "gtk")]
-    {
-        _ = Executor::init_glib();
-        let app = Application::builder().application_id(APP_ID).build();
+    _ = Executor::init_glib();
+    let app = Application::builder().application_id(APP_ID).build();
 
-        app.connect_startup(|_| load_css());
+    app.connect_startup(|_| load_css());
 
-        app.connect_activate(|app| {
-            // Connect to "activate" signal of `app`
-            let owner = Owner::new();
-            let view = owner.with(ui);
-            let (root, state) = leptos_gtk::root(view);
-
-            let window = ApplicationWindow::builder()
-                .application(app)
-                .title("TachyGTK")
-                .child(&root)
-                .build();
-            // Present window
-            window.present();
-            mem::forget((owner, state));
-        });
-
-        app.run();
-    }
-
-    #[cfg(all(feature = "wasm", not(feature = "gtk")))]
-    {
-        console_error_panic_hook::set_once();
-        _ = Executor::init_wasm_bindgen();
+    app.connect_activate(|app| {
+        // Connect to "activate" signal of `app`
         let owner = Owner::new();
         let view = owner.with(ui);
-        let mut state = view.build();
-        state.mount(&body().into(), None);
+        let (root, state) = leptos_gtk::root(view);
+
+        let window = ApplicationWindow::builder()
+            .application(app)
+            .title("TachyGTK")
+            .child(&root)
+            .build();
+        // Present window
+        window.present();
         mem::forget((owner, state));
-    }
+    });
+
+    app.run();
 }
 
-#[cfg(feature = "gtk")]
-type Rndr = LeptosGtk;
-#[cfg(all(feature = "wasm", not(feature = "gtk")))]
-type Rndr = Dom;
-
-fn ui() -> impl Render<Rndr> {
+fn ui() -> impl Render<LeptosGtk> {
     let value = RwSignal::new(0);
     let rows = RwSignal::new(vec![1, 2, 3, 4, 5]);
 
     Effect::new(move |_| {
-        logging::log!("value = {}", value.get());
+        println!("value = {}", value.get());
     });
 
     // just an example of multithreaded reactivity
-    #[cfg(feature = "gtk")]
     thread::spawn(move || loop {
         thread::sleep(Duration::from_millis(250));
         value.update(|n| *n += 1);
@@ -82,7 +50,10 @@ fn ui() -> impl Render<Rndr> {
 
     vstack((
         hstack((
-            button("-1", move || value.update(|n| *n -= 1)),
+            button("-1", move || {
+                println!("clicked -1");
+                value.update(|n| *n -= 1);
+            }),
             move || value.get().to_string(),
             button("+1", move || value.update(|n| *n += 1)),
         )),
@@ -91,75 +62,36 @@ fn ui() -> impl Render<Rndr> {
                 items.swap(1, 3);
             })
         }),
-        hstack(For(ForProps::builder()
-            .each(move || rows.get())
-            .key(|k| *k)
-            .children(|v| v)
-            .build())),
+        hstack(rows),
     ))
 }
 
 fn button(
-    label: impl Render<Rndr>,
+    label: impl Render<LeptosGtk>,
     callback: impl Fn() + Send + Sync + 'static,
-) -> impl Render<Rndr> {
-    #[cfg(feature = "gtk")]
-    {
-        leptos_gtk::button()
-            .child(label)
-            .connect("clicked", move |_| {
-                callback();
-                None
-            })
-    }
-    #[cfg(all(feature = "wasm", not(feature = "gtk")))]
-    {
-        element::button()
-            .on(ev::click, move |_| callback())
-            .child(label)
-    }
+) -> impl Render<LeptosGtk> {
+    leptos_gtk::button()
+        .child(label)
+        .connect("clicked", move |_| {
+            callback();
+            None
+        })
 }
 
-fn vstack(children: impl Render<Rndr>) -> impl Render<Rndr> {
-    #[cfg(feature = "gtk")]
-    {
-        leptos_gtk::r#box()
-            .orientation(Orientation::Vertical)
-            .spacing(12)
-            .child(children)
-    }
-    #[cfg(all(feature = "wasm", not(feature = "gtk")))]
-    {
-        element::div()
-            .style(("display", "flex"))
-            .style(("flex-direction", "column"))
-            .style(("align-items", "center"))
-            .style(("justify-content", "center"))
-            .style(("margin", "1rem"))
-            .child(children)
-    }
+fn vstack(children: impl Render<LeptosGtk>) -> impl Render<LeptosGtk> {
+    leptos_gtk::r#box()
+        .orientation(Orientation::Vertical)
+        .spacing(12)
+        .child(children)
 }
 
-fn hstack(children: impl Render<Rndr>) -> impl Render<Rndr> {
-    #[cfg(feature = "gtk")]
-    {
-        leptos_gtk::r#box()
-            .orientation(Orientation::Horizontal)
-            .spacing(12)
-            .child(children)
-    }
-    #[cfg(all(feature = "wasm", not(feature = "gtk")))]
-    {
-        element::div()
-            .style(("display", "flex"))
-            .style(("align-items", "center"))
-            .style(("justify-content", "center"))
-            .style(("margin", "1rem"))
-            .child(children)
-    }
+fn hstack(children: impl Render<LeptosGtk>) -> impl Render<LeptosGtk> {
+    leptos_gtk::r#box()
+        .orientation(Orientation::Horizontal)
+        .spacing(12)
+        .child(children)
 }
 
-#[cfg(feature = "gtk")]
 fn load_css() {
     use gtk::{gdk::Display, CssProvider};
 

examples/hackernews/Cargo.toml

@@ -13,31 +13,27 @@ panic = "abort"
 lto = true
 
 [dependencies]
-actix-files = { version = "0.6", optional = true }
-actix-web = { version = "4", optional = true, features = ["macros"] }
-console_log = "1"
-console_error_panic_hook = "0.1"
+actix-files = { version = "0.6.6", optional = true }
+actix-web = { version = "4.8", optional = true, features = ["macros"] }
+console_log = "1.0"
+console_error_panic_hook = "0.1.7"
 leptos = { path = "../../leptos" }
 leptos_meta = { path = "../../meta" }
 leptos_actix = { path = "../../integrations/actix", optional = true }
 leptos_router = { path = "../../router" }
-log = "0.4"
-serde = { version = "1", features = ["derive"] }
-gloo-net = { version = "0.2", features = ["http"] }
-reqwest = { version = "0.11", features = ["json"] }
-wasm-bindgen = "0.2"
-web-sys = { version = "0.3", features = ["AbortController", "AbortSignal"] }
+log = "0.4.22"
+serde = { version = "1.0", features = ["derive"] }
+gloo-net = { version = "0.6.0", features = ["http"] }
+reqwest = { version = "0.12.5", features = ["json"] }
+wasm-bindgen = "0.2.93"
+web-sys = { version = "0.3.70", features = ["AbortController", "AbortSignal"] }
 send_wrapper = "0.6.0"
 
 [features]
+default = ["csr"]
 csr = ["leptos/csr"]
 hydrate = ["leptos/hydrate"]
-ssr = [
-	"dep:actix-files",
-	"dep:actix-web",
-	"dep:leptos_actix",
-	"leptos/ssr",
-]
+ssr = ["dep:actix-files", "dep:actix-web", "dep:leptos_actix", "leptos/ssr"]
 
 [profile.wasm-release]
 inherits = "release"

examples/hackernews_axum/Cargo.toml

@@ -11,22 +11,22 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-console_error_panic_hook = "0.1"
+console_error_panic_hook = "0.1.7"
 leptos = { path = "../../leptos" }
 leptos_axum = { path = "../../integrations/axum", optional = true }
 leptos_meta = { path = "../../meta" }
 leptos_router = { path = "../../router" }
 serde = { version = "1.0", features = ["derive"] }
-tracing = "0.1"
-gloo-net = { version = "0.4", features = ["http"] }
-reqwest = { version = "0.11", features = ["json"] }
-axum = { version = "0.7", optional = true }
-tower = { version = "0.4", optional = true }
-tower-http = { version = "0.5", features = ["fs"], optional = true }
-tokio = { version = "1", features = ["full"], optional = true }
-http = { version = "1.0", optional = true }
-web-sys = { version = "0.3", features = ["AbortController", "AbortSignal"] }
-wasm-bindgen = "0.2"
+tracing = "0.1.40"
+gloo-net = { version = "0.6.0", features = ["http"] }
+reqwest = { version = "0.12.5", features = ["json"] }
+axum = { version = "0.7.5", optional = true }
+tower = { version = "0.4.13", optional = true }
+tower-http = { version = "0.5.2", features = ["fs"], optional = true }
+tokio = { version = "1.39", features = ["full"], optional = true }
+http = { version = "1.1", optional = true }
+web-sys = { version = "0.3.70", features = ["AbortController", "AbortSignal"] }
+wasm-bindgen = "0.2.93"
 send_wrapper = { version = "0.6.0", features = ["futures"] }
 
 [features]

examples/hackernews_islands_axum/Cargo.toml

@@ -11,34 +11,35 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-console_error_panic_hook = "0.1"
-leptos = { path = "../../leptos", features = [
-  "experimental-islands",
-] }
+console_error_panic_hook = "0.1.7"
+leptos = { path = "../../leptos", features = ["experimental-islands"] }
 leptos_axum = { path = "../../integrations/axum", optional = true }
 leptos_meta = { path = "../../meta" }
-leptos_router = { path = "../../router"}
+leptos_router = { path = "../../router" }
 serde = { version = "1.0", features = ["derive"] }
-tracing = "0.1"
-gloo-net = { version = "0.4", features = ["http"] }
-reqwest = { version = "0.11", features = ["json"] }
-axum = { version = "0.7", optional = true, features = ["http2"] }
-tower = { version = "0.4", optional = true }
-tower-http = { version = "0.5", features = [
+tracing = "0.1.40"
+gloo-net = { version = "0.6.0", features = ["http"] }
+reqwest = { version = "0.12.5", features = ["json"] }
+axum = { version = "0.7.5", optional = true, features = ["http2"] }
+tower = { version = "0.4.13", optional = true }
+tower-http = { version = "0.5.2", features = [
   "fs",
   "compression-gzip",
   "compression-br",
 ], optional = true }
-tokio = { version = "1", features = ["full"], optional = true }
-http = { version = "1.0", optional = true }
-web-sys = { version = "0.3", features = ["AbortController", "AbortSignal"] }
-wasm-bindgen = "0.2"
-lazy_static = "1.4.0"
-rust-embed = { version = "8", features = ["axum", "mime_guess", "tokio"], optional = true  }
-mime_guess = { version = "2.0.4", optional = true }
+tokio = { version = "1.39", features = ["full"], optional = true }
+http = { version = "1.1", optional = true }
+web-sys = { version = "0.3.70", features = ["AbortController", "AbortSignal"] }
+wasm-bindgen = "0.2.93"
+lazy_static = "1.5"
+rust-embed = { version = "8.5", features = [
+  "axum",
+  "mime_guess",
+  "tokio",
+], optional = true }
+mime_guess = { version = "2.0", optional = true }
 
 [features]
-default = []
 csr = ["leptos/csr"]
 hydrate = ["leptos/hydrate"]
 ssr = [

examples/hackernews_js_fetch/Cargo.toml

@@ -11,30 +11,30 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-console_error_panic_hook = "0.1"
+console_error_panic_hook = "0.1.7"
 console_log = "1.0"
-log = "0.4"
+log = "0.4.22"
 leptos = { path = "../../leptos" }
 leptos_axum = { path = "../../integrations/axum", default-features = false, optional = true }
 leptos_meta = { path = "../../meta" }
 leptos_router = { path = "../../router" }
 leptos_server = { path = "../../leptos_server", optional = true }
 serde = { version = "1.0", features = ["derive"] }
-tracing = "0.1"
-gloo-net = { version = "0.5", features = ["http"] }
-reqwest = { version = "0.12", features = ["json"] }
-axum = { version = "0.7", default-features = false, optional = true }
-tower = { version = "0.4", optional = true }
-http = { version = "1.0", optional = true }
-web-sys = { version = "0.3", features = [
+tracing = "0.1.40"
+gloo-net = { version = "0.6.0", features = ["http"] }
+reqwest = { version = "0.12.5", features = ["json"] }
+axum = { version = "0.7.5", default-features = false, optional = true }
+tower = { version = "0.4.13", optional = true }
+http = { version = "1.1", optional = true }
+web-sys = { version = "0.3.70", features = [
   "AbortController",
   "AbortSignal",
   "Request",
   "Response",
 ] }
-getrandom = { version = "0.2.7", features = ["js"] }
-wasm-bindgen = "0.2"
-wasm-bindgen-futures = { version = "0.4.37", features = [
+getrandom = { version = "0.2.15", features = ["js"] }
+wasm-bindgen = "0.2.93"
+wasm-bindgen-futures = { version = "0.4.42", features = [
   "futures-core-03-stream",
 ], optional = true }
 axum-js-fetch = { git = "https://github.com/seanaye/axum-js-fetch", optional = true }

examples/islands/Cargo.toml

@@ -7,32 +7,32 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-console_error_panic_hook = "0.1"
-futures = "0.3"
-http = "1.0"
+console_error_panic_hook = "0.1.7"
+futures = "0.3.30"
+http = "1.1"
 leptos = { path = "../../leptos", features = [
-	"tracing",
-	"experimental-islands",
+  "tracing",
+  "experimental-islands",
 ] }
 server_fn = { path = "../../server_fn", features = ["serde-lite"] }
 leptos_axum = { path = "../../integrations/axum", optional = true }
-log = "0.4"
-serde = { version = "1", features = ["derive"] }
-axum = { version = "0.7", optional = true }
-tower = { version = "0.4", optional = true }
-tower-http = { version = "0.5", features = ["fs"], optional = true }
-tokio = { version = "1", features = ["full"], optional = true }
-wasm-bindgen = "0.2"
+log = "0.4.22"
+serde = { version = "1.0", features = ["derive"] }
+axum = { version = "0.7.5", optional = true }
+tower = { version = "0.4.13", optional = true }
+tower-http = { version = "0.5.2", features = ["fs"], optional = true }
+tokio = { version = "1.39", features = ["full"], optional = true }
+wasm-bindgen = "0.2.93"
 
 [features]
 hydrate = ["leptos/hydrate"]
 ssr = [
-	"dep:axum",
-	"dep:tower",
-	"dep:tower-http",
-	"dep:tokio",
-	"leptos/ssr",
-	"dep:leptos_axum",
+  "dep:axum",
+  "dep:tower",
+  "dep:tower-http",
+  "dep:tokio",
+  "leptos/ssr",
+  "dep:leptos_axum",
 ]
 
 [profile.wasm-release]

examples/islands_router/Cargo.toml

@@ -7,33 +7,35 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-console_error_panic_hook = "0.1"
-futures = "0.3"
-http = "1.0"
+console_error_panic_hook = "0.1.7"
+futures = "0.3.30"
+http = "1.1"
 leptos = { path = "../../leptos", features = [
-	"tracing",
-	"experimental-islands",
+  "tracing",
+  "experimental-islands",
 ] }
 leptos_router = { path = "../../router" }
 server_fn = { path = "../../server_fn", features = ["serde-lite"] }
-leptos_axum = { path = "../../integrations/axum", features = ["islands-router"], optional = true }
-log = "0.4"
-serde = { version = "1", features = ["derive"] }
-axum = { version = "0.7", optional = true }
-tower = { version = "0.4", optional = true }
-tower-http = { version = "0.5", features = ["fs"], optional = true }
-tokio = { version = "1", features = ["full"], optional = true }
-wasm-bindgen = "0.2"
+leptos_axum = { path = "../../integrations/axum", features = [
+  "islands-router",
+], optional = true }
+log = "0.4.22"
+serde = { version = "1.0", features = ["derive"] }
+axum = { version = "0.7.5", optional = true }
+tower = { version = "0.4.13", optional = true }
+tower-http = { version = "0.5.2", features = ["fs"], optional = true }
+tokio = { version = "1.39", features = ["full"], optional = true }
+wasm-bindgen = "0.2.93"
 
 [features]
 hydrate = ["leptos/hydrate"]
 ssr = [
-	"dep:axum",
-	"dep:tower",
-	"dep:tower-http",
-	"dep:tokio",
-	"leptos/ssr",
-	"dep:leptos_axum",
+  "dep:axum",
+  "dep:tower",
+  "dep:tower-http",
+  "dep:tokio",
+  "leptos/ssr",
+  "dep:leptos_axum",
 ]
 
 [profile.wasm-release]

examples/js-framework-benchmark/Cargo.toml

@@ -8,13 +8,13 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-leptos = { path = "../../leptos", features = ["csr"] } # for actual benchmarking, add `nightly` and `event-delegation` features
+leptos = { path = "../../leptos", features = ["csr"] } # for actual benchmarking, add `nightly` and `delegation` features
 # used in rand, but we need to enable js feature
-getrandom = { version = "0.2.7", features = ["js"] }
+getrandom = { version = "0.2.15", features = ["js"] }
 rand = { version = "0.8.5", features = ["small_rng"] }
 console_error_panic_hook = "0.1.7"
 
 [dev-dependencies]
 wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen-test = "0.3.42"
 web-sys = "0.3"

examples/parent_child/Cargo.toml

@@ -9,7 +9,7 @@ lto = true
 
 [dependencies]
 leptos = { path = "../../leptos", features = ["csr"] }
-console_log = "1"
-log = "0.4"
+console_log = "1.0"
+log = "0.4.22"
 console_error_panic_hook = "0.1.7"
-web-sys = "0.3"
+web-sys = "0.3.70"

examples/portal/Cargo.toml

@@ -5,12 +5,12 @@ edition = "2021"
 
 [dependencies]
 leptos = { path = "../../leptos", features = ["csr"] }
-log = "0.4"
-console_log = "1"
+log = "0.4.22"
+console_log = "1.0"
 console_error_panic_hook = "0.1.7"
-wasm-bindgen = "0.2"
+wasm-bindgen = "0.2.93"
 
 [dev-dependencies]
-wasm-bindgen-test = "0.3.0"
-wasm-bindgen = "0.2"
-web-sys = "0.3"
+wasm-bindgen-test = "0.3.42"
+wasm-bindgen = "0.2.93"
+web-sys = "0.3.70"

examples/router/Cargo.toml

@@ -10,16 +10,16 @@ codegen-units = 1
 panic = "abort"
 
 [dependencies]
-console_log = "1"
+console_log = "1.0"
 leptos = { path = "../../leptos", features = ["csr", "tracing"] }
-leptos_router = { path = "../../router" }              #, features = ["tracing"] }
+leptos_router = { path = "../../router" }                         #, features = ["tracing"] }
 leptos_router_macro = { path = "../../router_macro" }
-serde = { version = "1", features = ["derive"] }
-futures = "0.3"
+serde = { version = "1.0", features = ["derive"] }
+futures = "0.3.30"
 console_error_panic_hook = "0.1.7"
 tracing-subscriber = "0.3.18"
 tracing-subscriber-wasm = "0.1.0"
 tracing = "0.1.40"
 
 [dev-dependencies]
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen-test = "0.3.42"

examples/router/src/lib.rs

@@ -72,6 +72,7 @@ pub fn ContactRoutes() -> impl MatchNestedRoutes<Dom> + Clone {
             <Route path=path!("/:id") view=Contact/>
         </ParentRoute>
     }
+    .into_inner()
 }
 
 #[component]

examples/server_fns_axum/Cargo.toml

@@ -7,44 +7,53 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-console_error_panic_hook = "0.1"
-futures = "0.3"
-http = "1.0"
+console_error_panic_hook = "0.1.7"
+futures = "0.3.30"
+http = "1.1"
 leptos = { path = "../../leptos" }
 leptos_axum = { path = "../../integrations/axum", optional = true }
-server_fn = { path = "../../server_fn", features = ["serde-lite", "rkyv", "multipart"] }
-log = "0.4"
-simple_logger = "4.0"
-serde = { version = "1", features = ["derive"] }
-axum = { version = "0.7", optional = true }
-tower = { version = "0.4", optional = true }
-tower-http = { version = "0.5", features = ["fs", "tracing", "trace"], optional = true }
-tokio = { version = "1", features = ["full"], optional = true }
+server_fn = { path = "../../server_fn", features = [
+  "serde-lite",
+  "rkyv",
+  "multipart",
+  "postcard",
+] }
+log = "0.4.22"
+simple_logger = "5.0"
+serde = { version = "1.0", features = ["derive"] }
+axum = { version = "0.7.5", optional = true }
+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 = "1.0"
-wasm-bindgen = "0.2"
+wasm-bindgen = "0.2.93"
 serde_toml = "0.0.1"
-toml = "0.8.8"
-web-sys = { version = "0.3.67", features = ["FileList", "File"] }
-strum = { version = "0.25.0", features = ["strum_macros", "derive"] }
-notify = { version = "6.1.1", optional = true }
-pin-project-lite = "0.2.13"
-dashmap = { version = "5.5.3", optional = true }
-once_cell = { version = "1.19.0", optional = true }
-async-broadcast = { version = "0.6.0", optional = true }
+toml = "0.8.19"
+web-sys = { version = "0.3.70", features = ["FileList", "File"] }
+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 }
+async-broadcast = { version = "0.7.1", optional = true }
 
 [features]
 hydrate = ["leptos/hydrate"]
 ssr = [
-	"dep:axum",
-	"dep:tower",
-	"dep:tower-http",
-	"dep:tokio",
-	"leptos/ssr",
-	"dep:leptos_axum",
-	"dep:notify",
-	"dep:dashmap",
-	"dep:once_cell",
-	"dep:async-broadcast",
+  "dep:axum",
+  "dep:tower",
+  "dep:tower-http",
+  "dep:tokio",
+  "leptos/ssr",
+  "dep:leptos_axum",
+  "dep:notify",
+  "dep:dashmap",
+  "dep:once_cell",
+  "dep:async-broadcast",
 ]
 
 [package.metadata.cargo-all-features]

examples/server_fns_axum/src/app.rs

@@ -6,7 +6,8 @@ use server_fn::{
     client::{browser::BrowserClient, Client},
     codec::{
         Encoding, FromReq, FromRes, GetUrl, IntoReq, IntoRes, MultipartData,
-        MultipartFormData, Rkyv, SerdeLite, StreamingText, TextStream,
+        MultipartFormData, Postcard, Rkyv, SerdeLite, StreamingText,
+        TextStream,
     },
     request::{browser::BrowserRequest, ClientReq, Req},
     response::{browser::BrowserResponse, ClientRes, Res},
@@ -65,6 +66,7 @@ pub fn HomePage() -> impl IntoView {
         <h2>"Alternative Encodings"</h2>
         <ServerFnArgumentExample/>
         <RkyvExample/>
+        <PostcardExample/>
         <FileUpload/>
         <FileUploadWithProgress/>
         <FileWatcher/>
@@ -880,3 +882,67 @@ pub fn CustomClientExample() -> impl IntoView {
         })>Click me</button>
     }
 }
+
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)]
+pub struct PostcardData {
+    name: String,
+    age: u32,
+    hobbies: Vec<String>,
+}
+
+/// This server function uses Postcard for both input and output encoding.
+/// Postcard provides efficient binary serialization, almost as fast as rkyv, while also being
+/// serde compatible
+#[server(input = Postcard, output = Postcard)]
+pub async fn postcard_example(
+    data: PostcardData,
+) -> Result<PostcardData, ServerFnError> {
+    // Simulate some processing time
+    tokio::time::sleep(std::time::Duration::from_millis(250)).await;
+
+    // Modify the data to demonstrate server-side changes
+    let mut modified_data = data.clone();
+    modified_data.age += 1;
+    modified_data.hobbies.push("Rust programming".to_string());
+
+    Ok(modified_data)
+}
+
+/// This component demonstrates the usage of Postcard encoding with server functions.
+/// It allows incrementing the age of a person and shows how the data is
+/// serialized, sent to the server, processed, and returned.
+#[component]
+pub fn PostcardExample() -> impl IntoView {
+    // Initialize the input data
+    let (input, set_input) = signal(PostcardData {
+        name: "Alice".to_string(),
+        age: 30,
+        hobbies: vec!["reading".to_string(), "hiking".to_string()],
+    });
+
+    // Create a resource that will call the server function whenever the input changes
+    let postcard_result = Resource::new(
+        move || input.get(),
+        |data| async move { postcard_example(data).await },
+    );
+
+    view! {
+        <h3>Using <code>postcard</code> encoding</h3>
+        <p>"This example demonstrates using Postcard for efficient binary serialization."</p>
+        <button on:click=move |_| {
+            // Update the input data when the button is clicked
+            set_input.update(|data| {
+                data.age += 1;
+            });
+        }>
+            "Increment Age"
+        </button>
+        // Display the current input data
+        <p>"Input: " {move || format!("{:?}", input.get())}</p>
+        <Transition>
+            // Display the result from the server, which will update automatically
+            // when the input changes due to the resource
+            <p>"Result: " {move || postcard_result.get().map(|r| format!("{:?}", r))}</p>
+        </Transition>
+    }
+}

examples/slots/Cargo.toml

@@ -9,6 +9,6 @@ lto = true
 
 [dependencies]
 leptos = { path = "../../leptos", features = ["csr"] }
-console_log = "1"
-log = "0.4"
+console_log = "1.0"
+log = "0.4.22"
 console_error_panic_hook = "0.1.7"

examples/ssr_modes/Cargo.toml

@@ -7,20 +7,20 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-actix-files = { version = "0.6", optional = true }
-actix-web = { version = "4", optional = true, features = ["macros"] }
-console_error_panic_hook = "0.1"
-console_log = "1"
-lazy_static = "1"
-leptos = { path = "../../leptos"}
+actix-files = { version = "0.6.6", optional = true }
+actix-web = { version = "4.8", optional = true, features = ["macros"] }
+console_error_panic_hook = "0.1.7"
+console_log = "1.0"
+lazy_static = "1.5"
+leptos = { path = "../../leptos" }
 leptos_meta = { path = "../../meta" }
 leptos_actix = { path = "../../integrations/actix", optional = true }
 leptos_router = { path = "../../router" }
-log = "0.4"
-serde = { version = "1", features = ["derive"] }
-thiserror = "1"
-tokio = { version = "1", features = ["time"] }
-wasm-bindgen = "0.2"
+log = "0.4.22"
+serde = { version = "1.0", features = ["derive"] }
+thiserror = "1.0"
+tokio = { version = "1.39", features = ["time"] }
+wasm-bindgen = "0.2.93"
 
 [features]
 hydrate = ["leptos/hydrate"]

examples/ssr_modes_axum/Cargo.toml

@@ -7,37 +7,39 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-console_error_panic_hook = "0.1"
-console_log = "1"
-lazy_static = "1"
-leptos = { path = "../../leptos", features = ["hydration" ] } #"nightly", "hydration"] }
+console_error_panic_hook = "0.1.7"
+console_log = "1.0"
+lazy_static = "1.5"
+leptos = { path = "../../leptos", features = [
+  "hydration",
+] } #"nightly", "hydration"] }
 leptos_meta = { path = "../../meta" }
 leptos_axum = { path = "../../integrations/axum", optional = true }
 leptos_router = { path = "../../router" }
-log = "0.4"
-serde = { version = "1", features = ["derive"] }
-thiserror = "1"
-axum = { version = "0.7", optional = true }
-tower = { version = "0.4", optional = true }
-tower-http = { version = "0.5", features = ["fs"], optional = true }
-tokio = { version = "1", features = [
-	"rt-multi-thread",
-	"macros",
-	"time",
+log = "0.4.22"
+serde = { version = "1.0", features = ["derive"] }
+thiserror = "1.0"
+axum = { version = "0.7.5", optional = true }
+tower = { version = "0.4.13", optional = true }
+tower-http = { version = "0.5.2", features = ["fs"], optional = true }
+tokio = { version = "1.39", features = [
+  "rt-multi-thread",
+  "macros",
+  "time",
 ], optional = true }
-wasm-bindgen = "0.2"
+wasm-bindgen = "0.2.93"
 
 [features]
 hydrate = ["leptos/hydrate"]
 ssr = [
-	"dep:axum",
-	"dep:tower",
-	"dep:tower-http",
-	"dep:tokio",
-	"leptos/ssr",
-	"leptos_meta/ssr",
-	"dep:leptos_axum",
-	"leptos_router/ssr",
+  "dep:axum",
+  "dep:tower",
+  "dep:tower-http",
+  "dep:tokio",
+  "leptos/ssr",
+  "leptos_meta/ssr",
+  "dep:leptos_axum",
+  "leptos_router/ssr",
 ]
 
 [profile.release]

examples/ssr_modes_axum/src/app.rs

@@ -20,7 +20,7 @@ pub fn shell(options: LeptosOptions) -> impl IntoView {
             <head>
                 <meta charset="utf-8"/>
                 <meta name="viewport" content="width=device-width, initial-scale=1"/>
-                <AutoReload options=options.clone() />
+                <AutoReload options=options.clone()/>
                 <HydrationScripts options/>
                 <MetaTags/>
             </head>
@@ -64,15 +64,24 @@ pub fn App() -> impl IntoView {
                 <a href="/admin">"Admin"</a>
                 <Transition>
                     <ActionForm action=toggle_admin>
-                        <input type="hidden" name="is_admin"
-                            value=move || (!is_admin.get().and_then(|n| n.ok()).unwrap_or_default()).to_string()
+                        <input
+                            type="hidden"
+                            name="is_admin"
+                            value=move || {
+                                (!is_admin.get().and_then(|n| n.ok()).unwrap_or_default())
+                                    .to_string()
+                            }
                         />
+
                         <button>
-                            {move || if is_admin.get().and_then(Result::ok).unwrap_or_default() {
-                                "Log Out"
-                            } else {
-                                "Log In"
+                            {move || {
+                                if is_admin.get().and_then(Result::ok).unwrap_or_default() {
+                                    "Log Out"
+                                } else {
+                                    "Log In"
+                                }
                             }}
+
                         </button>
                     </ActionForm>
                 </Transition>
@@ -139,9 +148,15 @@ fn HomePage() -> impl IntoView {
                     <li>
                         <a href=format!("/post/{}", post.id)>{post.title.clone()}</a>
                         "|"
-                        <a href=format!("/post_in_order/{}", post.id)>{post.title.clone()} "(in order)"</a>
+                        <a href=format!(
+                            "/post_in_order/{}",
+                            post.id,
+                        )>{post.title.clone()} "(in order)"</a>
                         "|"
-                        <a href=format!("/post_partially_blocked/{}", post.id)>{post.title} "(partially blocked)"</a>
+                        <a href=format!(
+                            "/post_partially_blocked/{}",
+                            post.id,
+                        )>{post.title} "(partially blocked)"</a>
                     </li>
                 </For>
             </ul>
@@ -204,12 +219,11 @@ fn Post() -> impl IntoView {
             Ok(comments) => Ok(view! {
                 <h1>"Comments"</h1>
                 <ul>
-                    {comments.into_iter()
-                        .map(|comment| view! {
-                            <li>{comment}</li>
-                        })
-                        .collect_view()
-                    }
+                    {comments
+                        .into_iter()
+                        .map(|comment| view! { <li>{comment}</li> })
+                        .collect_view()}
+
                 </ul>
             }),
             _ => Err(PostError::ServerError),
@@ -237,17 +251,13 @@ fn Post() -> impl IntoView {
                 }
             }>{post_view}</ErrorBoundary>
         </Suspense>
-        <Suspense fallback=move || view! { <p>"Loading comments..."</p> }>
-            {comments_view}
-        </Suspense>
+        <Suspense fallback=move || view! { <p>"Loading comments..."</p> }>{comments_view}</Suspense>
     }
 }
 
 #[component]
 pub fn Admin() -> impl IntoView {
-    view! {
-        <p>"You can only see this page if you're logged in."</p>
-    }
+    view! { <p>"You can only see this page if you're logged in."</p> }
 }
 
 // Dummy API

examples/stores/Cargo.toml

@@ -15,6 +15,6 @@ reactive_stores_macro = { path = "../../reactive_stores_macro" }
 console_error_panic_hook = "0.1.7"
 
 [dev-dependencies]
-wasm-bindgen = "0.2"
-wasm-bindgen-test = "0.3.0"
-web-sys = "0.3"
+wasm-bindgen = "0.2.93"
+wasm-bindgen-test = "0.3.42"
+web-sys = "0.3.70"

examples/suspense_tests/Cargo.toml

@@ -7,26 +7,26 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-actix-files = { version = "0.6", optional = true }
-actix-web = { version = "4", optional = true, features = ["macros"] }
-console_error_panic_hook = "0.1"
+actix-files = { version = "0.6.6", optional = true }
+actix-web = { version = "4.8", optional = true, features = ["macros"] }
+console_error_panic_hook = "0.1.7"
 leptos = { path = "../../leptos" }
 leptos_actix = { path = "../../integrations/actix", optional = true }
 leptos_router = { path = "../../router" }
-log = "0.4"
-wasm-bindgen = "0.2"
-serde = "1.0.159"
-tokio = { version = "1.29", features = ["time", "rt"], optional = true }
+log = "0.4.22"
+wasm-bindgen = "0.2.93"
+serde = "1.0"
+tokio = { version = "1.39", features = ["time", "rt"], optional = true }
 
 [features]
 hydrate = ["leptos/hydrate"]
 ssr = [
-	"dep:actix-files",
-	"dep:actix-web",
-	"dep:leptos_actix",
-	"leptos/ssr",
-	"leptos_router/ssr",
-	"dep:tokio",
+  "dep:actix-files",
+  "dep:actix-web",
+  "dep:leptos_actix",
+  "leptos/ssr",
+  "leptos_router/ssr",
+  "dep:tokio",
 ]
 
 [package.metadata.leptos]

examples/suspense_tests/e2e/Cargo.toml

@@ -4,14 +4,14 @@ version = "0.1.0"
 edition = "2021"
 
 [dev-dependencies]
-anyhow = "1.0.72"
-async-trait = "0.1.72"
-cucumber = "0.19.1"
-fantoccini = "0.19.3"
-pretty_assertions = "1.4.0"
-serde_json = "1.0.104"
-tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread", "time"] }
-url = "2.4.0"
+anyhow = "1.0"
+async-trait = "0.1.81"
+cucumber = "0.21.1"
+fantoccini = "0.21.1"
+pretty_assertions = "1.4"
+serde_json = "1.0"
+tokio = { version = "1.39", features = ["macros", "rt-multi-thread", "time"] }
+url = "2.5"
 
 [[test]]
 name = "app_suite"

examples/suspense_tests/e2e/README.md

@@ -8,8 +8,8 @@ This example demonstrates e2e testing with Rust using executable requirements.
 |---|---|---|
 | [Cucumber](https://github.com/cucumber-rs/cucumber/tree/main) | Test Runner | Run [Gherkin](https://cucumber.io/docs/gherkin/reference/) specifications as Rust tests |
 | [Fantoccini](https://github.com/jonhoo/fantoccini/tree/main) | Browser Client | Interact with web pages through WebDriver |
-| [Cargo Leptos ](https://github.com/leptos-rs/cargo-leptos) | Build Tool |  Compile example and start the server and end-2-end tests |
-| [chromedriver](https://chromedriver.chromium.org/downloads) | WebDriver | Provide WebDriver for Chrome
+| [Cargo Leptos](https://github.com/leptos-rs/cargo-leptos) | Build Tool |  Compile example and start the server and end-2-end tests |
+| [chromedriver](https://chromedriver.chromium.org/downloads) | WebDriver | Provide WebDriver for Chrome |
 
 ## Testing Organization
 

examples/tailwind_actix/Cargo.toml

@@ -13,19 +13,15 @@ leptos_meta = { path = "../../meta" }
 leptos_router = { path = "../../router" }
 
 # dependencies for browser (enable when hydrate set)
-console_error_panic_hook = { version = "0.1", optional = true }
-wasm-bindgen = { version = "0.2", optional = true }
+console_error_panic_hook = { version = "0.1.7", optional = true }
+wasm-bindgen = { version = "0.2.93", optional = true }
 
 # dependencies for server (enable when ssr set)
-actix-files = { version = "0.6", optional = true }
-actix-web = { version = "4", features = ["macros"], optional = true }
+actix-files = { version = "0.6.6", optional = true }
+actix-web = { version = "4.8", features = ["macros"], optional = true }
 
 [features]
-hydrate = [
-  "leptos/hydrate",
-  "dep:wasm-bindgen",
-  "dep:console_error_panic_hook",
-]
+hydrate = ["leptos/hydrate", "dep:wasm-bindgen", "dep:console_error_panic_hook"]
 ssr = [
   "leptos/ssr",
   "leptos_meta/ssr",

examples/tailwind_axum/Cargo.toml

@@ -7,32 +7,35 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-axum = { version = "0.7", optional = true }
-console_error_panic_hook = "0.1"
+axum = { version = "0.7.5", optional = true }
+console_error_panic_hook = "0.1.7"
 leptos = { path = "../../leptos" }
 leptos_meta = { path = "../../meta" }
 leptos_axum = { path = "../../integrations/axum", optional = true }
 leptos_router = { path = "../../router" }
-tokio = { version = "1", features = ["rt-multi-thread", "macros"], optional = true }
-tower = { version = "0.4", optional = true }
-tower-http = { version = "0.5", features = ["fs"], optional = true }
-wasm-bindgen = "0.2"
+tokio = { version = "1.39", features = [
+  "rt-multi-thread",
+  "macros",
+], optional = true }
+tower = { version = "0.4.13", optional = true }
+tower-http = { version = "0.5.2", features = ["fs"], optional = true }
+wasm-bindgen = "0.2.93"
 thiserror = "1.0"
-tracing = { version = "0.1", optional = true }
-http = "1.0"
+tracing = { version = "0.1.40", optional = true }
+http = "1.1"
 
 [features]
 hydrate = ["leptos/hydrate"]
 ssr = [
-    "dep:axum",
-    "dep:tokio",
-    "dep:tower",
-    "dep:tower-http",
-    "dep:leptos_axum",
-    "leptos/ssr",
-    "leptos_meta/ssr",
-    "leptos_router/ssr",
-    "dep:tracing",
+  "dep:axum",
+  "dep:tokio",
+  "dep:tower",
+  "dep:tower-http",
+  "dep:leptos_axum",
+  "leptos/ssr",
+  "leptos_meta/ssr",
+  "leptos_router/ssr",
+  "dep:tracing",
 ]
 
 [package.metadata.cargo-all-features]

examples/tailwind_csr/Cargo.toml

@@ -7,5 +7,5 @@ edition = "2021"
 leptos = { path = "../../leptos", features = ["csr"] }
 leptos_meta = { path = "../../meta" }
 leptos_router = { path = "../../router" }
-gloo-net = { version = "0.5", features = ["http"] }
-console_error_panic_hook = { version = "0.1" }
+gloo-net = { version = "0.6.0", features = ["http"] }
+console_error_panic_hook = { version = "0.1.7" }

examples/timer/Cargo.toml

@@ -8,15 +8,15 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-leptos = { path = "../../leptos" }
-console_log = "1"
-log = "0.4"
+leptos = { path = "../../leptos", features = ["csr"] }
+console_log = "1.0"
+log = "0.4.22"
 console_error_panic_hook = "0.1.7"
-wasm-bindgen = "0.2"
+wasm-bindgen = "0.2.93"
 
 [dependencies.web-sys]
-version = "0.3"
+version = "0.3.70"
 features = ["Window"]
 
 [dev-dependencies]
-wasm-bindgen-test = "0.3.0"
+wasm-bindgen-test = "0.3.42"

examples/todo_app_sqlite/Cargo.toml

@@ -7,36 +7,36 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-actix-files = { version = "0.6.2", optional = true }
-actix-web = { version = "4.2.1", optional = true, features = ["macros"] }
-anyhow = "1.0.68"
-broadcaster = "1.0.0"
-console_log = "1.0.0"
+actix-files = { version = "0.6.6", optional = true }
+actix-web = { version = "4.8", optional = true, features = ["macros"] }
+anyhow = "1.0"
+broadcaster = "1.0"
+console_log = "1.0"
 console_error_panic_hook = "0.1.7"
-serde = { version = "1.0.152", features = ["derive"] }
-futures = "0.3.25"
-leptos = { path = "../../leptos"}
+serde = { version = "1.0", features = ["derive"] }
+futures = "0.3.30"
+leptos = { path = "../../leptos" }
 leptos_actix = { path = "../../integrations/actix", optional = true }
-log = "0.4.17"
-simple_logger = "4.0.0"
+log = "0.4.22"
+simple_logger = "5.0"
 gloo = { git = "https://github.com/rustwasm/gloo" }
-sqlx = { version = "0.6.2", features = [
-	"runtime-tokio-rustls",
-	"sqlite",
+sqlx = { version = "0.8.0", features = [
+  "runtime-tokio-rustls",
+  "sqlite",
 ], optional = true }
-wasm-bindgen = "0.2"
-tokio = { version = "1", features = ["rt", "time"], optional = true }
+wasm-bindgen = "0.2.93"
+tokio = { version = "1.39", features = ["rt", "time"], optional = true }
 server_fn = { path = "../../server_fn", features = ["cbor"] }
 
 [features]
 hydrate = ["leptos/hydrate"]
 ssr = [
-	"dep:actix-files",
-	"dep:actix-web",
-	"dep:sqlx",
-	"leptos/ssr",
-	"leptos_actix",
-	"dep:tokio",
+  "dep:actix-files",
+  "dep:actix-web",
+  "dep:sqlx",
+  "leptos/ssr",
+  "leptos_actix",
+  "dep:tokio",
 ]
 
 [package.metadata.cargo-all-features]

examples/todo_app_sqlite/e2e/Cargo.toml

@@ -4,14 +4,14 @@ version = "0.1.0"
 edition = "2021"
 
 [dev-dependencies]
-anyhow = "1.0.72"
-async-trait = "0.1.72"
-cucumber = "0.19.1"
-fantoccini = "0.19.3"
-pretty_assertions = "1.4.0"
-serde_json = "1.0.104"
-tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread", "time"] }
-url = "2.4.0"
+anyhow = "1.0"
+async-trait = "0.1.81"
+cucumber = "0.21.1"
+fantoccini = "0.21.1"
+pretty_assertions = "1.4"
+serde_json = "1.0"
+tokio = { version = "1.39", features = ["macros", "rt-multi-thread", "time"] }
+url = "2.5"
 
 [[test]]
 name = "app_suite"

examples/todo_app_sqlite_axum/Cargo.toml

@@ -8,35 +8,35 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 console_log = "1.0"
-console_error_panic_hook = "0.1"
-futures = "0.3"
-http = "1.0"
+console_error_panic_hook = "0.1.7"
+futures = "0.3.30"
+http = "1.1"
 leptos = { path = "../../leptos", features = ["tracing"] }
 leptos_axum = { path = "../../integrations/axum", optional = true }
-log = "0.4"
-simple_logger = "4.0"
-serde = { version = "1", features = ["derive"] }
-axum = { version = "0.7", optional = true }
-tower = { version = "0.4", optional = true }
-tower-http = { version = "0.5", features = ["fs"], optional = true }
-tokio = { version = "1", features = ["full"], optional = true }
-sqlx = { version = "0.7", features = [
-	"runtime-tokio-rustls",
-	"sqlite",
+log = "0.4.22"
+simple_logger = "5.0"
+serde = { version = "1.0", features = ["derive"] }
+axum = { version = "0.7.5", optional = true }
+tower = { version = "0.4.13", optional = true }
+tower-http = { version = "0.5.2", features = ["fs"], optional = true }
+tokio = { version = "1.39", features = ["full"], optional = true }
+sqlx = { version = "0.8.0", features = [
+  "runtime-tokio-rustls",
+  "sqlite",
 ], optional = true }
 thiserror = "1.0"
-wasm-bindgen = "0.2"
+wasm-bindgen = "0.2.93"
 
 [features]
 hydrate = ["leptos/hydrate"]
 ssr = [
-	"dep:axum",
-	"dep:tower",
-	"dep:tower-http",
-	"dep:tokio",
-	"dep:sqlx",
-	"leptos/ssr",
-	"dep:leptos_axum",
+  "dep:axum",
+  "dep:tower",
+  "dep:tower-http",
+  "dep:tokio",
+  "dep:sqlx",
+  "leptos/ssr",
+  "dep:leptos_axum",
 ]
 
 [package.metadata.cargo-all-features]

examples/todo_app_sqlite_axum/e2e/Cargo.toml

@@ -4,14 +4,14 @@ version = "0.1.0"
 edition = "2021"
 
 [dev-dependencies]
-anyhow = "1.0.72"
-async-trait = "0.1.72"
-cucumber = "0.19.1"
-fantoccini = "0.19.3"
-pretty_assertions = "1.4.0"
-serde_json = "1.0.104"
-tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread", "time"] }
-url = "2.4.0"
+anyhow = "1.0"
+async-trait = "0.1.81"
+cucumber = "0.21.1"
+fantoccini = "0.21.1"
+pretty_assertions = "1.4"
+serde_json = "1.0"
+tokio = { version = "1.39", features = ["macros", "rt-multi-thread", "time"] }
+url = "2.5"
 
 [[test]]
 name = "app_suite"

examples/todo_app_sqlite_csr/Cargo.toml

@@ -7,39 +7,39 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-console_error_panic_hook = "0.1"
-futures = "0.3"
+console_error_panic_hook = "0.1.7"
+futures = "0.3.30"
 leptos = { path = "../../leptos" }
 leptos_axum = { path = "../../integrations/axum", optional = true }
-leptos_meta = { path = "../../meta"}
+leptos_meta = { path = "../../meta" }
 leptos_router = { path = "../../router" }
 leptos_integration_utils = { path = "../../integrations/utils", optional = true }
-serde = { version = "1", features = ["derive"] }
-axum = { version = "0.7", optional = true }
-tower = { version = "0.4", optional = true }
-tower-http = { version = "0.5", features = ["fs"], optional = true }
-tokio = { version = "1", features = ["full"], optional = true }
-http = { version = "1.0" }
-sqlx = { version = "0.7", features = [
-	"runtime-tokio-rustls",
-	"sqlite",
+serde = { version = "1.0", features = ["derive"] }
+axum = { version = "0.7.5", optional = true }
+tower = { version = "0.4.13", optional = true }
+tower-http = { version = "0.5.2", features = ["fs"], optional = true }
+tokio = { version = "1.39", features = ["full"], optional = true }
+http = { version = "1.1" }
+sqlx = { version = "0.8.0", features = [
+  "runtime-tokio-rustls",
+  "sqlite",
 ], optional = true }
 thiserror = "1.0"
-wasm-bindgen = "0.2"
+wasm-bindgen = "0.2.93"
 
 [features]
 csr = ["leptos/csr"]
 ssr = [
-	"dep:axum",
-	"dep:tower",
-	"dep:tower-http",
-	"dep:tokio",
-	"dep:sqlx",
-	"leptos/ssr",
-	"leptos_meta/ssr",
-	"leptos_router/ssr",
-	"dep:leptos_axum",
-	"dep:leptos_integration_utils",
+  "dep:axum",
+  "dep:tower",
+  "dep:tower-http",
+  "dep:tokio",
+  "dep:sqlx",
+  "leptos/ssr",
+  "leptos_meta/ssr",
+  "leptos_router/ssr",
+  "dep:leptos_axum",
+  "dep:leptos_integration_utils",
 ]
 
 [package.metadata.cargo-all-features]

examples/todo_app_sqlite_csr/e2e/Cargo.toml

@@ -4,14 +4,14 @@ version = "0.1.0"
 edition = "2021"
 
 [dev-dependencies]
-anyhow = "1.0.72"
-async-trait = "0.1.72"
-cucumber = "0.19.1"
-fantoccini = "0.19.3"
-pretty_assertions = "1.4.0"
-serde_json = "1.0.104"
-tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread", "time"] }
-url = "2.4.0"
+anyhow = "1.0"
+async-trait = "0.1.81"
+cucumber = "0.21.1"
+fantoccini = "0.21.1"
+pretty_assertions = "1.4"
+serde_json = "1.0"
+tokio = { version = "1.39", features = ["macros", "rt-multi-thread", "time"] }
+url = "2.5"
 
 [[test]]
 name = "app_suite"

examples/todomvc/Cargo.toml

@@ -8,19 +8,15 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-leptos = { path = "../../leptos" }
+leptos = { path = "../../leptos", features = ["csr"] }
 console_error_panic_hook = "0.1.7"
-uuid = { version = "1", features = ["v4", "js", "serde"] }
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
-web-sys = { version = "0.3.60", features = ["Storage"] }
+uuid = { version = "1.10", features = ["v4", "js", "serde"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+web-sys = { version = "0.3.70", features = ["Storage"] }
 
 [dev-dependencies]
-wasm-bindgen-test = "0.3.0"
-
-[features]
-default = ["csr"]
-csr = ["leptos/csr"]
+wasm-bindgen-test = "0.3.42"
 
 [package.metadata.cargo-all-features]
 skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]

hydration_context/Cargo.toml

@@ -1,22 +1,22 @@
 [package]
 name = "hydration_context"
-edition = "2021"
-version = "0.2.0-alpha"
+version = "0.2.0-beta2"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Utilities for sharing data between web servers and client-side web applications."
 rust-version.workspace = true
+edition.workspace = true
 
 [dependencies]
 throw_error = { workspace = true }
 or_poisoned = { workspace = true }
-futures = "0.3"
-serde = { version = "1", features = ["derive"] }
-wasm-bindgen = { version = "0.2", optional = true }
-js-sys = { version = "0.3", optional = true }
-once_cell = "1.19.0"
+futures = "0.3.30"
+serde = { version = "1.0", features = ["derive"] }
+wasm-bindgen = { version = "0.2.93", optional = true }
+js-sys = { version = "0.3.69", optional = true }
+once_cell = "1.19"
 pin-project-lite = "0.2.14"
 
 [features]

hydration_context/src/hydrate.rs

@@ -12,42 +12,48 @@ use wasm_bindgen::{prelude::wasm_bindgen, JsCast};
 
 #[wasm_bindgen]
 extern "C" {
+    #[wasm_bindgen(thread_local)]
     static __RESOLVED_RESOURCES: Array;
 
+    #[wasm_bindgen(thread_local)]
     static __SERIALIZED_ERRORS: Array;
 
+    #[wasm_bindgen(thread_local)]
     static __INCOMPLETE_CHUNKS: Array;
 }
 
 fn serialized_errors() -> Vec<(SerializedDataId, ErrorId, Error)> {
-    __SERIALIZED_ERRORS
-        .iter()
-        .flat_map(|value| {
-            value.dyn_ref::<Array>().map(|value| {
-                let error_boundary_id = value.get(0).as_f64().unwrap() as usize;
-                let error_id = value.get(1).as_f64().unwrap() as usize;
-                let value = value
-                    .get(2)
-                    .as_string()
-                    .expect("Expected a [number, string] tuple");
-                (
-                    SerializedDataId(error_boundary_id),
-                    ErrorId::from(error_id),
-                    Error::from(SerializedError(value)),
-                )
+    __SERIALIZED_ERRORS.with(|s| {
+        s.iter()
+            .flat_map(|value| {
+                value.dyn_ref::<Array>().map(|value| {
+                    let error_boundary_id =
+                        value.get(0).as_f64().unwrap() as usize;
+                    let error_id = value.get(1).as_f64().unwrap() as usize;
+                    let value = value
+                        .get(2)
+                        .as_string()
+                        .expect("Expected a [number, string] tuple");
+                    (
+                        SerializedDataId(error_boundary_id),
+                        ErrorId::from(error_id),
+                        Error::from(SerializedError(value)),
+                    )
+                })
             })
-        })
-        .collect()
+            .collect()
+    })
 }
 
 fn incomplete_chunks() -> Vec<SerializedDataId> {
-    __INCOMPLETE_CHUNKS
-        .iter()
-        .map(|value| {
-            let id = value.as_f64().unwrap() as usize;
-            SerializedDataId(id)
-        })
-        .collect()
+    __INCOMPLETE_CHUNKS.with(|i| {
+        i.iter()
+            .map(|value| {
+                let id = value.as_f64().unwrap() as usize;
+                SerializedDataId(id)
+            })
+            .collect()
+    })
 }
 
 /// An error that has been serialized across the network boundary.
@@ -118,7 +124,7 @@ impl SharedContext for HydrateSharedContext {
     fn write_async(&self, _id: SerializedDataId, _fut: PinnedFuture<String>) {}
 
     fn read_data(&self, id: &SerializedDataId) -> Option<String> {
-        __RESOLVED_RESOURCES.get(id.0 as u32).as_string()
+        __RESOLVED_RESOURCES.with(|r| r.get(id.0 as u32).as_string())
     }
 
     fn await_data(&self, _id: &SerializedDataId) -> Option<String> {

hydration_context/src/lib.rs

@@ -44,6 +44,12 @@ pub type PinnedStream<T> = Pin<Box<dyn Stream<Item = T> + Send + Sync>>;
 /// from the server to the client.
 pub struct SerializedDataId(usize);
 
+impl From<SerializedDataId> for ErrorId {
+    fn from(value: SerializedDataId) -> Self {
+        value.0.into()
+    }
+}
+
 /// Information that will be shared between the server and the client.
 pub trait SharedContext: Debug {
     /// Whether the application is running in the browser.

integrations/actix/Cargo.toml

@@ -1,17 +1,17 @@
 [package]
 name = "leptos_actix"
-version = { workspace = true }
-edition = "2021"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Actix integrations for the Leptos web framework."
+version = { workspace = true }
 rust-version.workspace = true
+edition.workspace = true
 
 [dependencies]
-actix-http = "3"
-actix-web = "4"
-futures = "0.3"
+actix-http = "3.8"
+actix-web = "4.8"
+futures = "0.3.30"
 any_spawner = { workspace = true, features = ["tokio"] }
 hydration_context = { workspace = true }
 leptos = { workspace = true, features = ["nonce", "ssr"] }
@@ -20,10 +20,10 @@ leptos_macro = { workspace = true, features = ["actix"] }
 leptos_meta = { workspace = true }
 leptos_router = { workspace = true, features = ["ssr"] }
 server_fn = { workspace = true, features = ["actix"] }
-serde_json = "1"
-parking_lot = "0.12.1"
-tracing = "0.1.37"
-tokio = { version = "1", features = ["rt", "fs"] }
+serde_json = "1.0"
+parking_lot = "0.12.3"
+tracing = { version = "0.1", optional = true }
+tokio = { version = "1.39", features = ["rt", "fs"] }
 send_wrapper = "0.6.0"
 
 [package.metadata.docs.rs]
@@ -31,3 +31,7 @@ rustdoc-args = ["--generate-link-to-definition"]
 
 [features]
 islands-router = []
+tracing = ["dep:tracing"]
+
+[package.metadata.cargo-all-features]
+denylist = ["tracing"]

integrations/actix/src/lib.rs

@@ -16,6 +16,7 @@ use actix_web::{
 };
 use futures::{stream::once, Stream, StreamExt};
 use http::StatusCode;
+use hydration_context::SsrSharedContext;
 use leptos::{
     context::{provide_context, use_context},
     reactive_graph::{computed::ScopedFuture, owner::Owner},
@@ -181,6 +182,20 @@ impl ExtendResponse for ActixResponse {
 
 /// Provides an easy way to redirect the user from within a server function.
 ///
+/// Calling `redirect` in a server function will redirect the browser in three
+/// situations:
+/// 1. A server function that is calling in a [blocking
+///    resource](leptos::server::Resource::new_blocking).
+/// 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`](leptos::form::ActionForm) without JS/WASM present.)
+///
+/// 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
+///
 /// This sets the `Location` header to the URL given.
 ///
 /// If the route or server function in which this is called is being accessed
@@ -192,7 +207,10 @@ impl ExtendResponse for ActixResponse {
 /// without actually setting the status code. This means that the client will not follow the
 /// redirect, and can therefore return the value of the server function and then handle
 /// the redirect with client-side routing.
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn redirect(path: &str) {
     if let (Some(req), Some(res)) =
         (use_context::<Request>(), use_context::<ResponseOptions>())
@@ -224,10 +242,14 @@ pub fn redirect(path: &str) {
             );
         }
     } else {
-        tracing::warn!(
-            "Couldn't retrieve either Parts or ResponseOptions while trying \
-             to redirect()."
-        );
+        let msg = "Couldn't retrieve either Parts or ResponseOptions while \
+                   trying to redirect().";
+
+        #[cfg(feature = "tracing")]
+        tracing::warn!("{}", &msg);
+
+        #[cfg(not(feature = "tracing"))]
+        eprintln!("{}", &msg);
     }
 }
 
@@ -267,7 +289,10 @@ pub fn redirect(path: &str) {
 /// This function always provides context values including the following types:
 /// - [ResponseOptions]
 /// - [HttpRequest](actix_web::HttpRequest)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn handle_server_fns() -> Route {
     handle_server_fns_with_context(|| {})
 }
@@ -291,7 +316,10 @@ pub fn handle_server_fns() -> Route {
 /// This function always provides context values including the following types:
 /// - [ResponseOptions]
 /// - [HttpRequest](actix_web::HttpRequest)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn handle_server_fns_with_context(
     additional_context: impl Fn() + 'static + Clone + Send,
 ) -> Route {
@@ -301,8 +329,9 @@ pub fn handle_server_fns_with_context(
             let additional_context = additional_context.clone();
 
             let path = req.path();
+            let method = req.method();
             if let Some(mut service) =
-                server_fn::actix::get_server_fn_service(path)
+                server_fn::actix::get_server_fn_service(path, method)
             {
                 let owner = Owner::new();
                 owner
@@ -384,7 +413,7 @@ pub fn handle_server_fns_with_context(
 /// This can then be set up at an appropriate route in your application:
 /// ```
 /// use actix_web::{App, HttpServer};
-/// use leptos::*;
+/// use leptos::prelude::*;
 /// use leptos_router::Method;
 /// use std::{env, net::SocketAddr};
 ///
@@ -406,11 +435,7 @@ pub fn handle_server_fns_with_context(
 ///             // the actual routing will be handled by `leptos_router`
 ///             .route(
 ///                 "/{tail:.*}",
-///                 leptos_actix::render_app_to_stream(
-///                     leptos_options.to_owned(),
-///                     || view! { <MyApp/> },
-///                     Method::Get,
-///                 ),
+///                 leptos_actix::render_app_to_stream(MyApp, Method::Get),
 ///             )
 ///     })
 ///     .bind(&addr)?
@@ -426,7 +451,10 @@ pub fn handle_server_fns_with_context(
 /// - [HttpRequest](actix_web::HttpRequest)
 /// - [MetaContext](leptos_meta::MetaContext)
 /// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn render_app_to_stream<IV>(
     app_fn: impl Fn() -> IV + Clone + Send + 'static,
     method: Method,
@@ -452,7 +480,7 @@ where
 /// This can then be set up at an appropriate route in your application:
 /// ```
 /// use actix_web::{App, HttpServer};
-/// use leptos::*;
+/// use leptos::prelude::*;
 /// use leptos_router::Method;
 /// use std::{env, net::SocketAddr};
 ///
@@ -475,8 +503,7 @@ where
 ///             .route(
 ///                 "/{tail:.*}",
 ///                 leptos_actix::render_app_to_stream_in_order(
-///                     leptos_options.to_owned(),
-///                     || view! { <MyApp/> },
+///                     MyApp,
 ///                     Method::Get,
 ///                 ),
 ///             )
@@ -494,7 +521,10 @@ where
 /// - [HttpRequest](actix_web::HttpRequest)
 /// - [MetaContext](leptos_meta::MetaContext)
 /// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn render_app_to_stream_in_order<IV>(
     app_fn: impl Fn() -> IV + Clone + Send + 'static,
     method: Method,
@@ -518,7 +548,7 @@ where
 /// This can then be set up at an appropriate route in your application:
 /// ```
 /// use actix_web::{App, HttpServer};
-/// use leptos::*;
+/// use leptos::prelude::*;
 /// use leptos_router::Method;
 /// use std::{env, net::SocketAddr};
 ///
@@ -540,11 +570,7 @@ where
 ///             // the actual routing will be handled by `leptos_router`
 ///             .route(
 ///                 "/{tail:.*}",
-///                 leptos_actix::render_app_async(
-///                     leptos_options.to_owned(),
-///                     || view! { <MyApp/> },
-///                     Method::Get,
-///                 ),
+///                 leptos_actix::render_app_async(MyApp, Method::Get),
 ///             )
 ///     })
 ///     .bind(&addr)?
@@ -560,7 +586,10 @@ where
 /// - [HttpRequest](actix_web::HttpRequest)
 /// - [MetaContext](leptos_meta::MetaContext)
 /// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn render_app_async<IV>(
     app_fn: impl Fn() -> IV + Clone + Send + 'static,
     method: Method,
@@ -583,7 +612,10 @@ where
 /// - [HttpRequest](actix_web::HttpRequest)
 /// - [MetaContext](leptos_meta::MetaContext)
 /// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn render_app_to_stream_with_context<IV>(
     additional_context: impl Fn() + 'static + Clone + Send,
     app_fn: impl Fn() -> IV + Clone + Send + 'static,
@@ -617,7 +649,10 @@ where
 /// - [HttpRequest](actix_web::HttpRequest)
 /// - [MetaContext](leptos_meta::MetaContext)
 /// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn render_app_to_stream_with_context_and_replace_blocks<IV>(
     additional_context: impl Fn() + 'static + Clone + Send,
     app_fn: impl Fn() -> IV + Clone + Send + 'static,
@@ -648,7 +683,10 @@ where
 /// - [HttpRequest](actix_web::HttpRequest)
 /// - [MetaContext](leptos_meta::MetaContext)
 /// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn render_app_to_stream_in_order_with_context<IV>(
     additional_context: impl Fn() + 'static + Clone + Send,
     app_fn: impl Fn() -> IV + Clone + Send + 'static,
@@ -678,7 +716,10 @@ where
 /// - [HttpRequest](actix_web::HttpRequest)
 /// - [MetaContext](leptos_meta::MetaContext)
 /// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn render_app_async_with_context<IV>(
     additional_context: impl Fn() + 'static + Clone + Send,
     app_fn: impl Fn() -> IV + Clone + Send + 'static,
@@ -697,7 +738,10 @@ where
     })
 }
 
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 fn provide_contexts(
     req: Request,
     meta_context: &ServerMetaContext,
@@ -944,7 +988,7 @@ where
 {
     let _ = any_spawner::Executor::init_tokio();
 
-    let owner = Owner::new_root(None);
+    let owner = Owner::new_root(Some(Arc::new(SsrSharedContext::new())));
     let (mock_meta, _) = ServerMetaContext::new();
     let routes = owner
         .with(|| {
@@ -1198,7 +1242,10 @@ where
         InitError = (),
     >,
 {
-    #[tracing::instrument(level = "trace", fields(error), skip_all)]
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(level = "trace", fields(error), skip_all)
+    )]
     fn leptos_routes<IV>(
         self,
         paths: Vec<ActixRouteListing>,
@@ -1210,7 +1257,10 @@ where
         self.leptos_routes_with_context(paths, || {}, app_fn)
     }
 
-    #[tracing::instrument(level = "trace", fields(error), skip_all)]
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(level = "trace", fields(error), skip_all)
+    )]
     fn leptos_routes_with_context<IV>(
         self,
         paths: Vec<ActixRouteListing>,
@@ -1297,7 +1347,10 @@ where
 /// The default implementation of `LeptosRoutes` which takes in a list of paths, and dispatches GET requests
 /// to those paths to Leptos's renderer.
 impl LeptosRoutes for &mut ServiceConfig {
-    #[tracing::instrument(level = "trace", fields(error), skip_all)]
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(level = "trace", fields(error), skip_all)
+    )]
     fn leptos_routes<IV>(
         self,
         paths: Vec<ActixRouteListing>,
@@ -1309,7 +1362,10 @@ impl LeptosRoutes for &mut ServiceConfig {
         self.leptos_routes_with_context(paths, || {}, app_fn)
     }
 
-    #[tracing::instrument(level = "trace", fields(error), skip_all)]
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(level = "trace", fields(error), skip_all)
+    )]
     fn leptos_routes_with_context<IV>(
         self,
         paths: Vec<ActixRouteListing>,
@@ -1380,18 +1436,21 @@ impl LeptosRoutes for &mut ServiceConfig {
 ///
 /// Any error that occurs during extraction is converted to a [`ServerFnError`].
 ///
-/// ```rust,ignore
-/// // MyQuery is some type that implements `Deserialize + Serialize`
+/// ```rust
+/// use leptos::prelude::*;
+///
 /// #[server]
-/// pub async fn query_extract() -> Result<MyQuery, ServerFnError> {
-///     use actix_web::web::Query;
+/// pub async fn extract_connection_info() -> Result<String, ServerFnError> {
+///     use actix_web::dev::ConnectionInfo;
 ///     use leptos_actix::*;
 ///
-///     let Query(data) = extract().await?;
+///     // this can be any type you can use an Actix extractor with, as long as
+///     // it works on the head, not the body of the request
+///     let info: ConnectionInfo = extract().await?;
 ///
 ///     // do something with the data
 ///
-///     Ok(data)
+///     Ok(format!("{info:?}"))
 /// }
 /// ```
 pub async fn extract<T>() -> Result<T, ServerFnError>
@@ -1399,7 +1458,7 @@ where
     T: actix_web::FromRequest,
     <T as FromRequest>::Error: Display,
 {
-    let req = use_context::<HttpRequest>().ok_or_else(|| {
+    let req = use_context::<Request>().ok_or_else(|| {
         ServerFnError::new("HttpRequest should have been provided via context")
     })?;
 

integrations/actix/tests/extract_routes.rs

@@ -1,148 +1,153 @@
-use leptos::*;
-use leptos_actix::generate_route_list;
-use leptos_router::{Route, Router, Routes, TrailingSlash};
+// TODO these tests relate to trailing-slash logic, which is still TBD for 0.7
 
-#[component]
-fn DefaultApp() -> impl IntoView {
-    let view = || view! { "" };
-    view! {
-        <Router>
-            <Routes>
-                <Route path="/foo" view/>
-                <Route path="/bar/" view/>
-                <Route path="/baz/:id" view/>
-                <Route path="/baz/:name/" view/>
-                <Route path="/baz/*any" view/>
-            </Routes>
-        </Router>
-    }
-}
-
-#[test]
-fn test_default_app() {
-    let routes = generate_route_list(DefaultApp);
-
-    // We still have access to the original (albeit normalized) Leptos paths:
-    assert_same(
-        &routes,
-        |r| r.leptos_path(),
-        &["/bar", "/baz/*any", "/baz/:id", "/baz/:name", "/foo"],
-    );
-
-    // ... But leptos-actix has also reformatted "paths" to work for Actix.
-    assert_same(
-        &routes,
-        |r| r.path(),
-        &["/bar", "/baz/{id}", "/baz/{name}", "/baz/{tail:.*}", "/foo"],
-    );
-}
-
-#[component]
-fn ExactApp() -> impl IntoView {
-    let view = || view! { "" };
-    let trailing_slash = TrailingSlash::Exact;
-    view! {
-        <Router trailing_slash>
-            <Routes>
-                <Route path="/foo" view/>
-                <Route path="/bar/" view/>
-                <Route path="/baz/:id" view/>
-                <Route path="/baz/:name/" view/>
-                <Route path="/baz/*any" view/>
-            </Routes>
-        </Router>
-    }
-}
-
-#[test]
-fn test_exact_app() {
-    let routes = generate_route_list(ExactApp);
-
-    // In Exact mode, the Leptos paths no longer have their trailing slashes stripped:
-    assert_same(
-        &routes,
-        |r| r.leptos_path(),
-        &["/bar/", "/baz/*any", "/baz/:id", "/baz/:name/", "/foo"],
-    );
-
-    // Actix paths also have trailing slashes as a result:
-    assert_same(
-        &routes,
-        |r| r.path(),
-        &[
-            "/bar/",
-            "/baz/{id}",
-            "/baz/{name}/",
-            "/baz/{tail:.*}",
-            "/foo",
-        ],
-    );
-}
-
-#[component]
-fn RedirectApp() -> impl IntoView {
-    let view = || view! { "" };
-    let trailing_slash = TrailingSlash::Redirect;
-    view! {
-        <Router trailing_slash>
-            <Routes>
-                <Route path="/foo" view/>
-                <Route path="/bar/" view/>
-                <Route path="/baz/:id" view/>
-                <Route path="/baz/:name/" view/>
-                <Route path="/baz/*any" view/>
-            </Routes>
-        </Router>
-    }
-}
-
-#[test]
-fn test_redirect_app() {
-    let routes = generate_route_list(RedirectApp);
-
-    assert_same(
-        &routes,
-        |r| r.leptos_path(),
-        &[
-            "/bar",
-            "/bar/",
-            "/baz/*any",
-            "/baz/:id",
-            "/baz/:id/",
-            "/baz/:name",
-            "/baz/:name/",
-            "/foo",
-            "/foo/",
-        ],
-    );
-
-    // ... But leptos-actix has also reformatted "paths" to work for Actix.
-    assert_same(
-        &routes,
-        |r| r.path(),
-        &[
-            "/bar",
-            "/bar/",
-            "/baz/{id}",
-            "/baz/{id}/",
-            "/baz/{name}",
-            "/baz/{name}/",
-            "/baz/{tail:.*}",
-            "/foo",
-            "/foo/",
-        ],
-    );
-}
-
-fn assert_same<'t, T, F, U>(
-    input: &'t Vec<T>,
-    mapper: F,
-    expected_sorted_values: &[U],
-) where
-    F: Fn(&'t T) -> U + 't,
-    U: Ord + std::fmt::Debug,
-{
-    let mut values: Vec<U> = input.iter().map(mapper).collect();
-    values.sort();
-    assert_eq!(values, expected_sorted_values);
-}
+// use leptos::*;
+// use leptos_actix::generate_route_list;
+// use leptos_router::{
+//     components::{Route, Router, Routes},
+//     path,
+// };
+//
+// #[component]
+// fn DefaultApp() -> impl IntoView {
+//     let view = || view! { "" };
+//     view! {
+//         <Router>
+//             <Routes>
+//                 <Route path=path!("/foo") view/>
+//                 <Route path=path!("/bar/") view/>
+//                 <Route path=path!("/baz/:id") view/>
+//                 <Route path=path!("/baz/:name/") view/>
+//                 <Route path=path!("/baz/*any") view/>
+//             </Routes>
+//         </Router>
+//     }
+// }
+//
+// #[test]
+// fn test_default_app() {
+//     let routes = generate_route_list(DefaultApp);
+//
+//     // We still have access to the original (albeit normalized) Leptos paths:
+//     assert_same(
+//         &routes,
+//         |r| r.leptos_path(),
+//         &["/bar", "/baz/*any", "/baz/:id", "/baz/:name", "/foo"],
+//     );
+//
+//     // ... But leptos-actix has also reformatted "paths" to work for Actix.
+//     assert_same(
+//         &routes,
+//         |r| r.path(),
+//         &["/bar", "/baz/{id}", "/baz/{name}", "/baz/{tail:.*}", "/foo"],
+//     );
+// }
+//
+// #[component]
+// fn ExactApp() -> impl IntoView {
+//     let view = || view! { "" };
+//     //let trailing_slash = TrailingSlash::Exact;
+//     view! {
+//         <Router>
+//             <Routes>
+//                 <Route path=path!("/foo") view/>
+//                 <Route path=path!("/bar/") view/>
+//                 <Route path=path!("/baz/:id") view/>
+//                 <Route path=path!("/baz/:name/") view/>
+//                 <Route path=path!("/baz/*any") view/>
+//             </Routes>
+//         </Router>
+//     }
+// }
+//
+// #[test]
+// fn test_exact_app() {
+//     let routes = generate_route_list(ExactApp);
+//
+//     // In Exact mode, the Leptos paths no longer have their trailing slashes stripped:
+//     assert_same(
+//         &routes,
+//         |r| r.leptos_path(),
+//         &["/bar/", "/baz/*any", "/baz/:id", "/baz/:name/", "/foo"],
+//     );
+//
+//     // Actix paths also have trailing slashes as a result:
+//     assert_same(
+//         &routes,
+//         |r| r.path(),
+//         &[
+//             "/bar/",
+//             "/baz/{id}",
+//             "/baz/{name}/",
+//             "/baz/{tail:.*}",
+//             "/foo",
+//         ],
+//     );
+// }
+//
+// #[component]
+// fn RedirectApp() -> impl IntoView {
+//     let view = || view! { "" };
+//     //let trailing_slash = TrailingSlash::Redirect;
+//     view! {
+//         <Router>
+//             <Routes>
+//                 <Route path=path!("/foo") view/>
+//                 <Route path=path!("/bar/") view/>
+//                 <Route path=path!("/baz/:id") view/>
+//                 <Route path=path!("/baz/:name/") view/>
+//                 <Route path=path!("/baz/*any") view/>
+//             </Routes>
+//         </Router>
+//     }
+// }
+//
+// #[test]
+// fn test_redirect_app() {
+//     let routes = generate_route_list(RedirectApp);
+//
+//     assert_same(
+//         &routes,
+//         |r| r.leptos_path(),
+//         &[
+//             "/bar",
+//             "/bar/",
+//             "/baz/*any",
+//             "/baz/:id",
+//             "/baz/:id/",
+//             "/baz/:name",
+//             "/baz/:name/",
+//             "/foo",
+//             "/foo/",
+//         ],
+//     );
+//
+//     // ... But leptos-actix has also reformatted "paths" to work for Actix.
+//     assert_same(
+//         &routes,
+//         |r| r.path(),
+//         &[
+//             "/bar",
+//             "/bar/",
+//             "/baz/{id}",
+//             "/baz/{id}/",
+//             "/baz/{name}",
+//             "/baz/{name}/",
+//             "/baz/{tail:.*}",
+//             "/foo",
+//             "/foo/",
+//         ],
+//     );
+// }
+//
+// fn assert_same<'t, T, F, U>(
+//     input: &'t Vec<T>,
+//     mapper: F,
+//     expected_sorted_values: &[U],
+// ) where
+//     F: Fn(&'t T) -> U + 't,
+//     U: Ord + std::fmt::Debug,
+// {
+//     let mut values: Vec<U> = input.iter().map(mapper).collect();
+//     values.sort();
+//     assert_eq!(values, expected_sorted_values);
+// }

integrations/axum/Cargo.toml

@@ -1,43 +1,47 @@
 [package]
 name = "leptos_axum"
-version = { workspace = true }
-edition = "2021"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Axum integrations for the Leptos web framework."
+version = { workspace = true }
 rust-version.workspace = true
+edition.workspace = true
 
 [dependencies]
 any_spawner = { workspace = true, features = ["tokio"] }
 hydration_context = { workspace = true }
-axum = { version = "0.7", default-features = false, features = [
-	"matched-path",
+axum = { version = "0.7.5", default-features = false, features = [
+  "matched-path",
 ] }
-futures = "0.3"
-http = "1"
-http-body-util = "0.1"
+futures = "0.3.30"
+http = "1.1"
+http-body-util = "0.1.2"
 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"] }
 leptos_router = { workspace = true, features = ["ssr"] }
 leptos_integration_utils = { workspace = true }
-parking_lot = "0.12"
-serde_json = "1"
-tokio = { version = "1", default-features = false }
-tower = "0.4"
-tower-http = "0.5"
-tracing = "0.1"
+parking_lot = "0.12.3"
+serde_json = "1.0"
+tokio = { version = "1.39", default-features = false }
+tower = "0.4.13"
+tower-http = "0.5.2"
+tracing = { version = "0.1.40", optional = true }
 
 [dev-dependencies]
-axum = "0.7"
-tokio = { version = "1", features = ["net"] }
+axum = "0.7.5"
+tokio = { version = "1.39", features = ["net", "rt-multi-thread"] }
 
 [features]
 wasm = []
 default = ["tokio/fs", "tokio/sync", "tower-http/fs"]
 islands-router = []
+tracing = ["dep:tracing"]
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--generate-link-to-definition"]
+
+[package.metadata.cargo-all-features]
+denylist = ["tracing"]

integrations/axum/src/lib.rs

@@ -34,16 +34,22 @@
 
 use axum::{
     body::{Body, Bytes},
-    extract::{FromRef, FromRequestParts, MatchedPath, State},
+    extract::{FromRequestParts, MatchedPath},
     http::{
         header::{self, HeaderName, HeaderValue, ACCEPT, LOCATION, REFERER},
         request::Parts,
-        HeaderMap, Method, Request, Response, StatusCode, Uri,
+        HeaderMap, Method, Request, Response, StatusCode,
     },
     response::IntoResponse,
     routing::{delete, get, patch, post, put},
 };
+#[cfg(feature = "default")]
+use axum::{
+    extract::{FromRef, State},
+    http::Uri,
+};
 use futures::{stream::once, Future, Stream, StreamExt};
+use hydration_context::SsrSharedContext;
 use leptos::{
     config::LeptosOptions,
     context::{provide_context, use_context},
@@ -62,6 +68,7 @@ use leptos_router::{
 use parking_lot::RwLock;
 use server_fn::{redirect::REDIRECT_HEADER, ServerFnError};
 use std::{fmt::Debug, io, pin::Pin, sync::Arc};
+#[cfg(feature = "default")]
 use tower::ServiceExt;
 #[cfg(feature = "default")]
 use tower_http::services::ServeDir;
@@ -95,7 +102,9 @@ impl ResponseParts {
 ///
 /// If you provide your own handler, you will need to provide `ResponseOptions` via context
 /// yourself if you want to access it via context.
-/// ```rust,ignore
+/// ```
+/// use leptos::prelude::*;
+///
 /// #[server]
 /// pub async fn get_opts() -> Result<(), ServerFnError> {
 ///     let opts = expect_context::<leptos_axum::ResponseOptions>();
@@ -169,9 +178,33 @@ impl ExtendResponse for AxumResponse {
     }
 }
 
-/// Provides an easy way to redirect the user from within a server function. Mimicking the Remix `redirect()`,
-/// it sets a StatusCode of 302 and a LOCATION header with the provided value.
-/// If looking to redirect from the client, `leptos_router::use_navigate()` should be used instead
+/// Provides an easy way to redirect the user from within a server function.
+///
+/// Calling `redirect` in a server function will redirect the browser in three
+/// situations:
+/// 1. A server function that is calling in a [blocking
+///    resource](leptos::server::Resource::new_blocking).
+/// 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`](leptos::form::ActionForm) without JS/WASM present.)
+///
+/// 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
+///
+/// This sets the `Location` header to the URL given.
+///
+/// If the route or server function in which this is called is being accessed
+/// by an ordinary `GET` request or an HTML `<form>` without any enhancement, it also sets a
+/// status code of `302` for a temporary redirect. (This is determined by whether the `Accept`
+/// header contains `text/html` as it does for an ordinary navigation.)
+///
+/// Otherwise, it sets a custom header that indicates to the client that it should redirect,
+/// without actually setting the status code. This means that the client will not follow the
+/// redirect, and can therefore return the value of the server function and then handle
+/// the redirect with client-side routing.
 pub fn redirect(path: &str) {
     if let (Some(req), Some(res)) =
         (use_context::<Parts>(), use_context::<ResponseOptions>())
@@ -203,10 +236,14 @@ pub fn redirect(path: &str) {
             );
         }
     } else {
-        tracing::warn!(
-            "Couldn't retrieve either Parts or ResponseOptions while trying \
-             to redirect()."
-        );
+        let msg = "Couldn't retrieve either Parts or ResponseOptions while \
+                   trying to redirect().";
+
+        #[cfg(feature = "tracing")]
+        tracing::warn!("{}", &msg);
+
+        #[cfg(not(feature = "tracing"))]
+        eprintln!("{}", &msg);
     }
 }
 
@@ -228,7 +265,7 @@ pub fn generate_request_and_parts(
 ///
 /// ```
 /// use axum::{handler::Handler, routing::post, Router};
-/// use leptos::*;
+/// use leptos::prelude::*;
 /// use std::net::SocketAddr;
 ///
 /// # if false { // don't actually try to run a server in a doctest...
@@ -256,7 +293,10 @@ pub fn generate_request_and_parts(
 /// This function always provides context values including the following types:
 /// - [`Parts`]
 /// - [`ResponseOptions`]
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub async fn handle_server_fns(req: Request<Body>) -> impl IntoResponse {
     handle_server_fns_inner(|| {}, req).await
 }
@@ -298,7 +338,10 @@ fn init_executor() {
 /// This function always provides context values including the following types:
 /// - [`Parts`]
 /// - [`ResponseOptions`]
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub async fn handle_server_fns_with_context(
     additional_context: impl Fn() + 'static + Clone + Send,
     req: Request<Body>,
@@ -312,10 +355,13 @@ async fn handle_server_fns_inner(
 ) -> impl IntoResponse {
     use server_fn::middleware::Service;
 
+    let method = req.method().clone();
     let path = req.uri().path().to_string();
     let (req, parts) = generate_request_and_parts(req);
 
-    if let Some(mut service) = server_fn::axum::get_server_fn_service(&path) {
+    if let Some(mut service) =
+        server_fn::axum::get_server_fn_service(&path, method)
+    {
         let owner = Owner::new();
         owner
             .with(|| {
@@ -388,8 +434,7 @@ pub type PinnedHtmlStream =
 /// This can then be set up at an appropriate route in your application:
 /// ```
 /// use axum::{handler::Handler, Router};
-/// use leptos::*;
-/// use leptos_config::get_configuration;
+/// use leptos::{config::get_configuration, prelude::*};
 /// use std::{env, net::SocketAddr};
 ///
 /// #[component]
@@ -407,8 +452,7 @@ pub type PinnedHtmlStream =
 ///
 ///     // build our application with a route
 ///     let app = Router::new().fallback(leptos_axum::render_app_to_stream(
-///         leptos_options,
-///         || view! { <MyApp/> },
+///         || { /* your application here */ },
 ///     ));
 ///
 ///     // run our app with hyper
@@ -426,7 +470,10 @@ pub type PinnedHtmlStream =
 /// - [`ResponseOptions`]
 /// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
 /// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn render_app_to_stream<IV>(
     app_fn: impl Fn() -> IV + Clone + Send + 'static,
 ) -> impl Fn(
@@ -446,7 +493,10 @@ where
 /// The difference between calling this and `render_app_to_stream_with_context()` is that this
 /// one respects the `SsrMode` on each Route and thus requires `Vec<AxumRouteListing>` for route checking.
 /// This is useful if you are using `.leptos_routes_with_handler()`
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn render_route<IV>(
     paths: Vec<AxumRouteListing>,
     app_fn: impl Fn() -> IV + Clone + Send + 'static,
@@ -476,8 +526,7 @@ where
 /// This can then be set up at an appropriate route in your application:
 /// ```
 /// use axum::{handler::Handler, Router};
-/// use leptos::*;
-/// use leptos_config::get_configuration;
+/// use leptos::{config::get_configuration, prelude::*};
 /// use std::{env, net::SocketAddr};
 ///
 /// #[component]
@@ -494,11 +543,9 @@ where
 ///     let addr = leptos_options.site_addr.clone();
 ///
 ///     // build our application with a route
-///     let app =
-///         Router::new().fallback(leptos_axum::render_app_to_stream_in_order(
-///             leptos_options,
-///             || view! { <MyApp/> },
-///         ));
+///     let app = Router::new().fallback(
+///         leptos_axum::render_app_to_stream_in_order(|| view! { <MyApp/> }),
+///     );
 ///
 ///     // run our app with hyper
 ///     let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
@@ -515,7 +562,10 @@ where
 /// - [`ResponseOptions`]
 /// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
 /// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn render_app_to_stream_in_order<IV>(
     app_fn: impl Fn() -> IV + Clone + Send + 'static,
 ) -> impl Fn(
@@ -536,14 +586,25 @@ where
 /// 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
 /// the data to leptos in a closure. An example is below
-/// ```ignore
-/// async fn custom_handler(Path(id): Path<String>, Extension(options): Extension<Arc<LeptosOptions>>, req: Request<Body>) -> Response{
-///     let handler = leptos_axum::render_app_to_stream_with_context((*options).clone(),
-///     || {
-///         provide_context(id.clone());
-///     },
-///     || view! { <TodoApp/> }
-/// );
+/// ```
+/// use axum::{
+///     body::Body,
+///     extract::Path,
+///     response::{IntoResponse, Response},
+/// };
+/// use http::Request;
+/// use leptos::{config::LeptosOptions, context::provide_context, prelude::*};
+///
+/// async fn custom_handler(
+///     Path(id): Path<String>,
+///     req: Request<Body>,
+/// ) -> Response {
+///     let handler = leptos_axum::render_app_to_stream_with_context(
+///         move || {
+///             provide_context(id.clone());
+///         },
+///         || { /* your app here */ },
+///     );
 ///     handler(req).await.into_response()
 /// }
 /// ```
@@ -555,7 +616,10 @@ where
 /// - [`ResponseOptions`]
 /// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
 /// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn render_app_to_stream_with_context<IV>(
     additional_context: impl Fn() + 'static + Clone + Send,
     app_fn: impl Fn() -> IV + Clone + Send + 'static,
@@ -580,7 +644,10 @@ where
 /// The difference between calling this and `render_app_to_stream_with_context()` is that this
 /// one respects the `SsrMode` on each Route, and thus requires `Vec<AxumRouteListing>` for route checking.
 /// This is useful if you are using `.leptos_routes_with_handler()`.
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn render_route_with_context<IV>(
     paths: Vec<AxumRouteListing>,
     additional_context: impl Fn() + 'static + Clone + Send,
@@ -659,7 +726,10 @@ where
 /// - [`ResponseOptions`]
 /// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
 /// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn render_app_to_stream_with_context_and_replace_blocks<IV>(
     additional_context: impl Fn() + 'static + Clone + Send,
     app_fn: impl Fn() -> IV + Clone + Send + 'static,
@@ -694,14 +764,25 @@ where
 /// 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
 /// the data to leptos in a closure. An example is below
-/// ```ignore
-/// async fn custom_handler(Path(id): Path<String>, Extension(options): Extension<Arc<LeptosOptions>>, req: Request<Body>) -> Response{
-///     let handler = leptos_axum::render_app_to_stream_in_order_with_context((*options).clone(),
-///     move || {
-///         provide_context(id.clone());
-///     },
-///     || view! { <TodoApp/> }
-/// );
+/// ```
+/// use axum::{
+///     body::Body,
+///     extract::Path,
+///     response::{IntoResponse, Response},
+/// };
+/// use http::Request;
+/// use leptos::context::provide_context;
+///
+/// async fn custom_handler(
+///     Path(id): Path<String>,
+///     req: Request<Body>,
+/// ) -> Response {
+///     let handler = leptos_axum::render_app_to_stream_in_order_with_context(
+///         move || {
+///             provide_context(id.clone());
+///         },
+///         || { /* your application here */ },
+///     );
 ///     handler(req).await.into_response()
 /// }
 /// ```
@@ -713,7 +794,10 @@ where
 /// - [`ResponseOptions`]
 /// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
 /// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn render_app_to_stream_in_order_with_context<IV>(
     additional_context: impl Fn() + 'static + Clone + Send,
     app_fn: impl Fn() -> IV + Clone + Send + 'static,
@@ -806,7 +890,10 @@ where
     })
 }
 
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 fn provide_contexts(
     path: &str,
     meta_context: &ServerMetaContext,
@@ -834,8 +921,7 @@ fn provide_contexts(
 /// This can then be set up at an appropriate route in your application:
 /// ```
 /// use axum::{handler::Handler, Router};
-/// use leptos::*;
-/// use leptos_config::get_configuration;
+/// use leptos::{config::get_configuration, prelude::*};
 /// use std::{env, net::SocketAddr};
 ///
 /// #[component]
@@ -852,10 +938,8 @@ fn provide_contexts(
 ///     let addr = leptos_options.site_addr.clone();
 ///
 ///     // build our application with a route
-///     let app = Router::new().fallback(leptos_axum::render_app_async(
-///         leptos_options,
-///         || view! { <MyApp/> },
-///     ));
+///     let app = Router::new()
+///         .fallback(leptos_axum::render_app_async(|| view! { <MyApp/> }));
 ///
 ///     // run our app with hyper
 ///     // `axum::Server` is a re-export of `hyper::Server`
@@ -874,7 +958,10 @@ fn provide_contexts(
 /// - [`ResponseOptions`]
 /// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
 /// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn render_app_async<IV>(
     app_fn: impl Fn() -> IV + Clone + Send + 'static,
 ) -> impl Fn(
@@ -896,14 +983,25 @@ where
 /// 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
 /// the data to leptos in a closure. An example is below
-/// ```ignore
-/// async fn custom_handler(Path(id): Path<String>, Extension(options): Extension<Arc<LeptosOptions>>, req: Request<Body>) -> Response{
-///     let handler = leptos_axum::render_app_async_with_context((*options).clone(),
-///     move || {
-///         provide_context(id.clone());
-///     },
-///     || view! { <TodoApp/> }
-/// );
+/// ```
+/// use axum::{
+///     body::Body,
+///     extract::Path,
+///     response::{IntoResponse, Response},
+/// };
+/// use http::Request;
+/// use leptos::context::provide_context;
+///
+/// async fn custom_handler(
+///     Path(id): Path<String>,
+///     req: Request<Body>,
+/// ) -> Response {
+///     let handler = leptos_axum::render_app_async_with_context(
+///         move || {
+///             provide_context(id.clone());
+///         },
+///         || { /* your application here */ },
+///     );
 ///     handler(req).await.into_response()
 /// }
 /// ```
@@ -915,7 +1013,10 @@ where
 /// - [`ResponseOptions`]
 /// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
 /// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn render_app_async_stream_with_context<IV>(
     additional_context: impl Fn() + 'static + Clone + Send,
     app_fn: impl Fn() -> IV + Clone + Send + 'static,
@@ -950,14 +1051,25 @@ where
 /// 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
 /// the data to leptos in a closure. An example is below
-/// ```ignore
-/// async fn custom_handler(Path(id): Path<String>, Extension(options): Extension<Arc<LeptosOptions>>, req: Request<Body>) -> Response{
-///     let handler = leptos_axum::render_app_async_with_context((*options).clone(),
-///     move || {
-///         provide_context(id.clone());
-///     },
-///     || view! { <TodoApp/> }
-/// );
+/// ```
+/// use axum::{
+///     body::Body,
+///     extract::Path,
+///     response::{IntoResponse, Response},
+/// };
+/// use http::Request;
+/// use leptos::context::provide_context;
+///
+/// async fn custom_handler(
+///     Path(id): Path<String>,
+///     req: Request<Body>,
+/// ) -> Response {
+///     let handler = leptos_axum::render_app_async_with_context(
+///         move || {
+///             provide_context(id.clone());
+///         },
+///         || { /* your application here */ },
+///     );
 ///     handler(req).await.into_response()
 /// }
 /// ```
@@ -969,7 +1081,10 @@ where
 /// - [`ResponseOptions`]
 /// - [`ServerMetaContext`](leptos_meta::ServerMetaContext)
 /// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn render_app_async_with_context<IV>(
     additional_context: impl Fn() + 'static + Clone + Send,
     app_fn: impl Fn() -> IV + Clone + Send + 'static,
@@ -1000,7 +1115,10 @@ where
 /// 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.
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn generate_route_list<IV>(
     app_fn: impl Fn() -> IV + 'static + Clone,
 ) -> Vec<AxumRouteListing>
@@ -1013,7 +1131,10 @@ where
 /// 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.
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn generate_route_list_with_ssg<IV>(
     app_fn: impl Fn() -> IV + 'static + Clone,
 ) -> (Vec<AxumRouteListing>, StaticDataMap)
@@ -1027,7 +1148,10 @@ where
 /// 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
 /// to this function will stop `.leptos_routes()` from generating a route for it, allowing a custom handler. These need to be in Axum path format
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn generate_route_list_with_exclusions<IV>(
     app_fn: impl Fn() -> IV + 'static + Clone,
     excluded_routes: Option<Vec<String>>,
@@ -1068,7 +1192,10 @@ pub async fn build_static_routes<IV>(
 /// 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
 /// to this function will stop `.leptos_routes()` from generating a route for it, allowing a custom handler. These need to be in Axum path format
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn generate_route_list_with_exclusions_and_ssg<IV>(
     app_fn: impl Fn() -> IV + 'static + Clone,
     excluded_routes: Option<Vec<String>>,
@@ -1155,7 +1282,10 @@ impl AxumRouteListing {
 /// as an argument so it can walk you app tree. This version is tailored to generate Axum compatible paths. Adding excluded_routes
 /// to this function will stop `.leptos_routes()` from generating a route for it, allowing a custom handler. These need to be in Axum path format
 /// Additional context will be provided to the app Element.
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+#[cfg_attr(
+    feature = "tracing",
+    tracing::instrument(level = "trace", fields(error), skip_all)
+)]
 pub fn generate_route_list_with_exclusions_and_ssg_and_context<IV>(
     app_fn: impl Fn() -> IV + 'static + Clone,
     excluded_routes: Option<Vec<String>>,
@@ -1166,7 +1296,7 @@ where
 {
     init_executor();
 
-    let owner = Owner::new_root(None);
+    let owner = Owner::new_root(Some(Arc::new(SsrSharedContext::new())));
     let routes = owner
         .with(|| {
             // stub out a path for now
@@ -1482,7 +1612,10 @@ impl<S> LeptosRoutes<S> for axum::Router<S>
 where
     S: Clone + Send + Sync + 'static,
 {
-    #[tracing::instrument(level = "trace", fields(error), skip_all)]
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(level = "trace", fields(error), skip_all)
+    )]
     fn leptos_routes<IV>(
         self,
         state: &S,
@@ -1495,7 +1628,10 @@ where
         self.leptos_routes_with_context(state, paths, || {}, app_fn)
     }
 
-    #[tracing::instrument(level = "trace", fields(error), skip_all)]
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(level = "trace", fields(error), skip_all)
+    )]
     fn leptos_routes_with_context<IV>(
         self,
         state: &S,
@@ -1638,7 +1774,10 @@ where
         router
     }
 
-    #[tracing::instrument(level = "trace", fields(error), skip_all)]
+    #[cfg_attr(
+        feature = "tracing",
+        tracing::instrument(level = "trace", fields(error), skip_all)
+    )]
     fn leptos_routes_with_handler<H, T>(
         self,
         paths: Vec<AxumRouteListing>,
@@ -1676,15 +1815,19 @@ where
 ///
 /// Any error that occurs during extraction is converted to a [`ServerFnError`].
 ///
-/// ```rust,ignore
-/// // MyQuery is some type that implements `Deserialize + Serialize`
-/// #[server]
-/// pub async fn query_extract() -> Result<MyQuery, ServerFnError> {
-///     use axum::{extract::Query, http::Method};
-///     use leptos_axum::*;
-///     let Query(query) = extract().await?;
+/// ```rust
+/// use leptos::prelude::*;
 ///
-///     Ok(query)
+/// #[server]
+/// pub async fn request_method() -> Result<String, ServerFnError> {
+///     use http::Method;
+///     use leptos_axum::extract;
+///
+///     // you can extract anything that a regular Axum extractor can extract
+///     // from the head (not from the body of the request)
+///     let method: Method = extract().await?;
+///
+///     Ok(format!("{method:?}"))
 /// }
 /// ```
 pub async fn extract<T>() -> Result<T, ServerFnError>
@@ -1702,18 +1845,6 @@ where
 /// therefore be used in an extractor. The compiler can often infer this type.
 ///
 /// Any error that occurs during extraction is converted to a [`ServerFnError`].
-///
-/// ```rust,ignore
-/// // MyQuery is some type that implements `Deserialize + Serialize`
-/// #[server]
-/// pub async fn query_extract() -> Result<MyQuery, ServerFnError> {
-///     use axum::{extract::Query, http::Method};
-///     use leptos_axum::*;
-///     let Query(query) = extract().await?;
-///
-///     Ok(query)
-/// }
-/// ```
 pub async fn extract_with_state<T, S>(state: &S) -> Result<T, ServerFnError>
 where
     T: Sized + FromRequestParts<S>,

integrations/utils/Cargo.toml

@@ -1,22 +1,21 @@
 [package]
 name = "leptos_integration_utils"
-version = { workspace = true }
-edition = "2021"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Utilities to help build server integrations for the Leptos web framework."
+version = { workspace = true }
 rust-version.workspace = true
+edition.workspace = true
 
 [dependencies]
-futures = "0.3"
+futures = "0.3.30"
 hydration_context = { workspace = true }
 leptos = { workspace = true, features = ["nonce"] }
 leptos_meta = { workspace = true, features = ["ssr"] }
 leptos_router = { workspace = true, features = ["ssr"] }
 leptos_config = { workspace = true }
 reactive_graph = { workspace = true, features = ["sandboxed-arenas"] }
-tracing = "0.1.37"
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--generate-link-to-definition"]

leptos/Cargo.toml

@@ -1,57 +1,62 @@
 [package]
 name = "leptos"
 version = { workspace = true }
-edition = "2021"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Leptos is a full-stack, isomorphic Rust web framework leveraging fine-grained reactivity to build declarative user interfaces."
 readme = "../README.md"
 rust-version.workspace = true
+edition.workspace = true
 
 [dependencies]
 throw_error = { workspace = true }
 any_spawner = { workspace = true, features = ["wasm-bindgen"] }
-base64 = { version = "0.22", optional = true }
-cfg-if = "1"
+base64 = { version = "0.22.1", optional = true }
+cfg-if = "1.0"
 hydration_context = { workspace = true }
 either_of = { workspace = true }
 leptos_dom = { workspace = true }
+leptos_hot_reload = { workspace = true }
 leptos_macro = { workspace = true }
 leptos_server = { workspace = true, features = ["tachys"] }
 leptos_config = { workspace = true }
-leptos-spin-macro = { version = "0.1", optional = true }
+leptos-spin-macro = { version = "0.2.0", optional = true }
 oco_ref = { workspace = true }
 or_poisoned = { workspace = true }
-paste = "1"
-rand = { version = "0.8", optional = true }
+paste = "1.0"
+rand = { version = "0.8.5", optional = true }
 reactive_graph = { workspace = true, features = ["serde"] }
-rustc-hash = "1"
+rustc-hash = "2.0"
 tachys = { workspace = true, features = ["reactive_graph", "oco"] }
-thiserror = "1"
-tracing = "0.1"
-typed-builder = "0.18"
-typed-builder-macro = "0.18"
-serde = "1"
-serde_json = { version = "1", optional = true }
+thiserror = "1.0"
+tracing = { version = "0.1.40", optional = true }
+typed-builder = "0.19.1"
+typed-builder-macro = "0.19.1"
+serde = "1.0"
+serde_json = { version = "1.0", optional = true }
 server_fn = { workspace = true, features = [
   "form-redirects",
   "browser",
   "url",
 ] }
-web-sys = { version = "0.3.63", features = [
+web-sys = { version = "0.3.70", features = [
   "ShadowRoot",
   "ShadowRootInit",
   "ShadowRootMode",
 ] }
-wasm-bindgen = "0.2"
-serde_qs = "0.12.0"
-slotmap = "1.0.7"
+wasm-bindgen = "0.2.93"
+serde_qs = "0.13.0"
+slotmap = "1.0"
 futures = "0.3.30"
 send_wrapper = "0.6.0"
 
 [features]
-hydration = ["reactive_graph/hydration", "leptos_server/hydration", "hydration_context/browser"]
+hydration = [
+  "reactive_graph/hydration",
+  "leptos_server/hydration",
+  "hydration_context/browser",
+]
 csr = ["leptos_macro/csr", "reactive_graph/effects"]
 hydrate = [
   "leptos_macro/hydrate",
@@ -68,22 +73,22 @@ ssr = [
   "hydration",
   "tachys/ssr",
 ]
-nightly = ["leptos_dom/nightly", "leptos_macro/nightly", "tachys/nightly"]
+nightly = ["leptos_macro/nightly", "reactive_graph/nightly", "tachys/nightly"]
 rkyv = ["server_fn/rkyv"]
 tracing = [
+  "dep:tracing",
   "reactive_graph/tracing",
   "tachys/tracing",
-] #, "leptos_macro/tracing", "leptos_dom/tracing"]
-nonce = ["base64", "leptos_dom/nonce", "rand"]
-spin = ["leptos-spin-macro"]
-experimental-islands = [
-  "leptos_dom/experimental-islands",
-  "leptos_macro/experimental-islands",
-  "dep:serde_json",
+  "leptos_macro/tracing",
+  "leptos_dom/tracing",
+  "leptos_server/tracing",
 ]
+nonce = ["base64", "rand"]
+spin = ["leptos-spin-macro"]
+experimental-islands = ["leptos_macro/experimental-islands", "dep:serde_json"]
 trace-component-props = [
-  "leptos_dom/trace-component-props",
   "leptos_macro/trace-component-props",
+  "leptos_dom/trace-component-props"
 ]
 delegation = ["tachys/delegation"]
 
@@ -95,52 +100,22 @@ denylist = [
   "rustls",
   "default-tls",
   "wasm-bindgen",
-  "rkyv",                  # was causing clippy issues on nightly
+  "rkyv", # was causing clippy issues on nightly
   "trace-component-props",
   "spin",
   "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]

leptos/src/animated_show.rs

@@ -43,10 +43,7 @@ use leptos_reactive::{
 /// }
 /// # }
 /// ```
-#[cfg_attr(
-    any(debug_assertions, feature = "ssr"),
-    tracing::instrument(level = "trace", skip_all)
-)]
+#[cfg_attr(feature = "tracing", tracing::instrument(level = "trace", skip_all))]
 #[component]
 pub fn AnimatedShow(
     /// The components Show wraps

leptos/src/callback.rs

@@ -6,16 +6,17 @@
 //! Callbacks can be created manually from any function or closure, but the easiest way
 //! to create them is to use `#[prop(into)]]` when defining a component.
 //! ```
-//! # use leptos::*;
+//! use leptos::prelude::*;
+//!
 //! #[component]
 //! fn MyComponent(
-//!     #[prop(into)] render_number: Callback<i32, String>,
+//!     #[prop(into)] render_number: Callback<(i32,), String>,
 //! ) -> impl IntoView {
 //!     view! {
 //!         <div>
-//!             {render_number.call(1)}
+//!             {render_number.run((1,))}
 //!             // callbacks can be called multiple times
-//!             {render_number.call(42)}
+//!             {render_number.run((42,))}
 //!         </div>
 //!     }
 //! }
@@ -30,28 +31,28 @@
 //! *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`] trait, and can be invoked with `my_callback.call(input)`. On nightly, you can even do `my_callback(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`]
-//! - [`SyncCallback`]
+//! - [`UnsyncCallback`]
 //!
-//! Use `SyncCallback` when you want the function to be `Sync` and `Send`.
+//! Use `SyncCallback` if the function is not `Sync` and `Send`.
 
-use reactive_graph::owner::StoredValue;
+use reactive_graph::owner::{LocalStorage, StoredValue};
 use std::{fmt, rc::Rc, sync::Arc};
 
 /// A wrapper trait for calling callbacks.
 pub trait Callable<In: 'static, Out: 'static = ()> {
     /// calls the callback with the specified argument.
-    fn call(&self, input: In) -> Out;
+    fn run(&self, input: In) -> Out;
 }
 
 /// A callback type that is not required to be `Send + Sync`.
 pub struct UnsyncCallback<In: 'static, Out: 'static = ()>(
-    Rc<dyn Fn(In) -> Out>,
+    StoredValue<Rc<dyn Fn(In) -> Out>, LocalStorage>,
 );
 
 impl<In> fmt::Debug for UnsyncCallback<In> {
@@ -60,9 +61,11 @@ impl<In> fmt::Debug for UnsyncCallback<In> {
     }
 }
 
+impl<In, Out> Copy for UnsyncCallback<In, Out> {}
+
 impl<In, Out> Clone for UnsyncCallback<In, Out> {
     fn clone(&self) -> Self {
-        Self(Rc::clone(&self.0))
+        *self
     }
 }
 
@@ -72,92 +75,62 @@ impl<In, Out> UnsyncCallback<In, Out> {
     where
         F: Fn(In) -> Out + 'static,
     {
-        Self(Rc::new(f))
+        Self(StoredValue::new_local(Rc::new(f)))
     }
 }
 
 impl<In: 'static, Out: 'static> Callable<In, Out> for UnsyncCallback<In, Out> {
-    fn call(&self, input: In) -> Out {
-        (self.0)(input)
+    fn run(&self, input: In) -> Out {
+        self.0.with_value(|fun| fun(input))
     }
 }
 
-macro_rules! impl_from_fn {
-    ($ty:ident) => {
-        #[cfg(not(feature = "nightly"))]
-        impl<F, In, T, Out> From<F> for $ty<In, Out>
+macro_rules! impl_unsync_callable_from_fn {
+    ($($arg:ident),*) => {
+        impl<F, $($arg,)* T, Out> From<F> for UnsyncCallback<($($arg,)*), Out>
         where
-            F: Fn(In) -> T + Send + Sync + 'static,
+            F: Fn($($arg),*) -> T + 'static,
             T: Into<Out> + 'static,
-            In: Send + Sync + 'static,
+            $($arg: 'static,)*
         {
             fn from(f: F) -> Self {
-                Self::new(move |x| f(x).into())
-            }
-        }
-
-        paste::paste! {
-            #[cfg(feature = "nightly")]
-            auto trait [<NotRaw $ty>] {}
-
-            #[cfg(feature = "nightly")]
-            impl<A, B> ![<NotRaw $ty>] for $ty<A, B> {}
-
-            #[cfg(feature = "nightly")]
-            impl<F, In, T, Out> From<F> for $ty<In, Out>
-            where
-                F: Fn(In) -> T + Send + Sync + [<NotRaw $ty>] + 'static,
-                T: Into<Out> + 'static,
-                In: Send + Sync + 'static
-            {
-                fn from(f: F) -> Self {
-                    Self::new(move |x| f(x).into())
-                }
+                paste::paste!(
+                    Self::new(move |($([<$arg:lower>],)*)| f($([<$arg:lower>]),*).into())
+                )
             }
         }
     };
 }
 
-// TODO
-//impl_from_fn!(UnsyncCallback);
+impl_unsync_callable_from_fn!();
+impl_unsync_callable_from_fn!(P1);
+impl_unsync_callable_from_fn!(P1, P2);
+impl_unsync_callable_from_fn!(P1, P2, P3);
+impl_unsync_callable_from_fn!(P1, P2, P3, P4);
+impl_unsync_callable_from_fn!(P1, P2, P3, P4, P5);
+impl_unsync_callable_from_fn!(P1, P2, P3, P4, P5, P6);
+impl_unsync_callable_from_fn!(P1, P2, P3, P4, P5, P6, P7);
+impl_unsync_callable_from_fn!(P1, P2, P3, P4, P5, P6, P7, P8);
+impl_unsync_callable_from_fn!(P1, P2, P3, P4, P5, P6, P7, P8, P9);
+impl_unsync_callable_from_fn!(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10);
+impl_unsync_callable_from_fn!(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11);
+impl_unsync_callable_from_fn!(
+    P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12
+);
 
-#[cfg(feature = "nightly")]
-impl<In, Out> FnOnce<(In,)> for UnsyncCallback<In, Out> {
-    type Output = Out;
-
-    extern "rust-call" fn call_once(self, args: (In,)) -> Self::Output {
-        Callable::call(&self, args.0)
-    }
-}
-
-#[cfg(feature = "nightly")]
-impl<In, Out> FnMut<(In,)> for UnsyncCallback<In, Out> {
-    extern "rust-call" fn call_mut(&mut self, args: (In,)) -> Self::Output {
-        Callable::call(&*self, args.0)
-    }
-}
-
-#[cfg(feature = "nightly")]
-impl<In, Out> Fn<(In,)> for UnsyncCallback<In, Out> {
-    extern "rust-call" fn call(&self, args: (In,)) -> Self::Output {
-        Callable::call(self, args.0)
-    }
-}
-
-// TODO update these docs to swap the two
 /// Callbacks define a standard way to store functions and closures.
 ///
 /// # Example
 /// ```
-/// # use leptos::*;
-/// # use leptos::{Callable, Callback};
+/// # use leptos::prelude::*;
+/// # use leptos::callback::{Callable, Callback};
 /// #[component]
 /// fn MyComponent(
-///     #[prop(into)] render_number: Callback<i32, String>,
+///     #[prop(into)] render_number: Callback<(i32,), String>,
 /// ) -> impl IntoView {
 ///     view! {
 ///         <div>
-///             {render_number.call(42)}
+///             {render_number.run((42,))}
 ///         </div>
 ///     }
 /// }
@@ -182,7 +155,7 @@ impl<In, Out> fmt::Debug for Callback<In, Out> {
 }
 
 impl<In, Out> Callable<In, Out> for Callback<In, Out> {
-    fn call(&self, input: In) -> Out {
+    fn run(&self, input: In) -> Out {
         self.0
             .try_with_value(|f| f(input))
             .expect("called a callback that has been disposed")
@@ -197,6 +170,37 @@ impl<In, Out> Clone for Callback<In, Out> {
 
 impl<In, Out> Copy for Callback<In, Out> {}
 
+macro_rules! impl_callable_from_fn {
+    ($($arg:ident),*) => {
+        impl<F, $($arg,)* T, Out> From<F> for Callback<($($arg,)*), Out>
+        where
+            F: Fn($($arg),*) -> T + Send + Sync + 'static,
+            T: Into<Out> + 'static,
+            $($arg: Send + Sync + 'static,)*
+        {
+            fn from(f: F) -> Self {
+                paste::paste!(
+                    Self::new(move |($([<$arg:lower>],)*)| f($([<$arg:lower>]),*).into())
+                )
+            }
+        }
+    };
+}
+
+impl_callable_from_fn!();
+impl_callable_from_fn!(P1);
+impl_callable_from_fn!(P1, P2);
+impl_callable_from_fn!(P1, P2, P3);
+impl_callable_from_fn!(P1, P2, P3, P4);
+impl_callable_from_fn!(P1, P2, P3, P4, P5);
+impl_callable_from_fn!(P1, P2, P3, P4, P5, P6);
+impl_callable_from_fn!(P1, P2, P3, P4, P5, P6, P7);
+impl_callable_from_fn!(P1, P2, P3, P4, P5, P6, P7, P8);
+impl_callable_from_fn!(P1, P2, P3, P4, P5, P6, P7, P8, P9);
+impl_callable_from_fn!(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10);
+impl_callable_from_fn!(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11);
+impl_callable_from_fn!(P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12);
+
 impl<In: 'static, Out: 'static> Callback<In, Out> {
     /// Creates a new callback from the given function.
     pub fn new<F>(fun: F) -> Self
@@ -207,114 +211,36 @@ impl<In: 'static, Out: 'static> Callback<In, Out> {
     }
 }
 
-impl_from_fn!(Callback);
-
-#[cfg(feature = "nightly")]
-impl<In, Out> FnOnce<(In,)> for Callback<In, Out>
-where
-    In: Send + Sync + 'static,
-    Out: 'static,
-{
-    type Output = Out;
-
-    extern "rust-call" fn call_once(self, args: (In,)) -> Self::Output {
-        Callable::call(&self, args.0)
-    }
-}
-
-#[cfg(feature = "nightly")]
-impl<In, Out> FnMut<(In,)> for Callback<In, Out>
-where
-    In: Send + Sync + 'static,
-    Out: 'static,
-{
-    extern "rust-call" fn call_mut(&mut self, args: (In,)) -> Self::Output {
-        Callable::call(&*self, args.0)
-    }
-}
-
-#[cfg(feature = "nightly")]
-impl<In, Out> Fn<(In,)> for Callback<In, Out>
-where
-    In: Send + Sync + 'static,
-    Out: 'static,
-{
-    extern "rust-call" fn call(&self, args: (In,)) -> Self::Output {
-        Callable::call(self, args.0)
-    }
-}
-
 #[cfg(test)]
 mod tests {
-    use crate::{
-        callback::{Callback, UnsyncCallback},
-        create_runtime,
-    };
+    use crate::callback::{Callback, UnsyncCallback};
 
     struct NoClone {}
 
     #[test]
     fn clone_callback() {
-        let rt = create_runtime();
+        let callback = Callback::new(move |_no_clone: NoClone| NoClone {});
+        let _cloned = callback.clone();
+    }
+
+    #[test]
+    fn clone_unsync_callback() {
         let callback =
             UnsyncCallback::new(move |_no_clone: NoClone| NoClone {});
         let _cloned = callback.clone();
-        rt.dispose();
     }
 
     #[test]
-    fn clone_sync_callback() {
-        let rt = create_runtime();
-        let callback = Callback::new(move |_no_clone: NoClone| NoClone {});
-        let _cloned = callback.clone();
-        rt.dispose();
-    }
-
-    #[test]
-    fn callback_from() {
-        let rt = create_runtime();
-        let _callback: UnsyncCallback<(), String> = (|()| "test").into();
-        rt.dispose();
-    }
-
-    #[test]
-    fn callback_from_html() {
-        let rt = create_runtime();
-        use leptos::{
-            html::{AnyElement, HtmlElement},
-            prelude::*,
-        };
-
-        let _callback: UnsyncCallback<String, HtmlElement<AnyElement>> =
-            (|x: String| {
-                view! { <h1>{x}</h1> }
-            })
-            .into();
-        rt.dispose();
+    fn runback_from() {
+        let _callback: Callback<(), String> = (|| "test").into();
+        let _callback: Callback<(i32, String), String> =
+            (|num, s| format!("{num} {s}")).into();
     }
 
     #[test]
     fn sync_callback_from() {
-        let rt = create_runtime();
-        let _callback: Callback<(), String> = (|()| "test").into();
-        rt.dispose();
-    }
-
-    #[test]
-    fn sync_callback_from_html() {
-        use leptos::{
-            html::{AnyElement, HtmlElement},
-            prelude::*,
-        };
-
-        let rt = create_runtime();
-
-        let _callback: Callback<String, HtmlElement<AnyElement>> =
-            (|x: String| {
-                view! { <h1>{x}</h1> }
-            })
-            .into();
-
-        rt.dispose();
+        let _callback: UnsyncCallback<(), String> = (|| "test").into();
+        let _callback: UnsyncCallback<(i32, String), String> =
+            (|num, s| format!("{num} {s}")).into();
     }
 }

leptos/src/children.rs

@@ -47,70 +47,44 @@ type BoxedChildrenFn = Box<dyn Fn() -> AnyView<Dom> + Send>;
 /// to know exactly what children type the component expects. This is used internally by the
 /// `view!` macro implementation, and can also be used explicitly when using the builder syntax.
 ///
-/// # Examples
 ///
-/// ## Without ToChildren
+/// Different component types take different types for their `children` prop, some of which cannot
+/// be directly constructed. Using `ToChildren` allows the component user to pass children without
+/// explicity constructing the correct type.
 ///
-/// Without [ToChildren], consumers need to explicitly provide children using the type expected
-/// by the component. For example, [Provider][crate::Provider]'s children need to wrapped in
-/// a [Box], while [Show][crate::Show]'s children need to be wrapped in an [Rc].
+/// ## Examples
 ///
 /// ```
-/// # use leptos::{ProviderProps, ShowProps};
-/// # use leptos_dom::html::p;
-/// # use leptos_dom::IntoView;
+/// # use leptos::prelude::*;
+/// # use leptos::html::p;
+/// # use leptos::IntoView;
 /// # use leptos_macro::component;
-/// # use std::rc::Rc;
-/// #
-/// #[component]
-/// fn App() -> impl IntoView {
-///     (
-///         ProviderProps::builder()
-///             .children(Box::new(|| p().child("Foo").into_view().into()))
-///             // ...
-/// #           .value("Foo")
-/// #           .build(),
-///         ShowProps::builder()
-///             .children(Rc::new(|| p().child("Foo").into_view().into()))
-///             // ...
-/// #           .when(|| true)
-/// #           .fallback(|| p().child("foo"))
-/// #           .build(),
-///     )
-/// }
-/// ```
-///
-/// ## With ToChildren
-///
-/// With [ToChildren], consumers don't need to know exactly which type a component uses for
-/// its children.
-///
-/// ```
-/// # use leptos::{ProviderProps, ShowProps};
-/// # use leptos_dom::html::p;
-/// # use leptos_dom::IntoView;
-/// # use leptos_macro::component;
-/// # use std::rc::Rc;
-/// # use leptos::ToChildren;
-/// #
+/// # use leptos::children::ToChildren;
+/// use leptos::context::{Provider, ProviderProps};
+/// use leptos::control_flow::{Show, ShowProps};
+///
 /// #[component]
 /// fn App() -> impl IntoView {
 ///     (
+///       Provider(
 ///         ProviderProps::builder()
 ///             .children(ToChildren::to_children(|| {
-///                 p().child("Foo").into_view().into()
+///                 p().child("Foo")
 ///             }))
 ///             // ...
-/// #           .value("Foo")
-/// #           .build(),
-///         ShowProps::builder()
+///            .value("Foo")
+///            .build(),
+///        ),
+///        Show(
+///          ShowProps::builder()
 ///             .children(ToChildren::to_children(|| {
-///                 p().child("Foo").into_view().into()
+///                 p().child("Foo")
 ///             }))
 ///             // ...
-/// #           .when(|| true)
-/// #           .fallback(|| p().child("foo"))
-/// #           .build(),
+///             .when(|| true)
+///             .fallback(|| p().child("foo"))
+///             .build(),
+///        )
 ///     )
 /// }
 pub trait ToChildren<F> {

leptos/src/error_boundary.rs

@@ -9,7 +9,7 @@ use reactive_graph::{
     traits::{Get, Update, With, WithUntracked},
 };
 use rustc_hash::FxHashMap;
-use std::{marker::PhantomData, sync::Arc};
+use std::{fmt::Debug, marker::PhantomData, sync::Arc};
 use tachys::{
     html::attribute::Attribute,
     hydration::Cursor,
@@ -22,6 +22,29 @@ use tachys::{
 };
 use throw_error::{Error, ErrorHook, ErrorId};
 
+/// When you render a `Result<_, _>` in your view, in the `Err` case it will
+/// render nothing, and search up through the view tree for an `<ErrorBoundary/>`.
+/// This component lets you define a fallback that should be rendered in that
+/// error case, allowing you to handle errors within a section of the interface.
+///
+/// ```
+/// # use leptos::prelude::*;
+/// #[component]
+/// pub fn ErrorBoundaryExample() -> impl IntoView {
+///   let (value, set_value) = signal(Ok(0));
+///   let on_input =
+///     move |ev| set_value.set(event_target_value(&ev).parse::<i32>());
+///
+///   view! {
+///     <input type="text" on:input=on_input/>
+///     <ErrorBoundary
+///       fallback=move |_| view! { <p class="error">"Enter a valid number."</p>}
+///     >
+///       <p>"Value is: " {move || value.get()}</p>
+///     </ErrorBoundary>
+///   }
+/// }
+/// ```
 ///
 /// ## Beginner's Tip: ErrorBoundary Requires Your Error To Implement std::error::Error.
 /// `ErrorBoundary` requires your `Result<T,E>` to implement [IntoView](https://docs.rs/leptos/latest/leptos/trait.IntoView.html).
@@ -72,12 +95,11 @@ where
     });
     let hook = hook as Arc<dyn ErrorHook>;
 
-    // provide the error hook and render children
-    // TODO unset this outside the ErrorBoundary
-    throw_error::set_error_hook(Arc::clone(&hook));
+    let _guard = throw_error::set_error_hook(Arc::clone(&hook));
     let children = children.into_inner()();
 
     ErrorBoundaryView {
+        hook,
         boundary_id,
         errors_empty,
         children,
@@ -87,8 +109,8 @@ where
     }
 }
 
-#[derive(Debug)]
 struct ErrorBoundaryView<Chil, FalFn, Rndr> {
+    hook: Arc<dyn ErrorHook>,
     boundary_id: SerializedDataId,
     errors_empty: ArcMemo<bool>,
     children: Chil,
@@ -145,11 +167,14 @@ where
     type State = RenderEffect<ErrorBoundaryViewState<Chil::State, Fal::State>>;
 
     fn build(mut self) -> Self::State {
+        let hook = Arc::clone(&self.hook);
+        let _hook = throw_error::set_error_hook(Arc::clone(&hook));
         let mut children = Some(self.children.build());
         RenderEffect::new(
             move |prev: Option<
                 ErrorBoundaryViewState<Chil::State, Fal::State>,
             >| {
+                let _hook = throw_error::set_error_hook(Arc::clone(&hook));
                 if let Some(mut state) = prev {
                     match (self.errors_empty.get(), &mut state.fallback) {
                         // no errors, and was showing fallback
@@ -216,6 +241,7 @@ where
         Self::Output<NewAttr>: RenderHtml<Rndr>,
     {
         let ErrorBoundaryView {
+            hook,
             boundary_id,
             errors_empty,
             children,
@@ -224,6 +250,7 @@ where
             rndr,
         } = self;
         ErrorBoundaryView {
+            hook,
             boundary_id,
             errors_empty,
             children: children.add_any_attr(attr.into_cloneable_owned()),
@@ -252,6 +279,7 @@ where
 
     async fn resolve(self) -> Self::AsyncOutput {
         let ErrorBoundaryView {
+            hook,
             boundary_id,
             errors_empty,
             children,
@@ -260,6 +288,7 @@ where
             ..
         } = self;
         ErrorBoundaryView {
+            hook,
             boundary_id,
             errors_empty,
             children: children.resolve().await,
@@ -277,6 +306,7 @@ where
         mark_branches: bool,
     ) {
         // first, attempt to serialize the children to HTML, then check for errors
+        let _hook = throw_error::set_error_hook(self.hook);
         let mut new_buf = String::with_capacity(Chil::MIN_LENGTH);
         let mut new_pos = *position;
         self.children.to_html_with_buf(
@@ -309,6 +339,7 @@ where
     ) where
         Self: Sized,
     {
+        let _hook = throw_error::set_error_hook(self.hook);
         // first, attempt to serialize the children to HTML, then check for errors
         let mut new_buf = StreamBuilder::new(buf.clone_id());
         let mut new_pos = *position;
@@ -319,10 +350,6 @@ where
             mark_branches,
         );
 
-        if let Some(sc) = Owner::current_shared_context() {
-            sc.seal_errors(&self.boundary_id);
-        }
-
         // any thrown errors would've been caught here
         if self.errors.with_untracked(|map| map.is_empty()) {
             buf.append(new_buf);
@@ -345,12 +372,14 @@ where
         position: &PositionState,
     ) -> Self::State {
         let mut children = Some(self.children);
+        let hook = Arc::clone(&self.hook);
         let cursor = cursor.to_owned();
         let position = position.to_owned();
         RenderEffect::new(
             move |prev: Option<
                 ErrorBoundaryViewState<Chil::State, Fal::State>,
             >| {
+                let _hook = throw_error::set_error_hook(Arc::clone(&hook));
                 if let Some(mut state) = prev {
                     match (self.errors_empty.get(), &mut state.fallback) {
                         // no errors, and was showing fallback
@@ -424,7 +453,10 @@ impl ErrorBoundaryErrorHook {
 impl ErrorHook for ErrorBoundaryErrorHook {
     fn throw(&self, error: Error) -> ErrorId {
         // generate a unique ID
-        let key = ErrorId::default(); // TODO unique ID...
+        let key: ErrorId = Owner::current_shared_context()
+            .map(|sc| sc.next_id())
+            .unwrap_or_default()
+            .into();
 
         // register it with the shared context, so that it can be serialized from server to client
         // as needed

leptos/src/for_loop.rs

@@ -1,6 +1,10 @@
 use crate::into_view::IntoView;
 use leptos_macro::component;
-use reactive_graph::owner::Owner;
+use reactive_graph::{
+    owner::Owner,
+    signal::{ArcRwSignal, ReadSignal},
+    traits::Set,
+};
 use std::hash::Hash;
 use tachys::{reactive_graph::OwnedView, view::keyed::keyed};
 
@@ -10,7 +14,7 @@ use tachys::{reactive_graph::OwnedView, view::keyed::keyed};
 /// as it avoids re-creating DOM nodes that are not being changed.
 ///
 /// ```
-/// # use leptos::*;
+/// # use leptos::prelude::*;
 ///
 /// #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 /// struct Counter {
@@ -68,10 +72,88 @@ where
     // a) the reactive owner for each row will not be cleared when the whole list updates
     // b) context provided in each row will not wipe out the others
     let parent = Owner::current().expect("no reactive owner");
-    let children = move |child| {
+    let children = move |_, child| {
         let owner = parent.with(Owner::new);
         let view = owner.with(|| children(child));
-        OwnedView::new_with_owner(view, owner)
+        (|_| {}, OwnedView::new_with_owner(view, owner))
+    };
+    move || keyed(each(), key.clone(), children.clone())
+}
+
+/// Iterates over children and displays them, keyed by the `key` function given.
+///
+/// Compared with For, it has an additional index parameter, which can be used to obtain the current index in real time.
+///
+/// This is much more efficient than naively iterating over nodes with `.iter().map(|n| view! { ... })...`,
+/// as it avoids re-creating DOM nodes that are not being changed.
+///
+/// ```
+/// # 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>
+///       <ForEnumerate
+///         // a function that returns the items we're iterating over; a signal is fine
+///         each=move || counters.get()
+///         // a unique key for each item
+///         key=|counter| counter.id
+///         // renders each item to a view
+///         children={move |index: ReadSignal<usize>, counter: Counter| {
+///           view! {
+///             <button>{move || index.get()} ". Value: " {move || counter.count.get()}</button>
+///           }
+///         }}
+///       />
+///     </div>
+///   }
+/// }
+/// ```
+#[cfg_attr(feature = "tracing", tracing::instrument(level = "trace", skip_all))]
+#[component]
+pub fn ForEnumerate<IF, I, T, EF, N, KF, K>(
+    /// Items over which the component should iterate.
+    each: IF,
+    /// A key function that will be applied to each item.
+    key: KF,
+    /// A function that takes the index and the item, and returns the view that will be displayed for each item.
+    children: EF,
+) -> impl IntoView
+where
+    IF: Fn() -> I + Send + 'static,
+    I: IntoIterator<Item = T> + Send + 'static,
+    EF: Fn(ReadSignal<usize>, T) -> N + Send + Clone + 'static,
+    N: IntoView + 'static,
+    KF: Fn(&T) -> K + Send + Clone + 'static,
+    K: Eq + Hash + 'static,
+    T: Send + 'static,
+{
+    // this takes the owner of the For itself
+    // this will end up with N + 1 children
+    // 1) the effect for the `move || keyed(...)` updates
+    // 2) an owner for each child
+    //
+    // this means
+    // a) the reactive owner for each row will not be cleared when the whole list updates
+    // b) context provided in each row will not wipe out the others
+    let parent = Owner::current().expect("no reactive owner");
+    let children = move |index, child| {
+        let owner = parent.with(Owner::new);
+        let (index, set_index) = ArcRwSignal::new(index).split();
+        let view = owner.with(|| children(index.into(), child));
+        (
+            move |index| set_index.set(index),
+            OwnedView::new_with_owner(view, owner),
+        )
     };
     move || keyed(each(), key.clone(), children.clone())
 }
@@ -80,25 +162,57 @@ where
 mod tests {
     use crate::prelude::*;
     use leptos_macro::view;
-    use tachys::{
-        html::element::HtmlElement, prelude::ElementChild,
-        renderer::mock_dom::MockDom, view::Render,
-    };
+    use tachys::{html::element::HtmlElement, prelude::ElementChild};
 
     #[test]
     fn creates_list() {
-        let values = RwSignal::new(vec![1, 2, 3, 4, 5]);
-        let list: HtmlElement<_, _, _, MockDom> = view! {
-            <ol>
-                <For each=move || values.get() key=|i| *i let:i>
-                    <li>{i}</li>
-                </For>
-            </ol>
-        };
-        let list = list.build();
-        assert_eq!(
-            list.el.to_debug_html(),
-            "<ol><li>1</li><li>2</li><li>3</li><li>4</li><li>5</li></ol>"
-        );
+        Owner::new().with(|| {
+            let values = RwSignal::new(vec![1, 2, 3, 4, 5]);
+            let list: View<HtmlElement<_, _, _, Dom>> = view! {
+                <ol>
+                    <For each=move || values.get() key=|i| *i let:i>
+                        <li>{i}</li>
+                    </For>
+                </ol>
+            };
+            assert_eq!(
+                list.to_html(),
+                "<ol><li>1</li><li>2</li><li>3</li><li>4</li><li>5</li><!></\
+                 ol>"
+            );
+        });
+    }
+
+    #[test]
+    fn creates_list_enumerate() {
+        Owner::new().with(|| {
+            let values = RwSignal::new(vec![1, 2, 3, 4, 5]);
+            let list: View<HtmlElement<_, _, _, Dom>> = view! {
+                <ol>
+                    <ForEnumerate each=move || values.get() key=|i| *i let(index, i)>
+                        <li>{move || index.get()}"-"{i}</li>
+                    </ForEnumerate>
+                </ol>
+            };
+            assert_eq!(
+                list.to_html(),
+                "<ol><li>0<!>-<!>1</li><li>1<!>-<!>2</li><li>2<!>-<!>3</li><li>3\
+                <!>-<!>4</li><li>4<!>-<!>5</li><!></ol>"
+            );
+
+            let list: View<HtmlElement<_, _, _, Dom>> = view! {
+                <ol>
+                    <ForEnumerate each=move || values.get() key=|i| *i let(index, i)>
+                        <li>{move || index.get()}"-"{i}</li>
+                    </ForEnumerate>
+                </ol>
+            };
+            values.set(vec![5, 4, 1, 2, 3]);
+            assert_eq!(
+                list.to_html(),
+                "<ol><li>0<!>-<!>5</li><li>1<!>-<!>4</li><li>2<!>-<!>1</li><li>3\
+                <!>-<!>2</li><li>4<!>-<!>3</li><!></ol>"
+            );
+        });
     }
 }

leptos/src/form.rs

@@ -34,8 +34,8 @@ use web_sys::{
 /// should make use of indexing notation of `serde_qs`.
 ///
 /// ```rust
-/// # use leptos::*;
-/// # use leptos_router::*;
+/// # use leptos::prelude::*;
+/// use leptos::form::ActionForm;
 ///
 /// #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
 /// struct HeftyData {
@@ -45,7 +45,7 @@ use web_sys::{
 ///
 /// #[component]
 /// fn ComplexInput() -> impl IntoView {
-///     let submit = Action::<VeryImportantFn, _>::server();
+///     let submit = ServerAction::<VeryImportantFn>::new();
 ///
 ///     view! {
 ///       <ActionForm action=submit>
@@ -69,10 +69,7 @@ use web_sys::{
 ///     Ok(())
 /// }
 /// ```
-#[cfg_attr(
-    any(debug_assertions, feature = "ssr"),
-    tracing::instrument(level = "trace", skip_all,)
-)]
+#[cfg_attr(feature = "tracing", tracing::instrument(level = "trace", skip_all))]
 #[component]
 pub fn ActionForm<ServFn>(
     /// The action from which to build the form. This should include a URL, which can be generated
@@ -145,10 +142,6 @@ where
     } else {
         Either::Right(action_form)
     }
-    // TODO add other attributes
-    /*for (attr_name, attr_value) in attributes {
-        action_form = action_form.attr(attr_name, attr_value);
-    }*/
 }
 
 /// Automatically turns a server [MultiAction](leptos_server::MultiAction) into an HTML
@@ -216,10 +209,6 @@ where
     } else {
         Either::Right(action_form)
     }
-    // TODO add other attributes
-    /*for (attr_name, attr_value) in attributes {
-        action_form = action_form.attr(attr_name, attr_value);
-    }*/
 }
 
 /// Resolves a redirect location to an (absolute) URL.

leptos/src/hydration/mod.rs

@@ -24,12 +24,13 @@ pub fn AutoReload(
             leptos_config::ReloadWSProtocol::WSS => "'wss://'",
         };
 
-        let script = include_str!("reload_script.js");
-        view! {
-            <script nonce=nonce>
-                {format!("{script}({reload_port:?}, {protocol})")}
-            </script>
-        }
+        let script = format!(
+            "(function (reload_port, protocol) {{ {} {} }})({reload_port:?}, \
+             {protocol})",
+            leptos_hot_reload::HOT_RELOAD_JS,
+            include_str!("reload_script.js")
+        );
+        view! { <script nonce=nonce>{script}</script> }
     })
 }
 
@@ -49,6 +50,9 @@ pub fn HydrationScripts(
     #[cfg(not(feature = "nonce"))]
     let nonce = None::<String>;
     let script = if islands {
+        if let Some(sc) = Owner::current_shared_context() {
+            sc.set_is_hydrating(false);
+        }
         include_str!("./island_script.js")
     } else {
         include_str!("./hydration_script.js")
@@ -56,7 +60,13 @@ pub fn HydrationScripts(
 
     view! {
         <link rel="modulepreload" href=format!("/{pkg_path}/{output_name}.js") nonce=nonce.clone()/>
-        <link rel="preload" href=format!("/{pkg_path}/{wasm_output_name}.wasm") r#as="fetch" r#type="application/wasm" crossorigin=nonce.clone().unwrap_or_default()/>
+        <link
+            rel="preload"
+            href=format!("/{pkg_path}/{wasm_output_name}.wasm")
+            r#as="fetch"
+            r#type="application/wasm"
+            crossorigin=nonce.clone().unwrap_or_default()
+        />
         <script type="module" nonce=nonce>
             {format!("{script}({pkg_path:?}, {output_name:?}, {wasm_output_name:?})")}
         </script>

leptos/src/hydration/reload_script.js

@@ -1,4 +1,3 @@
-(function (reload_port, protocol) {
 let host = window.location.hostname;
 let ws = new WebSocket(`${protocol}${host}:${reload_port}/live_reload`);
 ws.onmessage = (ev) => {
@@ -20,4 +19,3 @@ ws.onmessage = (ev) => {
 	}
 };
 ws.onclose = () => console.warn('Live-reload stopped. Manual reload necessary.');
-})