chore: clippy

Co-authored-by: alicia.garcia.raboso <alicia.garcia.raboso@bbva.com>

.github/dependabot.yml

@@ -1,13 +0,0 @@
-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: 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)
+    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)
     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-08-01
+          rust-toolchain: nightly-2024-04-14

.github/workflows/ci.yml

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

.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@v44
+        uses: tj-actions/changed-files@v41
         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@v44
+        uses: tj-actions/changed-files@v43
         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@v44
+        uses: tj-actions/changed-files@v43
         with:
           files: |
             any_error/**

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

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

Cargo.toml

@@ -37,39 +37,37 @@ members = [
   "router_macro",
   "any_error",
 ]
-exclude = ["benchmarks", "examples", "projects"]
+exclude = ["benchmarks", "examples"]
 
 [workspace.package]
-version = "0.7.0-beta2"
-edition = "2021"
-rust-version = "1.76"
+version = "0.7.0-alpha"
+rust-version = "1.75"
 
 [workspace.dependencies]
-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" }
+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" }
 
 [profile.release]
 codegen-units = 1

README.md

@@ -12,8 +12,6 @@
 
 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"
-version = "0.2.0-beta2"
+edition = "2021"
+version = "0.1.0"
 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.14"
+pin-project-lite = "0.2"

any_error/src/lib.rs

@@ -9,7 +9,7 @@ use std::{
     error,
     fmt::{self, Display},
     future::Future,
-    mem, ops,
+    ops,
     pin::Pin,
     sync::Arc,
     task::{Context, Poll},
@@ -92,25 +92,9 @@ 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>) -> ResetErrorHookOnDrop {
-    ResetErrorHookOnDrop(
-        ERROR_HOOK.with_borrow_mut(|this| mem::replace(this, Some(hook))),
-    )
+pub fn set_error_hook(hook: Arc<dyn ErrorHook>) {
+    ERROR_HOOK.with_borrow_mut(|this| *this = Some(hook))
 }
 
 /// Invokes the error hook set by [`set_error_hook`] with the given error.
@@ -156,10 +140,9 @@ where
 
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.project();
-        let _hook = this
-            .hook
-            .as_ref()
-            .map(|hook| set_error_hook(Arc::clone(hook)));
+        if let Some(hook) = &this.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.30"
-glib = { version = "0.20.0", optional = true }
-thiserror = "1.0"
-tokio = { version = "1.39", optional = true, default-features = false, features = [
-  "rt",
+futures = "0.3"
+glib = { version = "0.19", optional = true }
+thiserror = "1"
+tokio = { version = "1", optional = true, default-features = false, features = [
+	"rt",
 ] }
-tracing = { version = "0.1.40", optional = true }
-wasm-bindgen-futures = { version = "0.4.42", optional = true }
+tracing = { version = "0.1", optional = true }
+wasm-bindgen-futures = { version = "0.4", optional = true }
 
 [features]
 tracing = ["dep: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.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"
+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"
 
 [dependencies.web-sys]
-version = "0.3.0"
+version = "0.3"
 features = ["Window", "Document", "HtmlElement", "HtmlInputElement"]

const_str_slice_concat/Cargo.toml

@@ -1,5 +1,6 @@
 [package]
 name = "const_str_slice_concat"
+edition = "2021"
 version = "0.1.0"
 authors = ["Greg Johnston"]
 license = "MIT"
@@ -7,6 +8,5 @@ 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,5 +1,6 @@
 [package]
 name = "either_of"
+edition = "2021"
 version = "0.1.0"
 authors = ["Greg Johnston"]
 license = "MIT"
@@ -7,7 +8,6 @@ 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.14"
+pin-project-lite = "0.2"

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

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

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

@@ -1,9 +1,68 @@
-# Action Form Error Handling Example
+<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>
 
-## Getting Started
+# Leptos Starter Template
 
-See the [Examples README](../README.md) for setup and run instructions.
+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.
 
-## Quick Start
+## Creating your template repo
 
-Execute `cargo leptos watch` to run this example.
+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`.

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

@@ -52,10 +52,23 @@ async fn main() -> std::io::Result<()> {
     .await
 }
 
-#[cfg(not(feature = "ssr"))]
+#[cfg(not(any(feature = "ssr", feature = "csr")))]
 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.0"
-log = "0.4.22"
+console_log = "1"
+log = "0.4"
 console_error_panic_hook = "0.1.7"
 gloo-timers = { version = "0.3.0", features = ["futures"] }
 
 [dev-dependencies]
-wasm-bindgen = "0.2.93"
-wasm-bindgen-test = "0.3.42"
-web-sys = "0.3.70"
+wasm-bindgen = "0.2"
+wasm-bindgen-test = "0.3.0"
+web-sys = "0.3"

examples/counter_isomorphic/Cargo.toml

@@ -11,34 +11,34 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-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"
+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"
 leptos = { path = "../../leptos" }
 leptos_actix = { path = "../../integrations/actix", optional = true }
 leptos_router = { path = "../../router" }
-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 }
+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 }
 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.93"
-wasm-bindgen-test = "0.3.42"
-web-sys = "0.3.70"
+wasm-bindgen = "0.2"
+wasm-bindgen-test = "0.3.0"
+web-sys = "0.3"

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.42"
-pretty_assertions = "1.4"
-rstest = "0.22.0"
+wasm-bindgen-test = "0.3.34"
+pretty_assertions = "1.3.0"
+rstest = "0.17.0"
 
 [dev-dependencies.web-sys]
 features = ["HtmlElement", "XPathResult"]
-version = "0.3.70"
+version = "0.3.61"

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.42"
-wasm-bindgen = "0.2.93"
-web-sys = "0.3.70"
+wasm-bindgen-test = "0.3.0"
+wasm-bindgen = "0.2"
+web-sys = "0.3"

examples/directives/Cargo.toml

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

examples/directives/src/lib.rs

@@ -24,7 +24,11 @@ pub fn copy_to_clipboard(el: Element, content: &str) {
         evt.prevent_default();
         evt.stop_propagation();
 
-        let _ = window().navigator().clipboard().write_text(&content);
+        let _ = window()
+            .navigator()
+            .clipboard()
+            .expect("navigator.clipboard to be available")
+            .write_text(&content);
 
         el.set_inner_html(&format!("Copied \"{}\"", &content));
     });
@@ -49,6 +53,7 @@ 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>();
@@ -77,17 +82,12 @@ 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>
-        // 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>
+        // `5.into()` automatically called
+        <button use:add_dot=5>"Add 5 dots"</button>
     }
 }

examples/error_boundary/Cargo.toml

@@ -9,6 +9,6 @@ lto = true
 
 [dependencies]
 leptos = { path = "../../leptos", features = ["csr"] }
-console_log = "1.0"
-log = "0.4.22"
+console_log = "1"
+log = "0.4"
 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.7"
+console_error_panic_hook = "0.1"
 leptos = { path = "../../leptos" }
 leptos_axum = { path = "../../integrations/axum", optional = true }
 leptos_meta = { path = "../../meta" }
 leptos_router = { path = "../../router" }
-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" }
+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" }
 thiserror = "1.0"
-wasm-bindgen = "0.2.93"
+wasm-bindgen = "0.2"
 
 [features]
 hydrate = ["leptos/hydrate"]

examples/fetch/Cargo.toml

@@ -9,16 +9,16 @@ lto = true
 
 [dependencies]
 leptos = { path = "../../leptos", features = ["csr", "tracing"] }
-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"
+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"
 
 [dev-dependencies]
-wasm-bindgen-test = "0.3.42"
+wasm-bindgen-test = "0.3"

examples/gtk/Cargo.toml

@@ -4,15 +4,15 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-leptos = { path = "../../leptos" }
+leptos = { path = "../../leptos", features = ["csr"] }
 throw_error = { path = "../../any_error/" }
-
-# these are used to build the integration
-gtk = { version = "0.9.0", package = "gtk4" }
+any_spawner = { path = "../../any_spawner/" }
 next_tuple = { path = "../../next_tuple/" }
-paste = "1.0"
+gtk = { version = "0.8.0", package = "gtk4", optional = true }
+paste = "1.0.14"
 
-# 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"] }
+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"]

examples/gtk/src/leptos_gtk.rs

@@ -56,12 +56,11 @@ 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 {
-        if let Some(parent) = self.0.parent() {
-            child.mount(&Element(parent), Some(self));
-            return true;
-        }
-        false
+    fn insert_before_this(&self, 
+        child: &mut dyn Mountable<LeptosGtk>,
+    ) -> bool {
+        child.mount(parent, Some(self.as_ref()));
+        true
     }
 }
 
@@ -80,8 +79,11 @@ 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 {
-        self.0.insert_before_this(child)
+    fn insert_before_this(&self, 
+        child: &mut dyn Mountable<LeptosGtk>,
+    ) -> bool {
+        child.mount(parent, Some(self.as_ref()));
+        true
     }
 }
 
@@ -330,12 +332,16 @@ 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 {
-        self.widget.insert_before_this(child)
+    fn insert_before_this(&self, 
+        child: &mut dyn Mountable<LeptosGtk>,
+    ) -> bool {
+        child.mount(parent, Some(self.widget.as_ref()));
+        true
     }
 }
 

examples/gtk/src/main.rs

@@ -1,8 +1,20 @@
-use any_spawner::Executor;
-use gtk::{prelude::*, Application, ApplicationWindow, Orientation};
-use leptos::prelude::*;
-use leptos_gtk::LeptosGtk;
+#[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 std::{mem, thread, time::Duration};
+#[cfg(feature = "gtk")]
 mod leptos_gtk;
 
 const APP_ID: &str = "dev.leptos.Counter";
@@ -10,39 +22,59 @@ 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
-    _ = Executor::init_glib();
-    let app = Application::builder().application_id(APP_ID).build();
+    #[cfg(feature = "gtk")]
+    {
+        _ = 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`
+        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();
         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();
+        let mut state = view.build();
+        state.mount(&body().into(), None);
         mem::forget((owner, state));
-    });
-
-    app.run();
+    }
 }
 
-fn ui() -> impl Render<LeptosGtk> {
+#[cfg(feature = "gtk")]
+type Rndr = LeptosGtk;
+#[cfg(all(feature = "wasm", not(feature = "gtk")))]
+type Rndr = Dom;
+
+fn ui() -> impl Render<Rndr> {
     let value = RwSignal::new(0);
     let rows = RwSignal::new(vec![1, 2, 3, 4, 5]);
 
     Effect::new(move |_| {
-        println!("value = {}", value.get());
+        logging::log!("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);
@@ -50,10 +82,7 @@ fn ui() -> impl Render<LeptosGtk> {
 
     vstack((
         hstack((
-            button("-1", move || {
-                println!("clicked -1");
-                value.update(|n| *n -= 1);
-            }),
+            button("-1", move || value.update(|n| *n -= 1)),
             move || value.get().to_string(),
             button("+1", move || value.update(|n| *n += 1)),
         )),
@@ -62,36 +91,75 @@ fn ui() -> impl Render<LeptosGtk> {
                 items.swap(1, 3);
             })
         }),
-        hstack(rows),
+        hstack(For(ForProps::builder()
+            .each(move || rows.get())
+            .key(|k| *k)
+            .children(|v| v)
+            .build())),
     ))
 }
 
 fn button(
-    label: impl Render<LeptosGtk>,
+    label: impl Render<Rndr>,
     callback: impl Fn() + Send + Sync + 'static,
-) -> impl Render<LeptosGtk> {
-    leptos_gtk::button()
-        .child(label)
-        .connect("clicked", move |_| {
-            callback();
-            None
-        })
+) -> 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)
+    }
 }
 
-fn vstack(children: impl Render<LeptosGtk>) -> impl Render<LeptosGtk> {
-    leptos_gtk::r#box()
-        .orientation(Orientation::Vertical)
-        .spacing(12)
-        .child(children)
+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 hstack(children: impl Render<LeptosGtk>) -> impl Render<LeptosGtk> {
-    leptos_gtk::r#box()
-        .orientation(Orientation::Horizontal)
-        .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)
+    }
 }
 
+#[cfg(feature = "gtk")]
 fn load_css() {
     use gtk::{gdk::Display, CssProvider};
 

examples/hackernews/Cargo.toml

@@ -13,27 +13,31 @@ panic = "abort"
 lto = true
 
 [dependencies]
-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"
+actix-files = { version = "0.6", optional = true }
+actix-web = { version = "4", optional = true, features = ["macros"] }
+console_log = "1"
+console_error_panic_hook = "0.1"
 leptos = { path = "../../leptos" }
 leptos_meta = { path = "../../meta" }
 leptos_actix = { path = "../../integrations/actix", optional = true }
 leptos_router = { path = "../../router" }
-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"] }
+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"] }
 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.7"
+console_error_panic_hook = "0.1"
 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.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"
+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"
 send_wrapper = { version = "0.6.0", features = ["futures"] }
 
 [features]

examples/hackernews_islands_axum/Cargo.toml

@@ -11,35 +11,34 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-console_error_panic_hook = "0.1.7"
-leptos = { path = "../../leptos", features = ["experimental-islands"] }
+console_error_panic_hook = "0.1"
+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.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 = [
+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 = [
   "fs",
   "compression-gzip",
   "compression-br",
 ], 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 }
+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 }
 
 [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.7"
+console_error_panic_hook = "0.1"
 console_log = "1.0"
-log = "0.4.22"
+log = "0.4"
 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.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 = [
+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 = [
   "AbortController",
   "AbortSignal",
   "Request",
   "Response",
 ] }
-getrandom = { version = "0.2.15", features = ["js"] }
-wasm-bindgen = "0.2.93"
-wasm-bindgen-futures = { version = "0.4.42", features = [
+getrandom = { version = "0.2.7", features = ["js"] }
+wasm-bindgen = "0.2"
+wasm-bindgen-futures = { version = "0.4.37", 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.7"
-futures = "0.3.30"
-http = "1.1"
+console_error_panic_hook = "0.1"
+futures = "0.3"
+http = "1.0"
 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.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"
+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"
 
 [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,35 +7,33 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-console_error_panic_hook = "0.1.7"
-futures = "0.3.30"
-http = "1.1"
+console_error_panic_hook = "0.1"
+futures = "0.3"
+http = "1.0"
 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.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"
+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"
 
 [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 `delegation` features
+leptos = { path = "../../leptos", features = ["csr"] } # for actual benchmarking, add `nightly` and `event-delegation` features
 # used in rand, but we need to enable js feature
-getrandom = { version = "0.2.15", features = ["js"] }
+getrandom = { version = "0.2.7", 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.42"
+wasm-bindgen-test = "0.3.0"
 web-sys = "0.3"

examples/parent_child/Cargo.toml

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

examples/portal/Cargo.toml

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

examples/router/Cargo.toml

@@ -10,16 +10,16 @@ codegen-units = 1
 panic = "abort"
 
 [dependencies]
-console_log = "1.0"
+console_log = "1"
 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.0", features = ["derive"] }
-futures = "0.3.30"
+serde = { version = "1", features = ["derive"] }
+futures = "0.3"
 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.42"
+wasm-bindgen-test = "0.3.0"

examples/router/src/lib.rs

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

examples/server_fns_axum/Cargo.toml

@@ -7,52 +7,44 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-console_error_panic_hook = "0.1.7"
-futures = "0.3.30"
-http = "1.1"
+console_error_panic_hook = "0.1"
+futures = "0.3"
+http = "1.0"
 leptos = { path = "../../leptos" }
 leptos_axum = { path = "../../integrations/axum", optional = true }
-server_fn = { path = "../../server_fn", features = [
-  "serde-lite",
-  "rkyv",
-  "multipart",
-] }
-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 }
+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 }
 thiserror = "1.0"
-wasm-bindgen = "0.2.93"
+wasm-bindgen = "0.2"
 serde_toml = "0.0.1"
-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 }
+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 }
 
 [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/slots/Cargo.toml

@@ -9,6 +9,6 @@ lto = true
 
 [dependencies]
 leptos = { path = "../../leptos", features = ["csr"] }
-console_log = "1.0"
-log = "0.4.22"
+console_log = "1"
+log = "0.4"
 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.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" }
+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"}
 leptos_meta = { path = "../../meta" }
 leptos_actix = { path = "../../integrations/actix", optional = true }
 leptos_router = { path = "../../router" }
-log = "0.4.22"
-serde = { version = "1.0", features = ["derive"] }
-thiserror = "1.0"
-tokio = { version = "1.39", features = ["time"] }
-wasm-bindgen = "0.2.93"
+log = "0.4"
+serde = { version = "1", features = ["derive"] }
+thiserror = "1"
+tokio = { version = "1", features = ["time"] }
+wasm-bindgen = "0.2"
 
 [features]
 hydrate = ["leptos/hydrate"]

examples/ssr_modes_axum/Cargo.toml

@@ -7,39 +7,37 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-console_error_panic_hook = "0.1.7"
-console_log = "1.0"
-lazy_static = "1.5"
-leptos = { path = "../../leptos", features = [
-  "hydration",
-] } #"nightly", "hydration"] }
+console_error_panic_hook = "0.1"
+console_log = "1"
+lazy_static = "1"
+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.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",
+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",
 ], optional = true }
-wasm-bindgen = "0.2.93"
+wasm-bindgen = "0.2"
 
 [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,24 +64,15 @@ 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>
@@ -148,15 +139,9 @@ 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>
@@ -219,11 +204,12 @@ 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),
@@ -251,13 +237,17 @@ 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.93"
-wasm-bindgen-test = "0.3.42"
-web-sys = "0.3.70"
+wasm-bindgen = "0.2"
+wasm-bindgen-test = "0.3.0"
+web-sys = "0.3"

examples/suspense_tests/Cargo.toml

@@ -7,26 +7,26 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-actix-files = { version = "0.6.6", optional = true }
-actix-web = { version = "4.8", optional = true, features = ["macros"] }
-console_error_panic_hook = "0.1.7"
+actix-files = { version = "0.6", optional = true }
+actix-web = { version = "4", optional = true, features = ["macros"] }
+console_error_panic_hook = "0.1"
 leptos = { path = "../../leptos" }
 leptos_actix = { path = "../../integrations/actix", optional = true }
 leptos_router = { path = "../../router" }
-log = "0.4.22"
-wasm-bindgen = "0.2.93"
-serde = "1.0"
-tokio = { version = "1.39", features = ["time", "rt"], optional = true }
+log = "0.4"
+wasm-bindgen = "0.2"
+serde = "1.0.159"
+tokio = { version = "1.29", 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"
-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"
+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"
 
 [[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,15 +13,19 @@ leptos_meta = { path = "../../meta" }
 leptos_router = { path = "../../router" }
 
 # dependencies for browser (enable when hydrate set)
-console_error_panic_hook = { version = "0.1.7", optional = true }
-wasm-bindgen = { version = "0.2.93", optional = true }
+console_error_panic_hook = { version = "0.1", optional = true }
+wasm-bindgen = { version = "0.2", optional = true }
 
 # dependencies for server (enable when ssr set)
-actix-files = { version = "0.6.6", optional = true }
-actix-web = { version = "4.8", features = ["macros"], optional = true }
+actix-files = { version = "0.6", optional = true }
+actix-web = { version = "4", 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,35 +7,32 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-axum = { version = "0.7.5", optional = true }
-console_error_panic_hook = "0.1.7"
+axum = { version = "0.7", optional = true }
+console_error_panic_hook = "0.1"
 leptos = { path = "../../leptos" }
 leptos_meta = { path = "../../meta" }
 leptos_axum = { path = "../../integrations/axum", optional = true }
 leptos_router = { path = "../../router" }
-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"
+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"
 thiserror = "1.0"
-tracing = { version = "0.1.40", optional = true }
-http = "1.1"
+tracing = { version = "0.1", optional = true }
+http = "1.0"
 
 [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.6.0", features = ["http"] }
-console_error_panic_hook = { version = "0.1.7" }
+gloo-net = { version = "0.5", features = ["http"] }
+console_error_panic_hook = { version = "0.1" }

examples/timer/Cargo.toml

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

examples/todo_app_sqlite/Cargo.toml

@@ -7,36 +7,36 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-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"
+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"
 console_error_panic_hook = "0.1.7"
-serde = { version = "1.0", features = ["derive"] }
-futures = "0.3.30"
-leptos = { path = "../../leptos" }
+serde = { version = "1.0.152", features = ["derive"] }
+futures = "0.3.25"
+leptos = { path = "../../leptos"}
 leptos_actix = { path = "../../integrations/actix", optional = true }
-log = "0.4.22"
-simple_logger = "5.0"
+log = "0.4.17"
+simple_logger = "4.0.0"
 gloo = { git = "https://github.com/rustwasm/gloo" }
-sqlx = { version = "0.8.0", features = [
-  "runtime-tokio-rustls",
-  "sqlite",
+sqlx = { version = "0.6.2", features = [
+	"runtime-tokio-rustls",
+	"sqlite",
 ], optional = true }
-wasm-bindgen = "0.2.93"
-tokio = { version = "1.39", features = ["rt", "time"], optional = true }
+wasm-bindgen = "0.2"
+tokio = { version = "1", 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"
-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"
+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"
 
 [[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.7"
-futures = "0.3.30"
-http = "1.1"
+console_error_panic_hook = "0.1"
+futures = "0.3"
+http = "1.0"
 leptos = { path = "../../leptos", features = ["tracing"] }
 leptos_axum = { path = "../../integrations/axum", optional = true }
-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",
+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",
 ], optional = true }
 thiserror = "1.0"
-wasm-bindgen = "0.2.93"
+wasm-bindgen = "0.2"
 
 [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"
-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"
+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"
 
 [[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.7"
-futures = "0.3.30"
+console_error_panic_hook = "0.1"
+futures = "0.3"
 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.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",
+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",
 ], optional = true }
 thiserror = "1.0"
-wasm-bindgen = "0.2.93"
+wasm-bindgen = "0.2"
 
 [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"
-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"
+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"
 
 [[test]]
 name = "app_suite"

examples/todomvc/Cargo.toml

@@ -8,15 +8,19 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-leptos = { path = "../../leptos", features = ["csr"] }
+leptos = { path = "../../leptos" }
 console_error_panic_hook = "0.1.7"
-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"] }
+uuid = { version = "1", features = ["v4", "js", "serde"] }
+serde = { version = "1", features = ["derive"] }
+serde_json = "1"
+web-sys = { version = "0.3.60", features = ["Storage"] }
 
 [dev-dependencies]
-wasm-bindgen-test = "0.3.42"
+wasm-bindgen-test = "0.3.0"
+
+[features]
+default = ["csr"]
+csr = ["leptos/csr"]
 
 [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"
-version = "0.2.0-beta2"
+edition = "2021"
+version = "0.2.0-alpha"
 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.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"
+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"
 pin-project-lite = "0.2.14"
 
 [features]

hydration_context/src/hydrate.rs

@@ -12,48 +12,42 @@ 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.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)),
-                    )
-                })
+    __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)),
+                )
             })
-            .collect()
-    })
+        })
+        .collect()
 }
 
 fn incomplete_chunks() -> Vec<SerializedDataId> {
-    __INCOMPLETE_CHUNKS.with(|i| {
-        i.iter()
-            .map(|value| {
-                let id = value.as_f64().unwrap() as usize;
-                SerializedDataId(id)
-            })
-            .collect()
-    })
+    __INCOMPLETE_CHUNKS
+        .iter()
+        .map(|value| {
+            let id = value.as_f64().unwrap() as usize;
+            SerializedDataId(id)
+        })
+        .collect()
 }
 
 /// An error that has been serialized across the network boundary.
@@ -124,7 +118,7 @@ impl SharedContext for HydrateSharedContext {
     fn write_async(&self, _id: SerializedDataId, _fut: PinnedFuture<String>) {}
 
     fn read_data(&self, id: &SerializedDataId) -> Option<String> {
-        __RESOLVED_RESOURCES.with(|r| r.get(id.0 as u32).as_string())
+        __RESOLVED_RESOURCES.get(id.0 as u32).as_string()
     }
 
     fn await_data(&self, _id: &SerializedDataId) -> Option<String> {

hydration_context/src/lib.rs

@@ -44,12 +44,6 @@ 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.8"
-actix-web = "4.8"
-futures = "0.3.30"
+actix-http = "3"
+actix-web = "4"
+futures = "0.3"
 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.0"
-parking_lot = "0.12.3"
-tracing = "0.1.40"
-tokio = { version = "1.39", features = ["rt", "fs"] }
+serde_json = "1"
+parking_lot = "0.12.1"
+tracing = "0.1.37"
+tokio = { version = "1", features = ["rt", "fs"] }
 send_wrapper = "0.6.0"
 
 [package.metadata.docs.rs]

integrations/actix/src/lib.rs

@@ -16,7 +16,6 @@ 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},
@@ -182,20 +181,6 @@ 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
@@ -316,9 +301,8 @@ 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, method)
+                server_fn::actix::get_server_fn_service(path)
             {
                 let owner = Owner::new();
                 owner
@@ -400,7 +384,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::prelude::*;
+/// use leptos::*;
 /// use leptos_router::Method;
 /// use std::{env, net::SocketAddr};
 ///
@@ -422,7 +406,11 @@ pub fn handle_server_fns_with_context(
 ///             // the actual routing will be handled by `leptos_router`
 ///             .route(
 ///                 "/{tail:.*}",
-///                 leptos_actix::render_app_to_stream(MyApp, Method::Get),
+///                 leptos_actix::render_app_to_stream(
+///                     leptos_options.to_owned(),
+///                     || view! { <MyApp/> },
+///                     Method::Get,
+///                 ),
 ///             )
 ///     })
 ///     .bind(&addr)?
@@ -464,7 +452,7 @@ where
 /// This can then be set up at an appropriate route in your application:
 /// ```
 /// use actix_web::{App, HttpServer};
-/// use leptos::prelude::*;
+/// use leptos::*;
 /// use leptos_router::Method;
 /// use std::{env, net::SocketAddr};
 ///
@@ -487,7 +475,8 @@ where
 ///             .route(
 ///                 "/{tail:.*}",
 ///                 leptos_actix::render_app_to_stream_in_order(
-///                     MyApp,
+///                     leptos_options.to_owned(),
+///                     || view! { <MyApp/> },
 ///                     Method::Get,
 ///                 ),
 ///             )
@@ -529,7 +518,7 @@ where
 /// This can then be set up at an appropriate route in your application:
 /// ```
 /// use actix_web::{App, HttpServer};
-/// use leptos::prelude::*;
+/// use leptos::*;
 /// use leptos_router::Method;
 /// use std::{env, net::SocketAddr};
 ///
@@ -551,7 +540,11 @@ where
 ///             // the actual routing will be handled by `leptos_router`
 ///             .route(
 ///                 "/{tail:.*}",
-///                 leptos_actix::render_app_async(MyApp, Method::Get),
+///                 leptos_actix::render_app_async(
+///                     leptos_options.to_owned(),
+///                     || view! { <MyApp/> },
+///                     Method::Get,
+///                 ),
 ///             )
 ///     })
 ///     .bind(&addr)?
@@ -951,7 +944,7 @@ where
 {
     let _ = any_spawner::Executor::init_tokio();
 
-    let owner = Owner::new_root(Some(Arc::new(SsrSharedContext::new())));
+    let owner = Owner::new_root(None);
     let (mock_meta, _) = ServerMetaContext::new();
     let routes = owner
         .with(|| {
@@ -1387,21 +1380,18 @@ impl LeptosRoutes for &mut ServiceConfig {
 ///
 /// Any error that occurs during extraction is converted to a [`ServerFnError`].
 ///
-/// ```rust
-/// use leptos::prelude::*;
-///
+/// ```rust,ignore
+/// // MyQuery is some type that implements `Deserialize + Serialize`
 /// #[server]
-/// pub async fn extract_connection_info() -> Result<String, ServerFnError> {
-///     use actix_web::dev::ConnectionInfo;
+/// pub async fn query_extract() -> Result<MyQuery, ServerFnError> {
+///     use actix_web::web::Query;
 ///     use leptos_actix::*;
 ///
-///     // 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?;
+///     let Query(data) = extract().await?;
 ///
 ///     // do something with the data
 ///
-///     Ok(format!("{info:?}"))
+///     Ok(data)
 /// }
 /// ```
 pub async fn extract<T>() -> Result<T, ServerFnError>
@@ -1409,7 +1399,7 @@ where
     T: actix_web::FromRequest,
     <T as FromRequest>::Error: Display,
 {
-    let req = use_context::<Request>().ok_or_else(|| {
+    let req = use_context::<HttpRequest>().ok_or_else(|| {
         ServerFnError::new("HttpRequest should have been provided via context")
     })?;
 

integrations/actix/tests/extract_routes.rs

@@ -1,153 +1,148 @@
-// TODO these tests relate to trailing-slash logic, which is still TBD for 0.7
+use leptos::*;
+use leptos_actix::generate_route_list;
+use leptos_router::{Route, Router, Routes, TrailingSlash};
 
-// 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);
-// }
+#[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);
+}

integrations/axum/Cargo.toml

@@ -1,38 +1,38 @@
 [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.5", default-features = false, features = [
-  "matched-path",
+axum = { version = "0.7", default-features = false, features = [
+	"matched-path",
 ] }
-futures = "0.3.30"
-http = "1.1"
-http-body-util = "0.1.2"
+futures = "0.3"
+http = "1"
+http-body-util = "0.1"
 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.3"
-serde_json = "1.0"
-tokio = { version = "1.39", default-features = false }
-tower = "0.4.13"
-tower-http = "0.5.2"
-tracing = "0.1.40"
+parking_lot = "0.12"
+serde_json = "1"
+tokio = { version = "1", default-features = false }
+tower = "0.4"
+tower-http = "0.5"
+tracing = "0.1"
 
 [dev-dependencies]
-axum = "0.7.5"
-tokio = { version = "1.39", features = ["net", "rt-multi-thread"] }
+axum = "0.7"
+tokio = { version = "1", features = ["net"] }
 
 [features]
 wasm = []

integrations/axum/src/lib.rs

@@ -34,22 +34,16 @@
 
 use axum::{
     body::{Body, Bytes},
-    extract::{FromRequestParts, MatchedPath},
+    extract::{FromRef, FromRequestParts, MatchedPath, State},
     http::{
         header::{self, HeaderName, HeaderValue, ACCEPT, LOCATION, REFERER},
         request::Parts,
-        HeaderMap, Method, Request, Response, StatusCode,
+        HeaderMap, Method, Request, Response, StatusCode, Uri,
     },
     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},
@@ -68,7 +62,6 @@ 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;
@@ -102,9 +95,7 @@ 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.
-/// ```
-/// use leptos::prelude::*;
-///
+/// ```rust,ignore
 /// #[server]
 /// pub async fn get_opts() -> Result<(), ServerFnError> {
 ///     let opts = expect_context::<leptos_axum::ResponseOptions>();
@@ -178,33 +169,9 @@ impl ExtendResponse for AxumResponse {
     }
 }
 
-/// 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.
+/// 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
 pub fn redirect(path: &str) {
     if let (Some(req), Some(res)) =
         (use_context::<Parts>(), use_context::<ResponseOptions>())
@@ -261,7 +228,7 @@ pub fn generate_request_and_parts(
 ///
 /// ```
 /// use axum::{handler::Handler, routing::post, Router};
-/// use leptos::prelude::*;
+/// use leptos::*;
 /// use std::net::SocketAddr;
 ///
 /// # if false { // don't actually try to run a server in a doctest...
@@ -345,13 +312,10 @@ 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, method)
-    {
+    if let Some(mut service) = server_fn::axum::get_server_fn_service(&path) {
         let owner = Owner::new();
         owner
             .with(|| {
@@ -424,7 +388,8 @@ pub type PinnedHtmlStream =
 /// This can then be set up at an appropriate route in your application:
 /// ```
 /// use axum::{handler::Handler, Router};
-/// use leptos::{config::get_configuration, prelude::*};
+/// use leptos::*;
+/// use leptos_config::get_configuration;
 /// use std::{env, net::SocketAddr};
 ///
 /// #[component]
@@ -442,7 +407,8 @@ pub type PinnedHtmlStream =
 ///
 ///     // build our application with a route
 ///     let app = Router::new().fallback(leptos_axum::render_app_to_stream(
-///         || { /* your application here */ },
+///         leptos_options,
+///         || view! { <MyApp/> },
 ///     ));
 ///
 ///     // run our app with hyper
@@ -510,7 +476,8 @@ where
 /// This can then be set up at an appropriate route in your application:
 /// ```
 /// use axum::{handler::Handler, Router};
-/// use leptos::{config::get_configuration, prelude::*};
+/// use leptos::*;
+/// use leptos_config::get_configuration;
 /// use std::{env, net::SocketAddr};
 ///
 /// #[component]
@@ -527,9 +494,11 @@ 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(|| view! { <MyApp/> }),
-///     );
+///     let app =
+///         Router::new().fallback(leptos_axum::render_app_to_stream_in_order(
+///             leptos_options,
+///             || view! { <MyApp/> },
+///         ));
 ///
 ///     // run our app with hyper
 ///     let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
@@ -567,25 +536,14 @@ 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
-/// ```
-/// 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 */ },
-///     );
+/// ```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/> }
+/// );
 ///     handler(req).await.into_response()
 /// }
 /// ```
@@ -736,25 +694,14 @@ 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
-/// ```
-/// 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 */ },
-///     );
+/// ```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/> }
+/// );
 ///     handler(req).await.into_response()
 /// }
 /// ```
@@ -887,7 +834,8 @@ fn provide_contexts(
 /// This can then be set up at an appropriate route in your application:
 /// ```
 /// use axum::{handler::Handler, Router};
-/// use leptos::{config::get_configuration, prelude::*};
+/// use leptos::*;
+/// use leptos_config::get_configuration;
 /// use std::{env, net::SocketAddr};
 ///
 /// #[component]
@@ -904,8 +852,10 @@ 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(|| view! { <MyApp/> }));
+///     let app = Router::new().fallback(leptos_axum::render_app_async(
+///         leptos_options,
+///         || view! { <MyApp/> },
+///     ));
 ///
 ///     // run our app with hyper
 ///     // `axum::Server` is a re-export of `hyper::Server`
@@ -946,25 +896,14 @@ 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
-/// ```
-/// 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 */ },
-///     );
+/// ```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/> }
+/// );
 ///     handler(req).await.into_response()
 /// }
 /// ```
@@ -1011,25 +950,14 @@ 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
-/// ```
-/// 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 */ },
-///     );
+/// ```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/> }
+/// );
 ///     handler(req).await.into_response()
 /// }
 /// ```
@@ -1238,7 +1166,7 @@ where
 {
     init_executor();
 
-    let owner = Owner::new_root(Some(Arc::new(SsrSharedContext::new())));
+    let owner = Owner::new_root(None);
     let routes = owner
         .with(|| {
             // stub out a path for now
@@ -1748,19 +1676,15 @@ where
 ///
 /// Any error that occurs during extraction is converted to a [`ServerFnError`].
 ///
-/// ```rust
-/// use leptos::prelude::*;
-///
+/// ```rust,ignore
+/// // MyQuery is some type that implements `Deserialize + Serialize`
 /// #[server]
-/// pub async fn request_method() -> Result<String, ServerFnError> {
-///     use http::Method;
-///     use leptos_axum::extract;
+/// pub async fn query_extract() -> Result<MyQuery, ServerFnError> {
+///     use axum::{extract::Query, http::Method};
+///     use leptos_axum::*;
+///     let Query(query) = extract().await?;
 ///
-///     // 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:?}"))
+///     Ok(query)
 /// }
 /// ```
 pub async fn extract<T>() -> Result<T, ServerFnError>
@@ -1778,6 +1702,18 @@ 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,22 @@
 [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.30"
+futures = "0.3"
 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.40"
+tracing = "0.1.37"
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--generate-link-to-definition"]

leptos/Cargo.toml

@@ -1,62 +1,57 @@
 [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.1", optional = true }
-cfg-if = "1.0"
+base64 = { version = "0.22", optional = true }
+cfg-if = "1"
 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.2.0", optional = true }
+leptos-spin-macro = { version = "0.1", optional = true }
 oco_ref = { workspace = true }
 or_poisoned = { workspace = true }
-paste = "1.0"
-rand = { version = "0.8.5", optional = true }
+paste = "1"
+rand = { version = "0.8", optional = true }
 reactive_graph = { workspace = true, features = ["serde"] }
-rustc-hash = "2.0"
+rustc-hash = "1"
 tachys = { workspace = true, features = ["reactive_graph", "oco"] }
-thiserror = "1.0"
-tracing = "0.1.40"
-typed-builder = "0.19.1"
-typed-builder-macro = "0.19.1"
-serde = "1.0"
-serde_json = { version = "1.0", optional = true }
+thiserror = "1"
+tracing = "0.1"
+typed-builder = "0.18"
+typed-builder-macro = "0.18"
+serde = "1"
+serde_json = { version = "1", optional = true }
 server_fn = { workspace = true, features = [
   "form-redirects",
   "browser",
   "url",
 ] }
-web-sys = { version = "0.3.70", features = [
+web-sys = { version = "0.3.63", features = [
   "ShadowRoot",
   "ShadowRootInit",
   "ShadowRootMode",
 ] }
-wasm-bindgen = "0.2.93"
-serde_qs = "0.13.0"
-slotmap = "1.0"
+wasm-bindgen = "0.2"
+serde_qs = "0.12.0"
+slotmap = "1.0.7"
 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",
@@ -73,16 +68,23 @@ ssr = [
   "hydration",
   "tachys/ssr",
 ]
-nightly = ["leptos_macro/nightly", "reactive_graph/nightly", "tachys/nightly"]
+nightly = ["leptos_dom/nightly", "leptos_macro/nightly", "tachys/nightly"]
 rkyv = ["server_fn/rkyv"]
 tracing = [
   "reactive_graph/tracing",
   "tachys/tracing",
 ] #, "leptos_macro/tracing", "leptos_dom/tracing"]
-nonce = ["base64", "rand"]
+nonce = ["base64", "leptos_dom/nonce", "rand"]
 spin = ["leptos-spin-macro"]
-experimental-islands = ["leptos_macro/experimental-islands", "dep:serde_json"]
-trace-component-props = ["leptos_macro/trace-component-props"]
+experimental-islands = [
+  "leptos_dom/experimental-islands",
+  "leptos_macro/experimental-islands",
+  "dep:serde_json",
+]
+trace-component-props = [
+  "leptos_dom/trace-component-props",
+  "leptos_macro/trace-component-props",
+]
 delegation = ["tachys/delegation"]
 
 [package.metadata.cargo-all-features]

leptos/src/callback.rs

@@ -6,17 +6,16 @@
 //! Callbacks can be created manually from any function or closure, but the easiest way
 //! to create them is to use `#[prop(into)]]` when defining a component.
 //! ```
-//! use leptos::prelude::*;
-//!
+//! # use leptos::*;
 //! #[component]
 //! fn MyComponent(
 //!     #[prop(into)] render_number: Callback<i32, String>,
 //! ) -> impl IntoView {
 //!     view! {
 //!         <div>
-//!             {render_number.run(1)}
+//!             {render_number.call(1)}
 //!             // callbacks can be called multiple times
-//!             {render_number.run(42)}
+//!             {render_number.call(42)}
 //!         </div>
 //!     }
 //! }
@@ -31,28 +30,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.run(input)`.
+//! - All callbacks implement the [`Callable`] trait, and can be invoked with `my_callback.call(input)`. On nightly, you can even do `my_callback(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`]
-//! - [`UnsyncCallback`]
+//! - [`SyncCallback`]
 //!
-//! Use `SyncCallback` if the function is not `Sync` and `Send`.
+//! Use `SyncCallback` when you want the function to be `Sync` and `Send`.
 
-use reactive_graph::owner::{LocalStorage, StoredValue};
+use reactive_graph::owner::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 run(&self, input: In) -> Out;
+    fn call(&self, input: In) -> Out;
 }
 
 /// A callback type that is not required to be `Send + Sync`.
 pub struct UnsyncCallback<In: 'static, Out: 'static = ()>(
-    StoredValue<Rc<dyn Fn(In) -> Out>, LocalStorage>,
+    Rc<dyn Fn(In) -> Out>,
 );
 
 impl<In> fmt::Debug for UnsyncCallback<In> {
@@ -61,11 +60,9 @@ 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
+        Self(Rc::clone(&self.0))
     }
 }
 
@@ -75,40 +72,92 @@ impl<In, Out> UnsyncCallback<In, Out> {
     where
         F: Fn(In) -> Out + 'static,
     {
-        Self(StoredValue::new_local(Rc::new(f)))
+        Self(Rc::new(f))
     }
 }
 
 impl<In: 'static, Out: 'static> Callable<In, Out> for UnsyncCallback<In, Out> {
-    fn run(&self, input: In) -> Out {
-        self.0.with_value(|fun| fun(input))
+    fn call(&self, input: In) -> Out {
+        (self.0)(input)
     }
 }
 
-impl<F, In, T, Out> From<F> for UnsyncCallback<In, Out>
-where
-    F: Fn(In) -> T + 'static,
-    T: Into<Out> + 'static,
-    In: 'static,
-{
-    fn from(f: F) -> Self {
-        Self::new(move |x| f(x).into())
+macro_rules! impl_from_fn {
+    ($ty:ident) => {
+        #[cfg(not(feature = "nightly"))]
+        impl<F, In, T, Out> From<F> for $ty<In, Out>
+        where
+            F: Fn(In) -> T + Send + Sync + 'static,
+            T: Into<Out> + 'static,
+            In: Send + Sync + '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())
+                }
+            }
+        }
+    };
+}
+
+// TODO
+//impl_from_fn!(UnsyncCallback);
+
+#[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::prelude::*;
-/// # use leptos::callback::{Callable, Callback};
+/// # use leptos::*;
+/// # use leptos::{Callable, Callback};
 /// #[component]
 /// fn MyComponent(
 ///     #[prop(into)] render_number: Callback<i32, String>,
 /// ) -> impl IntoView {
 ///     view! {
 ///         <div>
-///             {render_number.run(42)}
+///             {render_number.call(42)}
 ///         </div>
 ///     }
 /// }
@@ -133,7 +182,7 @@ impl<In, Out> fmt::Debug for Callback<In, Out> {
 }
 
 impl<In, Out> Callable<In, Out> for Callback<In, Out> {
-    fn run(&self, input: In) -> Out {
+    fn call(&self, input: In) -> Out {
         self.0
             .try_with_value(|f| f(input))
             .expect("called a callback that has been disposed")
@@ -148,17 +197,6 @@ impl<In, Out> Clone for Callback<In, Out> {
 
 impl<In, Out> Copy for Callback<In, Out> {}
 
-impl<F, In, T, Out> From<F> for Callback<In, Out>
-where
-    F: Fn(In) -> T + Send + Sync + 'static,
-    T: Into<Out> + 'static,
-    In: Send + Sync + 'static,
-{
-    fn from(f: F) -> Self {
-        Self::new(move |x| f(x).into())
-    }
-}
-
 impl<In: 'static, Out: 'static> Callback<In, Out> {
     /// Creates a new callback from the given function.
     pub fn new<F>(fun: F) -> Self
@@ -169,32 +207,114 @@ 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};
+    use crate::{
+        callback::{Callback, UnsyncCallback},
+        create_runtime,
+    };
 
     struct NoClone {}
 
     #[test]
     fn clone_callback() {
-        let callback = Callback::new(move |_no_clone: NoClone| NoClone {});
-        let _cloned = callback.clone();
-    }
-
-    #[test]
-    fn clone_unsync_callback() {
+        let rt = create_runtime();
         let callback =
             UnsyncCallback::new(move |_no_clone: NoClone| NoClone {});
         let _cloned = callback.clone();
+        rt.dispose();
     }
 
     #[test]
-    fn runback_from() {
-        let _callback: Callback<(), String> = (|()| "test").into();
+    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();
     }
 
     #[test]
     fn sync_callback_from() {
-        let _callback: UnsyncCallback<(), String> = (|()| "test").into();
+        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();
     }
 }

leptos/src/children.rs

@@ -47,44 +47,70 @@ 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
 ///
-/// 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
 ///
-/// ## Examples
+/// 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].
 ///
 /// ```
-/// # use leptos::prelude::*;
-/// # use leptos::html::p;
-/// # use leptos::IntoView;
+/// # use leptos::{ProviderProps, ShowProps};
+/// # use leptos_dom::html::p;
+/// # use leptos_dom::IntoView;
 /// # use leptos_macro::component;
-/// # use leptos::children::ToChildren;
-/// use leptos::context::{Provider, ProviderProps};
-/// use leptos::control_flow::{Show, ShowProps};
-///
+/// # 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;
+/// #
 /// #[component]
 /// fn App() -> impl IntoView {
 ///     (
-///       Provider(
 ///         ProviderProps::builder()
 ///             .children(ToChildren::to_children(|| {
-///                 p().child("Foo")
+///                 p().child("Foo").into_view().into()
 ///             }))
 ///             // ...
-///            .value("Foo")
-///            .build(),
-///        ),
-///        Show(
-///          ShowProps::builder()
+/// #           .value("Foo")
+/// #           .build(),
+///         ShowProps::builder()
 ///             .children(ToChildren::to_children(|| {
-///                 p().child("Foo")
+///                 p().child("Foo").into_view().into()
 ///             }))
 ///             // ...
-///             .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::{fmt::Debug, marker::PhantomData, sync::Arc};
+use std::{marker::PhantomData, sync::Arc};
 use tachys::{
     html::attribute::Attribute,
     hydration::Cursor,
@@ -22,29 +22,6 @@ 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).
@@ -95,11 +72,12 @@ where
     });
     let hook = hook as Arc<dyn ErrorHook>;
 
-    let _guard = throw_error::set_error_hook(Arc::clone(&hook));
+    // provide the error hook and render children
+    // TODO unset this outside the ErrorBoundary
+    throw_error::set_error_hook(Arc::clone(&hook));
     let children = children.into_inner()();
 
     ErrorBoundaryView {
-        hook,
         boundary_id,
         errors_empty,
         children,
@@ -109,8 +87,8 @@ where
     }
 }
 
+#[derive(Debug)]
 struct ErrorBoundaryView<Chil, FalFn, Rndr> {
-    hook: Arc<dyn ErrorHook>,
     boundary_id: SerializedDataId,
     errors_empty: ArcMemo<bool>,
     children: Chil,
@@ -167,14 +145,11 @@ 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
@@ -241,7 +216,6 @@ where
         Self::Output<NewAttr>: RenderHtml<Rndr>,
     {
         let ErrorBoundaryView {
-            hook,
             boundary_id,
             errors_empty,
             children,
@@ -250,7 +224,6 @@ where
             rndr,
         } = self;
         ErrorBoundaryView {
-            hook,
             boundary_id,
             errors_empty,
             children: children.add_any_attr(attr.into_cloneable_owned()),
@@ -279,7 +252,6 @@ where
 
     async fn resolve(self) -> Self::AsyncOutput {
         let ErrorBoundaryView {
-            hook,
             boundary_id,
             errors_empty,
             children,
@@ -288,7 +260,6 @@ where
             ..
         } = self;
         ErrorBoundaryView {
-            hook,
             boundary_id,
             errors_empty,
             children: children.resolve().await,
@@ -306,7 +277,6 @@ 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(
@@ -339,7 +309,6 @@ 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;
@@ -350,6 +319,10 @@ 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);
@@ -372,14 +345,12 @@ 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
@@ -453,10 +424,7 @@ impl ErrorBoundaryErrorHook {
 impl ErrorHook for ErrorBoundaryErrorHook {
     fn throw(&self, error: Error) -> ErrorId {
         // generate a unique ID
-        let key: ErrorId = Owner::current_shared_context()
-            .map(|sc| sc.next_id())
-            .unwrap_or_default()
-            .into();
+        let key = ErrorId::default(); // TODO unique ID...
 
         // register it with the shared context, so that it can be serialized from server to client
         // as needed

leptos/src/for_loop.rs

@@ -1,10 +1,6 @@
 use crate::into_view::IntoView;
 use leptos_macro::component;
-use reactive_graph::{
-    owner::Owner,
-    signal::{ArcRwSignal, ReadSignal},
-    traits::Set,
-};
+use reactive_graph::owner::Owner;
 use std::hash::Hash;
 use tachys::{reactive_graph::OwnedView, view::keyed::keyed};
 
@@ -14,7 +10,7 @@ use tachys::{reactive_graph::OwnedView, view::keyed::keyed};
 /// as it avoids re-creating DOM nodes that are not being changed.
 ///
 /// ```
-/// # use leptos::prelude::*;
+/// # use leptos::*;
 ///
 /// #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 /// struct Counter {
@@ -72,88 +68,10 @@ 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))
-    };
-    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),
-        )
+        OwnedView::new_with_owner(view, owner)
     };
     move || keyed(each(), key.clone(), children.clone())
 }
@@ -162,57 +80,25 @@ where
 mod tests {
     use crate::prelude::*;
     use leptos_macro::view;
-    use tachys::{html::element::HtmlElement, prelude::ElementChild};
+    use tachys::{
+        html::element::HtmlElement, prelude::ElementChild,
+        renderer::mock_dom::MockDom, view::Render,
+    };
 
     #[test]
     fn creates_list() {
-        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>"
-            );
-        });
+        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>"
+        );
     }
 }

leptos/src/form.rs

@@ -34,8 +34,8 @@ use web_sys::{
 /// should make use of indexing notation of `serde_qs`.
 ///
 /// ```rust
-/// # use leptos::prelude::*;
-/// use leptos::form::ActionForm;
+/// # use leptos::*;
+/// # use leptos_router::*;
 ///
 /// #[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
 /// struct HeftyData {
@@ -45,7 +45,7 @@ use web_sys::{
 ///
 /// #[component]
 /// fn ComplexInput() -> impl IntoView {
-///     let submit = ServerAction::<VeryImportantFn>::new();
+///     let submit = Action::<VeryImportantFn, _>::server();
 ///
 ///     view! {
 ///       <ActionForm action=submit>
@@ -145,6 +145,10 @@ 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
@@ -212,6 +216,10 @@ 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,13 +24,12 @@ pub fn AutoReload(
             leptos_config::ReloadWSProtocol::WSS => "'wss://'",
         };
 
-        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> }
+        let script = include_str!("reload_script.js");
+        view! {
+            <script nonce=nonce>
+                {format!("{script}({reload_port:?}, {protocol})")}
+            </script>
+        }
     })
 }
 
@@ -50,9 +49,6 @@ 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")
@@ -60,13 +56,7 @@ 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,3 +1,4 @@
+(function (reload_port, protocol) {
 let host = window.location.hostname;
 let ws = new WebSocket(`${protocol}${host}:${reload_port}/live_reload`);
 ws.onmessage = (ev) => {
@@ -19,3 +20,4 @@ ws.onmessage = (ev) => {
 	}
 };
 ws.onclose = () => console.warn('Live-reload stopped. Manual reload necessary.');
+})

leptos/src/into_view.rs

@@ -1,50 +1,18 @@
-use std::borrow::Cow;
 use tachys::{
     html::attribute::Attribute,
     hydration::Cursor,
-    renderer::{dom::Dom, Renderer},
+    renderer::dom::Dom,
     ssr::StreamBuilder,
-    view::{
-        add_attr::AddAnyAttr, Position, PositionState, Render, RenderHtml,
-        ToTemplate,
-    },
+    view::{add_attr::AddAnyAttr, Position, PositionState, Render, RenderHtml},
 };
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
-pub struct View<T>
+pub struct View<T>(T)
 where
-    T: Sized,
-{
-    inner: T,
-    #[cfg(debug_assertions)]
-    view_marker: Option<Cow<'static, str>>,
-}
+    T: Sized;
 
 impl<T> View<T> {
-    pub fn new(inner: T) -> Self {
-        Self {
-            inner,
-            #[cfg(debug_assertions)]
-            view_marker: None,
-        }
-    }
-
     pub fn into_inner(self) -> T {
-        self.inner
-    }
-
-    #[inline(always)]
-    pub fn with_view_marker(
-        #[allow(unused_mut)] // used in debug
-        mut self,
-        #[allow(unused_variables)] // used in debug
-        view_marker: impl Into<Cow<'static, str>>,
-    ) -> Self {
-        #[cfg(debug_assertions)]
-        {
-            self.view_marker = Some(view_marker.into());
-        }
-        self
+        self.0
     }
 }
 
@@ -60,37 +28,33 @@ where
     T: Sized + Render<Dom> + RenderHtml<Dom> + Send, //+ AddAnyAttr<Dom>,
 {
     fn into_view(self) -> View<Self> {
-        View {
-            inner: self,
-            #[cfg(debug_assertions)]
-            view_marker: None,
-        }
+        View(self)
     }
 }
 
-impl<T: Render<Rndr>, Rndr: Renderer> Render<Rndr> for View<T> {
+impl<T: IntoView> Render<Dom> for View<T> {
     type State = T::State;
 
     fn build(self) -> Self::State {
-        self.inner.build()
+        self.0.build()
     }
 
     fn rebuild(self, state: &mut Self::State) {
-        self.inner.rebuild(state)
+        self.0.rebuild(state)
     }
 }
 
-impl<T: RenderHtml<Rndr>, Rndr: Renderer> RenderHtml<Rndr> for View<T> {
+impl<T: IntoView> RenderHtml<Dom> for View<T> {
     type AsyncOutput = T::AsyncOutput;
 
-    const MIN_LENGTH: usize = <T as RenderHtml<Rndr>>::MIN_LENGTH;
+    const MIN_LENGTH: usize = <T as RenderHtml<Dom>>::MIN_LENGTH;
 
     async fn resolve(self) -> Self::AsyncOutput {
-        self.inner.resolve().await
+        self.0.resolve().await
     }
 
     fn dry_resolve(&mut self) {
-        self.inner.dry_resolve();
+        self.0.dry_resolve();
     }
 
     fn to_html_with_buf(
@@ -100,20 +64,8 @@ impl<T: RenderHtml<Rndr>, Rndr: Renderer> RenderHtml<Rndr> for View<T> {
         escape: bool,
         mark_branches: bool,
     ) {
-        #[cfg(debug_assertions)]
-        let vm = self.view_marker.to_owned();
-        #[cfg(debug_assertions)]
-        if let Some(vm) = vm.as_ref() {
-            buf.push_str(&format!("<!--hot-reload|{vm}|open-->"));
-        }
-
-        self.inner
+        self.0
             .to_html_with_buf(buf, position, escape, mark_branches);
-
-        #[cfg(debug_assertions)]
-        if let Some(vm) = vm.as_ref() {
-            buf.push_str(&format!("<!--hot-reload|{vm}|close-->"));
-        }
     }
 
     fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
@@ -125,70 +77,35 @@ impl<T: RenderHtml<Rndr>, Rndr: Renderer> RenderHtml<Rndr> for View<T> {
     ) where
         Self: Sized,
     {
-        #[cfg(debug_assertions)]
-        let vm = self.view_marker.to_owned();
-        #[cfg(debug_assertions)]
-        if let Some(vm) = vm.as_ref() {
-            buf.push_sync(&format!("<!--hot-reload|{vm}|open-->"));
-        }
-
-        self.inner.to_html_async_with_buf::<OUT_OF_ORDER>(
+        self.0.to_html_async_with_buf::<OUT_OF_ORDER>(
             buf,
             position,
             escape,
             mark_branches,
-        );
-
-        #[cfg(debug_assertions)]
-        if let Some(vm) = vm.as_ref() {
-            buf.push_sync(&format!("<!--hot-reload|{vm}|close-->"));
-        }
+        )
     }
 
     fn hydrate<const FROM_SERVER: bool>(
         self,
-        cursor: &Cursor<Rndr>,
+        cursor: &Cursor<Dom>,
         position: &PositionState,
     ) -> Self::State {
-        self.inner.hydrate::<FROM_SERVER>(cursor, position)
+        self.0.hydrate::<FROM_SERVER>(cursor, position)
     }
 }
 
-impl<T: ToTemplate> ToTemplate for View<T> {
-    fn to_template(
-        buf: &mut String,
-        class: &mut String,
-        style: &mut String,
-        inner_html: &mut String,
-        position: &mut Position,
-    ) {
-        T::to_template(buf, class, style, inner_html, position);
-    }
-}
+impl<T: IntoView> AddAnyAttr<Dom> for View<T> {
+    type Output<SomeNewAttr: Attribute<Dom>> =
+        <T as AddAnyAttr<Dom>>::Output<SomeNewAttr>;
 
-impl<T: AddAnyAttr<Rndr>, Rndr> AddAnyAttr<Rndr> for View<T>
-where
-    Rndr: Renderer,
-{
-    type Output<SomeNewAttr: Attribute<Rndr>> = View<T::Output<SomeNewAttr>>;
-
-    fn add_any_attr<NewAttr: Attribute<Rndr>>(
+    fn add_any_attr<NewAttr: Attribute<Dom>>(
         self,
         attr: NewAttr,
     ) -> Self::Output<NewAttr>
     where
-        Self::Output<NewAttr>: RenderHtml<Rndr>,
+        Self::Output<NewAttr>: RenderHtml<Dom>,
     {
-        let View {
-            inner,
-            #[cfg(debug_assertions)]
-            view_marker,
-        } = self;
-        View {
-            inner: inner.add_any_attr(attr),
-            #[cfg(debug_assertions)]
-            view_marker,
-        }
+        self.0.add_any_attr(attr)
     }
 }
 

leptos/src/lib.rs

@@ -1,4 +1,4 @@
-#!rdeny(missing_docs)]
+//#!rdeny(missing_docs)] // TODO restore
 #![forbid(unsafe_code)]
 //! # About Leptos
 //!
@@ -98,25 +98,25 @@
 //! # A Simple Counter
 //!
 //! ```rust
-//! use leptos::prelude::*;
+//! use leptos::*;
 //!
 //! #[component]
-//! pub fn SimpleCounter(initial_value: i32) -> impl IntoView {
+//! pub fn SimpleCounter( initial_value: i32) -> impl IntoView {
 //!     // create a reactive signal with the initial value
-//!     let (value, set_value) = signal( initial_value);
+//!     let (value, set_value) = create_signal( initial_value);
 //!
 //!     // create event handlers for our buttons
 //!     // note that `value` and `set_value` are `Copy`, so it's super easy to move them into closures
 //!     let clear = move |_| set_value.set(0);
-//!     let decrement = move |_| *set_value.write() -= 1;
-//!     let increment = move |_| *set_value.write() += 1;
+//!     let decrement = move |_| set_value.update(|value| *value -= 1);
+//!     let increment = move |_| set_value.update(|value| *value += 1);
 //!
 //!     view! {
 //!
 //!         <div>
 //!             <button on:click=clear>"Clear"</button>
 //!             <button on:click=decrement>"-1"</button>
-//!             <span>"Value: " {value} "!"</span>
+//!             <span>"Value: " {move || value.get().to_string()} "!"</span>
 //!             <button on:click=increment>"+1"</button>
 //!         </div>
 //!     }
@@ -125,23 +125,24 @@
 //!
 //! Leptos is easy to use with [Trunk](https://trunkrs.dev/) (or with a simple wasm-bindgen setup):
 //! ```
-//! use leptos::{mount::mount_to_body, prelude::*};
+//! # use leptos::*;
+//! # if false { // can't run in doctests
 //!
 //! #[component]
 //! fn SimpleCounter(initial_value: i32) -> impl IntoView {
-//!     // ...
-//!     # _ = initial_value;
+//!     todo!()
 //! }
 //!
 //! pub fn main() {
-//! # if false { // can't run in doctest
 //!     mount_to_body(|| view! { <SimpleCounter initial_value=3 /> })
-//! # }
 //! }
+//! # }
 //! ```
 
 #![cfg_attr(feature = "nightly", feature(fn_traits))]
 #![cfg_attr(feature = "nightly", feature(unboxed_closures))]
+#![cfg_attr(feature = "nightly", feature(auto_traits))]
+#![cfg_attr(feature = "nightly", feature(negative_impls))]
 
 extern crate self as leptos;
 
@@ -295,17 +296,10 @@ pub mod spawn {
     }
 }
 
-// these reexports are used in islands
-#[cfg(feature = "experimental-islands")]
 #[doc(hidden)]
-pub use serde;
-#[cfg(feature = "experimental-islands")]
+pub use wasm_bindgen; // used in islands
 #[doc(hidden)]
-pub use serde_json;
-#[doc(hidden)]
-pub use wasm_bindgen;
-#[doc(hidden)]
-pub use web_sys;
+pub use web_sys; // used in islands
 
 /*mod additional_attributes;
 pub use additional_attributes::*;

leptos/src/mount.rs

@@ -1,10 +1,6 @@
-#[cfg(debug_assertions)]
-use crate::logging;
-use crate::IntoView;
+use crate::{logging, IntoView};
 use any_spawner::Executor;
 use reactive_graph::owner::Owner;
-#[cfg(debug_assertions)]
-use std::cell::Cell;
 use std::marker::PhantomData;
 use tachys::{
     dom::body,
@@ -31,11 +27,6 @@ where
     owner.forget();
 }
 
-#[cfg(debug_assertions)]
-thread_local! {
-    static FIRST_CALL: Cell<bool> = const { Cell::new(true) };
-}
-
 #[cfg(feature = "hydrate")]
 /// Runs the provided closure and mounts the result to the provided element.
 pub fn hydrate_from<F, N>(
@@ -54,19 +45,15 @@ where
     // already initialized, which is not an issue
     _ = Executor::init_wasm_bindgen();
 
-    #[cfg(debug_assertions)]
-    {
-        if !cfg!(feature = "hydrate") && FIRST_CALL.get() {
-            logging::warn!(
-                "It seems like you're trying to use Leptos in hydration mode, \
-                 but the `hydrate` feature is not enabled on the `leptos` \
-                 crate. Add `features = [\"hydrate\"]` to your Cargo.toml for \
-                 the crate to work properly.\n\nNote that hydration and \
-                 client-side rendering now use separate functions from \
-                 leptos::mount: you are calling a hydration function."
-            );
-        }
-        FIRST_CALL.set(false);
+    if !cfg!(feature = "hydrate") {
+        logging::warn!(
+            "It seems like you're trying to use Leptos in hydration mode, but \
+             the `hydrate` feature is not enabled on the `leptos` crate. Add \
+             `features = [\"hydrate\"]` to your Cargo.toml for the crate to \
+             work properly.\n\nNote that hydration and client-side rendering \
+             now use separate functions from leptos::mount: you are calling a \
+             hydration function."
+        );
     }
 
     // create a new reactive owner and use it as the root node to run the app
@@ -113,20 +100,16 @@ where
     // already initialized, which is not an issue
     _ = Executor::init_wasm_bindgen();
 
-    #[cfg(debug_assertions)]
-    {
-        if !cfg!(feature = "csr") && FIRST_CALL.get() {
-            logging::warn!(
-                "It seems like you're trying to use Leptos in client-side \
-                 rendering mode, but the `csr` feature is not enabled on the \
-                 `leptos` crate. Add `features = [\"csr\"]` to your \
-                 Cargo.toml for the crate to work properly.\n\nNote that \
-                 hydration and client-side rendering now use different \
-                 functions from leptos::mount. You are using a client-side \
-                 rendering mount function."
-            );
-        }
-        FIRST_CALL.set(false);
+    if !cfg!(feature = "csr") {
+        logging::warn!(
+            "It seems like you're trying to use Leptos in client-side \
+             rendering mode, but the `csr` feature is not enabled on the \
+             `leptos` crate. Add `features = [\"csr\"]` to your Cargo.toml \
+             for the crate to work properly.\n\nNote that hydration and \
+             client-side rendering now use different functions from \
+             leptos::mount. You are using a client-side rendering mount \
+             function."
+        );
     }
 
     // create a new reactive owner and use it as the root node to run the app
@@ -183,7 +166,7 @@ where
 /// Hydrates any islands that are currently present on the page.
 #[cfg(feature = "hydrate")]
 pub fn hydrate_islands() {
-    use hydration_context::{HydrateSharedContext, SharedContext};
+    use hydration_context::HydrateSharedContext;
     use std::sync::Arc;
 
     // use wasm-bindgen-futures to drive the reactive system
@@ -191,13 +174,8 @@ pub fn hydrate_islands() {
     // already initialized, which is not an issue
     _ = Executor::init_wasm_bindgen();
 
-    #[cfg(debug_assertions)]
-    FIRST_CALL.set(false);
-
     // create a new reactive owner and use it as the root node to run the app
-    let sc = HydrateSharedContext::new();
-    sc.set_is_hydrating(false); // islands mode starts in "not hydrating"
-    let owner = Owner::new_root(Some(Arc::new(sc)));
+    let owner = Owner::new_root(Some(Arc::new(HydrateSharedContext::new())));
     owner.set();
     std::mem::forget(owner);
 }

leptos/src/portal.rs

@@ -1,7 +1,7 @@
 use crate::{children::TypedChildrenFn, mount, IntoView};
 use leptos_dom::helpers::document;
 use leptos_macro::component;
-use reactive_graph::{effect::Effect, owner::Owner, untrack};
+use reactive_graph::{effect::Effect, owner::Owner};
 use std::sync::Arc;
 
 /// Renders components somewhere else in the DOM.
@@ -62,11 +62,12 @@ where
                 container.clone()
             };
 
+            // SendWrapper: this is only created in a single-threaded browser environment
             let _ = mount.append_child(&container);
             let handle = SendWrapper::new((
                 mount::mount_to(render_root.unchecked_into(), {
                     let children = Arc::clone(&children);
-                    move || untrack(|| children())
+                    move || children()
                 }),
                 mount.clone(),
                 container,

leptos/src/provider.rs

@@ -9,8 +9,7 @@ use tachys::reactive_graph::OwnedView;
 /// This prevents issues related to “context shadowing.”
 ///
 /// ```rust
-/// use leptos::{context::Provider, prelude::*};
-///
+/// # use leptos::prelude::*;
 /// #[component]
 /// pub fn App() -> impl IntoView {
 ///     // each Provider will only provide the value to its children

leptos/src/suspense_component.rs

@@ -31,61 +31,6 @@ use tachys::{
 };
 use throw_error::ErrorHookFuture;
 
-/// If any [`Resource`](leptos_reactive::Resource) is read in the `children` of this
-/// component, it will show the `fallback` while they are loading. Once all are resolved,
-/// it will render the `children`.
-///
-/// Each time one of the resources is loading again, it will fall back. To keep the current
-/// children instead, use [Transition](crate::Transition).
-///
-/// Note that the `children` will be rendered initially (in order to capture the fact that
-/// those resources are read under the suspense), so you cannot assume that resources read
-/// synchronously have
-/// `Some` value in `children`. However, you can read resources asynchronously by using
-/// [Suspend](crate::prelude::Suspend).
-///
-/// ```
-/// # use leptos::prelude::*;
-/// # if false { // don't run in doctests
-/// async fn fetch_cats(how_many: u32) -> Vec<String> { vec![] }
-///
-/// let (cat_count, set_cat_count) = signal::<u32>(1);
-///
-/// let cats = Resource::new(move || cat_count.get(), |count| fetch_cats(count));
-///
-/// view! {
-///   <div>
-///     <Suspense fallback=move || view! { <p>"Loading (Suspense Fallback)..."</p> }>
-///       // you can access a resource synchronously
-///       {move || {
-///           cats.get().map(|data| {
-///             data
-///               .into_iter()
-///               .map(|src| {
-///                   view! {
-///                     <img src={src}/>
-///                   }
-///               })
-///               .collect_view()
-///           })
-///         }
-///       }
-///       // or you can use `Suspend` to read resources asynchronously
-///       {move || Suspend::new(async move {
-///         cats.await
-///               .into_iter()
-///               .map(|src| {
-///                   view! {
-///                     <img src={src}/>
-///                   }
-///               })
-///               .collect_view()
-///       })}
-///     </Suspense>
-///   </div>
-/// }
-/// # ;}
-/// ```
 #[component]
 pub fn Suspense<Chil>(
     #[prop(optional, into)] fallback: ViewFnOnce,
@@ -442,101 +387,3 @@ where
         })
     }
 }
-
-/// A wrapper that prevents [`Suspense`] from waiting for any resource reads that happen inside
-/// `Unsuspend`.
-pub struct Unsuspend<T>(Box<dyn FnOnce() -> T + Send>);
-
-impl<T> Unsuspend<T> {
-    /// Wraps the given function, such that it is not called until all resources are ready.
-    pub fn new(fun: impl FnOnce() -> T + Send + 'static) -> Self {
-        Self(Box::new(fun))
-    }
-}
-
-impl<T, Rndr> Render<Rndr> for Unsuspend<T>
-where
-    T: Render<Rndr>,
-    Rndr: Renderer,
-{
-    type State = T::State;
-
-    fn build(self) -> Self::State {
-        (self.0)().build()
-    }
-
-    fn rebuild(self, state: &mut Self::State) {
-        (self.0)().rebuild(state);
-    }
-}
-
-impl<T, Rndr> AddAnyAttr<Rndr> for Unsuspend<T>
-where
-    T: AddAnyAttr<Rndr> + 'static,
-    Rndr: Renderer,
-{
-    type Output<SomeNewAttr: Attribute<Rndr>> =
-        Unsuspend<T::Output<SomeNewAttr::CloneableOwned>>;
-
-    fn add_any_attr<NewAttr: Attribute<Rndr>>(
-        self,
-        attr: NewAttr,
-    ) -> Self::Output<NewAttr>
-    where
-        Self::Output<NewAttr>: RenderHtml<Rndr>,
-    {
-        let attr = attr.into_cloneable_owned();
-        Unsuspend::new(move || (self.0)().add_any_attr(attr))
-    }
-}
-
-impl<T, Rndr> RenderHtml<Rndr> for Unsuspend<T>
-where
-    T: RenderHtml<Rndr> + 'static,
-    Rndr: Renderer,
-{
-    type AsyncOutput = Self;
-
-    const MIN_LENGTH: usize = T::MIN_LENGTH;
-
-    fn dry_resolve(&mut self) {}
-
-    async fn resolve(self) -> Self::AsyncOutput {
-        self
-    }
-
-    fn to_html_with_buf(
-        self,
-        buf: &mut String,
-        position: &mut Position,
-        escape: bool,
-        mark_branches: bool,
-    ) {
-        (self.0)().to_html_with_buf(buf, position, escape, mark_branches);
-    }
-
-    fn to_html_async_with_buf<const OUT_OF_ORDER: bool>(
-        self,
-        buf: &mut StreamBuilder,
-        position: &mut Position,
-        escape: bool,
-        mark_branches: bool,
-    ) where
-        Self: Sized,
-    {
-        (self.0)().to_html_async_with_buf::<OUT_OF_ORDER>(
-            buf,
-            position,
-            escape,
-            mark_branches,
-        );
-    }
-
-    fn hydrate<const FROM_SERVER: bool>(
-        self,
-        cursor: &Cursor<Rndr>,
-        position: &PositionState,
-    ) -> Self::State {
-        (self.0)().hydrate::<FROM_SERVER>(cursor, position)
-    }
-}

leptos/src/transition.rs

@@ -15,61 +15,7 @@ use reactive_graph::{
 use slotmap::{DefaultKey, SlotMap};
 use tachys::reactive_graph::OwnedView;
 
-/// If any [`Resource`](leptos_reactive::Resource) is read in the `children` of this
-/// component, it will show the `fallback` while they are loading. Once all are resolved,
-/// it will render the `children`.
-///
-/// Unlike [`Suspense`](crate::Suspense), this will not fall
-/// back to the `fallback` state if there are further changes after the initial load.
-///
-/// Note that the `children` will be rendered initially (in order to capture the fact that
-/// those resources are read under the suspense), so you cannot assume that resources read
-/// synchronously have
-/// `Some` value in `children`. However, you can read resources asynchronously by using
-/// [Suspend](crate::prelude::Suspend).
-///
-/// ```
-/// # use leptos::prelude::*;
-/// # if false { // don't run in doctests
-/// async fn fetch_cats(how_many: u32) -> Vec<String> { vec![] }
-///
-/// let (cat_count, set_cat_count) = signal::<u32>(1);
-///
-/// let cats = Resource::new(move || cat_count.get(), |count| fetch_cats(count));
-///
-/// view! {
-///   <div>
-///     <Transition fallback=move || view! { <p>"Loading (Suspense Fallback)..."</p> }>
-///       // you can access a resource synchronously
-///       {move || {
-///           cats.get().map(|data| {
-///             data
-///               .into_iter()
-///               .map(|src| {
-///                   view! {
-///                     <img src={src}/>
-///                   }
-///               })
-///               .collect_view()
-///           })
-///         }
-///       }
-///       // or you can use `Suspend` to read resources asynchronously
-///       {move || Suspend::new(async move {
-///         cats.await
-///               .into_iter()
-///               .map(|src| {
-///                   view! {
-///                     <img src={src}/>
-///                   }
-///               })
-///               .collect_view()
-///       })}
-///     </Transition>
-///   </div>
-/// }
-/// # ;}
-/// ```
+/// TODO docs!
 #[component]
 pub fn Transition<Chil>(
     /// Will be displayed while resources are pending. By default this is the empty view.

leptos/tests/ssr.rs

@@ -1,11 +1,11 @@
-use leptos::html::HtmlElement;
-
+#[cfg(not(any(feature = "csr", feature = "hydrate")))]
 #[test]
 fn simple_ssr_test() {
     use leptos::prelude::*;
 
+    let runtime = create_runtime();
     let (value, set_value) = signal(0);
-    let rendered: View<HtmlElement<_, _, _, Dom>> = view! {
+    let rendered = view! {
         <div>
             <button on:click=move |_| set_value.update(|value| *value -= 1)>"-1"</button>
             <span>"Value: " {move || value.get().to_string()} "!"</span>
@@ -13,13 +13,26 @@ fn simple_ssr_test() {
         </div>
     };
 
-    assert_eq!(
-        rendered.to_html(),
-        "<div><button>-1</button><span>Value: \
-         <!>0<!>!</span><button>+1</button></div>"
-    );
+    if cfg!(all(feature = "experimental-islands", feature = "ssr")) {
+        assert_eq!(
+            rendered.into_view().to_html(),
+            "<div><button>-1</button><span>Value: \
+             0!</span><button>+1</button></div>"
+        );
+    } else {
+        assert!(rendered.into_view().to_html().contains(
+            "<div data-hk=\"0-0-0-1\"><button \
+             data-hk=\"0-0-0-2\">-1</button><span data-hk=\"0-0-0-3\">Value: \
+             <!--hk=0-0-0-4o|leptos-dyn-child-start-->0<!\
+             --hk=0-0-0-4c|leptos-dyn-child-end-->!</span><button \
+             data-hk=\"0-0-0-5\">+1</button></div>"
+        ));
+    }
+
+    runtime.dispose();
 }
 
+#[cfg(not(any(feature = "csr", feature = "hydrate")))]
 #[test]
 fn ssr_test_with_components() {
     use leptos::prelude::*;
@@ -36,21 +49,35 @@ fn ssr_test_with_components() {
         }
     }
 
-    let rendered: View<HtmlElement<_, _, _, Dom>> = view! {
+    let runtime = create_runtime();
+    let rendered = view! {
+
         <div class="counters">
             <Counter initial_value=1/>
             <Counter initial_value=2/>
         </div>
     };
 
-    assert_eq!(
-        rendered.to_html(),
-        "<div class=\"counters\"><div><button>-1</button><span>Value: \
-         <!>1<!>!</span><button>+1</button></div><div><button>-1</\
-         button><span>Value: <!>2<!>!</span><button>+1</button></div></div>"
-    );
+    if cfg!(all(feature = "experimental-islands", feature = "ssr")) {
+        assert_eq!(
+            rendered.into_view().to_html(),
+            "<div class=\"counters\"><div><button>-1</button><span>Value: \
+             1!</span><button>+1</button></div><div><button>-1</\
+             button><span>Value: 2!</span><button>+1</button></div></div>"
+        );
+    } else {
+        assert!(rendered.into_view().to_html().contains(
+            "<div data-hk=\"0-0-0-3\"><button \
+             data-hk=\"0-0-0-4\">-1</button><span data-hk=\"0-0-0-5\">Value: \
+             <!--hk=0-0-0-6o|leptos-dyn-child-start-->1<!\
+             --hk=0-0-0-6c|leptos-dyn-child-end-->!</span><button \
+             data-hk=\"0-0-0-7\">+1</button></div>"
+        ));
+    }
+    runtime.dispose();
 }
 
+#[cfg(not(any(feature = "csr", feature = "hydrate")))]
 #[test]
 fn ssr_test_with_snake_case_components() {
     use leptos::prelude::*;
@@ -59,6 +86,7 @@ fn ssr_test_with_snake_case_components() {
     fn snake_case_counter(initial_value: i32) -> impl IntoView {
         let (value, set_value) = signal(initial_value);
         view! {
+
             <div>
                 <button on:click=move |_| set_value.update(|value| *value -= 1)>"-1"</button>
                 <span>"Value: " {move || value.get().to_string()} "!"</span>
@@ -66,65 +94,111 @@ fn ssr_test_with_snake_case_components() {
             </div>
         }
     }
-    let rendered: View<HtmlElement<_, _, _, Dom>> = view! {
+
+    let runtime = create_runtime();
+    let rendered = view! {
+
         <div class="counters">
             <SnakeCaseCounter initial_value=1/>
             <SnakeCaseCounter initial_value=2/>
         </div>
     };
 
-    assert_eq!(
-        rendered.to_html(),
-        "<div class=\"counters\"><div><button>-1</button><span>Value: \
-         <!>1<!>!</span><button>+1</button></div><div><button>-1</\
-         button><span>Value: <!>2<!>!</span><button>+1</button></div></div>"
-    );
+    if cfg!(all(feature = "experimental-islands", feature = "ssr")) {
+        assert_eq!(
+            rendered.into_view().to_html(),
+            "<div class=\"counters\"><div><button>-1</button><span>Value: \
+             1!</span><button>+1</button></div><div><button>-1</\
+             button><span>Value: 2!</span><button>+1</button></div></div>"
+        );
+    } else {
+        assert!(rendered.into_view().to_html().contains(
+            "<div data-hk=\"0-0-0-3\"><button \
+             data-hk=\"0-0-0-4\">-1</button><span data-hk=\"0-0-0-5\">Value: \
+             <!--hk=0-0-0-6o|leptos-dyn-child-start-->1<!\
+             --hk=0-0-0-6c|leptos-dyn-child-end-->!</span><button \
+             data-hk=\"0-0-0-7\">+1</button></div>"
+        ));
+    }
+
+    runtime.dispose();
 }
 
+#[cfg(not(any(feature = "csr", feature = "hydrate")))]
 #[test]
 fn test_classes() {
     use leptos::prelude::*;
 
+    let runtime = create_runtime();
     let (value, _set_value) = signal(5);
-    let rendered: View<HtmlElement<_, _, _, Dom>> = view! {
-        <div
-            class="my big"
-            class:a=move || { value.get() > 10 }
-            class:red=true
-            class:car=move || { value.get() > 1 }
-        ></div>
+    let rendered = view! {
+
+        <div class="my big" class:a={move || value.get() > 10} class:red=true class:car={move || value.get() > 1}></div>
     };
 
-    assert_eq!(rendered.to_html(), "<div class=\"my big  red car\"></div>");
+    if cfg!(all(feature = "experimental-islands", feature = "ssr")) {
+        assert_eq!(
+            rendered.into_view().to_html(),
+            "<div class=\"my big  red car\"></div>"
+        );
+    } else {
+        assert!(rendered.into_view().to_html().contains(
+            "<div data-hk=\"0-0-0-1\" class=\"my big  red car\"></div>"
+        ));
+    }
+    runtime.dispose();
 }
 
+#[cfg(not(any(feature = "csr", feature = "hydrate")))]
 #[test]
 fn ssr_with_styles() {
     use leptos::prelude::*;
 
+    let runtime = create_runtime();
     let (_, set_value) = signal(0);
     let styles = "myclass";
-    let rendered: View<HtmlElement<_, _, _, Dom>> = view! { class=styles,
+    let rendered = view! {
+        class = styles,
         <div>
-            <button class="btn" on:click=move |_| set_value.update(|value| *value -= 1)>
-                "-1"
-            </button>
+            <button class="btn" on:click=move |_| set_value.update(|value| *value -= 1)>"-1"</button>
         </div>
     };
 
-    assert_eq!(
-        rendered.to_html(),
-        "<div class=\"myclass\"><button class=\"btn \
-         myclass\">-1</button></div>"
-    );
+    if cfg!(all(feature = "experimental-islands", feature = "ssr")) {
+        assert_eq!(
+            rendered.into_view().to_html(),
+            "<div class=\" myclass\"><button class=\"btn \
+             myclass\">-1</button></div>"
+        );
+    } else {
+        assert!(rendered.into_view().to_html().contains(
+            "<div data-hk=\"0-0-0-1\" class=\" myclass\"><button \
+             data-hk=\"0-0-0-2\" class=\"btn myclass\">-1</button></div>"
+        ));
+    }
+    runtime.dispose();
 }
 
+#[cfg(not(any(feature = "csr", feature = "hydrate")))]
 #[test]
 fn ssr_option() {
     use leptos::prelude::*;
 
+    let runtime = create_runtime();
     let (_, _) = signal(0);
-    let rendered: View<HtmlElement<_, _, _, Dom>> = view! { <option></option> };
+    let rendered = view! {
 
-    assert_eq!(rendered.to_html(), "<option></option>");
+        <option/>
+    };
+
+    if cfg!(all(feature = "experimental-islands", feature = "ssr")) {
+        assert_eq!(rendered.into_view().to_html(), "<option></option>");
+    } else {
+        assert!(rendered
+            .into_view()
+            .to_html()
+            .contains("<option data-hk=\"0-0-0-1\"></option>"));
+    }
+
+    runtime.dispose();
 }

leptos_config/Cargo.toml

@@ -1,27 +1,24 @@
 [package]
 name = "leptos_config"
+version = { workspace = true }
+edition = "2021"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Configuration for the Leptos web framework."
 readme = "../README.md"
-version = { workspace = true }
 rust-version.workspace = true
-edition.workspace = true
 
 [dependencies]
-config = { version = "0.14.0", default-features = false, features = [
-  "toml",
-  "convert-case",
-] }
-regex = "1.10"
-serde = { version = "1.0", features = ["derive"] }
-thiserror = "1.0"
-typed-builder = "0.19.1"
+config = { version = "0.14", default-features = false, features = ["toml", "convert-case"] }
+regex = "1.7.0"
+serde = { version = "1.0.151", features = ["derive"] }
+thiserror = "1.0.38"
+typed-builder = "0.18"
 
 [dev-dependencies]
-tokio = { version = "1.39", features = ["rt", "macros"] }
-tempfile = "3.12"
+tokio = { version = "1", features = ["rt", "macros"] }
+tempfile = "3"
 temp-env = { version = "0.3.6", features = ["async_closure"] }
 
 [package.metadata.docs.rs]

leptos_dom/Cargo.toml

@@ -1,31 +1,40 @@
 [package]
 name = "leptos_dom"
 version = { workspace = true }
+edition = "2021"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "DOM operations for the Leptos web framework."
 rust-version.workspace = true
-edition.workspace = true
 
 [dependencies]
 tachys = { workspace = true }
 reactive_graph = { workspace = true }
+hydration_context = { workspace = true }
 or_poisoned = { workspace = true }
-js-sys = "0.3.69"
-send_wrapper = "0.6.0"
-tracing = "0.1.40"
-wasm-bindgen = "0.2.93"
+base64 = { version = "0.21", optional = true }
+getrandom = { version = "0.2", optional = true }
+js-sys = "0.3"
+rand = { version = "0.8", optional = true }
+send_wrapper = "0.6"
+tracing = "0.1"
+wasm-bindgen = "0.2"
 
 [dev-dependencies]
 leptos = { path = "../leptos" }
 
 [dependencies.web-sys]
-version = "0.3.70"
+version = "0.3"
 features = ["Location"]
 
 [features]
 default = []
+nightly = ["reactive_graph/nightly"]
+# TODO implement nonces
+nonce = ["dep:base64", "dep:getrandom", "dep:rand"]
+experimental-islands = []
+trace-component-props = ["tracing"]
 tracing = []
 
 [package.metadata.docs.rs]

leptos_dom/examples/hydration-test/Cargo.toml

@@ -9,11 +9,11 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 leptos = { path = "../../../leptos", features = ["nightly"] }
 actix-web = { version = "4", optional = true }
-actix-files = { version = "0.6.0", optional = true }
-wasm-bindgen = { version = "0.2.0", optional = true }
-gloo = { version = "0.11.0", optional = true }
+actix-files = { version = "0.6", optional = true }
+wasm-bindgen = { version = "0.2", optional = true }
+gloo = { version = "0.8", optional = true }
 console_error_panic_hook = "0.1.7"
-futures = "0.3.0"
+futures = "0.3"
 
 [features]
 default = ["ssr"]

leptos_dom/examples/test-bench/Cargo.toml

@@ -4,11 +4,11 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-console_error_panic_hook = "0.1.0"
-gloo = { version = "0.11.0", features = ["futures"] }
+console_error_panic_hook = "0.1"
+gloo = { version = "0.8", features = ["futures"] }
 leptos = { path = "../../../leptos", features = ["nightly", "csr", "tracing"] }
-tracing = "0.1.0"
-tracing-subscriber = "0.3.0"
-tracing-subscriber-wasm = "0.1.0"
+tracing = "0.1"
+tracing-subscriber = "0.3"
+tracing-subscriber-wasm = "0.1"
 
 [workspace]

leptos_dom/examples/view-tests/Cargo.toml

@@ -5,9 +5,10 @@ edition = "2021"
 
 [dependencies]
 leptos = { path = "../../leptos", features = ["csr", "nightly"] }
-console_log = "1.0"
-log = "0.4.0"
+console_log = "1"
+log = "0.4"
 console_error_panic_hook = "0.1.7"
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.0"
+

leptos_dom/src/components.rs

@@ -0,0 +1,287 @@
+mod dyn_child;
+mod each;
+mod errors;
+mod fragment;
+mod unit;
+
+use crate::{
+    hydration::{HydrationCtx, HydrationKey},
+    Comment, IntoView, View,
+};
+#[cfg(all(target_arch = "wasm32", feature = "web"))]
+use crate::{mount_child, prepare_to_move, MountKind, Mountable};
+pub use dyn_child::*;
+pub use each::*;
+pub use errors::*;
+pub use fragment::*;
+use leptos_reactive::{untrack_with_diagnostics, Oco};
+#[cfg(all(target_arch = "wasm32", feature = "web"))]
+use once_cell::unsync::OnceCell;
+use std::fmt;
+#[cfg(all(target_arch = "wasm32", feature = "web"))]
+use std::rc::Rc;
+pub use unit::*;
+#[cfg(all(target_arch = "wasm32", feature = "web"))]
+use wasm_bindgen::JsCast;
+
+/// The core foundational leptos components.
+#[derive(Clone, PartialEq, Eq)]
+pub enum CoreComponent {
+    /// The [Unit] component.
+    Unit(UnitRepr),
+    /// The [DynChild] component.
+    DynChild(DynChildRepr),
+    /// The [Each] component.
+    Each(EachRepr),
+}
+
+impl Default for CoreComponent {
+    fn default() -> Self {
+        Self::Unit(UnitRepr::default())
+    }
+}
+
+impl fmt::Debug for CoreComponent {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Unit(u) => u.fmt(f),
+            Self::DynChild(dc) => dc.fmt(f),
+            Self::Each(e) => e.fmt(f),
+        }
+    }
+}
+
+/// Custom leptos component.
+#[derive(Clone, PartialEq, Eq)]
+pub struct ComponentRepr {
+    #[cfg(all(target_arch = "wasm32", feature = "web"))]
+    pub(crate) document_fragment: web_sys::DocumentFragment,
+    #[cfg(all(target_arch = "wasm32", feature = "web"))]
+    mounted: Rc<OnceCell<()>>,
+    #[cfg(any(debug_assertions, feature = "ssr"))]
+    pub(crate) name: Oco<'static, str>,
+    #[cfg(debug_assertions)]
+    _opening: Comment,
+    /// The children of the component.
+    pub children: Vec<View>,
+    closing: Comment,
+    #[cfg(not(all(target_arch = "wasm32", feature = "web")))]
+    pub(crate) id: Option<HydrationKey>,
+    #[cfg(debug_assertions)]
+    pub(crate) view_marker: Option<String>,
+}
+
+impl fmt::Debug for ComponentRepr {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        use fmt::Write;
+
+        if self.children.is_empty() {
+            #[cfg(debug_assertions)]
+            return write!(f, "<{} />", self.name);
+
+            #[cfg(not(debug_assertions))]
+            return f.write_str("<Component />");
+        } else {
+            #[cfg(debug_assertions)]
+            writeln!(f, "<{}>", self.name)?;
+            #[cfg(not(debug_assertions))]
+            f.write_str("<Component>")?;
+
+            let mut pad_adapter = pad_adapter::PadAdapter::new(f);
+
+            for child in &self.children {
+                writeln!(pad_adapter, "{child:#?}")?;
+            }
+
+            #[cfg(debug_assertions)]
+            write!(f, "</{}>", self.name)?;
+            #[cfg(not(debug_assertions))]
+            f.write_str("</Component>")?;
+
+            Ok(())
+        }
+    }
+}
+
+#[cfg(all(target_arch = "wasm32", feature = "web"))]
+impl Mountable for ComponentRepr {
+    fn get_mountable_node(&self) -> web_sys::Node {
+        if self.mounted.get().is_none() {
+            self.mounted.set(()).unwrap();
+
+            self.document_fragment
+                .unchecked_ref::<web_sys::Node>()
+                .to_owned()
+        }
+        // We need to prepare all children to move
+        else {
+            let opening = self.get_opening_node();
+
+            prepare_to_move(
+                &self.document_fragment,
+                &opening,
+                &self.closing.node,
+            );
+
+            self.document_fragment.clone().unchecked_into()
+        }
+    }
+
+    fn get_opening_node(&self) -> web_sys::Node {
+        #[cfg(debug_assertions)]
+        return self._opening.node.clone();
+
+        #[cfg(not(debug_assertions))]
+        return if let Some(child) = self.children.get(0) {
+            child.get_opening_node()
+        } else {
+            self.closing.node.clone()
+        };
+    }
+
+    #[inline]
+    fn get_closing_node(&self) -> web_sys::Node {
+        self.closing.node.clone()
+    }
+}
+impl From<ComponentRepr> for View {
+    fn from(value: ComponentRepr) -> Self {
+        #[cfg(all(target_arch = "wasm32", feature = "web"))]
+        if !HydrationCtx::is_hydrating() {
+            for child in &value.children {
+                mount_child(MountKind::Before(&value.closing.node), child);
+            }
+        }
+
+        View::Component(value)
+    }
+}
+
+impl IntoView for ComponentRepr {
+    #[cfg_attr(any(debug_assertions, feature = "ssr"), instrument(level = "trace", name = "<Component />", skip_all, fields(name = %self.name)))]
+    fn into_view(self) -> View {
+        self.into()
+    }
+}
+
+impl ComponentRepr {
+    /// Creates a new [`Component`].
+    #[inline(always)]
+    pub fn new(name: impl Into<Oco<'static, str>>) -> Self {
+        Self::new_with_id_concrete(name.into(), HydrationCtx::id())
+    }
+
+    /// Creates a new [`Component`] with the given hydration ID.
+    #[inline(always)]
+    pub fn new_with_id(
+        name: impl Into<Oco<'static, str>>,
+        id: Option<HydrationKey>,
+    ) -> Self {
+        Self::new_with_id_concrete(name.into(), id)
+    }
+
+    fn new_with_id_concrete(
+        name: Oco<'static, str>,
+        id: Option<HydrationKey>,
+    ) -> Self {
+        let markers = (
+            Comment::new(format!("</{name}>"), &id, true),
+            #[cfg(debug_assertions)]
+            Comment::new(format!("<{name}>"), &id, false),
+        );
+
+        #[cfg(all(target_arch = "wasm32", feature = "web"))]
+        let document_fragment = {
+            let fragment = crate::document().create_document_fragment();
+
+            // Insert the comments into the document fragment
+            // so they can serve as our references when inserting
+            // future nodes
+            if !HydrationCtx::is_hydrating() {
+                #[cfg(debug_assertions)]
+                fragment
+                    .append_with_node_2(&markers.1.node, &markers.0.node)
+                    .expect("append to not err");
+                #[cfg(not(debug_assertions))]
+                fragment
+                    .append_with_node_1(&markers.0.node)
+                    .expect("append to not err");
+            }
+
+            fragment
+        };
+
+        Self {
+            #[cfg(all(target_arch = "wasm32", feature = "web"))]
+            document_fragment,
+            #[cfg(all(target_arch = "wasm32", feature = "web"))]
+            mounted: Default::default(),
+            #[cfg(debug_assertions)]
+            _opening: markers.1,
+            closing: markers.0,
+            #[cfg(any(debug_assertions, feature = "ssr"))]
+            name,
+            children: Vec::with_capacity(1),
+            #[cfg(not(all(target_arch = "wasm32", feature = "web")))]
+            id,
+            #[cfg(debug_assertions)]
+            view_marker: None,
+        }
+    }
+
+    #[cfg(any(debug_assertions, feature = "ssr"))]
+    /// Returns the name of the component.
+    pub fn name(&self) -> &str {
+        &self.name
+    }
+}
+
+/// A user-defined `leptos` component.
+pub struct Component<F, V>
+where
+    F: FnOnce() -> V,
+    V: IntoView,
+{
+    id: Option<HydrationKey>,
+    name: Oco<'static, str>,
+    children_fn: F,
+}
+
+impl<F, V> Component<F, V>
+where
+    F: FnOnce() -> V,
+    V: IntoView,
+{
+    /// Creates a new component.
+    pub fn new(name: impl Into<Oco<'static, str>>, f: F) -> Self {
+        Self {
+            id: HydrationCtx::id(),
+            name: name.into(),
+            children_fn: f,
+        }
+    }
+}
+
+impl<F, V> IntoView for Component<F, V>
+where
+    F: FnOnce() -> V,
+    V: IntoView,
+{
+    #[track_caller]
+    fn into_view(self) -> View {
+        let Self {
+            id,
+            name,
+            children_fn,
+        } = self;
+
+        let mut repr = ComponentRepr::new_with_id(name, id);
+
+        // disposed automatically when the parent scope is disposed
+        let child = untrack_with_diagnostics(|| children_fn().into_view());
+
+        repr.children.push(child);
+
+        repr.into_view()
+    }
+}

leptos_dom/src/components/dyn_child.rs

@@ -0,0 +1,452 @@
+use crate::{
+    hydration::{HydrationCtx, HydrationKey},
+    Comment, IntoView, View,
+};
+use cfg_if::cfg_if;
+use std::{cell::RefCell, fmt, ops::Deref, rc::Rc};
+cfg_if! {
+  if #[cfg(all(target_arch = "wasm32", feature = "web"))] {
+    use crate::{mount_child, prepare_to_move, unmount_child, MountKind, Mountable, Text};
+    use leptos_reactive::create_render_effect;
+    use wasm_bindgen::JsCast;
+  }
+}
+
+/// The internal representation of the [`DynChild`] core-component.
+#[derive(Clone, PartialEq, Eq)]
+pub struct DynChildRepr {
+    #[cfg(all(target_arch = "wasm32", feature = "web"))]
+    document_fragment: web_sys::DocumentFragment,
+    #[cfg(debug_assertions)]
+    opening: Comment,
+    pub(crate) child: Rc<RefCell<Box<Option<View>>>>,
+    closing: Comment,
+    #[cfg(not(all(target_arch = "wasm32", feature = "web")))]
+    pub(crate) id: Option<HydrationKey>,
+}
+
+impl fmt::Debug for DynChildRepr {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        use fmt::Write;
+
+        f.write_str("<DynChild>\n")?;
+
+        let mut pad_adapter = pad_adapter::PadAdapter::new(f);
+
+        writeln!(
+            pad_adapter,
+            "{:#?}",
+            self.child.borrow().deref().deref().as_ref().unwrap()
+        )?;
+
+        f.write_str("</DynChild>")
+    }
+}
+
+#[cfg(all(target_arch = "wasm32", feature = "web"))]
+impl Mountable for DynChildRepr {
+    fn get_mountable_node(&self) -> web_sys::Node {
+        if self.document_fragment.child_nodes().length() != 0 {
+            self.document_fragment.clone().unchecked_into()
+        } else {
+            let opening = self.get_opening_node();
+
+            prepare_to_move(
+                &self.document_fragment,
+                &opening,
+                &self.closing.node,
+            );
+
+            self.document_fragment.clone().unchecked_into()
+        }
+    }
+
+    fn get_opening_node(&self) -> web_sys::Node {
+        #[cfg(debug_assertions)]
+        return self.opening.node.clone();
+
+        #[cfg(not(debug_assertions))]
+        return self
+            .child
+            .borrow()
+            .as_ref()
+            .as_ref()
+            .unwrap()
+            .get_opening_node();
+    }
+
+    fn get_closing_node(&self) -> web_sys::Node {
+        self.closing.node.clone()
+    }
+}
+
+impl DynChildRepr {
+    fn new_with_id(id: Option<HydrationKey>) -> Self {
+        let markers = (
+            Comment::new("</DynChild>", &id, true),
+            #[cfg(debug_assertions)]
+            Comment::new("<DynChild>", &id, false),
+        );
+
+        #[cfg(all(target_arch = "wasm32", feature = "web"))]
+        let document_fragment = {
+            let fragment = crate::document().create_document_fragment();
+
+            // Insert the comments into the document fragment
+            // so they can serve as our references when inserting
+            // future nodes
+            if !HydrationCtx::is_hydrating() {
+                #[cfg(debug_assertions)]
+                fragment
+                    .append_with_node_2(&markers.1.node, &markers.0.node)
+                    .unwrap();
+                #[cfg(not(debug_assertions))]
+                fragment.append_with_node_1(&markers.0.node).unwrap();
+            }
+
+            fragment
+        };
+
+        Self {
+            #[cfg(all(target_arch = "wasm32", feature = "web"))]
+            document_fragment,
+            #[cfg(debug_assertions)]
+            opening: markers.1,
+            child: Default::default(),
+            closing: markers.0,
+            #[cfg(not(all(target_arch = "wasm32", feature = "web")))]
+            id,
+        }
+    }
+}
+
+/// Represents any [`View`] that can change over time.
+pub struct DynChild<CF, N>
+where
+    CF: Fn() -> N + 'static,
+    N: IntoView,
+{
+    id: Option<HydrationKey>,
+    child_fn: CF,
+}
+
+impl<CF, N> DynChild<CF, N>
+where
+    CF: Fn() -> N + 'static,
+    N: IntoView,
+{
+    /// Creates a new dynamic child which will re-render whenever it's
+    /// signal dependencies change.
+    #[track_caller]
+    #[inline(always)]
+    pub fn new(child_fn: CF) -> Self {
+        Self::new_with_id(HydrationCtx::id(), child_fn)
+    }
+
+    #[doc(hidden)]
+    #[track_caller]
+    #[inline(always)]
+    pub const fn new_with_id(id: Option<HydrationKey>, child_fn: CF) -> Self {
+        Self { id, child_fn }
+    }
+}
+
+impl<CF, N> IntoView for DynChild<CF, N>
+where
+    CF: Fn() -> N + 'static,
+    N: IntoView,
+{
+    #[cfg_attr(
+        any(debug_assertions, feature = "ssr"),
+        instrument(level = "trace", name = "<DynChild />", skip_all)
+    )]
+    #[inline]
+    fn into_view(self) -> View {
+        // concrete inner function
+        #[inline(never)]
+        fn create_dyn_view(
+            component: DynChildRepr,
+            child_fn: Box<dyn Fn() -> View>,
+        ) -> DynChildRepr {
+            #[cfg(all(target_arch = "wasm32", feature = "web"))]
+            let closing = component.closing.node.clone();
+
+            let child = component.child.clone();
+
+            #[cfg(all(
+                debug_assertions,
+                target_arch = "wasm32",
+                feature = "web"
+            ))]
+            let span = tracing::Span::current();
+
+            #[cfg(all(target_arch = "wasm32", feature = "web"))]
+            create_render_effect(
+                move |prev_run: Option<Option<web_sys::Node>>| {
+                    #[cfg(debug_assertions)]
+                    let _guard = span.enter();
+
+                    let new_child = child_fn().into_view();
+
+                    let mut child_borrow = child.borrow_mut();
+
+                    // Is this at least the second time we are loading a child?
+                    if let Some(prev_t) = prev_run {
+                        let child = child_borrow.take().unwrap();
+
+                        // We need to know if our child wasn't moved elsewhere.
+                        // If it was, `DynChild` no longer "owns" that child, and
+                        // is therefore no longer sound to unmount it from the DOM
+                        // or to reuse it in the case of a text node
+
+                        // TODO check does this still detect moves correctly?
+                        let was_child_moved = prev_t.is_none()
+                            && child
+                                .get_closing_node()
+                                .next_non_view_marker_sibling()
+                                .as_ref()
+                                != Some(&closing);
+
+                        // If the previous child was a text node, we would like to
+                        // make use of it again if our current child is also a text
+                        // node
+                        let ret = if let Some(prev_t) = prev_t {
+                            // Here, our child is also a text node
+
+                            // nb: the match/ownership gymnastics here
+                            // are so that, if we can reuse the text node,
+                            // we can take ownership of new_t so we don't clone
+                            // the contents, which in O(n) on the length of the text
+                            if matches!(new_child, View::Text(_)) {
+                                if !was_child_moved && child != new_child {
+                                    let mut new_t = match new_child {
+                                        View::Text(t) => t,
+                                        _ => unreachable!(),
+                                    };
+                                    prev_t
+                                        .unchecked_ref::<web_sys::Text>()
+                                        .set_data(&new_t.content);
+
+                                    // replace new_t's text node with the prev node
+                                    // see discussion: https://github.com/leptos-rs/leptos/pull/1472
+                                    new_t.node = prev_t.clone();
+
+                                    let new_child = View::Text(new_t);
+                                    **child_borrow = Some(new_child);
+
+                                    Some(prev_t)
+                                } else {
+                                    let new_t = new_child.as_text().unwrap();
+                                    mount_child(
+                                        MountKind::Before(&closing),
+                                        &new_child,
+                                    );
+
+                                    **child_borrow = Some(new_child.clone());
+
+                                    Some(new_t.node.clone())
+                                }
+                            }
+                            // Child is not a text node, so we can remove the previous
+                            // text node
+                            else {
+                                if !was_child_moved && child != new_child {
+                                    // Remove the text
+                                    closing
+                                        .previous_non_view_marker_sibling()
+                                        .unwrap()
+                                        .unchecked_into::<web_sys::Element>()
+                                        .remove();
+                                }
+
+                                // Mount the new child, and we're done
+                                mount_child(
+                                    MountKind::Before(&closing),
+                                    &new_child,
+                                );
+
+                                **child_borrow = Some(new_child);
+
+                                None
+                            }
+                        }
+                        // Otherwise, the new child can still be a text node,
+                        // but we know the previous child was not, so no special
+                        // treatment here
+                        else {
+                            // Technically, I think this check shouldn't be necessary, but
+                            // I can imagine some edge case that the child changes while
+                            // hydration is ongoing
+                            if !HydrationCtx::is_hydrating() {
+                                let same_child = child == new_child;
+                                if !was_child_moved && !same_child {
+                                    // Remove the child
+                                    let start = child.get_opening_node();
+                                    let end = &closing;
+
+                                    match child {
+                                        View::CoreComponent(
+                                            crate::CoreComponent::DynChild(
+                                                child,
+                                            ),
+                                        ) => {
+                                            let start =
+                                                child.get_opening_node();
+                                            let end = child.closing.node;
+                                            prepare_to_move(
+                                                &child.document_fragment,
+                                                &start,
+                                                &end,
+                                            );
+                                        }
+                                        View::Component(child) => {
+                                            let start =
+                                                child.get_opening_node();
+                                            let end = child.closing.node;
+                                            prepare_to_move(
+                                                &child.document_fragment,
+                                                &start,
+                                                &end,
+                                            );
+                                        }
+                                        _ => unmount_child(&start, end),
+                                    }
+                                }
+
+                                // Mount the new child
+                                // If it's the same child, don't re-mount
+                                if !same_child {
+                                    mount_child(
+                                        MountKind::Before(&closing),
+                                        &new_child,
+                                    );
+                                }
+                            }
+
+                            // We want to reuse text nodes, so hold onto it if
+                            // our child is one
+                            let t =
+                                new_child.get_text().map(|t| t.node.clone());
+
+                            **child_borrow = Some(new_child);
+
+                            t
+                        };
+
+                        ret
+                    }
+                    // Otherwise, we know for sure this is our first time
+                    else {
+                        // If it's a text node, we want to use the old text node
+                        // as the text node for the DynChild, rather than the new
+                        // text node being created during hydration
+                        let new_child = if HydrationCtx::is_hydrating()
+                            && new_child.get_text().is_some()
+                        {
+                            let t = closing
+                                .previous_non_view_marker_sibling()
+                                .unwrap()
+                                .unchecked_into::<web_sys::Text>();
+
+                            let new_child = match new_child {
+                                View::Text(text) => text,
+                                _ => unreachable!(),
+                            };
+                            t.set_data(&new_child.content);
+                            View::Text(Text {
+                                node: t.unchecked_into(),
+                                content: new_child.content,
+                            })
+                        } else {
+                            new_child
+                        };
+
+                        // If we are not hydrating, we simply mount the child
+                        if !HydrationCtx::is_hydrating() {
+                            mount_child(
+                                MountKind::Before(&closing),
+                                &new_child,
+                            );
+                        }
+
+                        // We want to update text nodes, rather than replace them, so
+                        // make sure to hold onto the text node
+                        let t = new_child.get_text().map(|t| t.node.clone());
+
+                        **child_borrow = Some(new_child);
+
+                        t
+                    }
+                },
+            );
+
+            #[cfg(not(all(target_arch = "wasm32", feature = "web")))]
+            {
+                let new_child = child_fn().into_view();
+
+                **child.borrow_mut() = Some(new_child);
+            }
+
+            component
+        }
+
+        // monomorphized outer function
+        let Self { id, child_fn } = self;
+
+        let component = DynChildRepr::new_with_id(id);
+        let component = create_dyn_view(
+            component,
+            Box::new(move || child_fn().into_view()),
+        );
+
+        View::CoreComponent(crate::CoreComponent::DynChild(component))
+    }
+}
+
+cfg_if! {
+    if #[cfg(all(target_arch = "wasm32", feature = "web"))] {
+        use web_sys::Node;
+
+        pub(crate) trait NonViewMarkerSibling {
+            fn next_non_view_marker_sibling(&self) -> Option<Node>;
+
+            fn previous_non_view_marker_sibling(&self) -> Option<Node>;
+        }
+
+        impl NonViewMarkerSibling for web_sys::Node {
+            #[cfg_attr(not(debug_assertions), inline(always))]
+            fn next_non_view_marker_sibling(&self) -> Option<Node> {
+                cfg_if! {
+                    if #[cfg(debug_assertions)] {
+                        self.next_sibling().and_then(|node| {
+                            if node.text_content().unwrap_or_default().trim().starts_with("leptos-view") {
+                                node.next_sibling()
+                            } else {
+                                Some(node)
+                            }
+                        })
+                    } else {
+                        self.next_sibling()
+                    }
+                }
+            }
+
+            #[cfg_attr(not(debug_assertions), inline(always))]
+            fn previous_non_view_marker_sibling(&self) -> Option<Node> {
+                cfg_if! {
+                    if #[cfg(debug_assertions)] {
+                        self.previous_sibling().and_then(|node| {
+                            if node.text_content().unwrap_or_default().trim().starts_with("leptos-view") {
+                                node.previous_sibling()
+                            } else {
+                                Some(node)
+                            }
+                        })
+                    } else {
+                        self.previous_sibling()
+                    }
+                }
+            }
+        }
+    }
+}

leptos_dom/src/components/errors.rs

@@ -0,0 +1,166 @@
+use crate::{HydrationCtx, IntoView};
+use cfg_if::cfg_if;
+use leptos_reactive::{signal_prelude::*, use_context};
+use server_fn::error::Error;
+use std::{borrow::Cow, collections::HashMap};
+
+/// A struct to hold all the possible errors that could be provided by child Views
+#[derive(Debug, Clone, Default)]
+#[repr(transparent)]
+pub struct Errors(HashMap<ErrorKey, Error>);
+
+/// A unique key for an error that occurs at a particular location in the user interface.
+#[derive(Debug, Default, Clone, PartialEq, Eq, Hash)]
+#[repr(transparent)]
+pub struct ErrorKey(Cow<'static, str>);
+
+impl<T> From<T> for ErrorKey
+where
+    T: Into<Cow<'static, str>>,
+{
+    #[inline(always)]
+    fn from(key: T) -> ErrorKey {
+        ErrorKey(key.into())
+    }
+}
+
+impl IntoIterator for Errors {
+    type Item = (ErrorKey, Error);
+    type IntoIter = IntoIter;
+
+    #[inline(always)]
+    fn into_iter(self) -> Self::IntoIter {
+        IntoIter(self.0.into_iter())
+    }
+}
+
+/// An owning iterator over all the errors contained in the [`Errors`] struct.
+#[repr(transparent)]
+pub struct IntoIter(std::collections::hash_map::IntoIter<ErrorKey, Error>);
+
+impl Iterator for IntoIter {
+    type Item = (ErrorKey, Error);
+
+    #[inline(always)]
+    fn next(
+        &mut self,
+    ) -> std::option::Option<<Self as std::iter::Iterator>::Item> {
+        self.0.next()
+    }
+}
+
+/// An iterator over all the errors contained in the [`Errors`] struct.
+#[repr(transparent)]
+pub struct Iter<'a>(std::collections::hash_map::Iter<'a, ErrorKey, Error>);
+
+impl<'a> Iterator for Iter<'a> {
+    type Item = (&'a ErrorKey, &'a Error);
+
+    #[inline(always)]
+    fn next(
+        &mut self,
+    ) -> std::option::Option<<Self as std::iter::Iterator>::Item> {
+        self.0.next()
+    }
+}
+
+impl<T, E> IntoView for Result<T, E>
+where
+    T: IntoView + 'static,
+    E: Into<Error>,
+{
+    fn into_view(self) -> crate::View {
+        let id = ErrorKey(
+            HydrationCtx::peek()
+                .map(|n| n.to_string())
+                .unwrap_or_default()
+                .into(),
+        );
+        let errors = use_context::<RwSignal<Errors>>();
+        match self {
+            Ok(stuff) => {
+                if let Some(errors) = errors {
+                    errors.update(|errors| {
+                        errors.0.remove(&id);
+                    });
+                }
+                stuff.into_view()
+            }
+            Err(error) => {
+                let error = error.into();
+                match errors {
+                    Some(errors) => {
+                        errors.update({
+                            #[cfg(all(
+                                target_arch = "wasm32",
+                                feature = "web"
+                            ))]
+                            let id = id.clone();
+                            move |errors: &mut Errors| errors.insert(id, error)
+                        });
+
+                        // remove the error from the list if this drops,
+                        // i.e., if it's in a DynChild that switches from Err to Ok
+                        // Only can run on the client, will panic on the server
+                        cfg_if! {
+                          if #[cfg(all(target_arch = "wasm32", feature = "web"))] {
+                            use leptos_reactive::{on_cleanup, queue_microtask};
+                            on_cleanup(move || {
+                              queue_microtask(move || {
+                                errors.update(|errors: &mut Errors| {
+                                  errors.remove(&id);
+                                });
+                              });
+                            });
+                          }
+                        }
+                    }
+                    None => {
+                        #[cfg(debug_assertions)]
+                        warn!(
+                            "No ErrorBoundary components found! Returning \
+                             errors will not be handled and will silently \
+                             disappear"
+                        );
+                    }
+                }
+                ().into_view()
+            }
+        }
+    }
+}
+
+impl Errors {
+    /// Returns `true` if there are no errors.
+    #[inline(always)]
+    pub fn is_empty(&self) -> bool {
+        self.0.is_empty()
+    }
+
+    /// Add an error to Errors that will be processed by `<ErrorBoundary/>`
+    pub fn insert<E>(&mut self, key: ErrorKey, error: E)
+    where
+        E: Into<Error>,
+    {
+        self.0.insert(key, error.into());
+    }
+
+    /// Add an error with the default key for errors outside the reactive system
+    pub fn insert_with_default_key<E>(&mut self, error: E)
+    where
+        E: Into<Error>,
+    {
+        self.0.insert(Default::default(), error.into());
+    }
+
+    /// Remove an error to Errors that will be processed by `<ErrorBoundary/>`
+    pub fn remove(&mut self, key: &ErrorKey) -> Option<Error> {
+        self.0.remove(key)
+    }
+
+    /// An iterator over all the errors, in arbitrary order.
+    #[inline(always)]
+    pub fn iter(&self) -> Iter<'_> {
+        Iter(self.0.iter())
+    }
+}

leptos_dom/src/components/fragment.rs

@@ -0,0 +1,117 @@
+use crate::{
+    hydration::HydrationKey, ComponentRepr, HydrationCtx, IntoView, View,
+};
+
+/// Trait for converting any iterable into a [`Fragment`].
+pub trait IntoFragment {
+    /// Consumes this type, returning [`Fragment`].
+    fn into_fragment(self) -> Fragment;
+}
+
+impl<I, V> IntoFragment for I
+where
+    I: IntoIterator<Item = V>,
+    V: IntoView,
+{
+    #[cfg_attr(
+        any(debug_assertions, feature = "ssr"),
+        instrument(level = "trace", skip_all,)
+    )]
+    fn into_fragment(self) -> Fragment {
+        self.into_iter().map(|v| v.into_view()).collect()
+    }
+}
+
+/// Represents a group of [`views`](View).
+#[must_use = "You are creating a Fragment but not using it. An unused view can \
+              cause your view to be rendered as () unexpectedly, and it can \
+              also cause issues with client-side hydration."]
+#[derive(Debug, Clone)]
+pub struct Fragment {
+    id: Option<HydrationKey>,
+    /// The nodes contained in the fragment.
+    pub nodes: Vec<View>,
+    #[cfg(debug_assertions)]
+    pub(crate) view_marker: Option<String>,
+}
+
+impl FromIterator<View> for Fragment {
+    fn from_iter<T: IntoIterator<Item = View>>(iter: T) -> Self {
+        Fragment::new(iter.into_iter().collect())
+    }
+}
+
+impl From<View> for Fragment {
+    fn from(view: View) -> Self {
+        Fragment::new(vec![view])
+    }
+}
+
+impl From<Fragment> for View {
+    fn from(value: Fragment) -> Self {
+        let mut frag = ComponentRepr::new_with_id("", value.id);
+
+        #[cfg(debug_assertions)]
+        {
+            frag.view_marker = value.view_marker;
+        }
+
+        frag.children = value.nodes;
+
+        frag.into()
+    }
+}
+
+impl Fragment {
+    /// Creates a new [`Fragment`] from a [`Vec<Node>`].
+    #[inline(always)]
+    pub fn new(nodes: Vec<View>) -> Self {
+        Self::new_with_id(HydrationCtx::id(), nodes)
+    }
+
+    /// Creates a new [`Fragment`] from a function that returns [`Vec<Node>`].
+    #[inline(always)]
+    pub fn lazy(nodes: impl FnOnce() -> Vec<View>) -> Self {
+        Self::new_with_id(HydrationCtx::id(), nodes())
+    }
+
+    /// Creates a new [`Fragment`] with the given hydration ID from a [`Vec<Node>`].
+    #[inline(always)]
+    pub const fn new_with_id(
+        id: Option<HydrationKey>,
+        nodes: Vec<View>,
+    ) -> Self {
+        Self {
+            id,
+            nodes,
+            #[cfg(debug_assertions)]
+            view_marker: None,
+        }
+    }
+
+    /// Gives access to the [`View`] children contained within the fragment.
+    #[inline(always)]
+    pub fn as_children(&self) -> &[View] {
+        &self.nodes
+    }
+
+    /// Returns the fragment's hydration ID.
+    #[inline(always)]
+    pub fn id(&self) -> &Option<HydrationKey> {
+        &self.id
+    }
+
+    #[cfg(debug_assertions)]
+    /// Adds an optional marker indicating the view macro source.
+    pub fn with_view_marker(mut self, marker: impl Into<String>) -> Self {
+        self.view_marker = Some(marker.into());
+        self
+    }
+}
+
+impl IntoView for Fragment {
+    #[cfg_attr(debug_assertions, instrument(level = "trace", name = "</>", skip_all, fields(children = self.nodes.len())))]
+    fn into_view(self) -> View {
+        self.into()
+    }
+}

leptos_dom/src/components/unit.rs

@@ -0,0 +1,73 @@
+use cfg_if::cfg_if;
+use std::fmt;
+
+cfg_if! {
+  if #[cfg(all(target_arch = "wasm32", feature = "web"))] {
+    use crate::Mountable;
+    use wasm_bindgen::JsCast;
+  } else {
+    use crate::hydration::HydrationKey;
+  }
+}
+
+use crate::{hydration::HydrationCtx, Comment, CoreComponent, IntoView, View};
+
+/// The internal representation of the [`Unit`] core-component.
+#[derive(Clone, PartialEq, Eq)]
+pub struct UnitRepr {
+    comment: Comment,
+    #[cfg(not(all(target_arch = "wasm32", feature = "web")))]
+    pub(crate) id: Option<HydrationKey>,
+}
+
+impl fmt::Debug for UnitRepr {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str("<() />")
+    }
+}
+
+impl Default for UnitRepr {
+    fn default() -> Self {
+        let id = HydrationCtx::id();
+
+        Self {
+            comment: Comment::new("<() />", &id, true),
+            #[cfg(not(all(target_arch = "wasm32", feature = "web")))]
+            id,
+        }
+    }
+}
+
+#[cfg(all(target_arch = "wasm32", feature = "web"))]
+impl Mountable for UnitRepr {
+    #[inline(always)]
+    fn get_mountable_node(&self) -> web_sys::Node {
+        self.comment.node.clone().unchecked_into()
+    }
+
+    #[inline(always)]
+    fn get_opening_node(&self) -> web_sys::Node {
+        self.comment.node.clone().unchecked_into()
+    }
+
+    #[inline(always)]
+    fn get_closing_node(&self) -> web_sys::Node {
+        self.comment.node.clone().unchecked_into()
+    }
+}
+
+/// The unit `()` leptos counterpart.
+#[derive(Clone, Copy, Debug)]
+pub struct Unit;
+
+impl IntoView for Unit {
+    #[cfg_attr(
+        any(debug_assertions, feature = "ssr"),
+        instrument(level = "trace", name = "<() />", skip_all)
+    )]
+    fn into_view(self) -> crate::View {
+        let component = UnitRepr::default();
+
+        View::CoreComponent(CoreComponent::Unit(component))
+    }
+}

leptos_dom/src/directive.rs

@@ -0,0 +1,83 @@
+use crate::{html::AnyElement, HtmlElement};
+use std::rc::Rc;
+
+/// Trait for a directive handler function.
+/// This is used so it's possible to use functions with one or two
+/// parameters as directive handlers.
+///
+/// You can use directives like the following.
+///
+/// ```
+/// # use leptos::{*, html::AnyElement};
+///
+/// // This doesn't take an attribute value
+/// fn my_directive(el: HtmlElement<AnyElement>) {
+///     // do sth
+/// }
+///
+/// // This requires an attribute value
+/// fn another_directive(el: HtmlElement<AnyElement>, params: i32) {
+///     // do sth
+/// }
+///
+/// #[component]
+/// pub fn MyComponent() -> impl IntoView {
+///     view! {
+///         // no attribute value
+///         <div use:my_directive></div>
+///
+///         // with an attribute value
+///         <div use:another_directive=8></div>
+///     }
+/// }
+/// ```
+///
+/// A directive is just syntactic sugar for
+///
+/// ```ignore
+/// let node_ref = create_node_ref();
+///
+/// create_effect(move |_| {
+///     if let Some(el) = node_ref.get() {
+///         directive_func(el, possibly_some_param);
+///     }
+/// });
+/// ```
+///
+/// A directive can be a function with one or two parameters.
+/// The first is the element the directive is added to and the optional
+/// second is the parameter that is provided in the attribute.
+pub trait Directive<T: ?Sized, P> {
+    /// Calls the handler function
+    fn run(&self, el: HtmlElement<AnyElement>, param: P);
+}
+
+impl<F> Directive<(HtmlElement<AnyElement>,), ()> for F
+where
+    F: Fn(HtmlElement<AnyElement>),
+{
+    fn run(&self, el: HtmlElement<AnyElement>, _: ()) {
+        self(el)
+    }
+}
+
+impl<F, P> Directive<(HtmlElement<AnyElement>, P), P> for F
+where
+    F: Fn(HtmlElement<AnyElement>, P),
+{
+    fn run(&self, el: HtmlElement<AnyElement>, param: P) {
+        self(el, param);
+    }
+}
+
+impl<T: ?Sized, P> Directive<T, P> for Rc<dyn Directive<T, P>> {
+    fn run(&self, el: HtmlElement<AnyElement>, param: P) {
+        (**self).run(el, param)
+    }
+}
+
+impl<T: ?Sized, P> Directive<T, P> for Box<dyn Directive<T, P>> {
+    fn run(&self, el: HtmlElement<AnyElement>, param: P) {
+        (**self).run(el, param);
+    }
+}