remove unnecessary Props imports

.gitignore

@@ -7,5 +7,3 @@ Cargo.lock
 **/*.rs.bk
 .DS_Store
 .idea
-.direnv
-.envrc

Cargo.toml

@@ -25,22 +25,22 @@ members = [
 exclude = ["benchmarks", "examples"]
 
 [workspace.package]
-version = "0.3.0-alpha"
+version = "0.2.5"
 
 [workspace.dependencies]
-leptos = { path = "./leptos", default-features = false, version = "0.3.0-alpha" }
-leptos_dom = { path = "./leptos_dom", default-features = false, version = "0.3.0-alpha" }
-leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.3.0-alpha" }
-leptos_macro = { path = "./leptos_macro", default-features = false, version = "0.3.0-alpha" }
-leptos_reactive = { path = "./leptos_reactive", default-features = false, version = "0.3.0-alpha" }
-leptos_server = { path = "./leptos_server", default-features = false, version = "0.3.0-alpha" }
-server_fn = { path = "./server_fn", default-features = false, version = "0.3.0-alpha" }
-server_fn_macro = { path = "./server_fn_macro", default-features = false, version = "0.3.0-alpha" }
-server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", default-features = false, version = "0.3.0-alpha" }
-leptos_config = { path = "./leptos_config", default-features = false, version = "0.3.0-alpha" }
-leptos_router = { path = "./router", version = "0.3.0-alpha" }
-leptos_meta = { path = "./meta", default-features = false, version = "0.3.0-alpha" }
-leptos_integration_utils = { path = "./integrations/utils", version = "0.3.0-alpha" }
+leptos = { path = "./leptos", default-features = false, version = "0.2.5" }
+leptos_dom = { path = "./leptos_dom", default-features = false, version = "0.2.5" }
+leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.2.5" }
+leptos_macro = { path = "./leptos_macro", default-features = false, version = "0.2.5" }
+leptos_reactive = { path = "./leptos_reactive", default-features = false, version = "0.2.5" }
+leptos_server = { path = "./leptos_server", default-features = false, version = "0.2.5" }
+server_fn = { path = "./server_fn", default-features = false, version = "0.2.5" }
+server_fn_macro = { path = "./server_fn_macro", default-features = false, version = "0.2.5" }
+server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", default-features = false, version = "0.2.5" }
+leptos_config = { path = "./leptos_config", default-features = false, version = "0.2.5" }
+leptos_router = { path = "./router", version = "0.2.5" }
+leptos_meta = { path = "./meta", default-features = false, version = "0.2.5" }
+leptos_integration_utils = { path = "./integrations/utils", version = "0.2.5" }
 
 [profile.release]
 codegen-units = 1

Makefile.toml

@@ -49,7 +49,6 @@ dependencies = [
 	{ name = "check", path = "examples/parent_child" },
 	{ name = "check", path = "examples/router" },
 	{ name = "check", path = "examples/session_auth_axum" },
-	{ name = "check", path = "examples/slots" },
 	{ name = "check", path = "examples/ssr_modes" },
 	{ name = "check", path = "examples/ssr_modes_axum" },
 	{ name = "check", path = "examples/tailwind" },
@@ -69,42 +68,15 @@ dependencies = [
 
 [tasks.test]
 clear = true
-dependencies = ["test-all", "test-leptos_macro-example", "doc-leptos_macro-example"]
+dependencies = ["test-all"]
 
 [tasks.test-all]
 command = "cargo"
 args = ["+nightly", "test-all-features"]
 install_crate = "cargo-all-features"
 
-[tasks.test-leptos_macro-example]
-description = "Tests the leptos_macro/example to check if macro handles doc comments correctly"
-command = "cargo"
-args = ["+nightly", "test", "--doc"]
-cwd = "leptos_macro/example"
-install_crate = false
-
-[tasks.doc-leptos_macro-example]
-description = "Docs the leptos_macro/example to check if macro handles doc comments correctly"
-command = "cargo"
-args = ["+nightly", "doc"]
-cwd = "leptos_macro/example"
-install_crate = false
-
-[tasks.test-examples]
-description = "Run all unit and web tests for examples"
-cwd = "examples"
-command = "cargo"
-args = ["make", "test-unit-and-web"]
-
-[tasks.verify-examples]
-description = "Run all quality checks and tests for examples"
-cwd = "examples"
-command = "cargo"
-args = ["make", "verify-flow"]
-
 [env]
-RUSTFLAGS = ""
-LEPTOS_OUTPUT_NAME="ci" # allows examples to check/build without cargo-leptos
+RUSTFLAGS=""
 
 [env.github-actions]
-RUSTFLAGS = "-D warnings"
+RUSTFLAGS="-D warnings"

README.md

@@ -6,7 +6,6 @@
 [![crates.io](https://img.shields.io/crates/v/leptos.svg)](https://crates.io/crates/leptos)
 [![docs.rs](https://docs.rs/leptos/badge.svg)](https://docs.rs/leptos)
 [![Discord](https://img.shields.io/discord/1031524867910148188?color=%237289DA&label=discord)](https://discord.gg/YdRAhS7eQB)
-[![Matrix](https://img.shields.io/badge/Matrix-leptos-grey?logo=matrix&labelColor=white&logoColor=black)](https://matrix.to/#/#leptos:matrix.org)
 
 # Leptos
 
@@ -66,9 +65,9 @@ Here are some resources for learning more about Leptos:
 
 ## `nightly` Note
 
-Most of the examples assume you’re using `nightly` version of Rust. For this, you can either set your toolchain globally or on per-project basis.
+Most of the examples assume you’re using `nightly` Rust.
 
-To set `nightly` as a default toolchain for all projects (and add the ability to compile Rust to WebAssembly, if you haven’t already):
+To set up your Rust toolchain using `nightly` (and add the ability to compile Rust to WebAssembly, if you haven’t already)
 
 ```
 rustup toolchain install nightly
@@ -76,14 +75,6 @@ rustup default nightly
 rustup target add wasm32-unknown-unknown
 ```
 
-If you'd like to use `nightly` only in your Leptos project however, add [`rust-toolchain.toml`](https://rust-lang.github.io/rustup/overrides.html#the-toolchain-file) file with the following content:
-
-```toml
-[toolchain]
-channel = "nightly"
-targets = ["wasm32-unknown-unknown"]
-```
-
 If you’re on `stable`, note the following:
 
 1. You need to enable the `"stable"` flag in `Cargo.toml`: `leptos = { version = "0.2", features = ["stable"] }`

benchmarks/src/reactive.rs

@@ -10,8 +10,8 @@ fn leptos_deep_creation(b: &mut Bencher) {
         create_scope(runtime, |cx| {
             let signal = create_rw_signal(cx, 0);
             let mut memos = Vec::<Memo<usize>>::new();
-            for _ in 0..1000usize {
-                let prev = memos.last().copied();
+            for i in 0..1000usize {
+                let prev = memos.get(i.saturating_sub(1)).copied();
                 if let Some(prev) = prev {
                     memos.push(create_memo(cx, move |_| prev.get() + 1));
                 } else {
@@ -34,8 +34,9 @@ fn leptos_deep_update(b: &mut Bencher) {
         create_scope(runtime, |cx| {
             let signal = create_rw_signal(cx, 0);
             let mut memos = Vec::<Memo<usize>>::new();
-            for _ in 0..1000usize {
-                if let Some(prev) = memos.last().copied() {
+            for i in 0..1000usize {
+                let prev = memos.get(i.saturating_sub(1)).copied();
+                if let Some(prev) = prev {
                     memos.push(create_memo(cx, move |_| prev.get() + 1));
                 } else {
                     memos.push(create_memo(cx, move |_| signal.get() + 1));
@@ -241,8 +242,9 @@ fn l021_deep_creation(b: &mut Bencher) {
         create_scope(runtime, |cx| {
             let signal = create_rw_signal(cx, 0);
             let mut memos = Vec::<Memo<usize>>::new();
-            for _ in 0..1000usize {
-                if let Some(prev) = memos.last().copied() {
+            for i in 0..1000usize {
+                let prev = memos.get(i.saturating_sub(1)).copied();
+                if let Some(prev) = prev {
                     memos.push(create_memo(cx, move |_| prev.get() + 1));
                 } else {
                     memos.push(create_memo(cx, move |_| signal.get() + 1));
@@ -264,8 +266,9 @@ fn l021_deep_update(b: &mut Bencher) {
         create_scope(runtime, |cx| {
             let signal = create_rw_signal(cx, 0);
             let mut memos = Vec::<Memo<usize>>::new();
-            for _ in 0..1000usize {
-                if let Some(prev) = memos.last().copied() {
+            for i in 0..1000usize {
+                let prev = memos.get(i.saturating_sub(1)).copied();
+                if let Some(prev) = prev {
                     memos.push(create_memo(cx, move |_| prev.get() + 1));
                 } else {
                     memos.push(create_memo(cx, move |_| signal.get() + 1));
@@ -441,8 +444,9 @@ fn sycamore_deep_creation(b: &mut Bencher) {
         let d = create_scope(|cx| {
             let signal = create_signal(cx, 0);
             let mut memos = Vec::<&ReadSignal<usize>>::new();
-            for _ in 0..1000usize {
-                if let Some(prev) = memos.last().copied() {
+            for i in 0..1000usize {
+                let prev = memos.get(i.saturating_sub(1)).copied();
+                if let Some(prev) = prev {
                     memos.push(create_memo(cx, move || *prev.get() + 1));
                 } else {
                     memos.push(create_memo(cx, move || *signal.get() + 1));
@@ -461,8 +465,9 @@ fn sycamore_deep_update(b: &mut Bencher) {
         let d = create_scope(|cx| {
             let signal = create_signal(cx, 0);
             let mut memos = Vec::<&ReadSignal<usize>>::new();
-            for _ in 0..1000usize {
-                if let Some(prev) = memos.last().copied() {
+            for i in 0..1000usize {
+                let prev = memos.get(i.saturating_sub(1)).copied();
+                if let Some(prev) = prev {
                     memos.push(create_memo(cx, move || *prev.get() + 1));
                 } else {
                     memos.push(create_memo(cx, move || *signal.get() + 1));

docs/COMMON_BUGS.md

@@ -28,52 +28,6 @@ let (a, set_a) = create_signal(cx, 0);
 let b = move || a () > 5;
 ```
 
-### Nested signal updates/reads triggering panic
-
-Sometimes you have nested signals: for example, hash-map that can change over time, each of whose values can also change over time:
-
-```rust
-#[component]
-pub fn App(cx: Scope) -> impl IntoView {
-    let resources = create_rw_signal(cx, HashMap::new());
-
-    let update = move |id: usize| {
-        resources.update(|resources| {
-            resources
-                .entry(id)
-                .or_insert_with(|| create_rw_signal(cx, 0))
-                .update(|amount| *amount += 1)
-        })
-    };
-
-    view! { cx,
-        <div>
-            <pre>{move || format!("{:#?}", resources.get().into_iter().map(|(id, resource)| (id, resource.get())).collect::<Vec<_>>())}</pre>
-            <button on:click=move |_| update(1)>"+"</button>
-        </div>
-    }
-}
-```
-
-Clicking the button twice will cause a panic, because of the nested signal *read*. Calling the `update` function on `resources` immediately takes out a mutable borrow on `resources`, then updates the `resource` signal—which re-runs the effect that reads from the signals, which tries to immutably access `resources` and panics. It's the nested update here which causes a problem, because the inner update triggers and effect that tries to read both signals while the outer is still updating.
-
-You can fix this fairly easily by using the [`Scope::batch()`](https://docs.rs/leptos/latest/leptos/struct.Scope.html#method.batch) method:
-
-```rust
-    let update = move |id: usize| {
-        cx.batch(move || {
-            resources.update(|resources| {
-                resources
-                    .entry(id)
-                    .or_insert_with(|| create_rw_signal(cx, 0))
-                    .update(|amount| *amount += 1)
-            })
-        });
-    };
-```
-
-This delays running any effects until after both updates are made, preventing the conflict entirely without requiring any other restructuring.
-
 ## Templates and the DOM
 
 ### `<input value=...>` doesn't update or stops updating

docs/book/src/SUMMARY.md

@@ -19,7 +19,6 @@
   - [Suspense](./async/11_suspense.md)
   - [Transition](./async/12_transition.md)
   - [Actions](./async/13_actions.md)
-- [Interlude: Projecting Children](./interlude_projecting_children.md)
 - [Responding to Changes with `create_effect`](./14_create_effect.md)
 - [Global State Management](./15_global_state.md)
 - [Router](./router/README.md)
@@ -28,24 +27,22 @@
   - [Params and Queries](./router/18_params_and_queries.md)
   - [`<A/>`](./router/19_a.md)
   - [`<Form/>`](./router/20_form.md)
-- [Interlude: Styling](./interlude_styling.md)
+- [Interlude: Styling — CSS, Tailwind, Style.rs, and more]()
 - [Metadata]()
-- [Server Side Rendering](./ssr/README.md)
-  - [`cargo-leptos`](./ssr/21_cargo_leptos.md)
-  - [The Life of a Page Load](./ssr/22_life_cycle.md)
-  - [Async Rendering and SSR “Modes”](./ssr/23_ssr_modes.md)
-  - [Hydration Footguns](./ssr/24_hydration_bugs.md)
-- [Server Functions]()
+- [SSR]()
+  - [Models of SSR]()
+  - [`cargo-leptos`]()
+  - [Hydration Footguns]()
 - [Request/Response]()
   - [Extractors]()
     - [Axum]()
     - [Actix]()
   - [Headers]()
   - [Cookies]()
-- [Building Full-Stack Apps]()
+- [Server Functions]()
   - [Actions]()
   - [Forms]()
   - [`<ActionForm/>`s]()
   - [Turning off WebAssembly]()
 - [Advanced Reactivity]()
-- [Appendix: Optimizing WASM Binary Size](./appendix_binary_size.md)
+- [Appendix: Optimizing WASM Binary Size]()

docs/book/src/appendix_binary_size.md

@@ -1,58 +0,0 @@
-# Appendix: Optimizing WASM Binary Size
-
-One of the primary downsides of deploying a Rust/WebAssembly frontend app is that splitting a WASM file into smaller chunks to be dynamically loaded is significantly more difficult than splitting a JavaScript bundle. There have been experiments like [`wasm-split`](https://emscripten.org/docs/optimizing/Module-Splitting.html) in the Emscripten ecosystem but at present there’s no way to split and dynamically load a Rust/`wasm-bindgen` binary. This means that the whole WASM binary needs to be loaded before your app becomes interactive. Because the WASM format is designed for streaming compilation, WASM files are much faster to compile per kilobyte than JavaScript files. (For a deeper look, you can [read this great article from the Mozilla team](https://hacks.mozilla.org/2018/01/making-webassembly-even-faster-firefoxs-new-streaming-and-tiering-compiler/) on streaming WASM compilation.)
-
-Still, it’s important to ship the smallest WASM binary to users that you can, as it will reduce their network usage and make your app interactive as quickly as possible.
-
-So what are some practical steps?
-
-## Things to Do
-
-1. Make sure you’re looking at a release build. (Debug builds are much, much larger.)
-2. Add a release profile for WASM that optimizes for size, not speed.
-
-For a `cargo-leptos` project, for example, you can add this to your `Cargo.toml`:
-
-```toml
-[profile.wasm-release]
-inherits = "release"
-opt-level = 'z'
-lto = true
-codegen-units = 1
-
-# ....
-
-[package.metadata.leptos]
-# ....
-lib-profile-release = "wasm-release"
-```
-
-This will hyper-optimize the WASM for your release build for size, while keeping your server build optimized for speed. (For a pure client-rendered app without server considerations, just use the `[profile.wasm-release]` block as your `[profile.release]`.)
-
-3. Always serve compressed WASM in production. WASM tends to compress very well, typically shrinking to less than 50% its uncompressed size, and it’s trivial to enable compression for static files being served from Actix or Axum.
-
-4. If you’re using nightly Rust, you can rebuild the standard library with this same profile rather than the prebuilt standard library that’s distributed with the `wasm32-unknown-unknown` target.
-
-To do this, create a file in your project at `.cargo/config.toml`
-
-```toml
-[unstable]
-build-std = ["std", "panic_abort", "core", "alloc"]
-build-std-features = ["panic_immediate_abort"]
-```
-
-5. One of the sources of binary size in WASM binaries can be `serde` serialization/deserialization code. Leptos uses `serde` by default to serialize and deserialize resources created with `create_resource`. You might try experimenting with the `miniserde` and `serde-lite` features, which allow you to use those crates for serialization and deserialization instead; each only implements a subset of `serde`’s functionality, but typically optimizes for size over speed.
-
-## Things to Avoid
-
-There are certain crates that tend to inflate binary sizes. For example, the `regex` crate with its default features adds about 500kb to a WASM binary (largely because it has to pull in Unicode table data!) In a size-conscious setting, you might consider avoiding regexes in general, or even dropping down and calling browser APIs to use the built-in regex engine instead. (This is what `leptos_router` does on the few occasions it needs a regular expression.)
-
-In general, Rust’s commitment to runtime performance is sometimes at odds with a commitment to a small binary. For example, Rust monomorphizes generic functions, meaning it creates a distinct copy of the function for each generic type it’s called with. This is significantly faster than dynamic dispatch, but increases binary size. Leptos tries to balance runtime performance with binary size considerations pretty carefully; but you might find that writing code that uses many generics tends to increase binary size. For example, if you have a generic component with a lot of code in its body and call it with four different types, remember that the compiler could include four copies of that same code. Refactoring to use a concrete inner function or helper can often maintain performance and ergonomics while reducing binary size.
-
-## A Final Thought
-
-Remember that in a server-rendered app, JS bundle size/WASM binary size affects only _one_ thing: time to interactivity on the first load. This is very important to a good user experience—nobody wants to click a button three times and have it do nothing because the interactive code is still loading—but it is not the only important measure.
-
-It’s especially worth remembering that streaming in a single WASM binary means all subsequent navigations are nearly instantaneous, depending only on any additional data loading. Precisely because your WASM binary is _not_ bundle split, navigating to a new route does not require loading additional JS/WASM, as it does in nearly every JavaScript framework. Is this copium? Maybe. Or maybe it’s just an honest trade-off between the two approaches!
-
-Always take the opportunity to optimize the low-hanging fruit in your application. And always test your app under real circumstances with real user network speeds and devices before making any heroic efforts.

docs/book/src/async/11_suspense.md

@@ -26,11 +26,11 @@ let b = create_resource(cx, count2, |count| async move { load_b(count).await });
 view! { cx,
     <h1>"My Data"</h1>
     {move || match (a.read(cx), b.read(cx)) {
+        _ => view! { cx, <p>"Loading..."</p> }.into_view(cx),
         (Some(a), Some(b)) => view! { cx,
             <ShowA a/>
             <ShowA b/>
-        }.into_view(cx),
-        _ => view! { cx, <p>"Loading..."</p> }.into_view(cx)
+        }.into_view(cx)
     }}
 }
 ```

docs/book/src/async/README.md

@@ -1,7 +1,7 @@
 # Working with `async`
 
 So far we’ve only been working with synchronous users interfaces: You provide some input,
-the app immediately processes it and updates the interface. This is great, but is a tiny
+the app immediately process it and updates the interface. This is great, but is a tiny
 subset of what web applications do. In particular, most web apps have to deal with some kind
 of asynchronous data loading, usually loading something from an API.
 

docs/book/src/interlude_projecting_children.md

@@ -1,177 +0,0 @@
-# Projecting Children
-
-As you build components you may occasionally find yourself wanting to “project” children through multiple layers of components.
-
-## The Problem
-
-Consider the following:
-
-```rust
-pub fn LoggedIn<F, IV>(cx: Scope, fallback: F, children: ChildrenFn) -> impl IntoView
-where
-    F: Fn(Scope) -> IV + 'static,
-    IV: IntoView,
-{
-    view! { cx,
-        <Suspense
-            fallback=|| ()
-        >
-            <Show
-				// check whether user is verified
-				// by reading from the resource
-                when=move || todo!()
-                fallback=fallback
-            >
-				{children(cx)}
-			</Show>
-        </Suspense>
-    }
-}
-```
-
-This is pretty straightforward: when the user is logged in, we want to show `children`. Until if the user is not logged in, we want to show `fallback`. And while we’re waiting to find out, we just render `()`, i.e., nothing.
-
-In other words, we want to pass the children of `<WhenLoaded/>` _through_ the `<Suspense/>` component to become the children of the `<Show/>`. This is what I mean by “projection.”
-
-This won’t compile.
-
-```
-error[E0507]: cannot move out of `fallback`, a captured variable in an `Fn` closure
-error[E0507]: cannot move out of `children`, a captured variable in an `Fn` closure
-```
-
-The problem here is that both `<Suspense/>` and `<Show/>` need to be able to construct their `children` multiple times. The first time you construct `<Suspense/>`’s children, it would take ownership of `fallback` and `children` to move them into the invocation of `<Show/>`, but then they're not available for future `<Suspense/>` children construction.
-
-## The Details
-
-> Feel free to skip ahead to the solution.
-
-If you want to really understand the issue here, it may help to look at the expanded `view` macro. Here’s a cleaned-up version:
-
-```rust
-Suspense(
-    cx,
-    ::leptos::component_props_builder(&Suspense)
-        .fallback(|| ())
-        .children({
-            // fallback and children are moved into this closure
-            Box::new(move |cx| {
-                {
-                    // fallback and children captured here
-                    leptos::Fragment::lazy(|| {
-                        vec![
-                            (Show(
-                                cx,
-                                ::leptos::component_props_builder(&Show)
-                                    .when(|| true)
-									// but fallback is moved into Show here
-                                    .fallback(fallback)
-									// and children is moved into Show here
-                                    .children(children)
-                                    .build(),
-                            )
-                            .into_view(cx)),
-                        ]
-                    })
-                }
-            })
-        })
-        .build(),
-)
-```
-
-All components own their props; so the `<Show/>` in this case can’t be called because it only has captured references to `fallback` and `children`.
-
-## Solution
-
-However, both `<Suspense/>` and `<Show/>` take `ChildrenFn`, i.e., their `children` should implement the `Fn` type so they can be called multiple times with only an immutable reference. This means we don’t need to own `children` or `fallback`; we just need to be able to pass `'static` references to them.
-
-We can solve this problem by using the [`store_value`](https://docs.rs/leptos/latest/leptos/fn.store_value.html) primitive. This essentially stores a value in the reactive system, handing ownership off to the framework in exchange for a reference that is, like signals, `Copy` and `'static`, which we can access or modify through certain methods.
-
-In this case, it’s really simple:
-
-```rust
-pub fn LoggedIn<F, IV>(cx: Scope, fallback: F, children: ChildrenFn) -> impl IntoView
-where
-    F: Fn(Scope) -> IV + 'static,
-    IV: IntoView,
-{
-    let fallback = store_value(cx, fallback);
-    let children = store_value(cx, children);
-    view! { cx,
-        <Suspense
-            fallback=|| ()
-        >
-            <Show
-                when=|| todo!()
-                fallback=move |cx| fallback.with_value(|fallback| fallback(cx))
-            >
-                {children.with_value(|children| children(cx))}
-            </Show>
-        </Suspense>
-    }
-}
-```
-
-At the top level, we store both `fallback` and `children` in the reactive scope owned by `LoggedIn`. Now we can simply move those references down through the other layers into the `<Show/>` component and call them there.
-
-## A Final Note
-
-Note that this works because `<Show/>` and `<Suspense/>` only need an immutable reference to their children (which `.with_value` can give it), not ownership.
-
-In other cases, you may need to project owned props through a function that takes `ChildrenFn` and therefore needs to be called more than once. In this case, you may find the `clone:` helper in the`view` macro helpful.
-
-Consider this example
-
-```rust
-#[component]
-pub fn App(cx: Scope) -> impl IntoView {
-    let name = "Alice".to_string();
-    view! { cx,
-        <Outer>
-            <Inner>
-                <Inmost name=name.clone()/>
-            </Inner>
-        </Outer>
-    }
-}
-
-#[component]
-pub fn Outer(cx: Scope, children: ChildrenFn) -> impl IntoView {
-    children(cx)
-}
-
-#[component]
-pub fn Inner(cx: Scope, children: ChildrenFn) -> impl IntoView {
-    children(cx)
-}
-
-#[component]
-pub fn Inmost(cx: Scope, name: String) -> impl IntoView {
-    view! { cx,
-        <p>{name}</p>
-    }
-}
-```
-
-Even with `name=name.clone()`, this gives the error
-
-```
-cannot move out of `name`, a captured variable in an `Fn` closure
-```
-
-It’s captured through multiple levels of children that need to run more than once, and there’s no obvious way to clone it _into_ the children.
-
-In this case, the `clone:` syntax comes in handy. Calling `clone:name` will clone `name` _before_ moving it into `<Inner/>`’s children, which solves our ownership issue.
-
-```rust
-view! { cx,
-	<Outer>
-		<Inner clone:name>
-			<Inmost name=name.clone()/>
-		</Inner>
-	</Outer>
-}
-```
-
-These issues can be a little tricky to understand or debug, because of the opacity of the `view` macro. But in general, they can always be solved.

docs/book/src/interlude_styling.md

@@ -1,112 +0,0 @@
-# Interlude: Styling
-
-Anyone creating a website or application soon runs into the question of styling. For a small app, a single CSS file is probably plenty to style your user interface. But as an application grows, many developers find that plain CSS becomes increasingly hard to manage.
-
-Some frontend frameworks (like Angular, Vue, and Svelte) provide built-in ways to scope your CSS to particular components, making it easier to manage styles across a whole application without styles meant to modify one small component having a global effect. Other frameworks (like React or Solid) don’t provide built-in CSS scoping, but rely on libraries in the ecosystem to do it for them. Leptos is in this latter camp: the framework itself has no opinions about CSS at all, but provides a few tools and primitives that allow others to build styling libraries.
-
-Here are a few different approaches to styling your Leptos app, other than plain CSS.
-
-## TailwindCSS: Utility-first CSS
-
-[TailwindCSS](https://tailwindcss.com/) is a popular utility-first CSS library. It allows you to style your application by using inline utility classes, with a custom CLI tool that scans your files for Tailwind class names and bundles the necessary CSS.
-
-This allows you to write components like this:
-
-```rust
-#[component]
-fn Home(cx: Scope) -> impl IntoView {
-    let (count, set_count) = create_signal(cx, 0);
-
-    view! { cx,
-        <main class="my-0 mx-auto max-w-3xl text-center">
-            <h2 class="p-6 text-4xl">"Welcome to Leptos with Tailwind"</h2>
-            <p class="px-10 pb-10 text-left">"Tailwind will scan your Rust files for Tailwind class names and compile them into a CSS file."</p>
-            <button
-                class="bg-sky-600 hover:bg-sky-700 px-5 py-3 text-white rounded-lg"
-                on:click=move |_| set_count.update(|count| *count += 1)
-            >
-                {move || if count() == 0 {
-                    "Click me!".to_string()
-                } else {
-                    count().to_string()
-                }}
-            </button>
-        </main>
-    }
-}
-```
-
-It can be a little complicated to set up the Tailwind integration at first, but you can check out our two examples of how to use Tailwind with a [client-side-rendered `trunk` application](https://github.com/leptos-rs/leptos/tree/main/examples/tailwind_csr_trunk) or with a [server-rendered `cargo-leptos` application](https://github.com/leptos-rs/leptos/tree/main/examples/tailwind). `cargo-leptos` also has some [built-in Tailwind support](https://github.com/leptos-rs/cargo-leptos#site-parameters) that you can use as an alternative to Tailwind’s CLI.
-
-## Stylers: Compile-time CSS Extraction
-
-[Stylers](https://github.com/abishekatp/stylers) is a compile-time scoped CSS library that lets you declare scoped CSS in the body of your component. Stylers will extract this CSS at compile time into CSS files that you can then import into your app, which means that it doesn’t add anything to the WASM binary size of your application.
-
-This allows you to write components like this:
-
-```rust
-use stylers::style;
-
-#[component]
-pub fn App(cx: Scope) -> impl IntoView {
-    let styler_class = style! { "App",
-        #two{
-            color: blue;
-        }
-        div.one{
-            color: red;
-            content: raw_str(r#"\hello"#);
-            font: "1.3em/1.2" Arial, Helvetica, sans-serif;
-        }
-        div {
-            border: 1px solid black;
-            margin: 25px 50px 75px 100px;
-            background-color: lightblue;
-        }
-        h2 {
-            color: purple;
-        }
-        @media only screen and (max-width: 1000px) {
-            h3 {
-                background-color: lightblue;
-                color: blue
-            }
-        }
-    };
-
-    view! { cx, class = styler_class,
-        <div class="one">
-            <h1 id="two">"Hello"</h1>
-            <h2>"World"</h2>
-            <h2>"and"</h2>
-            <h3>"friends!"</h3>
-        </div>
-    }
-}
-```
-
-## Styled: Runtime CSS Scoping
-
-[Styled](https://github.com/eboody/styled) is a runtime scoped CSS library that integrates well with Leptos. It lets you declare scoped CSS in the body of your component function, and then applies those styles at runtime.
-
-```rust
-use styled::style;
-
-#[component]
-pub fn MyComponent(cx: Scope) -> impl IntoView {
-    let styles = style!(
-      div {
-        background-color: red;
-        color: white;
-      }
-    );
-
-    styled::view! { cx, styles,
-        <div>"This text should be red with white text."</div>
-    }
-}
-```
-
-## Contributions Welcome
-
-Leptos has no opinions on how you style your website or app, but we’re very happy to provide support to any tools you’re trying to create to make it easier. If you’re working on a CSS or styling approach that you’d like to add to this list, please let us know!

docs/book/src/router/20_form.md

@@ -23,6 +23,8 @@ async fn fetch_results() {
 	// some async function to fetch our search results
 }
 
+#[component]
+pub fn Search(cx: Scope) -> impl IntoView {
 #[component]
 pub fn FormExample(cx: Scope) -> impl IntoView {
     // reactive access to URL query strings

docs/book/src/ssr/21_cargo_leptos.md

@@ -1,37 +0,0 @@
-# Introducing `cargo-leptos`
-
-So far, we’ve just been running code in the browser and using Trunk to coordinate the build process and run a local development process. If we’re going to add server-side rendering, we’ll need to run our application code on the server as well. This means we’ll need to build two separate binaries, one compiled to native code and running the server, the other compiled to WebAssembly (WASM) and running in the user’s browser. Additionally, the server needs to know how to serve this WASM version (and the JavaScript required to initialize it) to the browser.
-
-This is not an insurmountable task but it adds some complication. For convenience and an easier developer experience, we built the [`cargo-leptos`](https://github.com/leptos-rs/cargo-leptos) build tool. `cargo-leptos` basically exists to coordinate the build process for your app, handling recompiling the server and client halves when you make changes, and adding some built-in support for things like Tailwind, SASS, and testing.
-
-Getting started is pretty easy. Just run
-
-```bash
-cargo install cargo-leptos
-```
-
-And then to create a new project, you can run either
-
-```bash
-# for an Actix template
-cargo leptos new --git leptos-rs/start
-```
-
-or
-
-```bash
-# for an Axum template
-cargo leptos new --git leptos-rs/start-axum
-```
-
-Now `cd` into the directory you’ve created and run
-
-```bash
-cargo leptos watch
-```
-
-Once your app has compiled you can open up your browser to [`http://localhost:3000`](http://localhost:3000) to see it.
-
-`cargo-leptos` has lots of additional features and built in tools. You can learn more [in its `README`](https://github.com/leptos-rs/leptos/blob/main/examples/hackernews/src/api.rs).
-
-But what exactly is happening when you open our browser to `localhost:3000`? Well, read on to find out.

docs/book/src/ssr/22_life_cycle.md

@@ -1,43 +0,0 @@
-# The Life of a Page Load
-
-Before we get into the weeds it might be helpful to have a higher-level overview. What exactly happens between the moment you type in the URL of a server-rendered Leptos app, and the moment you click a button and a counter increases?
-
-I’m assuming some basic knowledge of how the Internet works here, and won’t get into the weeds about HTTP or whatever. Instead, I’ll try to show how different parts of the Leptos APIs map onto each part of the process.
-
-This description also starts from the premise that your app is being compiled for two separate targets:
-
-1. A server version, often running on Actix or Axum, compiled with the Leptos `ssr` feature
-2. A browser version, compiled to WebAssembly (WASM) with the Leptos `hydrate` feature
-
-The [`cargo-leptos`](https://github.com/leptos-rs/cargo-leptos) build tool exists to coordinate the process of compiling your app for these two different targets.
-
-## On the Server
-
-- Your browser makes a `GET` request for that URL to your server. At this point, the browser knows almost nothing about the page that’s going to be rendered. (The question “How does the browser know where to ask for the page?” is an interesting one, but out of the scope of this tutorial!)
-- The server receives that request, and checks whether it has a way to handle a `GET` request at that path. This is what the `.leptos_routes()` methods in [`leptos_axum`](https://docs.rs/leptos_axum/0.2.5/leptos_axum/trait.LeptosRoutes.html) and [`leptos_actix`](https://docs.rs/leptos_actix/0.2.5/leptos_actix/trait.LeptosRoutes.html) are for. When the server starts up, these methods walk over the routing structure you provide in `<Routes/>`, generating a list of all possible routes your app can handle and telling the server’s router “for each of these routes, if you get a request... hand it off to Leptos.”
-- The server sees that this route can be handled by Leptos. So it renders your root component (often called something like `<App/>`), providing it with the URL that’s being requested and some other data like the HTTP headers and request metadata.
-- Your application runs once on the server, building up an HTML version of the component tree that will be rendered at that route. (There’s more to be said here about resources and `<Suspense/>` in the next chapter.)
-- The server returns this HTML page, also injecting information on how to load the version of your app that has been compiled to WASM so that it can run in the browser.
-
-> The HTML page that’s returned is essentially your app, “dehydrated” or “freeze-dried”: it is HTML without any of the reactivity or event listeners you’ve added. The browser will “rehydrate” this HTML page by adding the reactive system and attaching event listeners to that server-rendered HTML. Hence the two feature flags that apply to the two halves of this process: `ssr` on the server for “server-side rendering”, and `hydrate` in the browser for that process of rehydration.
-
-## In the Browser
-
-- The browser receives this HTML page from the server. It immediately goes back to the server to begin loading the JS and WASM necessary to run the interactive, client side version of the app.
-- In the meantime, it renders the HTML version.
-- When the WASM version has reloaded, it does the same route-matching process that the server did. Because the `<Routes/>` component is identical on the server and in the client, the browser version will read the URL and render the same page that was already returned by the server.
-- During this initial “hydration” phase, the WASM version of your app doesn’t re-create the DOM nodes that make up your application. Instead, it walks over the existing HTML tree, “picking up” existing elements and adding the necessary interactivity.
-
-> Note that there are some trade-offs here. Before this hydration process is complete, the page will _appear_ interactive but won’t actually respond to interactions. For example, if you have a counter button and click it before WASM has loaded, the count will not increment, because the necessary event listeners and reactivity have not been added yet. We’ll look at some ways to build in “graceful degradation” in future chapters.
-
-## Client-Side Navigation
-
-The next step is very important. Imagine that the user now clicks a link to navigate to another page in your application.
-
-The browser will _not_ make another round trip to the server, reloading the full page as it would for navigating between plain HTML pages or an application that uses server rendering (for example with PHP) but without a client-side half.
-
-Instead, the WASM version of your app will load the new page, right there in the browser, without requesting another page from the server. Essentially, your app upgrades itself from a server-loaded “multi-page app” into a browser-rendered “single-page app.” This yields the best of both worlds: a fast initial load time due to the server-rendered HTML, and fast secondary navigations because of the client-side routing.
-
-Some of what will be described in the following chapters—like the interactions between server functions, resources, and `<Suspense/>`—may seem overly complicated. You might find yourself asking, “If my page is being rendered to HTML on the server, why can’t I just `.await` this on the server? If I can just call library X in a server function, why can’t I call it in my component?” The reason is pretty simple: to enable the upgrade from server rendering to client rendering, everything in your application must be able to run either on the server or in the browser.
-
-This is not the only way to create a website or web framework, of course. But it’s the most common way, and we happen to think it’s quite a good way, to create the smoothest possible experience for your users.

docs/book/src/ssr/23_ssr_modes.md

@@ -1,122 +0,0 @@
-# Async Rendering and SSR “Modes”
-
-Server-rendering a page that uses only synchronous data is pretty simple: You just walk down the component tree, rendering each element to an HTML string. But this is a pretty big caveat: it doesn’t answer the question of what we should do with pages that includes asynchronous data, i.e., the sort of stuff that would be rendered under a `<Suspense/>` node on the client.
-
-When a page loads async data that it needs to render, what should we do? Should we wait for all the async data to load, and then render everything at once? (Let’s call this “async” rendering) Should we go all the way in the opposite direction, just sending the HTML we have immediately down to the client and letting the client load the resources and fill them in? (Let’s call this “synchronous” rendering) Or is there some middle-ground solution that somehow beats them both? (Hint: There is.)
-
-If you’ve ever listened to streaming music or watched a video online, I’m sure you realize that HTTP supports streaming, allowing a single connection to send chunks of data one after another without waiting for the full content to load. You may not realize that browsers are also really good at rendering partial HTML pages. Taken together, this means that you can actually enhance your users’ experience by **streaming HTML**: and this is something that Leptos supports out of the box, with no configuration at all. And there’s actually more than one way to stream HTML: you can stream the chunks of HTML that make up your page in order, like frames of a video, or you can stream them... well, out of order.
-
-Let me say a little more about what I mean.
-
-Leptos supports all four different of these different ways to render HTML that includes asynchronous data.
-
-## Synchronous Rendering
-
-1. **Synchronous**: Serve an HTML shell that includes `fallback` for any `<Suspense/>`. Load data on the client using `create_local_resource`, replacing `fallback` once resources are loaded.
-
-- _Pros_: App shell appears very quickly: great TTFB (time to first byte).
-- _Cons_
-  - Resources load relatively slowly; you need to wait for JS + WASM to load before even making a request.
-  - No ability to include data from async resources in the `<title>` or other `<meta>` tags, hurting SEO and things like social media link previews.
-
-If you’re using server-side rendering, the synchronous mode is almost never what you actually want, from a performance perspective. This is because it misses out on an important optimization. If you’re loading async resources during server rendering, you can actually begin loading the data on the server. Rather than waiting for the client to receive the HTML response, then loading its JS + WASM, _then_ realize it needs the resources and begin loading them, server rendering can actually begin loading the resources when the client first makes the response. In this sense, during server rendering an async resource is like a `Future` that begins loading on the server and resolves on the client. As long as the resources are actually serializable, this will always lead to a faster total load time.
-
-> This is why [`create_resource`](https://docs.rs/leptos/latest/leptos/fn.create_resource.html) requires resources data to be serializable by default, and why you need to explicitly use [`create_local_resource`](https://docs.rs/leptos/latest/leptos/fn.create_local_resource.html) for any async data that is not serializable and should therefore only be loaded in the browser itself. Creating a local resource when you could create a serializable resource is always a deoptimization.
-
-## Async Rendering
-
-<video controls>
-	<source src="https://github.com/leptos-rs/leptos/blob/main/docs/video/async.mov?raw=true" type="video/mp4">
-</video>
-
-2. **`async`**: Load all resources on the server. Wait until all data are loaded, and render HTML in one sweep.
-
-- _Pros_: Better handling for meta tags (because you know async data even before you render the `<head>`). Faster complete load than **synchronous** because async resources begin loading on server.
-- _Cons_: Slower load time/TTFB: you need to wait for all async resources to load before displaying anything on the client. The page is totally blank until everything is loaded.
-
-## In-Order Streaming
-
-<video controls>
-	<source src="https://github.com/leptos-rs/leptos/blob/main/docs/video/in-order.mov?raw=true" type="video/mp4">
-</video>
-
-3. **In-order streaming**: Walk through the component tree, rendering HTML until you hit a `<Suspense/>`. Send down all the HTML you’ve got so far as a chunk in the stream, wait for all the resources accessed under the `<Suspense/>` to load, then render it to HTML and keep walking until you hit another `<Suspense/>` or the end of the page.
-
-- _Pros_: Rather than a blank screen, shows at least _something_ before the data are ready.
-- _Cons_
-  - Loads the shell more slowly than synchronous rendering (or out-of-order streaming) because it needs to pause at every `<Suspense/>`.
-  - Unable to show fallback states for `<Suspense/>`.
-  - Can’t begin hydration until the entire page has loaded, so earlier pieces of the page will not be interactive until the suspended chunks have loaded.
-
-## Out-of-Order Streaming
-
-<video controls>
-	<source src="https://github.com/leptos-rs/leptos/blob/main/docs/video/out-of-order.mov?raw=true" type="video/mp4">
-</video>
-
-4. **Out-of-order streaming**: Like synchronous rendering, serve an HTML shell that includes `fallback` for any `<Suspense/>`. But load data on the **server**, streaming it down to the client as it resolves, and streaming down HTML for `<Suspense/>` nodes, which is swapped in to replace the fallback.
-
-- _Pros_: Combines the best of **synchronous** and **`async`**.
-  - Fast initial response/TTFB because it immediately sends the whole synchronous shell
-  - Fast total time because resources begin loading on the server.
-  - Able to show the fallback loading state and dynamically replace it, instead of showing blank sections for un-loaded data.
-- _Cons_: Requires JavaScript to be enabled for suspended fragments to appear in correct order. (This small chunk of JS streamed down in a `<script>` tag alongside the `<template>` tag that contains the rendered `<Suspense/>` fragment, so it does not need to load any additional JS files.)
-
-## Using SSR Modes
-
-Because it offers the best blend of performance characteristics, Leptos defaults to out-of-order streaming. But it’s really simple to opt into these different modes. You do it by adding an `ssr` property onto one or more of your `<Route/>` components, like in the [`ssr_modes` example](https://github.com/leptos-rs/leptos/blob/main/examples/ssr_modes/src/app.rs).
-
-```rust
-<Routes>
-	// We’ll load the home page with out-of-order streaming and <Suspense/>
-	<Route path="" view=|cx| view! { cx, <HomePage/> }/>
-
-	// We'll load the posts with async rendering, so they can set
-	// the title and metadata *after* loading the data
-	<Route
-		path="/post/:id"
-		view=|cx| view! { cx, <Post/> }
-		ssr=SsrMode::Async
-	/>
-</Routes>
-```
-
-For a path that includes multiple nested routes, the most restrictive mode will be used: i.e., if even a single nested route asks for `async` rendering, the whole initial request will be rendered `async`. `async` is the most restricted requirement, followed by in-order, and then out-of-order. (This probably makes sense if you think about it for a few minutes.)
-
-## Blocking Resources
-
-Any Leptos versions later than `0.2.5` (i.e., git main and `0.3.x` or later) introduce a new resource primitive with `create_blocking_resource`. A blocking resource still loads asynchronously like any other `async`/`.await` in Rust; it doesn’t block a server thread or anything. Instead, reading from a blocking resource under a `<Suspense/>` blocks the HTML _stream_ from returning anything, including its initial synchronous shell, until that `<Suspense/>` has resolved.
-
-Now from a performance perspective, this is not ideal. None of the synchronous shell for your page will load until that resource is ready. However, rendering nothing means that you can do things like set the `<title>` or `<meta>` tags in your `<head>` in actual HTML. This sounds a lot like `async` rendering, but there’s one big difference: if you have multiple `<Suspense/>` sections, you can block on _one_ of them but still render a placeholder and then stream in the other.
-
-For example, think about a blog post. For SEO and for social sharing, I definitely want my blog post’s title and metadata in the initial HTML `<head>`. But I really don’t care whether comments have loaded yet or not; I’d like to load those as lazily as possible.
-
-With blocking resources, I can do something like this:
-
-```rust
-#[component]
-pub fn BlogPost(cx: Scope) -> impl IntoView {
-	let post_data = create_blocking_resource(cx, /* load blog post */);
-	let comment_data = create_resource(cx, /* load blog post */);
-	view! { cx,
-		<Suspense fallback=|| ()>
-			{move || {
-				post_data.with(cx, |data| {
-					view! { cx,
-						<Title text=data.title/>
-						<Meta name="description" content=data.excerpt/>
-						<article>
-							/* render the post content */
-						</article>
-					}
-				})
-			}}
-		</Suspense>
-		<Suspense fallback=|| "Loading comments...">
-			/* render comment data here */
-		</Suspense>
-	}
-}
-```
-
-The first `<Suspense/>`, with the body of the blog post, will block my HTML stream, because it reads from a blocking resource. The second `<Suspense/>`, with the comments, will not block the stream. Blocking resources gave me exactly the power and granularity I needed to optimize my page for SEO and user experience.

docs/book/src/ssr/24_hydration_bugs.md

@@ -1,148 +0,0 @@
-# Hydration Bugs _(and how to avoid them)_
-
-## A Thought Experiment
-
-Let’s try an experiment to test your intuitions. Open up an app you’re server-rendering with `cargo-leptos`. (If you’ve just been using `trunk` so far to play with examples, go [clone a `cargo-leptos` template](./21_cargo_leptos.md) just for the sake of this exercise.)
-
-Put a log somewhere in your root component. (I usually call mine `<App/>`, but anything will do.)
-
-```rust
-#[component]
-pub fn App(cx: Scope) -> impl IntoView {
-	leptos::log!("where do I run?");
-	// ... whatever
-}
-```
-
-And let’s fire it up
-
-```bash
-cargo leptos watch
-```
-
-Where do you expect `where do I run?` to log?
-
-- In the command line where you’re running the server?
-- In the browser console when you load the page?
-- Neither?
-- Both?
-
-Try it out.
-
-...
-
-...
-
-...
-
-Okay, consider the spoiler alerted.
-
-You’ll notice of course that it logs in both places, assuming everything goes according to plan. In fact on the server it logs twice—first during the initial server startup, when Leptos renders your app once to extract the route tree, then a second time when you make a request. Each time you reload the page, `where do I run?` should log once on the server and once on the client.
-
-If you think about the description in the last couple sections, hopefully this makes sense. Your application runs once on the server, where it builds up a tree of HTML which is sent to the client. During this initial render, `where do I run?` logs on the server.
-
-Once the WASM binary has loaded in the browser, your application runs a second time, walking over the same user interface tree and adding interactivity.
-
-> Does that sound like a waste? It is, in a sense. But reducing that waste is a genuinely hard problem. It’s what some JS frameworks like Qwik are intended to solve, although it’s probably too early to tell whether it’s a net performance gain as opposed to other approaches.
-
-## The Potential for Bugs
-
-Okay, hopefully all of that made sense. But what does it have to do with the title of this chapter, which is “Hydration bugs (and how to avoid them)”?
-
-Remember that the application needs to run on both the server and the client. This generates a few different sets of potential issues you need to know how to avoid.
-
-### Mismatches between server and client code
-
-One way to create a bug is by creating a mismatch between the HTML that’s sent down by the server and what’s rendered on the client. It’s actually fairly hard to do this unintentionally, I think (at least judging by the bug reports I get from people.) But imagine I do something like this
-
-```rust
-#[component]
-pub fn App(cx: Scope) -> impl IntoView {
-    let data = if cfg!(target_arch = "wasm32") {
-        vec![0, 1, 2]
-    } else {
-        vec![]
-    };
-    data.into_iter()
-        .map(|value| view! { cx, <span>{value}</span> })
-        .collect_view(cx)
-}
-```
-
-In other words, if this is being compiled to WASM, it has three items; otherwise it’s empty.
-
-When I load the page in the browser, I see nothing. If I open the console I see a bunch of warnings:
-
-```
-element with id 0-0-1 not found, ignoring it for hydration
-element with id 0-0-2 not found, ignoring it for hydration
-element with id 0-0-3 not found, ignoring it for hydration
-component with id _0-0-4c not found, ignoring it for hydration
-component with id _0-0-4o not found, ignoring it for hydration
-```
-
-The WASM version of your app, running in the browser, expects to find three items; but the HTML has none.
-
-#### Solution
-
-It’s pretty rare that you do this intentionally, but it could happen from somehow running different logic on the server and in the browser. If you’re seeing warnings like this and you don’t think it’s your fault, it’s much more likely that it’s a bug with `<Suspense/>` or something. Feel free to go ahead and open an [issue](https://github.com/leptos-rs/leptos/issues) or [discussion](https://github.com/leptos-rs/leptos/discussions) on GitHub for help.
-
-### Not all client code can run on the server
-
-Imagine you happily import a dependency like `gloo-net` that you’ve been used to using to make requests in the browser, and use it in a `create_resource` in a server-rendered app.
-
-You’ll probably instantly see the dreaded message
-
-```
-panicked at 'cannot call wasm-bindgen imported functions on non-wasm targets'
-```
-
-Uh-oh.
-
-But of course this makes sense. We’ve just said that your app needs to run on the client and the server.
-
-#### Solution
-
-There are a few ways to avoid this:
-
-1. Only use libraries that can run on both the server and the client. `reqwest`, for example, works for making HTTP requests in both settings.
-2. Use different libraries on the server and the client, and gate them using the `#[cfg]` macro. ([Click here for an example](https://github.com/leptos-rs/leptos/blob/main/examples/hackernews/src/api.rs).)
-3. Wrap client-only code in `create_effect`. Because `create_effect` only runs on the client, this can be an effective way to access browser APIs that are not needed for initial rendering.
-
-For example, say that I want to store something in the browser’s `localStorage` whenever a signal changes.
-
-```rust
-#[component]
-pub fn App(cx: Scope) -> impl IntoView {
-    use gloo_storage::Storage;
-	let storage = gloo_storage::LocalStorage::raw();
-	leptos::log!("{storage:?}");
-}
-```
-
-This panics because I can’t access `LocalStorage` during server rendering.
-
-But if I wrap it in an effect...
-
-```rust
-#[component]
-pub fn App(cx: Scope) -> impl IntoView {
-    use gloo_storage::Storage;
-    create_effect(cx, move |_| {
-        let storage = gloo_storage::LocalStorage::raw();
-		leptos::log!("{storage:?}");
-    });
-}
-```
-
-It’s fine! This will render appropriately on the server, ignoring the client-only code, and then access the storage and log a message on the browser.
-
-### Not all server code can run on the client
-
-WebAssembly running in the browser is a pretty limited environment. You don’t have access to a file-system or to many of the other things the standard library may be used to having. Not every crate can even be compiled to WASM, let alone run in a WASM environment.
-
-In particular, you’ll sometimes see errors about the crate `mio` or missing things from `core`. This is generally a sign that you are trying to compile something to WASM that can’t be compiled to WASM. If you’re adding server-only dependencies, you’ll want to mark them `optional = true` in your `Cargo.toml` and then enable them in the `ssr` feature definition. (Check out one of the template `Cargo.toml` files to see more details.)
-
-You can use `create_effect` to specify that something should only run on the client, and not in the server. Is there a way to specify that something should run only on the server, and not the client?
-
-In fact, there is. The next chapter will cover the topic of server functions in some detail. (In the meantime, you can check out their docs [here](https://docs.rs/leptos_server/0.2.5/leptos_server/index.html).)

docs/book/src/ssr/README.md

@@ -1,21 +0,0 @@
-# Server Side Rendering
-
-So far, everything we’ve written has been rendered almost entirely in the browser. When we create an app using Trunk, it’s served using a local development server. If you build it for production and deploy it, it’s served by whatever server or CDN you’re using. In either case, what’s served is an HTML page with
-
-1. the URL of your Leptos app, which has been compiled to WebAssembly (WASM)
-2. the URL of the JavaScript used to initialized this WASM blob
-3. an empty `<body>` element
-
-When the JS and WASM have loaded, Leptos will render your app into the `<body>`. This means that nothing appears on the screen until JS/WASM have loaded and run. This has some drawbacks:
-
-1. It increases load time, as your user’s screen is blank until additional resources have been downloaded.
-2. It’s bad for SEO, as load times are longer and the HTML you serve has no meaningful content.
-3. It’s broken for users for whom JS/WASM don’t load for some reason (e.g., they’re on a train and just went into a tunnel before WASM finished loading; they’re using an older device that doesn’t support WASM; they have JavaScript or WASM turned off for some reason; etc.)
-
-These downsides apply across the web ecosystem, but especially to WASM apps.
-
-So what do you do if you want to return more than just an empty `<body>` tag? Use “server-side rendering.”
-
-Whole books could be (and probably have been) written about this topic, but at its core, it’s really simple: rather than returning an empty `<body>` tag, return an initial HTML page that reflects the actual starting state of your app or site, so that while JS/WASM are loading, and until they load, the user can access the plain HTML version.
-
-The rest of this section will cover this topic in some detail!

docs/book/src/view/02_dynamic_attributes.md

@@ -52,12 +52,6 @@ reactively update when the signal changes.
 Now every time I click the button, the text should toggle between red and black as
 the number switches between even and odd.
 
-> If you’re following along, make sure you go into your `index.html` and add something like this:
-> 
-> ```html
-> <style>.red { color: red; }</style>
-> ```
-
 ## Dynamic Attributes
 
 The same applies to plain attributes. Passing a plain string or primitive value to

docs/book/src/view/04_iteration.md

@@ -31,22 +31,6 @@ view! { cx,
 }
 ```
 
-Leptos also provides a `.collect_view(cx)` helper function that allows you to collect any iterator of `T: IntoView` into `Vec<View>`.
-
-```rust
-let values = vec![0, 1, 2];
-view! { cx,
-    // this will just render "012"
-    <p>{values.clone()}</p>
-    // or we can wrap them in <li>
-    <ul>
-        {values.into_iter()
-            .map(|n| view! { cx, <li>{n}</li>})
-            .collect_view(cx)}
-    </ul>
-}
-```
-
 The fact that the _list_ is static doesn’t mean the interface needs to be static.
 You can render dynamic items as part of a static list.
 
@@ -68,7 +52,7 @@ let counter_buttons = counters
             </li>
         }
     })
-    .collect_view(cx);
+    .collect::<Vec<_>>();
 
 view! { cx,
     <ul>{counter_buttons}</ul>

docs/book/src/view/07_errors.md

@@ -80,7 +80,7 @@ fn NumericInput(cx: Scope) -> impl IntoView {
                             {move || errors.get()
                                 .into_iter()
                                 .map(|(_, e)| view! { cx, <li>{e.to_string()}</li>})
-                                .collect_view(cx)
+                                .collect::<Vec<_>>()
                             }
                         </ul>
                     </div>

docs/book/src/view/08_parent_child.md

@@ -15,7 +15,7 @@ covered some of this in the material on [components and props](./03_components.m
 Basically if you want the parent to communicate to the child, you can pass a
 [`ReadSignal`](https://docs.rs/leptos/latest/leptos/struct.ReadSignal.html), a
 [`Signal`](https://docs.rs/leptos/latest/leptos/struct.Signal.html), or even a
-[`MaybeSignal`](https://docs.rs/leptos/latest/leptos/enum.MaybeSignal.html) as a prop.
+[`MaybeSignal`](https://docs.rs/leptos/latest/leptos/struct.MaybeSignal.html) as a prop.
 
 But what about the other direction? How can a child send notifications about events
 or state changes back up to the parent?

docs/book/src/view/09_component_children.md

@@ -103,7 +103,7 @@ pub fn WrapsChildren(cx: Scope, children: Children) -> impl IntoView {
         .nodes
         .into_iter()
         .map(|child| view! { cx, <li>{child}</li> })
-        .collect_view(cx);
+        .collect::<Vec<_>>();
 
     view! { cx,
         <ul>{children}</ul>

examples/Makefile.toml

@@ -1,56 +0,0 @@
-extend = [{ path = "./cargo-make/common.toml" }]
-
-[env]
-CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
-CARGO_MAKE_CARGO_BUILD_TEST_FLAGS = ""
-CARGO_MAKE_WORKSPACE_EMULATION = true
-CARGO_MAKE_CRATE_WORKSPACE_MEMBERS = [
-    "counter",
-    "counter_isomorphic",
-    "counters",
-    "counters_stable",
-    "counter_without_macros",
-    "error_boundary",
-    "errors_axum",
-    "fetch",
-    "hackernews",
-    "hackernews_axum",
-    "login_with_token_csr_only",
-    "parent_child",
-    "router",
-    "session_auth_axum",
-    "ssr_modes",
-    "ssr_modes_axum",
-    "tailwind",
-    "tailwind_csr_trunk",
-    "todo_app_sqlite",
-    "todo_app_sqlite_axum",
-    "todo_app_sqlite_viz",
-    "todomvc",
-]
-
-[tasks.verify-flow]
-description = "Provides pre and post hooks for verify"
-dependencies = ["pre-verify-flow", "verify", "post-verify-flow"]
-
-[tasks.verify]
-description = "Run all quality checks and tests"
-dependencies = ["check-style", "test-unit-and-web"]
-
-[tasks.test-unit-and-web]
-description = "Run all unit and web tests"
-dependencies = ["test-flow", "web-test-flow"]
-
-[tasks.pre-verify-flow]
-
-[tasks.post-verify-flow]
-
-[tasks.web-test-flow]
-description = "Provides pre and post hooks for web-test"
-dependencies = ["pre-web-test-flow", "web-test", "post-web-test-flow"]
-
-[tasks.pre-web-test-flow]
-
-[tasks.web-test]
-
-[tasks.post-web-test-flow]

examples/cargo-make/common.toml

@@ -1,14 +0,0 @@
-[env]
-CARGO_MAKE_CLIPPY_ARGS = "--all-targets -- -D warnings"
-
-[tasks.check-style]
-description = "Check for style violations"
-dependencies = ["check-format-flow", "clippy-flow"]
-
-[tasks.verify-local]
-description = "Run all quality checks and tests from an example directory"
-dependencies = ["check-style", "test-local"]
-
-[tasks.test-local]
-description = "Run all tests from an example directory"
-dependencies = ["test", "web-test"]

examples/cargo-make/wasm-web-test.toml

@@ -1,4 +0,0 @@
-[tasks.web-test]
-env = { CARGO_MAKE_WASM_TEST_ARGS = "--headless --chrome" }
-command = "cargo"
-args = ["make", "wasm-pack-test"]

examples/counter/Cargo.toml

@@ -3,10 +3,6 @@ name = "counter"
 version = "0.1.0"
 edition = "2021"
 
-[profile.release]
-codegen-units = 1
-lto = true
-
 [dependencies]
 leptos = { path = "../../leptos" }
 console_log = "1"
@@ -16,4 +12,5 @@ console_error_panic_hook = "0.1.7"
 [dev-dependencies]
 wasm-bindgen = "0.2"
 wasm-bindgen-test = "0.3.0"
-web-sys = "0.3"
+web-sys ="0.3"
+

examples/counter/Makefile.toml

@@ -1,8 +1,3 @@
-extend = [
-    { path = "../cargo-make/common.toml" },
-    { path = "../cargo-make/wasm-web-test.toml" },
-]
-
 [tasks.build]
 command = "cargo"
 args = ["+nightly", "build-all-features"]

examples/counter/src/lib.rs

@@ -1,7 +1,7 @@
 use leptos::*;
 
 /// A simple counter component.
-///
+/// 
 /// You can use doc comments like this to document your component.
 #[component]
 pub fn SimpleCounter(
@@ -9,7 +9,7 @@ pub fn SimpleCounter(
     /// The starting value for the counter
     initial_value: i32,
     /// The change that should be applied each time the button is clicked.
-    step: i32,
+    step: i32
 ) -> impl IntoView {
     let (value, set_value) = create_signal(cx, initial_value);
 

examples/counter/src/main.rs

@@ -4,12 +4,10 @@ use leptos::*;
 pub fn main() {
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
-    mount_to_body(|cx| {
-        view! { cx,
-            <SimpleCounter
-                initial_value=0
-                step=1
-            />
-        }
+    mount_to_body(|cx| view! { cx,
+        <SimpleCounter
+            initial_value=0
+            step=1
+        />
     })
 }

examples/counter/tests/mod.rs

@@ -9,7 +9,7 @@ wasm_bindgen_test_configure!(run_in_browser);
 fn clear() {
     let document = leptos::document();
     let test_wrapper = document.create_element("section").unwrap();
-    let _ = document.body().unwrap().append_child(&test_wrapper);
+    document.body().unwrap().append_child(&test_wrapper);
 
     // start by rendering our counter and mounting it to the DOM
     // note that we start at the initial value of 10
@@ -38,7 +38,7 @@ fn clear() {
         // test case
         run_scope(create_runtime(), |cx| {
             // it's as if we're creating it with a value of 0, right?
-            let (value, _set_value) = create_signal(cx, 0);
+            let (value, set_value) = create_signal(cx, 0);
 
             // we can remove the event listeners because they're not rendered to HTML
             view! { cx,
@@ -71,7 +71,7 @@ fn clear() {
 fn inc() {
     let document = leptos::document();
     let test_wrapper = document.create_element("section").unwrap();
-    let _ = document.body().unwrap().append_child(&test_wrapper);
+    document.body().unwrap().append_child(&test_wrapper);
 
     mount_to(
         test_wrapper.clone().unchecked_into(),
@@ -79,7 +79,7 @@ fn inc() {
     );
 
     // You can do testing with vanilla DOM operations
-    let _document = leptos::document();
+    let document = leptos::document();
     let div = test_wrapper.query_selector("div").unwrap().unwrap();
     let clear = div
         .first_child()

examples/counter_isomorphic/Cargo.toml

@@ -6,10 +6,6 @@ edition = "2021"
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-[profile.release]
-codegen-units = 1
-lto = true
-
 [dependencies]
 actix-files = { version = "0.6", optional = true }
 actix-web = { version = "4", optional = true, features = ["macros"] }

examples/counter_without_macros/Cargo.toml

@@ -3,10 +3,6 @@ name = "counter_without_macros"
 version = "0.1.0"
 edition = "2021"
 
-[profile.release]
-codegen-units = 1
-lto = true
-
 [dependencies]
 leptos = { path = "../../leptos", features = ["stable"] }
 console_log = "1"
@@ -14,11 +10,4 @@ log = "0.4"
 console_error_panic_hook = "0.1.7"
 
 [dev-dependencies]
-wasm-bindgen = "0.2.84"
-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.61"
+wasm-bindgen-test = "0.3.0"

examples/counter_without_macros/Makefile.toml

@@ -1,8 +1,3 @@
-extend = [
-    { path = "../cargo-make/common.toml" },
-    { path = "../cargo-make/wasm-web-test.toml" },
-]
-
 [tasks.build]
 command = "cargo"
 args = ["+stable", "build-all-features"]

examples/counter_without_macros/README.md

@@ -3,5 +3,3 @@
 This example is the same like the `counter` but it's written without using macros and can be build with stable Rust.
 
 To run it, just issue the `trunk serve --open` command in the example root. This will build the app, run it, and open a new browser to serve it.
-
-Issue the `cargo make test-flow` command to run unit and wasm tests.

examples/counter_without_macros/src/lib.rs

@@ -2,8 +2,8 @@ use leptos::{ev, html::*, *};
 
 /// A simple counter view.
 // A component is really just a function call: it runs once to create the DOM and reactive system
-pub fn counter(cx: Scope, initial_value: i32, step: u32) -> impl IntoView {
-    let (count, set_count) = create_signal(cx, Count::new(initial_value, step));
+pub fn counter(cx: Scope, initial_value: i32, step: i32) -> impl IntoView {
+    let (value, set_value) = create_signal(cx, initial_value);
 
     // elements are created by calling a function with a Scope argument
     // the function name is the same as the HTML tag name
@@ -16,13 +16,13 @@ pub fn counter(cx: Scope, initial_value: i32, step: u32) -> impl IntoView {
                 // typed events found in leptos::ev
                 // 1) prevent typos in event names
                 // 2) allow for correct type inference in callbacks
-                .on(ev::click, move |_| set_count.update(|count| count.clear()))
+                .on(ev::click, move |_| set_value.update(|value| *value = 0))
                 .child("Clear"),
         )
         .child(
             button(cx)
                 .on(ev::click, move |_| {
-                    set_count.update(|count| count.decrease())
+                    set_value.update(|value| *value -= step)
                 })
                 .child("-1"),
         )
@@ -31,45 +31,14 @@ pub fn counter(cx: Scope, initial_value: i32, step: u32) -> impl IntoView {
                 .child("Value: ")
                 // reactive values are passed to .child() as a tuple
                 // (Scope, [child function]) so an effect can be created
-                .child(move || count.get().value())
+                .child((cx, move || value.get()))
                 .child("!"),
         )
         .child(
             button(cx)
                 .on(ev::click, move |_| {
-                    set_count.update(|count| count.increase())
+                    set_value.update(|value| *value += step)
                 })
                 .child("+1"),
         )
 }
-
-#[derive(Debug, Clone)]
-pub struct Count {
-    value: i32,
-    step: i32,
-}
-
-impl Count {
-    pub fn new(value: i32, step: u32) -> Self {
-        Count {
-            value,
-            step: step as i32,
-        }
-    }
-
-    pub fn value(&self) -> i32 {
-        self.value
-    }
-
-    pub fn increase(&mut self) {
-        self.value += self.step;
-    }
-
-    pub fn decrease(&mut self) {
-        self.value += -self.step;
-    }
-
-    pub fn clear(&mut self) {
-        self.value = 0;
-    }
-}

examples/counter_without_macros/tests/business.rs

@@ -1,49 +0,0 @@
-mod count {
-    use counter_without_macros::Count;
-    use pretty_assertions::assert_eq;
-    use rstest::rstest;
-
-    #[rstest]
-    #[case(-2, 1)]
-    #[case(-1, 1)]
-    #[case(0, 1)]
-    #[case(1, 1)]
-    #[case(2, 1)]
-    #[case(3, 2)]
-    #[case(4, 3)]
-    fn should_increase_count(#[case] initial_value: i32, #[case] step: u32) {
-        let mut count = Count::new(initial_value, step);
-        count.increase();
-        assert_eq!(count.value(), initial_value + step as i32);
-    }
-
-    #[rstest]
-    #[case(-2, 1)]
-    #[case(-1, 1)]
-    #[case(0, 1)]
-    #[case(1, 1)]
-    #[case(2, 1)]
-    #[case(3, 2)]
-    #[case(4, 3)]
-    #[trace]
-    fn should_decrease_count(#[case] initial_value: i32, #[case] step: u32) {
-        let mut count = Count::new(initial_value, step);
-        count.decrease();
-        assert_eq!(count.value(), initial_value - step as i32);
-    }
-
-    #[rstest]
-    #[case(-2, 1)]
-    #[case(-1, 1)]
-    #[case(0, 1)]
-    #[case(1, 1)]
-    #[case(2, 1)]
-    #[case(3, 2)]
-    #[case(4, 3)]
-    #[trace]
-    fn should_clear_count(#[case] initial_value: i32, #[case] step: u32) {
-        let mut count = Count::new(initial_value, step);
-        count.clear();
-        assert_eq!(count.value(), 0);
-    }
-}

examples/counter_without_macros/tests/mod.rs

@@ -0,0 +1,58 @@
+use wasm_bindgen_test::*;
+
+wasm_bindgen_test_configure!(run_in_browser);
+use counter_without_macros as counter;
+use leptos::*;
+use web_sys::HtmlElement;
+
+#[wasm_bindgen_test]
+fn inc() {
+    mount_to_body(|cx| {
+        counter::view(
+            cx,
+            counter::Props {
+                initial_value: 0,
+                step: 1,
+            },
+        )
+    });
+
+    let document = leptos::document();
+    let div = document.query_selector("div").unwrap().unwrap();
+    let clear = div
+        .first_child()
+        .unwrap()
+        .dyn_into::<HtmlElement>()
+        .unwrap();
+    let dec = clear
+        .next_sibling()
+        .unwrap()
+        .dyn_into::<HtmlElement>()
+        .unwrap();
+    let text = dec
+        .next_sibling()
+        .unwrap()
+        .dyn_into::<HtmlElement>()
+        .unwrap();
+    let inc = text
+        .next_sibling()
+        .unwrap()
+        .dyn_into::<HtmlElement>()
+        .unwrap();
+
+    inc.click();
+    inc.click();
+
+    assert_eq!(text.text_content(), Some("Value: 2!".to_string()));
+
+    dec.click();
+    dec.click();
+    dec.click();
+    dec.click();
+
+    assert_eq!(text.text_content(), Some("Value: -2!".to_string()));
+
+    clear.click();
+
+    assert_eq!(text.text_content(), Some("Value: 0!".to_string()));
+}

examples/counter_without_macros/tests/web.rs

@@ -1,86 +0,0 @@
-use counter_without_macros::counter;
-use leptos::*;
-use pretty_assertions::assert_eq;
-use wasm_bindgen::JsCast;
-use wasm_bindgen_test::*;
-use web_sys::HtmlElement;
-
-wasm_bindgen_test_configure!(run_in_browser);
-
-#[wasm_bindgen_test]
-fn should_increment_counter() {
-    open_counter();
-
-    click_increment();
-    click_increment();
-
-    assert_eq!(see_text(), Some("Value: 2!".to_string()));
-}
-
-#[wasm_bindgen_test]
-fn should_decrement_counter() {
-    open_counter();
-
-    click_decrement();
-    click_decrement();
-
-    assert_eq!(see_text(), Some("Value: -2!".to_string()));
-}
-
-#[wasm_bindgen_test]
-fn should_clear_counter() {
-    open_counter();
-
-    click_increment();
-    click_increment();
-
-    click_clear();
-
-    assert_eq!(see_text(), Some("Value: 0!".to_string()));
-}
-
-fn open_counter() {
-    remove_existing_counter();
-    mount_to_body(move |cx| counter(cx, 0, 1));
-}
-
-fn remove_existing_counter() {
-    if let Some(counter) =
-        leptos::document().query_selector("body div").unwrap()
-    {
-        counter.remove();
-    }
-}
-
-fn click_clear() {
-    click_text("Clear");
-}
-
-fn click_decrement() {
-    click_text("-1");
-}
-
-fn click_increment() {
-    click_text("+1");
-}
-
-fn click_text(text: &str) {
-    find_by_text(text).click();
-}
-
-fn see_text() -> Option<String> {
-    find_by_text("Value: ").text_content()
-}
-
-fn find_by_text(text: &str) -> HtmlElement {
-    let xpath = format!("//*[text()='{}']", text);
-    let document = leptos::document();
-    document
-        .evaluate(&xpath, &document)
-        .unwrap()
-        .iterate_next()
-        .unwrap()
-        .unwrap()
-        .dyn_into::<HtmlElement>()
-        .unwrap()
-}

examples/counters/Cargo.toml

@@ -11,5 +11,4 @@ console_error_panic_hook = "0.1.7"
 
 [dev-dependencies]
 wasm-bindgen-test = "0.3.0"
-wasm-bindgen = "0.2"
-web-sys = "0.3"
+

examples/counters/Makefile.toml

@@ -1,8 +1,3 @@
-extend = [
-    { path = "../cargo-make/common.toml" },
-    { path = "../cargo-make/wasm-web-test.toml" },
-]
-
 [tasks.build]
 command = "cargo"
 args = ["+nightly", "build-all-features"]

examples/counters/src/lib.rs

@@ -38,7 +38,7 @@ pub fn Counters(cx: Scope) -> impl IntoView {
     };
 
     view! { cx,
-        <div>
+        <>
             <button on:click=add_counter>
                 "Add Counter"
             </button>
@@ -72,7 +72,7 @@ pub fn Counters(cx: Scope) -> impl IntoView {
                     }
                 />
             </ul>
-        </div>
+        </>
     }
 }
 

examples/counters/tests/mod.rs

@@ -0,0 +1,113 @@
+use wasm_bindgen_test::*;
+
+wasm_bindgen_test_configure!(run_in_browser);
+use leptos::*;
+use web_sys::HtmlElement;
+
+use counters::{Counters, CountersProps};
+
+#[wasm_bindgen_test]
+fn inc() {
+    mount_to_body(|cx| view! { cx,  <Counters/> });
+
+    let document = leptos::document();
+    let div = document.query_selector("div").unwrap().unwrap();
+    let add_counter = div
+        .first_child()
+        .unwrap()
+        .dyn_into::<HtmlElement>()
+        .unwrap();
+
+    // add 3 counters
+    add_counter.click();
+    add_counter.click();
+    add_counter.click();
+
+    // check HTML
+    assert_eq!(div.inner_html(), "<button>Add Counter</button><button>Add 1000 Counters</button><button>Clear Counters</button><p>Total: <span>0</span> from <span>3</span> counters.</p><ul><li><button>-1</button><input type=\"text\"><span>0</span><button>+1</button><button>x</button></li><li><button>-1</button><input type=\"text\"><span>0</span><button>+1</button><button>x</button></li><li><button>-1</button><input type=\"text\"><span>0</span><button>+1</button><button>x</button></li></ul>");
+
+    let counters = div
+        .query_selector("ul")
+        .unwrap()
+        .unwrap()
+        .unchecked_into::<HtmlElement>()
+        .children();
+
+    // click first counter once, second counter twice, etc.
+    // `NodeList` isn't a `Vec` so we iterate over it in this slightly awkward way
+    for idx in 0..counters.length() {
+        let counter = counters.item(idx).unwrap();
+        let inc_button = counter
+            .first_child()
+            .unwrap()
+            .next_sibling()
+            .unwrap()
+            .next_sibling()
+            .unwrap()
+            .next_sibling()
+            .unwrap()
+            .unchecked_into::<HtmlElement>();
+        for _ in 0..=idx {
+            inc_button.click();
+        }
+    }
+
+    assert_eq!(div.inner_html(), "<button>Add Counter</button><button>Add 1000 Counters</button><button>Clear Counters</button><p>Total: <span>6</span> from <span>3</span> counters.</p><ul><li><button>-1</button><input type=\"text\"><span>1</span><button>+1</button><button>x</button></li><li><button>-1</button><input type=\"text\"><span>2</span><button>+1</button><button>x</button></li><li><button>-1</button><input type=\"text\"><span>3</span><button>+1</button><button>x</button></li></ul>");
+
+    // remove the first counter
+    counters
+        .item(0)
+        .unwrap()
+        .last_child()
+        .unwrap()
+        .unchecked_into::<HtmlElement>()
+        .click();
+
+    assert_eq!(div.inner_html(), "<button>Add Counter</button><button>Add 1000 Counters</button><button>Clear Counters</button><p>Total: <span>5</span> from <span>2</span> counters.</p><ul><li><button>-1</button><input type=\"text\"><span>2</span><button>+1</button><button>x</button></li><li><button>-1</button><input type=\"text\"><span>3</span><button>+1</button><button>x</button></li></ul>");
+
+    // decrement all by 1
+    for idx in 0..counters.length() {
+        let counter = counters.item(idx).unwrap();
+        let dec_button = counter
+            .first_child()
+            .unwrap()
+            .unchecked_into::<HtmlElement>();
+        dec_button.click();
+    }
+
+    run_scope(create_runtime(), move |cx| {
+        // we can use RSX in test comparisons!
+        // note that if RSX template creation is bugged, this probably won't catch it
+        // (because the same bug will be reproduced in both sides of the assertion)
+        // so I use HTML tests for most internal testing like this
+        // but in user-land testing, RSX comparanda are cool
+        assert_eq!(
+            div.outer_html(),
+            view! { cx,
+                <div>
+                    <button>"Add Counter"</button>
+                    <button>"Add 1000 Counters"</button>
+                    <button>"Clear Counters"</button>
+                    <p>"Total: "<span>"3"</span>" from "<span>"2"</span>" counters."</p>
+                    <ul>
+                        <li>
+                            <button>"-1"</button>
+                            <input type="text"/>
+                            <span>"1"</span>
+                            <button>"+1"</button>
+                            <button>"x"</button>
+                        </li>
+                        <li>
+                            <button>"-1"</button>
+                            <input type="text"/>
+                            <span>"2"</span>
+                            <button>"+1"</button>
+                            <button>"x"</button>
+                        </li>
+                    </ul>
+                </div>
+            }
+            .outer_html()
+        );
+    });
+}

examples/counters/tests/web.rs

@@ -1,120 +0,0 @@
-use wasm_bindgen::JsCast;
-use wasm_bindgen_test::*;
-
-wasm_bindgen_test_configure!(run_in_browser);
-use counters::Counters;
-use leptos::*;
-use web_sys::HtmlElement;
-
-#[wasm_bindgen_test]
-fn inc() {
-    mount_to_body(|cx| view! { cx,  <Counters/> });
-
-    let document = leptos::document();
-    let div = document.query_selector("div").unwrap().unwrap();
-    let add_counter = div
-        .first_child()
-        .unwrap()
-        .dyn_into::<HtmlElement>()
-        .unwrap();
-
-    // add 3 counters
-    add_counter.click();
-    add_counter.click();
-    add_counter.click();
-
-    // check HTML
-    assert_eq!(
-        div.inner_html(),
-        "<button>Add Counter</button><button>Add 1000 \
-         Counters</button><button>Clear Counters</button><p>Total: <span><!-- \
-         <DynChild> -->0<!-- </DynChild> --></span> from <span><!-- \
-         <DynChild> -->3<!-- </DynChild> --></span> counters.</p><ul><!-- \
-         <Each> --><!-- <EachItem> --><!-- <Counter> \
-         --><li><button>-1</button><input type=\"text\"><span><!-- <DynChild> \
-         -->0<!-- </DynChild> \
-         --></span><button>+1</button><button>x</button></li><!-- </Counter> \
-         --><!-- </EachItem> --><!-- <EachItem> --><!-- <Counter> \
-         --><li><button>-1</button><input type=\"text\"><span><!-- <DynChild> \
-         -->0<!-- </DynChild> \
-         --></span><button>+1</button><button>x</button></li><!-- </Counter> \
-         --><!-- </EachItem> --><!-- <EachItem> --><!-- <Counter> \
-         --><li><button>-1</button><input type=\"text\"><span><!-- <DynChild> \
-         -->0<!-- </DynChild> \
-         --></span><button>+1</button><button>x</button></li><!-- </Counter> \
-         --><!-- </EachItem> --><!-- </Each> --></ul>"
-    );
-
-    let counters = div
-        .query_selector("ul")
-        .unwrap()
-        .unwrap()
-        .unchecked_into::<HtmlElement>()
-        .children();
-
-    // click first counter once, second counter twice, etc.
-    // `NodeList` isn't a `Vec` so we iterate over it in this slightly awkward way
-    for idx in 0..counters.length() {
-        let counter = counters.item(idx).unwrap();
-        let inc_button = counter
-            .first_child()
-            .unwrap()
-            .next_sibling()
-            .unwrap()
-            .next_sibling()
-            .unwrap()
-            .next_sibling()
-            .unwrap()
-            .unchecked_into::<HtmlElement>();
-        for _ in 0..=idx {
-            inc_button.click();
-        }
-    }
-
-    assert_eq!(
-        div.inner_html(),
-        "<button>Add Counter</button><button>Add 1000 \
-         Counters</button><button>Clear Counters</button><p>Total: <span><!-- \
-         <DynChild> -->6<!-- </DynChild> --></span> from <span><!-- \
-         <DynChild> -->3<!-- </DynChild> --></span> counters.</p><ul><!-- \
-         <Each> --><!-- <EachItem> --><!-- <Counter> \
-         --><li><button>-1</button><input type=\"text\"><span><!-- <DynChild> \
-         -->1<!-- </DynChild> \
-         --></span><button>+1</button><button>x</button></li><!-- </Counter> \
-         --><!-- </EachItem> --><!-- <EachItem> --><!-- <Counter> \
-         --><li><button>-1</button><input type=\"text\"><span><!-- <DynChild> \
-         -->2<!-- </DynChild> \
-         --></span><button>+1</button><button>x</button></li><!-- </Counter> \
-         --><!-- </EachItem> --><!-- <EachItem> --><!-- <Counter> \
-         --><li><button>-1</button><input type=\"text\"><span><!-- <DynChild> \
-         -->3<!-- </DynChild> \
-         --></span><button>+1</button><button>x</button></li><!-- </Counter> \
-         --><!-- </EachItem> --><!-- </Each> --></ul>"
-    );
-
-    // remove the first counter
-    counters
-        .item(0)
-        .unwrap()
-        .last_child()
-        .unwrap()
-        .unchecked_into::<HtmlElement>()
-        .click();
-
-    assert_eq!(
-        div.inner_html(),
-        "<button>Add Counter</button><button>Add 1000 \
-         Counters</button><button>Clear Counters</button><p>Total: <span><!-- \
-         <DynChild> -->5<!-- </DynChild> --></span> from <span><!-- \
-         <DynChild> -->2<!-- </DynChild> --></span> counters.</p><ul><!-- \
-         <Each> --><!-- <EachItem> --><!-- <Counter> \
-         --><li><button>-1</button><input type=\"text\"><span><!-- <DynChild> \
-         -->2<!-- </DynChild> \
-         --></span><button>+1</button><button>x</button></li><!-- </Counter> \
-         --><!-- </EachItem> --><!-- <EachItem> --><!-- <Counter> \
-         --><li><button>-1</button><input type=\"text\"><span><!-- <DynChild> \
-         -->3<!-- </DynChild> \
-         --></span><button>+1</button><button>x</button></li><!-- </Counter> \
-         --><!-- </EachItem> --><!-- </Each> --></ul>"
-    );
-}

examples/error_boundary/Cargo.toml

@@ -3,10 +3,6 @@ name = "error_boundary"
 version = "0.1.0"
 edition = "2021"
 
-[profile.release]
-codegen-units = 1
-lto = true
-
 [dependencies]
 leptos = { path = "../../leptos" }
 console_log = "1"

examples/error_boundary/src/lib.rs

@@ -26,7 +26,7 @@ pub fn App(cx: Scope) -> impl IntoView {
                             {move || errors.get()
                                 .into_iter()
                                 .map(|(_, e)| view! { cx, <li>{e.to_string()}</li>})
-                                .collect_view(cx)
+                                .collect::<Vec<_>>()
                             }
                         </ul>
                     </div>

examples/errors_axum/Cargo.toml

@@ -28,6 +28,8 @@ thiserror = "1.0.38"
 wasm-bindgen = "0.2"
 
 [features]
+default = ["csr"]
+csr = ["leptos/csr", "leptos_meta/csr", "leptos_router/csr"]
 hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
 ssr = [
   "dep:axum",
@@ -42,7 +44,7 @@ ssr = [
 
 [package.metadata.cargo-all-features]
 denylist = ["axum", "tower", "tower-http", "tokio", "leptos_axum"]
-skip_feature_sets = [["ssr", "hydrate"]]
+skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]
 
 [package.metadata.leptos]
 # The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name

examples/fetch/Cargo.toml

@@ -3,18 +3,15 @@ name = "fetch"
 version = "0.1.0"
 edition = "2021"
 
-[profile.release]
-codegen-units = 1
-lto = true
-
 [dependencies]
+anyhow = "1.0.58"
 leptos = { path = "../../leptos" }
-reqwasm = "0.5"
+reqwasm = "0.5.0"
 serde = { version = "1", features = ["derive"] }
 log = "0.4"
 console_log = "1"
-console_error_panic_hook = "0.1"
-thiserror = "1"
+console_error_panic_hook = "0.1.7"
 
 [dev-dependencies]
-wasm-bindgen-test = "0.3"
+wasm-bindgen-test = "0.3.0"
+

examples/fetch/src/lib.rs

@@ -1,50 +1,38 @@
+use anyhow::Result;
 use leptos::*;
 use serde::{Deserialize, Serialize};
-use thiserror::Error;
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Cat {
     url: String,
 }
 
-#[derive(Error, Clone, Debug)]
-pub enum FetchError {
-    #[error("Please request more than zero cats.")]
-    NonZeroCats,
-    #[error("Error loading data from serving.")]
-    Request,
-    #[error("Error deserializaing cat data from request.")]
-    Json
-}
-
-async fn fetch_cats(count: u32) -> Result<Vec<String>, FetchError> {
+async fn fetch_cats(count: u32) -> Result<Vec<String>> {
     if count > 0 {
         // make the request
         let res = reqwasm::http::Request::get(&format!(
             "https://api.thecatapi.com/v1/images/search?limit={count}",
         ))
         .send()
-        .await
-        .map_err(|_| FetchError::Request)?
+        .await?
         // convert it to JSON
         .json::<Vec<Cat>>()
-        .await
-        .map_err(|_| FetchError::Json)?
+        .await?
         // extract the URL field for each cat
         .into_iter()
         .map(|cat| cat.url)
         .collect::<Vec<_>>();
         Ok(res)
     } else {
-        Err(FetchError::NonZeroCats)
+        Ok(vec![])
     }
 }
 
 pub fn fetch_example(cx: Scope) -> impl IntoView {
-    let (cat_count, set_cat_count) = create_signal::<u32>(cx, 0);
+    let (cat_count, set_cat_count) = create_signal::<u32>(cx, 1);
 
     // we use local_resource here because
-    // 1) our error type isn't serializable/deserializable
+    // 1) anyhow::Result isn't serializable/deserializable
     // 2) we're not doing server-side rendering in this example anyway
     //    (during SSR, create_resource will begin loading on the server and resolve on the client)
     let cats = create_local_resource(cx, cat_count, fetch_cats);
@@ -54,8 +42,8 @@ pub fn fetch_example(cx: Scope) -> impl IntoView {
             errors.with(|errors| {
                 errors
                     .iter()
-                    .map(|(_, e)| view! { cx, <li>{e.to_string()}</li> })
-                    .collect_view(cx)
+                    .map(|(_, e)| view! { cx, <li>{e.to_string()}</li>})
+                    .collect::<Vec<_>>()
             })
         };
 
@@ -72,12 +60,11 @@ pub fn fetch_example(cx: Scope) -> impl IntoView {
     // and by using the ErrorBoundary fallback to catch Err(_)
     // so we'll just implement our happy path and let the framework handle the rest
     let cats_view = move || {
-        cats.read(cx).map(|data| {
-            data.map(|data| {
-                data.iter()
-                    .map(|s| view! { cx, <span>{s}</span> })
-                    .collect_view(cx)
-            })
+        cats.with(cx, |data| {
+            data.iter()
+                .flatten()
+                .map(|cat| view! { cx, <img src={cat}/> })
+                .collect::<Vec<_>>()
         })
     };
 
@@ -85,9 +72,8 @@ pub fn fetch_example(cx: Scope) -> impl IntoView {
         <div>
             <label>
                 "How many cats would you like?"
-                <input
-                    type="number"
-                    prop:value=move || cat_count.get().to_string()
+                <input type="number"
+                    prop:value={move || cat_count.get().to_string()}
                     on:input=move |ev| {
                         let val = event_target_value(&ev).parse::<u32>().unwrap_or(0);
                         set_cat_count(val);
@@ -95,9 +81,7 @@ pub fn fetch_example(cx: Scope) -> impl IntoView {
                 />
             </label>
             <ErrorBoundary fallback>
-                <Transition fallback=move || {
-                    view! { cx, <div>"Loading (Suspense Fallback)..."</div> }
-                }>
+                <Transition fallback=move || view! { cx, <div>"Loading (Suspense Fallback)..."</div>}>
                     {cats_view}
                 </Transition>
             </ErrorBoundary>

examples/hackernews/Cargo.toml

@@ -6,10 +6,6 @@ edition = "2021"
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-[profile.release]
-codegen-units = 1
-lto = true
-
 [dependencies]
 actix-files = { version = "0.6", optional = true }
 actix-web = { version = "4", optional = true, features = ["macros"] }

examples/hackernews_axum/Cargo.toml

@@ -6,10 +6,6 @@ edition = "2021"
 [lib]
 crate-type = ["cdylib", "rlib"]
 
-[profile.release]
-codegen-units = 1
-lto = true
-
 [dependencies]
 console_log = "1.0.0"
 console_error_panic_hook = "0.1.7"

examples/login_with_token_csr_only/Cargo.toml

@@ -1,10 +1,6 @@
 [workspace]
 members = ["client", "api-boundary", "server"]
 
-[profile.release]
-codegen-units = 1
-lto = true
-
 [patch.crates-io]
 leptos = { path = "../../leptos" }
 leptos_router = { path = "../../router" }

examples/parent_child/Cargo.toml

@@ -3,10 +3,6 @@ name = "parent-child"
 version = "0.1.0"
 edition = "2021"
 
-[profile.release]
-codegen-units = 1
-lto = true
-
 [dependencies]
 leptos = { path = "../../leptos" }
 console_log = "1"

examples/router/Cargo.toml

@@ -3,10 +3,6 @@ name = "router"
 version = "0.1.0"
 edition = "2021"
 
-[profile.release]
-codegen-units = 1
-lto = true
-
 [dependencies]
 console_log = "1"
 log = "0.4"

examples/router/index.html

@@ -3,7 +3,17 @@
 	<head>
 		<link data-trunk rel="rust" data-wasm-opt="z"/>
 		<link data-trunk rel="icon" type="image/ico" href="/public/favicon.ico"/>
-        <link data-trunk rel="css" href="style.css"/>
+		<style>
+			a[aria-current] {
+				font-weight: bold;
+			}
+
+			.contact, .contact-list {
+				border: 1px solid #c0c0c0;
+				border-radius: 3px;
+				padding: 1rem;
+			}
+		</style>
 	</head>
 	<body></body>
-</html>
+</html>

examples/router/src/lib.rs

@@ -27,12 +27,7 @@ pub fn RouterExample(cx: Scope) -> impl IntoView {
                 <A href="redirect-home">"Redirect to Home"</A>
             </nav>
             <main>
-                <AnimatedRoutes
-                    outro="slideOut"
-                    intro="slideIn"
-                    outro_back="slideOutBack"
-                    intro_back="slideInBack"
-                >
+                <Routes>
                     <ContactRoutes/>
                     <Route
                         path="about"
@@ -46,7 +41,7 @@ pub fn RouterExample(cx: Scope) -> impl IntoView {
                         path="redirect-home"
                         view=move |cx| view! { cx, <Redirect path="/"/> }
                     />
-                </AnimatedRoutes>
+                </Routes>
             </main>
         </Router>
     }
@@ -97,7 +92,7 @@ pub fn ContactList(cx: Scope) -> impl IntoView {
                         <li><A href=contact.id.to_string()><span>{&contact.first_name} " " {&contact.last_name}</span></A></li>
                     }
                 })
-                .collect_view(cx)
+                .collect::<Vec<_>>()
         })
     };
 
@@ -107,11 +102,7 @@ pub fn ContactList(cx: Scope) -> impl IntoView {
             <Suspense fallback=move || view! { cx,  <p>"Loading contacts..."</p> }>
                 {move || view! { cx, <ul>{contacts}</ul>}}
             </Suspense>
-            <AnimatedOutlet 
-                class="outlet"
-                outro="fadeOut"
-                intro="fadeIn"
-            />
+            <Outlet/>
         </div>
     }
 }

examples/router/style.css

@@ -1,95 +0,0 @@
-a[aria-current] {
-    font-weight: bold;
-}
-
-.outlet {
-  border: 1px dotted grey;
-}
-
-.contact, .contact-list {
-    border: 1px solid #c0c0c0;
-    border-radius: 3px;
-    padding: 1rem;
-}
-
-.fadeIn {
-  animation: 0.5s fadeIn forwards;
-}
-
-.fadeOut {
-  animation: 0.5s fadeOut forwards;
-}
-
-@keyframes fadeIn {
-  from {
-    opacity: 0;
-  }
-
-  to {
-    opacity: 1;
-  }
-}
-
-@keyframes fadeOut {
-  from {
-    opacity: 1;
-  }
-
-  to {
-    opacity: 0;
-  }
-}
-
-.slideIn {
-  animation: 0.25s slideIn forwards;
-}
-
-.slideOut {
-  animation: 0.25s slideOut forwards;
-}
-
-@keyframes slideIn {
-  from {
-    transform: translate(100vw, 0);
-  }
-  to {
-    transform: translate(0px, 0px);
-  }
-}
-
-@keyframes slideOut {
-  from {
-    transform: translate(0px, 0px);
-  }
-  to {
-    transform: translate(-100vw, 0);
-  }
-}
-
-.slideInBack {
-  animation: 0.25s slideInBack forwards;
-}
-
-.slideOutBack {
-  animation: 0.25s slideOutBack forwards;
-}
-
-@keyframes slideInBack {
-  from {
-    transform: translate(-100vw, 0);
-  }
-
-  to {
-    transform: translate(0px, 0px);
-  }
-}
-
-@keyframes slideOutBack {
-  from {
-    transform: translate(0px, 0px);
-  }
-
-  to {
-    transform: translate(100vw, 0);
-  }
-}

examples/session_auth_axum/Cargo.toml

@@ -43,6 +43,8 @@ bcrypt = { version = "0.14", optional = true }
 async-trait = { version = "0.1.64", optional = true }
 
 [features]
+default = ["csr"]
+csr = ["leptos/csr", "leptos_meta/csr", "leptos_router/csr"]
 hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
 ssr = [
 	"dep:axum",
@@ -63,7 +65,7 @@ ssr = [
 
 [package.metadata.cargo-all-features]
 denylist = ["axum", "tower", "tower-http", "tokio", "sqlx", "leptos_axum"]
-skip_feature_sets = [["ssr", "hydrate"]]
+skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]
 
 [package.metadata.leptos]
 # The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name

examples/session_auth_axum/flake.lock

@@ -1,15 +1,12 @@
 {
   "nodes": {
     "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
       "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "lastModified": 1676283394,
+        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
         "type": "github"
       },
       "original": {
@@ -19,15 +16,12 @@
       }
     },
     "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
       "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
+        "lastModified": 1659877975,
+        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
+        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
         "type": "github"
       },
       "original": {
@@ -67,11 +61,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1681525152,
-        "narHash": "sha256-KzI+ILcmU03iFWtB+ysPqtNmp8TP8v1BBReTuPP8MJY=",
+        "lastModified": 1677292251,
+        "narHash": "sha256-D+6q5Z2MQn3UFJtqsM5/AvVHi3NXKZTIMZt1JGq/spA=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "b6f8d87208336d7cb85003b2e439fc707c38f92a",
+        "rev": "34cdbf6ad480ce13a6a526f57d8b9e609f3d65dc",
         "type": "github"
       },
       "original": {
@@ -79,36 +73,6 @@
         "repo": "rust-overlay",
         "type": "github"
       }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",

examples/session_auth_axum/src/todo.rs

@@ -241,11 +241,11 @@ pub fn Todos(cx: Scope) -> impl IntoView {
                             todos.read(cx)
                                 .map(move |todos| match todos {
                                     Err(e) => {
-                                        view! { cx, <pre class="error">"Server Error: " {e.to_string()}</pre>}.into_view(cx)
+                                        vec![view! { cx, <pre class="error">"Server Error: " {e.to_string()}</pre>}.into_any()]
                                     }
                                     Ok(todos) => {
                                         if todos.is_empty() {
-                                            view! { cx, <p>"No tasks were found."</p> }.into_view(cx)
+                                            vec![view! { cx, <p>"No tasks were found."</p> }.into_any()]
                                         } else {
                                             todos
                                                 .into_iter()
@@ -266,8 +266,9 @@ pub fn Todos(cx: Scope) -> impl IntoView {
                                                             </ActionForm>
                                                         </li>
                                                     }
+                                                    .into_any()
                                                 })
-                                                .collect_view(cx)
+                                                .collect::<Vec<_>>()
                                         }
                                     }
                                 })
@@ -286,7 +287,7 @@ pub fn Todos(cx: Scope) -> impl IntoView {
                                 <li class="pending">{move || submission.input.get().map(|data| data.title) }</li>
                             }
                         })
-                        .collect_view(cx)
+                        .collect::<Vec<_>>()
                     };
 
                     view! {

examples/slots/Cargo.toml

@@ -1,14 +0,0 @@
-[package]
-name = "slots"
-version = "0.1.0"
-edition = "2021"
-
-[profile.release]
-codegen-units = 1
-lto = true
-
-[dependencies]
-leptos = { path = "../../leptos" }
-console_log = "1"
-log = "0.4"
-console_error_panic_hook = "0.1.7"

examples/slots/Makefile.toml

@@ -1,9 +0,0 @@
-[tasks.build]
-command = "cargo"
-args = ["+nightly", "build-all-features"]
-install_crate = "cargo-all-features"
-
-[tasks.check]
-command = "cargo"
-args = ["+nightly", "check-all-features"]
-install_crate = "cargo-all-features"

examples/slots/README.md

@@ -1,7 +0,0 @@
-# Leptos `<Component slot/>` Example
-
-This example shows how to use Slots in Leptos.
-
-To run it, just issue the `trunk serve --open` command in the example root. This will build the app, run it, and open a new browser to serve it.
-
-> If you don't have `trunk` installed, [click here for install instructions.](https://trunkrs.dev/)

examples/slots/index.html

@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<link data-trunk rel="rust" data-wasm-opt="z"/>
-		<link data-trunk rel="icon" type="image/ico" href="/public/favicon.ico"/>
-	</head>
-	<body></body>
-</html>

examples/slots/src/lib.rs

@@ -1,63 +0,0 @@
-use leptos::*;
-
-// Slots are created in simillar manner to components, except that they use the #[slot] macro.
-#[slot]
-struct Then {
-    children: ChildrenFn,
-}
-
-// Props work just like component props, for example, you can specify a prop as optional by prefixing
-// the type with Option<...> and marking the option as #[prop(optional)].
-#[slot]
-struct ElseIf {
-    cond: MaybeSignal<bool>,
-    children: ChildrenFn,
-}
-
-#[slot]
-struct Fallback {
-    children: ChildrenFn,
-}
-
-// Slots are added to components like any other prop.
-#[component]
-fn SlotIf(
-    cx: Scope,
-    cond: MaybeSignal<bool>,
-    then: Then,
-    #[prop(default=vec![])] else_if: Vec<ElseIf>,
-    #[prop(optional)] fallback: Option<Fallback>,
-) -> impl IntoView {
-    move || {
-        if cond() {
-            (then.children)(cx).into_view(cx)
-        } else if let Some(else_if) = else_if.iter().find(|i| (i.cond)()) {
-            (else_if.children)(cx).into_view(cx)
-        } else if let Some(fallback) = &fallback {
-            (fallback.children)(cx).into_view(cx)
-        } else {
-            ().into_view(cx)
-        }
-    }
-}
-
-#[component]
-pub fn App(cx: Scope) -> impl IntoView {
-    let (count, set_count) = create_signal(cx, 0);
-    let is_even = MaybeSignal::derive(cx, move || count() % 2 == 0);
-    let is_div5 = MaybeSignal::derive(cx, move || count() % 5 == 0);
-    let is_div7 = MaybeSignal::derive(cx, move || count() % 7 == 0);
-
-    view! { cx,
-        <button on:click=move |_| set_count.update(|value| *value += 1)>"+1"</button>
-        " "{count}" is "
-        <SlotIf cond=is_even>
-            // The slot name can be emitted if it would match the slot struct name (in snake case).
-            <Then slot>"even"</Then>
-            // Props are passed just like on normal components.
-            <ElseIf slot cond=is_div5>"divisible by 5"</ElseIf>
-            <ElseIf slot cond=is_div7>"divisible by 7"</ElseIf>
-            <Fallback slot>"odd"</Fallback>
-        </SlotIf>
-    }
-}

examples/slots/src/main.rs

@@ -1,12 +0,0 @@
-use leptos::*;
-use slots::*;
-
-pub fn main() {
-    _ = console_log::init_with_level(log::Level::Debug);
-    console_error_panic_hook::set_once();
-    mount_to_body(|cx| {
-        view! { cx,
-            <App/>
-        }
-    })
-}

examples/ssr_modes/Cargo.toml

@@ -36,10 +36,6 @@ ssr = [
   "leptos_router/ssr",
 ]
 
-[package.metadata.cargo-all-features]
-denylist = ["actix-files", "actix-web", "leptos_actix"]
-skip_feature_sets = [["ssr", "hydrate"]]
-
 [package.metadata.leptos]
 # The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name   
 output-name = "ssr_modes"

examples/ssr_modes/src/app.rs

@@ -44,7 +44,7 @@ fn HomePage(cx: Scope) -> impl IntoView {
             .map(|posts| {
                 posts.iter()
                 .map(|post| view! { cx, <li><a href=format!("/post/{}", post.id)>{&post.title}</a></li>})
-                .collect_view(cx)
+                .collect::<Vec<_>>()
             })
         )
     };
@@ -109,7 +109,7 @@ fn Post(cx: Scope) -> impl IntoView {
                         {move || errors.get()
                             .into_iter()
                             .map(|(_, error)| view! { cx, <li>{error.to_string()} </li> })
-                            .collect_view(cx)
+                            .collect::<Vec<_>>()
                         }
                         </ul>
                     </div>

examples/ssr_modes_axum/Cargo.toml

@@ -39,10 +39,6 @@ ssr = [
   "dep:leptos_axum",
 ]
 
-[package.metadata.cargo-all-features]
-denylist = ["axum", "tower", "tower-http", "tokio", "sqlx", "leptos_axum"]
-skip_feature_sets = [["ssr", "hydrate"]]
-
 [package.metadata.leptos]
 # The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name
 output-name = "ssr_modes"

examples/ssr_modes_axum/src/app.rs

@@ -49,7 +49,7 @@ fn HomePage(cx: Scope) -> impl IntoView {
             .map(|posts| {
                 posts.iter()
                 .map(|post| view! { cx, <li><a href=format!("/post/{}", post.id)>{&post.title}</a> "|" <a href=format!("/post_in_order/{}", post.id)>{&post.title}"(in order)"</a></li>})
-                .collect_view(cx)
+                .collect::<Vec<_>>()
             })
         )
     };
@@ -114,7 +114,7 @@ fn Post(cx: Scope) -> impl IntoView {
                         {move || errors.get()
                             .into_iter()
                             .map(|(_, error)| view! { cx, <li>{error.to_string()} </li> })
-                            .collect_view(cx)
+                            .collect::<Vec<_>>()
                         }
                         </ul>
                     </div>

examples/ssr_modes_axum/src/main.rs

@@ -1,15 +1,12 @@
 #[cfg(feature = "ssr")]
 #[tokio::main]
-async fn main() {
-    use axum::{
-        extract::{Extension, Path},
-        routing::{get, post},
-        Router,
-    };
+async fn main(){
     use leptos::*;
     use leptos_axum::{generate_route_list, LeptosRoutes};
-    use ssr_modes_axum::{app::*, fallback::file_and_error_handler};
+    use axum::{extract::{Extension, Path}, Router, routing::{get, post}};
     use std::sync::Arc;
+    use ssr_modes_axum::fallback::file_and_error_handler;
+    use ssr_modes_axum::app::*;
 
     let conf = get_configuration(None).await.unwrap();
     let addr = conf.leptos_options.site_addr;
@@ -22,11 +19,7 @@ async fn main() {
 
     let app = Router::new()
         .route("/api/*fn_name", post(leptos_axum::handle_server_fns))
-        .leptos_routes(
-            leptos_options.clone(),
-            routes,
-            |cx| view! { cx, <App/> },
-        )
+        .leptos_routes(leptos_options.clone(), routes, |cx| view! { cx, <App/> })
         .fallback(file_and_error_handler)
         .layer(Extension(Arc::new(leptos_options)));
 

examples/timer/Cargo.toml

@@ -1,24 +0,0 @@
-[package]
-name = "timer"
-version = "0.1.0"
-edition = "2021"
-
-[profile.release]
-codegen-units = 1
-lto = true
-
-[dependencies]
-leptos = { path = "../../leptos" }
-console_log = "1"
-log = "0.4"
-console_error_panic_hook = "0.1.7"
-wasm-bindgen = "0.2"
-
-[dependencies.web-sys]
-version = "0.3"
-features = [
-    "Window",
-]
-
-[dev-dependencies]
-wasm-bindgen-test = "0.3.0"

examples/timer/Makefile.toml

@@ -1,9 +0,0 @@
-[tasks.build]
-command = "cargo"
-args = ["+nightly", "build-all-features"]
-install_crate = "cargo-all-features"
-
-[tasks.check]
-command = "cargo"
-args = ["+nightly", "check-all-features"]
-install_crate = "cargo-all-features"

examples/timer/README.md

@@ -1,7 +0,0 @@
-# Leptos Timer Example
-
-This example creates a simple timer based on `setInterval` in a client side rendered app with Rust and WASM.
-
-To run it, just issue the `trunk serve --open` command in the example root. This will build the app, run it, and open a new browser to serve it.
-
-> If you don't have `trunk` installed, [click here for install instructions.](https://trunkrs.dev/)

examples/timer/index.html

@@ -1,8 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<link data-trunk rel="rust" data-wasm-opt="z"/>
-		<link data-trunk rel="icon" type="image/ico" href="/public/favicon.ico"/>
-	</head>
-	<body></body>
-</html>

examples/timer/rust-toolchain.toml

@@ -1,2 +0,0 @@
-[toolchain]
-channel = "nightly"

examples/timer/src/lib.rs

@@ -1,61 +0,0 @@
-use leptos::{leptos_dom::helpers::IntervalHandle, *};
-use std::time::Duration;
-
-/// Timer example, demonstrating the use of `use_interval`.
-#[component]
-pub fn TimerDemo(cx: Scope) -> impl IntoView {
-    // count_a updates with a fixed interval of 1000 ms, whereas count_b has a dynamic
-    // update interval.
-    let (count_a, set_count_a) = create_signal(cx, 0_i32);
-    let (count_b, set_count_b) = create_signal(cx, 0_i32);
-
-    let (interval, set_interval) = create_signal(cx, 1000);
-
-    use_interval(cx, 1000, move || {
-        set_count_a.update(|c| *c = *c + 1);
-    });
-    use_interval(cx, interval, move || {
-        set_count_b.update(|c| *c = *c + 1);
-    });
-
-    view! { cx,
-        <div>
-            <div>"Count A (fixed interval of 1000 ms)"</div>
-            <div>{count_a}</div>
-            <div>"Count B (dynamic interval, currently " {interval} " ms)"</div>
-            <div>{count_b}</div>
-            <input prop:value=interval on:input=move |ev| {
-                if let Ok(value) = event_target_value(&ev).parse::<u64>() {
-                    set_interval(value);
-                }
-            }/>
-        </div>
-    }
-}
-
-/// Hook to wrap the underlying `setInterval` call and make it reactive w.r.t.
-/// possible changes of the timer interval.
-pub fn use_interval<T, F>(cx: Scope, interval_millis: T, f: F)
-where
-    F: Fn() + Clone + 'static,
-    T: Into<MaybeSignal<u64>> + 'static,
-{
-    let interval_millis = interval_millis.into();
-    create_effect(cx, move |prev_handle: Option<IntervalHandle>| {
-        // effects get their previous return value as an argument
-        // each time the effect runs, it will return the interval handle
-        // so if we have a previous one, we cancel it
-        if let Some(prev_handle) = prev_handle {
-            prev_handle.clear();
-        };
-
-        // here, we return the handle
-        set_interval_with_handle(
-            f.clone(),
-            // this is the only reactive access, so this effect will only
-            // re-run when the interval changes
-            Duration::from_millis(interval_millis.get()),
-        )
-        .expect("could not create interval")
-    });
-}

examples/timer/src/main.rs

@@ -1,12 +0,0 @@
-use leptos::*;
-use timer::TimerDemo;
-
-pub fn main() {
-    _ = console_log::init_with_level(log::Level::Debug);
-    console_error_panic_hook::set_once();
-    mount_to_body(|cx| {
-        view! { cx,
-            <TimerDemo />
-        }
-    })
-}

examples/todo_app_sqlite/README.md

@@ -1,23 +1,19 @@
-# Leptos Todo App Sqlite
+# Leptos Todo App Sqlite 
 
 This example creates a basic todo app with an Actix backend that uses Leptos' server functions to call sqlx from the client and seamlessly run it on the server.
 
 ## Client Side Rendering
-
-This example cannot be built as a trunk standalone CSR-only app. Only the server may directly connect to the database.
+To run it as a Client Side App, you can issue  `trunk serve --open` in the root. This will build the entire
+app into one CSR bundle. Make sure you have trunk installed with `cargo install trunk`.
 
 ## Server Side Rendering with cargo-leptos
-
 cargo-leptos is now the easiest and most featureful way to build server side rendered apps with hydration. It provides automatic recompilation of client and server code, wasm optimisation, CSS minification, and more! Check out more about it [here](https://github.com/akesson/cargo-leptos)
 
 1. Install cargo-leptos
-
 ```bash
 cargo install --locked cargo-leptos
-```
-
+``` 
 2. Build the site in watch mode, recompiling on file changes
-
 ```bash
 cargo leptos watch
 ```
@@ -25,30 +21,24 @@ cargo leptos watch
 Open browser on [http://localhost:3000/](http://localhost:3000/)
 
 3. When ready to deploy, run
-
 ```bash
 cargo leptos build --release
 ```
 
 ## Server Side Rendering without cargo-leptos
-
 To run it as a server side app with hydration, you'll need to have wasm-pack installed.
 
 0. Edit the `[package.metadata.leptos]` section and set `site-root` to `"."`. You'll also want to change the path of the `<StyleSheet / >` component in the root component to point towards the CSS file in the root. This tells leptos that the WASM/JS files generated by wasm-pack are available at `./pkg` and that the CSS files are no longer processed by cargo-leptos. Building to alternative folders is not supported at this time. You'll also want to edit the call to `get_configuration()` to pass in `Some(Cargo.toml)`, so that Leptos will read the settings instead of cargo-leptos. If you do so, your file/folder names cannot include dashes.
 1. Install wasm-pack
-
 ```bash
 cargo install wasm-pack
 ```
-
 2. Build the Webassembly used to hydrate the HTML from the server
-
 ```bash
 wasm-pack build --target=web --debug --no-default-features --features=hydrate
 ```
-
-3. Run the server to serve the Webassembly, JS, and HTML
-
+3. Run the server to serve the Webassembly, JS, and HTML 
 ```bash
 cargo run --no-default-features --features=ssr
 ```
+

examples/todo_app_sqlite/src/todo.rs

@@ -156,11 +156,11 @@ pub fn Todos(cx: Scope) -> impl IntoView {
                             todos.read(cx)
                                 .map(move |todos| match todos {
                                     Err(e) => {
-                                        view! { cx, <pre class="error">"Server Error: " {e.to_string()}</pre>}.into_view(cx)
+                                        vec![view! { cx, <pre class="error">"Server Error: " {e.to_string()}</pre>}.into_any()]
                                     }
                                     Ok(todos) => {
                                         if todos.is_empty() {
-                                            view! { cx, <p>"No tasks were found."</p> }.into_view(cx)
+                                            vec![view! { cx, <p>"No tasks were found."</p> }.into_any()]
                                         } else {
                                             todos
                                                 .into_iter()
@@ -175,8 +175,9 @@ pub fn Todos(cx: Scope) -> impl IntoView {
                                                             </ActionForm>
                                                         </li>
                                                     }
+                                                    .into_any()
                                                 })
-                                                .collect_view(cx)
+                                                .collect::<Vec<_>>()
                                         }
                                     }
                                 })
@@ -195,7 +196,7 @@ pub fn Todos(cx: Scope) -> impl IntoView {
                                 <li class="pending">{move || submission.input.get().map(|data| data.title) }</li>
                             }
                         })
-                        .collect_view(cx)
+                        .collect::<Vec<_>>()
                     };
 
                     view! {

examples/todo_app_sqlite_axum/src/errors.rs

@@ -13,9 +13,7 @@ impl TodoAppError {
     pub fn status_code(&self) -> StatusCode {
         match self {
             TodoAppError::NotFound => StatusCode::NOT_FOUND,
-            TodoAppError::InternalServerError => {
-                StatusCode::INTERNAL_SERVER_ERROR
-            }
+            TodoAppError::InternalServerError => StatusCode::INTERNAL_SERVER_ERROR,
         }
     }
 }

examples/todo_app_sqlite_axum/src/todo.rs

@@ -18,7 +18,6 @@ cfg_if! {
             _ = GetTodos::register();
             _ = AddTodo::register();
             _ = DeleteTodo::register();
-            _ = FormDataHandler::register();
         }
 
         #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, sqlx::FromRow)]
@@ -52,8 +51,7 @@ pub async fn get_todos(cx: Scope) -> Result<Vec<Todo>, ServerFnError> {
     let mut conn = db().await?;
 
     let mut todos = Vec::new();
-    let mut rows =
-        sqlx::query_as::<_, Todo>("SELECT * FROM todos").fetch(&mut conn);
+    let mut rows = sqlx::query_as::<_, Todo>("SELECT * FROM todos").fetch(&mut conn);
     while let Some(row) = rows
         .try_next()
         .await
@@ -108,30 +106,6 @@ pub async fn delete_todo(id: u16) -> Result<(), ServerFnError> {
         .map_err(|e| ServerFnError::ServerError(e.to_string()))
 }
 
-#[derive(Serialize, Deserialize, Debug, Clone, Default)]
-pub struct FormData {
-    hi: String,
-}
-
-#[server(FormDataHandler, "/api")]
-pub async fn form_data(cx: Scope) -> Result<FormData, ServerFnError> {
-    use axum::extract::FromRequest;
-
-    let req = use_context::<leptos_axum::LeptosRequest<axum::body::Body>>(cx)
-        .and_then(|req| req.take_request())
-        .unwrap();
-    if req.method() == http::Method::POST {
-        let form = axum::Form::from_request(req, &())
-            .await
-            .map_err(|e| ServerFnError::ServerError(e.to_string()))?;
-        Ok(form.0)
-    } else {
-        Err(ServerFnError::ServerError(
-            "wrong form fields submitted".to_string(),
-        ))
-    }
-}
-
 #[component]
 pub fn TodoApp(cx: Scope) -> impl IntoView {
     //let id = use_context::<String>(cx);
@@ -152,23 +126,6 @@ pub fn TodoApp(cx: Scope) -> impl IntoView {
                             <Todos/>
                         </ErrorBoundary>
                     }/> //Route
-                    <Route path="weird" methods=&[Method::Get, Method::Post]
-                        ssr=SsrMode::Async
-                        view=|cx| {
-                            let res = create_resource(cx, || (), move |_| async move {
-                                form_data(cx).await
-                            });
-                            view! { cx,
-                                <Suspense fallback=|| ()>
-                                    <pre>
-                                        {move || {
-                                            res.with(cx, |body| format!("{body:#?}"))
-                                        }}
-                                    </pre>
-                                </Suspense>
-                            }
-                        }
-                    />
                 </Routes>
             </main>
         </Router>
@@ -190,10 +147,6 @@ pub fn Todos(cx: Scope) -> impl IntoView {
 
     view! {
         cx,
-        <form method="POST" action="/weird">
-            <input type="text" name="hi" value="John"/>
-            <input type="submit"/>
-        </form>
         <div>
             <MultiActionForm action=add_todo>
                 <label>
@@ -209,11 +162,11 @@ pub fn Todos(cx: Scope) -> impl IntoView {
                             todos.read(cx)
                                 .map(move |todos| match todos {
                                     Err(e) => {
-                                        view! { cx, <pre class="error">"Server Error: " {e.to_string()}</pre>}.into_view(cx)
+                                        vec![view! { cx, <pre class="error">"Server Error: " {e.to_string()}</pre>}.into_any()]
                                     }
                                     Ok(todos) => {
                                         if todos.is_empty() {
-                                            view! { cx, <p>"No tasks were found."</p> }.into_view(cx)
+                                            vec![view! { cx, <p>"No tasks were found."</p> }.into_any()]
                                         } else {
                                             todos
                                                 .into_iter()
@@ -228,8 +181,9 @@ pub fn Todos(cx: Scope) -> impl IntoView {
                                                             </ActionForm>
                                                         </li>
                                                     }
+                                                    .into_any()
                                                 })
-                                                .collect_view(cx)
+                                                .collect::<Vec<_>>()
                                         }
                                     }
                                 })
@@ -248,7 +202,7 @@ pub fn Todos(cx: Scope) -> impl IntoView {
                                 <li class="pending">{move || submission.input.get().map(|data| data.title) }</li>
                             }
                         })
-                        .collect_view(cx)
+                        .collect::<Vec<_>>()
                     };
 
                     view! {

examples/todo_app_sqlite_viz/src/todo.rs

@@ -163,11 +163,11 @@ pub fn Todos(cx: Scope) -> impl IntoView {
                             todos.read(cx)
                                 .map(move |todos| match todos {
                                     Err(e) => {
-                                        view! { cx, <pre class="error">"Server Error: " {e.to_string()}</pre>}.into_view(cx)
+                                        vec![view! { cx, <pre class="error">"Server Error: " {e.to_string()}</pre>}.into_any()]
                                     }
                                     Ok(todos) => {
                                         if todos.is_empty() {
-                                            view! { cx, <p>"No tasks were found."</p> }.into_view(cx)
+                                            vec![view! { cx, <p>"No tasks were found."</p> }.into_any()]
                                         } else {
                                             todos
                                                 .into_iter()
@@ -182,8 +182,9 @@ pub fn Todos(cx: Scope) -> impl IntoView {
                                                             </ActionForm>
                                                         </li>
                                                     }
+                                                    .into_any()
                                                 })
-                                                .collect_view(cx)
+                                                .collect::<Vec<_>>()
                                         }
                                     }
                                 })
@@ -202,7 +203,7 @@ pub fn Todos(cx: Scope) -> impl IntoView {
                                 <li class="pending">{move || submission.input.get().map(|data| data.title) }</li>
                             }
                         })
-                        .collect_view(cx)
+                        .collect::<Vec<_>>()
                     };
 
                     view! {

examples/todomvc/Cargo.toml

@@ -3,10 +3,6 @@ name = "todomvc"
 version = "0.1.0"
 edition = "2021"
 
-[profile.release]
-codegen-units = 1
-lto = true
-
 [dependencies]
 leptos = { path = "../../leptos", default-features = false }
 log = "0.4"
@@ -25,6 +21,3 @@ default = ["csr"]
 csr = ["leptos/csr"]
 hydrate = ["leptos/hydrate"]
 ssr = ["leptos/ssr"]
-
-[package.metadata.cargo-all-features]
-skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]

examples/todomvc/src/lib.rs

@@ -202,19 +202,6 @@ pub fn TodoMVC(cx: Scope) -> impl IntoView {
         }
     });
 
-    // focus the main input on load  
-    create_effect(cx, move |_| {
-        if let Some(input) = input_ref.get() {
-            // We use request_animation_frame here because the NodeRef 
-            // is filled when the element is created, but before it's mounted 
-            // to the DOM. Calling .focus() before it's mounted does nothing.
-            // So inside, we wait a tick for the browser to mount it, then .focus()
-            request_animation_frame(move || {
-                input.focus();
-            });
-        }
-    });
-
     view! { cx,
         <main>
             <section class="todoapp">

flake.lock

@@ -1,130 +0,0 @@
-{
-  "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1681920287,
-        "narHash": "sha256-+/d6XQQfhhXVfqfLROJoqj3TuG38CAeoT6jO1g9r1k0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "645bc49f34fa8eff95479f0345ff57e55b53437e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1681358109,
-        "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "96ba1c52e54e74c3197f4d43026b3f3d92e83ff9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1682043560,
-        "narHash": "sha256-ZsF4Yee9pQbvLtwSVGgYux+az4yFSLXrxPyGHm3ptJM=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "48037a6f8faeee138ede96bf607bc95c9dab9aec",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

flake.nix

@@ -1,36 +0,0 @@
-{
-  description = "A basic Rust devshell for NixOS users developing Leptos";
-
-  inputs = {
-    nixpkgs.url      = "github:NixOS/nixpkgs/nixos-unstable";
-    rust-overlay.url = "github:oxalica/rust-overlay";
-    flake-utils.url  = "github:numtide/flake-utils";
-  };
-
-  outputs = { self, nixpkgs, rust-overlay, flake-utils, ... }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        overlays = [ (import rust-overlay) ];
-        pkgs = import nixpkgs {
-          inherit system overlays;
-        };
-      in
-      with pkgs;
-      {
-        devShells.default = mkShell {
-          buildInputs = [
-            openssl
-            pkg-config
-            cacert
-            (rust-bin.selectLatestNightlyWith( toolchain: toolchain.default.override {
-              extensions= [ "rust-src" "rust-analyzer" ];
-              targets = [ "wasm32-unknown-unknown" ];
-            }))
-          ];
-
-          shellHook = ''
-            '';
-        };
-      }
-    );
-}

integrations/actix/Cargo.toml

@@ -17,4 +17,3 @@ leptos_integration_utils = { workspace = true }
 serde_json = "1"
 parking_lot = "0.12.1"
 regex = "1.7.0"
-tracing = "0.1.37"

integrations/actix/src/lib.rs

@@ -13,7 +13,7 @@ use actix_web::{
     web::Bytes,
     *,
 };
-use futures::{Stream, StreamExt};
+use futures::{Future, Stream, StreamExt};
 use http::StatusCode;
 use leptos::{
     leptos_dom::ssr::render_to_stream_with_prefix_undisposed_with_context,
@@ -26,8 +26,8 @@ use leptos_meta::*;
 use leptos_router::*;
 use parking_lot::RwLock;
 use regex::Regex;
-use std::{fmt::Display, future::Future, sync::Arc};
-use tracing::instrument;
+use std::sync::Arc;
+
 /// This struct lets you define headers and override the status of the Response from an Element or a Server Function
 /// Typically contained inside of a ResponseOptions. Setting this is useful for cookies and custom responses.
 #[derive(Debug, Clone, Default)]
@@ -98,7 +98,6 @@ impl ResponseOptions {
 /// 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::LOCATION) header with the provided value.
 /// If looking to redirect from the client, `leptos_router::use_navigate()` should be used instead.
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub fn redirect(cx: leptos::Scope, path: &str) {
     if let Some(response_options) = use_context::<ResponseOptions>(cx) {
         response_options.set_status(StatusCode::FOUND);
@@ -148,7 +147,6 @@ pub fn redirect(cx: leptos::Scope, path: &str) {
 /// This function always provides context values including the following types:
 /// - [ResponseOptions]
 /// - [HttpRequest](actix_web::HttpRequest)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub fn handle_server_fns() -> Route {
     handle_server_fns_with_context(|_cx| {})
 }
@@ -168,7 +166,6 @@ pub fn handle_server_fns() -> Route {
 /// This function always provides context values including the following types:
 /// - [ResponseOptions]
 /// - [HttpRequest](actix_web::HttpRequest)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub fn handle_server_fns_with_context(
     additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
 ) -> Route {
@@ -204,11 +201,15 @@ pub fn handle_server_fns_with_context(
                         Encoding::Url | Encoding::Cbor => body,
                         Encoding::GetJSON | Encoding::GetCBOR => query,
                     };
-                    let res = match (server_fn.trait_obj)(cx, data).await {
+                    match (server_fn.trait_obj)(cx, data).await {
                         Ok(serialized) => {
                             let res_options =
                                 use_context::<ResponseOptions>(cx).unwrap();
 
+                            // clean up the scope, which we only needed to run the server fn
+                            disposer.dispose();
+                            runtime.dispose();
+
                             let mut res: HttpResponseBuilder;
                             let mut res_parts = res_options.0.write();
 
@@ -267,11 +268,7 @@ pub fn handle_server_fns_with_context(
                             serde_json::to_string(&e)
                                 .unwrap_or_else(|_| e.to_string()),
                         ),
-                    };
-                    // clean up the scope
-                    disposer.dispose();
-                    runtime.dispose();
-                    res
+                    }
                 } else {
                     HttpResponse::BadRequest().body(format!(
                         "Could not find a server function at the route {:?}. \
@@ -301,7 +298,6 @@ pub fn handle_server_fns_with_context(
 /// ```
 /// use actix_web::{App, HttpServer};
 /// use leptos::*;
-/// use leptos_router::Method;
 /// use std::{env, net::SocketAddr};
 ///
 /// #[component]
@@ -325,7 +321,6 @@ pub fn handle_server_fns_with_context(
 ///                 leptos_actix::render_app_to_stream(
 ///                     leptos_options.to_owned(),
 ///                     |cx| view! { cx, <MyApp/> },
-///                     Method::Get,
 ///                 ),
 ///             )
 ///     })
@@ -342,16 +337,14 @@ pub fn handle_server_fns_with_context(
 /// - [HttpRequest](actix_web::HttpRequest)
 /// - [MetaContext](leptos_meta::MetaContext)
 /// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub fn render_app_to_stream<IV>(
     options: LeptosOptions,
     app_fn: impl Fn(leptos::Scope) -> IV + Clone + 'static,
-    method: Method,
 ) -> Route
 where
     IV: IntoView,
 {
-    render_app_to_stream_with_context(options, |_cx| {}, app_fn, method)
+    render_app_to_stream_with_context(options, |_cx| {}, app_fn)
 }
 
 /// Returns an Actix [Route](actix_web::Route) that listens for a `GET` request and tries
@@ -370,7 +363,6 @@ where
 /// ```
 /// use actix_web::{App, HttpServer};
 /// use leptos::*;
-/// use leptos_router::Method;
 /// use std::{env, net::SocketAddr};
 ///
 /// #[component]
@@ -394,7 +386,6 @@ where
 ///                 leptos_actix::render_app_to_stream_in_order(
 ///                     leptos_options.to_owned(),
 ///                     |cx| view! { cx, <MyApp/> },
-///                     Method::Get,
 ///                 ),
 ///             )
 ///     })
@@ -411,21 +402,14 @@ where
 /// - [HttpRequest](actix_web::HttpRequest)
 /// - [MetaContext](leptos_meta::MetaContext)
 /// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub fn render_app_to_stream_in_order<IV>(
     options: LeptosOptions,
     app_fn: impl Fn(leptos::Scope) -> IV + Clone + 'static,
-    method: Method,
 ) -> Route
 where
     IV: IntoView,
 {
-    render_app_to_stream_in_order_with_context(
-        options,
-        |_cx| {},
-        app_fn,
-        method,
-    )
+    render_app_to_stream_in_order_with_context(options, |_cx| {}, app_fn)
 }
 
 /// Returns an Actix [Route](actix_web::Route) that listens for a `GET` request and tries
@@ -442,7 +426,6 @@ where
 /// ```
 /// use actix_web::{App, HttpServer};
 /// use leptos::*;
-/// use leptos_router::Method;
 /// use std::{env, net::SocketAddr};
 ///
 /// #[component]
@@ -466,7 +449,6 @@ where
 ///                 leptos_actix::render_app_async(
 ///                     leptos_options.to_owned(),
 ///                     |cx| view! { cx, <MyApp/> },
-///                     Method::Get,
 ///                 ),
 ///             )
 ///     })
@@ -483,16 +465,14 @@ where
 /// - [HttpRequest](actix_web::HttpRequest)
 /// - [MetaContext](leptos_meta::MetaContext)
 /// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub fn render_app_async<IV>(
     options: LeptosOptions,
     app_fn: impl Fn(leptos::Scope) -> IV + Clone + 'static,
-    method: Method,
 ) -> Route
 where
     IV: IntoView,
 {
-    render_app_async_with_context(options, |_cx| {}, app_fn, method)
+    render_app_async_with_context(options, |_cx| {}, app_fn)
 }
 
 /// Returns an Actix [Route](actix_web::Route) that listens for a `GET` request and tries
@@ -507,17 +487,15 @@ where
 /// - [HttpRequest](actix_web::HttpRequest)
 /// - [MetaContext](leptos_meta::MetaContext)
 /// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub fn render_app_to_stream_with_context<IV>(
     options: LeptosOptions,
     additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
     app_fn: impl Fn(leptos::Scope) -> IV + Clone + 'static,
-    method: Method,
 ) -> Route
 where
     IV: IntoView,
 {
-    let handler = move |req: HttpRequest| {
+    web::get().to(move |req: HttpRequest| {
         let options = options.clone();
         let app_fn = app_fn.clone();
         let additional_context = additional_context.clone();
@@ -535,14 +513,7 @@ where
 
             stream_app(&options, app, res_options, additional_context).await
         }
-    };
-    match method {
-        Method::Get => web::get().to(handler),
-        Method::Post => web::post().to(handler),
-        Method::Put => web::put().to(handler),
-        Method::Delete => web::delete().to(handler),
-        Method::Patch => web::patch().to(handler),
-    }
+    })
 }
 
 /// Returns an Actix [Route](actix_web::Route) that listens for a `GET` request and tries
@@ -557,17 +528,15 @@ where
 /// - [HttpRequest](actix_web::HttpRequest)
 /// - [MetaContext](leptos_meta::MetaContext)
 /// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub fn render_app_to_stream_in_order_with_context<IV>(
     options: LeptosOptions,
     additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
     app_fn: impl Fn(leptos::Scope) -> IV + Clone + 'static,
-    method: Method,
 ) -> Route
 where
     IV: IntoView,
 {
-    let handler = move |req: HttpRequest| {
+    web::get().to(move |req: HttpRequest| {
         let options = options.clone();
         let app_fn = app_fn.clone();
         let additional_context = additional_context.clone();
@@ -586,14 +555,7 @@ where
             stream_app_in_order(&options, app, res_options, additional_context)
                 .await
         }
-    };
-    match method {
-        Method::Get => web::get().to(handler),
-        Method::Post => web::post().to(handler),
-        Method::Put => web::put().to(handler),
-        Method::Delete => web::delete().to(handler),
-        Method::Patch => web::patch().to(handler),
-    }
+    })
 }
 
 /// Returns an Actix [Route](actix_web::Route) that listens for a `GET` request and tries
@@ -609,17 +571,15 @@ where
 /// - [HttpRequest](actix_web::HttpRequest)
 /// - [MetaContext](leptos_meta::MetaContext)
 /// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub fn render_app_async_with_context<IV>(
     options: LeptosOptions,
     additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
     app_fn: impl Fn(leptos::Scope) -> IV + Clone + 'static,
-    method: Method,
 ) -> Route
 where
     IV: IntoView,
 {
-    let handler = move |req: HttpRequest| {
+    web::get().to(move |req: HttpRequest| {
         let options = options.clone();
         let app_fn = app_fn.clone();
         let additional_context = additional_context.clone();
@@ -643,14 +603,7 @@ where
             )
             .await
         }
-    };
-    match method {
-        Method::Get => web::get().to(handler),
-        Method::Post => web::post().to(handler),
-        Method::Put => web::put().to(handler),
-        Method::Delete => web::delete().to(handler),
-        Method::Patch => web::patch().to(handler),
-    }
+    })
 }
 
 /// Returns an Actix [Route](actix_web::Route) that listens for a `GET` request and tries
@@ -750,7 +703,7 @@ where
         }
     })
 }
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+
 fn provide_contexts(
     cx: leptos::Scope,
     req: &HttpRequest,
@@ -775,7 +728,7 @@ fn leptos_corrected_path(req: &HttpRequest) -> String {
         "http://leptos".to_string() + path + "?" + query
     }
 }
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+
 async fn stream_app(
     options: &LeptosOptions,
     app: impl FnOnce(leptos::Scope) -> View + 'static,
@@ -791,10 +744,7 @@ async fn stream_app(
 
     build_stream_response(options, res_options, stream, runtime, scope).await
 }
-#[cfg_attr(
-    any(debug_assertions, feature = "ssr"),
-    instrument(level = "trace", skip_all,)
-)]
+
 async fn stream_app_in_order(
     options: &LeptosOptions,
     app: impl FnOnce(leptos::Scope) -> View + 'static,
@@ -812,7 +762,7 @@ async fn stream_app_in_order(
 
     build_stream_response(options, res_options, stream, runtime, scope).await
 }
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+
 async fn build_stream_response(
     options: &LeptosOptions,
     res_options: ResponseOptions,
@@ -862,7 +812,7 @@ async fn build_stream_response(
     // Return the response
     res
 }
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+
 async fn render_app_async_helper(
     options: &LeptosOptions,
     app: impl FnOnce(leptos::Scope) -> View + 'static,
@@ -904,21 +854,7 @@ async fn render_app_async_helper(
 /// as an argument so it can walk you app tree. This version is tailored to generated Actix compatible paths.
 pub fn generate_route_list<IV>(
     app_fn: impl FnOnce(leptos::Scope) -> IV + 'static,
-) -> Vec<RouteListing>
-where
-    IV: IntoView + 'static,
-{
-    generate_route_list_with_exclusions(app_fn, None)
-}
-
-/// Generates a list of all routes defined in Leptos's Router in your app. We can then use this to automatically
-/// create routes in Actix's App without having to use wildcard matching or fallbacks. Takes in your root app Element
-/// as an argument so it can walk you app tree. This version is tailored to generated Actix compatible paths. Adding excluded_routes
-/// to this function will stop `.leptos_routes()` from generating a route for it, allowing a custom handler. These need to be in Actix path format
-pub fn generate_route_list_with_exclusions<IV>(
-    app_fn: impl FnOnce(leptos::Scope) -> IV + 'static,
-    excluded_routes: Option<Vec<String>>,
-) -> Vec<RouteListing>
+) -> Vec<(String, SsrMode)>
 where
     IV: IntoView + 'static,
 {
@@ -927,16 +863,11 @@ where
     // Empty strings screw with Actix pathing, they need to be "/"
     routes = routes
         .into_iter()
-        .map(|listing| {
-            let path = listing.path();
-            if path.is_empty() {
-                return RouteListing::new(
-                    "/".to_string(),
-                    listing.mode(),
-                    listing.methods(),
-                );
+        .map(|(s, mode)| {
+            if s.is_empty() {
+                return ("/".to_string(), mode);
             }
-            RouteListing::new(listing.path(), listing.mode(), listing.methods())
+            (s, mode)
         })
         .collect();
 
@@ -946,24 +877,15 @@ where
     // Match `:some_word` but only capture `some_word` in the groups to replace with `{some_word}`
     let capture_re = Regex::new(r":((?:[^.,/]+)+)[^/]?").unwrap();
 
-    let mut routes = routes
+    let routes: Vec<(String, SsrMode)> = routes
         .into_iter()
-        .map(|listing| {
-            let path = wildcard_re
-                .replace_all(listing.path(), "{tail:.*}")
-                .to_string();
-            let path = capture_re.replace_all(&path, "{$1}").to_string();
-            RouteListing::new(path, listing.mode(), listing.methods())
-        })
-        .collect::<Vec<_>>();
+        .map(|(s, m)| (wildcard_re.replace_all(&s, "{tail:.*}").to_string(), m))
+        .map(|(s, m)| (capture_re.replace_all(&s, "{$1}").to_string(), m))
+        .collect();
 
     if routes.is_empty() {
-        vec![RouteListing::new("/", Default::default(), [Method::Get])]
+        vec![("/".to_string(), Default::default())]
     } else {
-        // Routes to exclude from auto generation
-        if let Some(excluded_routes) = excluded_routes {
-            routes.retain(|p| !excluded_routes.iter().any(|e| e == p.path()))
-        }
         routes
     }
 }
@@ -979,7 +901,7 @@ pub trait LeptosRoutes {
     fn leptos_routes<IV>(
         self,
         options: LeptosOptions,
-        paths: Vec<RouteListing>,
+        paths: Vec<(String, SsrMode)>,
         app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + 'static,
     ) -> Self
     where
@@ -1004,7 +926,7 @@ pub trait LeptosRoutes {
     fn leptos_routes_with_context<IV>(
         self,
         options: LeptosOptions,
-        paths: Vec<RouteListing>,
+        paths: Vec<(String, SsrMode)>,
         additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
         app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + 'static,
     ) -> Self
@@ -1023,11 +945,10 @@ where
         InitError = (),
     >,
 {
-    #[tracing::instrument(level = "trace", fields(error), skip_all)]
     fn leptos_routes<IV>(
         self,
         options: LeptosOptions,
-        paths: Vec<RouteListing>,
+        paths: Vec<(String, SsrMode)>,
         app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + 'static,
     ) -> Self
     where
@@ -1035,7 +956,7 @@ where
     {
         self.leptos_routes_with_context(options, paths, |_| {}, app_fn)
     }
-    #[tracing::instrument(level = "trace", fields(error), skip_all)]
+
     fn leptos_preloaded_data_routes<Data, Fut, IV>(
         self,
         options: LeptosOptions,
@@ -1063,11 +984,11 @@ where
         }
         router
     }
-    #[tracing::instrument(level = "trace", fields(error), skip_all)]
+
     fn leptos_routes_with_context<IV>(
         self,
         options: LeptosOptions,
-        paths: Vec<RouteListing>,
+        paths: Vec<(String, SsrMode)>,
         additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
         app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + 'static,
     ) -> Self
@@ -1075,131 +996,30 @@ where
         IV: IntoView + 'static,
     {
         let mut router = self;
-        for listing in paths.iter() {
-            let path = listing.path();
-            let mode = listing.mode();
-
-            for method in listing.methods() {
-                router = router.route(
-                    path,
-                    match mode {
-                        SsrMode::OutOfOrder => {
-                            render_app_to_stream_with_context(
-                                options.clone(),
-                                additional_context.clone(),
-                                app_fn.clone(),
-                                method,
-                            )
-                        }
-                        SsrMode::InOrder => {
-                            render_app_to_stream_in_order_with_context(
-                                options.clone(),
-                                additional_context.clone(),
-                                app_fn.clone(),
-                                method,
-                            )
-                        }
-                        SsrMode::Async => render_app_async_with_context(
+        for (path, mode) in paths.iter() {
+            router = router.route(
+                path,
+                match mode {
+                    SsrMode::OutOfOrder => render_app_to_stream_with_context(
+                        options.clone(),
+                        additional_context.clone(),
+                        app_fn.clone(),
+                    ),
+                    SsrMode::InOrder => {
+                        render_app_to_stream_in_order_with_context(
                             options.clone(),
                             additional_context.clone(),
                             app_fn.clone(),
-                            method,
-                        ),
-                    },
-                );
-            }
+                        )
+                    }
+                    SsrMode::Async => render_app_async_with_context(
+                        options.clone(),
+                        additional_context.clone(),
+                        app_fn.clone(),
+                    ),
+                },
+            );
         }
         router
     }
 }
-
-/// A helper to make it easier to use Axum extractors in server functions. This takes
-/// a handler function as its argument. The handler follows similar rules to an Actix
-/// [Handler](actix_web::Handler): it is an async function that receives arguments that  
-/// will be extracted from the request and returns some value.
-///
-/// ```rust,ignore
-/// use leptos::*;
-/// use serde::Deserialize;
-/// #[derive(Deserialize)]
-/// struct Search {
-///     q: String,
-/// }
-///
-/// #[server(ExtractoServerFn, "/api")]
-/// pub async fn extractor_server_fn(cx: Scope) -> Result<String, ServerFnError> {
-///     use actix_web::dev::ConnectionInfo;
-///     use actix_web::web::{Data, Query};
-///
-///     extract(
-///         cx,
-///         |data: Data<String>, search: Query<Search>, connection: ConnectionInfo| async move {
-///             format!(
-///                 "data = {}\nsearch = {}\nconnection = {:?}",
-///                 data.into_inner(),
-///                 search.q,
-///                 connection
-///             )
-///         },
-///     )
-///     .await
-/// }
-/// ```
-pub async fn extract<F, E>(
-    cx: leptos::Scope,
-    f: F,
-) -> Result<<<F as Extractor<E>>::Future as Future>::Output, ServerFnError>
-where
-    F: Extractor<E>,
-    E: actix_web::FromRequest,
-    <E as actix_web::FromRequest>::Error: Display,
-    <F as Extractor<E>>::Future: Future,
-{
-    let req = use_context::<actix_web::HttpRequest>(cx)
-        .expect("HttpRequest should have been provided via context");
-    let input = E::extract(&req)
-        .await
-        .map_err(|e| ServerFnError::ServerError(e.to_string()))?;
-    Ok(f.call(input).await)
-}
-
-// Drawn from the Actix Handler implementation
-// https://github.com/actix/actix-web/blob/19c9d858f25e8262e14546f430d713addb397e96/actix-web/src/handler.rs#L124
-pub trait Extractor<T> {
-    type Future;
-
-    fn call(&self, args: T) -> Self::Future;
-}
-macro_rules! factory_tuple ({ $($param:ident)* } => {
-    impl<Func, Fut, $($param,)*> Extractor<($($param,)*)> for Func
-    where
-        Func: Fn($($param),*) -> Fut + Clone + 'static,
-        Fut: Future,
-    {
-        type Future = Fut;
-
-        #[inline]
-        #[allow(non_snake_case)]
-        fn call(&self, ($($param,)*): ($($param,)*)) -> Self::Future {
-            (self)($($param,)*)
-        }
-    }
-});
-
-factory_tuple! {}
-factory_tuple! { A }
-factory_tuple! { A B }
-factory_tuple! { A B C }
-factory_tuple! { A B C D }
-factory_tuple! { A B C D E }
-factory_tuple! { A B C D E F }
-factory_tuple! { A B C D E F G }
-factory_tuple! { A B C D E F G H }
-factory_tuple! { A B C D E F G H I }
-factory_tuple! { A B C D E F G H I J }
-factory_tuple! { A B C D E F G H I J K }
-factory_tuple! { A B C D E F G H I J K L }
-factory_tuple! { A B C D E F G H I J K L M }
-factory_tuple! { A B C D E F G H I J K L M N }
-factory_tuple! { A B C D E F G H I J K L M N O }
-factory_tuple! { A B C D E F G H I J K L M N O P }

integrations/axum/Cargo.toml

@@ -19,6 +19,4 @@ leptos_integration_utils = { workspace = true }
 serde_json = "1"
 tokio = { version = "1", features = ["full"] }
 parking_lot = "0.12.1"
-tokio-util = {version = "0.7.7", features = ["rt"] }
-tracing = "0.1.37"
-once_cell = "1.17"
+tokio-util = {version = "0.7.7", features = ["rt"] }

integrations/axum/src/lib.rs

@@ -1,4 +1,5 @@
 #![forbid(unsafe_code)]
+
 //! Provides functions to easily integrate Leptos with Axum.
 //!
 //! For more details on how to use the integrations, see the
@@ -13,16 +14,13 @@ use axum::{
         HeaderMap, Request, StatusCode,
     },
     response::IntoResponse,
-    routing::{delete, get, patch, post, put},
+    routing::get,
 };
 use futures::{
     channel::mpsc::{Receiver, Sender},
     Future, SinkExt, Stream, StreamExt,
 };
-use http::{
-    header, method::Method, request::Parts, uri::Uri, version::Version,
-    Response,
-};
+use http::{header, method::Method, uri::Uri, version::Version, Response};
 use hyper::body;
 use leptos::{
     leptos_server::{server_fn_by_path, Payload},
@@ -33,12 +31,16 @@ use leptos::{
 use leptos_integration_utils::{build_async_response, html_parts_separated};
 use leptos_meta::{generate_head_metadata_separated, MetaContext};
 use leptos_router::*;
-use once_cell::sync::OnceCell;
 use parking_lot::RwLock;
-use std::{io, pin::Pin, sync::Arc, thread::available_parallelism};
+use std::{
+    io,
+    pin::Pin,
+    sync::{Arc, OnceLock},
+    thread::available_parallelism,
+};
 use tokio::task::LocalSet;
 use tokio_util::task::LocalPoolHandle;
-use tracing::Instrument;
+
 /// A struct to hold the parts of the incoming Request. Since `http::Request` isn't cloneable, we're forced
 /// to construct this for Leptos to use in Axum
 #[derive(Debug, Clone)]
@@ -49,21 +51,6 @@ pub struct RequestParts {
     pub headers: HeaderMap<HeaderValue>,
     pub body: Bytes,
 }
-
-/// Convert http::Parts to RequestParts(and vice versa). Body and Extensions will
-/// be lost in the conversion
-impl From<Parts> for RequestParts {
-    fn from(parts: Parts) -> Self {
-        Self {
-            version: parts.version,
-            method: parts.method,
-            uri: parts.uri,
-            headers: parts.headers,
-            body: Bytes::default(),
-        }
-    }
-}
-
 /// This struct lets you define headers and override the status of the Response from an Element or a Server Function
 /// Typically contained inside of a ResponseOptions. Setting this is useful for cookies and custom responses.
 #[derive(Debug, Clone, Default)]
@@ -265,7 +252,6 @@ where
 /// This function always provides context values including the following types:
 /// - [RequestParts]
 /// - [ResponseOptions]
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub async fn handle_server_fns(
     Path(fn_name): Path<String>,
     headers: HeaderMap,
@@ -289,7 +275,6 @@ pub async fn handle_server_fns(
 /// This function always provides context values including the following types:
 /// - [RequestParts]
 /// - [ResponseOptions]
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub async fn handle_server_fns_with_context(
     Path(fn_name): Path<String>,
     headers: HeaderMap,
@@ -300,7 +285,7 @@ pub async fn handle_server_fns_with_context(
     handle_server_fns_inner(fn_name, headers, query, additional_context, req)
         .await
 }
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+
 async fn handle_server_fns_inner(
     fn_name: String,
     headers: HeaderMap,
@@ -338,11 +323,15 @@ async fn handle_server_fns_inner(
                     Encoding::Url | Encoding::Cbor => &req_parts.body,
                     Encoding::GetJSON | Encoding::GetCBOR => query,
                 };
-                let res = match (server_fn.trait_obj)(cx, data).await {
+                match (server_fn.trait_obj)(cx, data).await {
                     Ok(serialized) => {
                         // If ResponseOptions are set, add the headers and status to the request
                         let res_options = use_context::<ResponseOptions>(cx);
 
+                        // clean up the scope, which we only needed to run the server fn
+                        disposer.dispose();
+                        runtime.dispose();
+
                         // if this is Accept: application/json then send a serialized JSON response
                         let accept_header = headers
                             .get("Accept")
@@ -407,11 +396,7 @@ async fn handle_server_fns_inner(
                             serde_json::to_string(&e)
                                 .unwrap_or_else(|_| e.to_string()),
                         )),
-                };
-                // clean up the scope
-                disposer.dispose();
-                runtime.dispose();
-                res
+                }
             } else {
                 Response::builder().status(StatusCode::BAD_REQUEST).body(
                     Full::from(format!(
@@ -484,7 +469,6 @@ pub type PinnedHtmlStream =
 /// - [ResponseOptions]
 /// - [MetaContext](leptos_meta::MetaContext)
 /// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "info", fields(error), skip_all)]
 pub fn render_app_to_stream<IV>(
     options: LeptosOptions,
     app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + 'static,
@@ -558,7 +542,6 @@ where
 /// - [ResponseOptions]
 /// - [MetaContext](leptos_meta::MetaContext)
 /// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "info", fields(error), skip_all)]
 pub fn render_app_to_stream_in_order<IV>(
     options: LeptosOptions,
     app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + 'static,
@@ -604,7 +587,6 @@ where
 /// - [ResponseOptions]
 /// - [MetaContext](leptos_meta::MetaContext)
 /// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "info", fields(error), skip_all)]
 pub fn render_app_to_stream_with_context<IV>(
     options: LeptosOptions,
     additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
@@ -633,8 +615,6 @@ where
             let res_options3 = default_res_options.clone();
             let local_pool = get_leptos_pool();
             let (tx, rx) = futures::channel::mpsc::channel(8);
-
-            let current_span = tracing::Span::current();
             local_pool.spawn_pinned(move || async move {
                 let app = {
                     // Need to get the path and query string of the Request
@@ -658,12 +638,12 @@ where
                     );
 
                     forward_stream(&options, res_options2, bundle, runtime, scope, tx).await;
-            }.instrument(current_span));
+            });
             async move { generate_response(res_options3, rx).await }
         })
     }
 }
-#[tracing::instrument(level = "info", fields(error), skip_all)]
+
 async fn generate_response(
     res_options: ResponseOptions,
     rx: Receiver<String>,
@@ -693,7 +673,7 @@ async fn generate_response(
 
     res
 }
-#[tracing::instrument(level = "info", fields(error), skip_all)]
+
 async fn forward_stream(
     options: &LeptosOptions,
     res_options2: ResponseOptions,
@@ -753,7 +733,6 @@ async fn forward_stream(
 /// - [ResponseOptions]
 /// - [MetaContext](leptos_meta::MetaContext)
 /// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "info", fields(error), skip_all)]
 pub fn render_app_to_stream_in_order_with_context<IV>(
     options: LeptosOptions,
     additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
@@ -791,8 +770,7 @@ where
 
                 let (tx, rx) = futures::channel::mpsc::channel(8);
                 let local_pool = get_leptos_pool();
-                let current_span = tracing::Span::current();
-                local_pool.spawn_pinned(|| async move {
+                local_pool.spawn_pinned(move || async move {
                     let app = {
                         let full_path = full_path.clone();
                         let (req, req_parts) = generate_request_and_parts(req).await;
@@ -811,14 +789,14 @@ where
                         );
 
                     forward_stream(&options, res_options2, bundle, runtime, scope, tx).await;
-                }.instrument(current_span));
+                });
 
                 generate_response(res_options3, rx).await
             }
         })
     }
 }
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+
 fn provide_contexts<B: 'static + std::fmt::Debug + std::default::Default>(
     cx: Scope,
     path: String,
@@ -886,7 +864,6 @@ fn provide_contexts<B: 'static + std::fmt::Debug + std::default::Default>(
 /// - [ResponseOptions]
 /// - [MetaContext](leptos_meta::MetaContext)
 /// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "info", fields(error), skip_all)]
 pub fn render_app_async<IV>(
     options: LeptosOptions,
     app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + 'static,
@@ -928,7 +905,6 @@ where
 /// - [ResponseOptions]
 /// - [MetaContext](leptos_meta::MetaContext)
 /// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
-#[tracing::instrument(level = "info", fields(error), skip_all)]
 pub fn render_app_async_with_context<IV>(
     options: LeptosOptions,
     additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
@@ -1017,30 +993,14 @@ where
 /// Generates a list of all routes defined in Leptos's Router in your app. We can then use this to automatically
 /// create routes in Axum's Router without having to use wildcard matching or fallbacks. Takes in your root app Element
 /// as an argument so it can walk you app tree. This version is tailored to generate Axum compatible paths.
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub async fn generate_route_list<IV>(
     app_fn: impl FnOnce(Scope) -> IV + 'static,
-) -> Vec<RouteListing>
-where
-    IV: IntoView + 'static,
-{
-    generate_route_list_with_exclusions(app_fn, None).await
-}
-
-/// Generates a list of all routes defined in Leptos's Router in your app. We can then use this to automatically
-/// create routes in Axum's Router without having to use wildcard matching or fallbacks. Takes in your root app Element
-/// as an argument so it can walk you app tree. This version is tailored to generate Axum compatible paths. Adding excluded_routes
-/// to this function will stop `.leptos_routes()` from generating a route for it, allowing a custom handler. These need to be in Axum path format
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
-pub async fn generate_route_list_with_exclusions<IV>(
-    app_fn: impl FnOnce(Scope) -> IV + 'static,
-    excluded_routes: Option<Vec<String>>,
-) -> Vec<RouteListing>
+) -> Vec<(String, SsrMode)>
 where
     IV: IntoView + 'static,
 {
     #[derive(Default, Clone, Debug)]
-    pub struct Routes(pub Arc<RwLock<Vec<RouteListing>>>);
+    pub struct Routes(pub Arc<RwLock<Vec<(String, SsrMode)>>>);
 
     let routes = Routes::default();
     let routes_inner = routes.clone();
@@ -1062,33 +1022,20 @@ where
 
     let routes = routes.0.read().to_owned();
     // Axum's Router defines Root routes as "/" not ""
-    let mut routes = routes
+    let routes = routes
         .into_iter()
-        .map(|listing| {
-            let path = listing.path();
-            if path.is_empty() {
-                RouteListing::new(
-                    "/",
-                    Default::default(),
-                    [leptos_router::Method::Get],
-                )
+        .map(|(s, m)| {
+            if s.is_empty() {
+                ("/".to_string(), m)
             } else {
-                listing
+                (s, m)
             }
         })
         .collect::<Vec<_>>();
 
     if routes.is_empty() {
-        vec![RouteListing::new(
-            "/",
-            Default::default(),
-            [leptos_router::Method::Get],
-        )]
+        vec![("/".to_string(), Default::default())]
     } else {
-        // Routes to exclude from auto generation
-        if let Some(excluded_routes) = excluded_routes {
-            routes.retain(|p| !excluded_routes.iter().any(|e| e == p.path()))
-        }
         routes
     }
 }
@@ -1099,7 +1046,7 @@ pub trait LeptosRoutes {
     fn leptos_routes<IV>(
         self,
         options: LeptosOptions,
-        paths: Vec<RouteListing>,
+        paths: Vec<(String, SsrMode)>,
         app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + 'static,
     ) -> Self
     where
@@ -1108,7 +1055,7 @@ pub trait LeptosRoutes {
     fn leptos_routes_with_context<IV>(
         self,
         options: LeptosOptions,
-        paths: Vec<RouteListing>,
+        paths: Vec<(String, SsrMode)>,
         additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
         app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + 'static,
     ) -> Self
@@ -1117,7 +1064,7 @@ pub trait LeptosRoutes {
 
     fn leptos_routes_with_handler<H, T>(
         self,
-        paths: Vec<RouteListing>,
+        paths: Vec<(String, SsrMode)>,
         handler: H,
     ) -> Self
     where
@@ -1127,11 +1074,10 @@ pub trait LeptosRoutes {
 /// The default implementation of `LeptosRoutes` which takes in a list of paths, and dispatches GET requests
 /// to those paths to Leptos's renderer.
 impl LeptosRoutes for axum::Router {
-    #[tracing::instrument(level = "info", fields(error), skip_all)]
     fn leptos_routes<IV>(
         self,
         options: LeptosOptions,
-        paths: Vec<RouteListing>,
+        paths: Vec<(String, SsrMode)>,
         app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + 'static,
     ) -> Self
     where
@@ -1140,11 +1086,10 @@ impl LeptosRoutes for axum::Router {
         self.leptos_routes_with_context(options, paths, |_| {}, app_fn)
     }
 
-    #[tracing::instrument(level = "trace", fields(error), skip_all)]
     fn leptos_routes_with_context<IV>(
         self,
         options: LeptosOptions,
-        paths: Vec<RouteListing>,
+        paths: Vec<(String, SsrMode)>,
         additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
         app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + 'static,
     ) -> Self
@@ -1152,66 +1097,38 @@ impl LeptosRoutes for axum::Router {
         IV: IntoView + 'static,
     {
         let mut router = self;
-        for listing in paths.iter() {
-            let path = listing.path();
-
-            for method in listing.methods() {
-                router = router.route(
-                    path,
-                    match listing.mode() {
-                        SsrMode::OutOfOrder => {
-                            let s = render_app_to_stream_with_context(
-                                options.clone(),
-                                additional_context.clone(),
-                                app_fn.clone(),
-                            );
-                            match method {
-                                leptos_router::Method::Get => get(s),
-                                leptos_router::Method::Post => post(s),
-                                leptos_router::Method::Put => put(s),
-                                leptos_router::Method::Delete => delete(s),
-                                leptos_router::Method::Patch => patch(s),
-                            }
-                        }
-                        SsrMode::InOrder => {
-                            let s = render_app_to_stream_in_order_with_context(
-                                options.clone(),
-                                additional_context.clone(),
-                                app_fn.clone(),
-                            );
-                            match method {
-                                leptos_router::Method::Get => get(s),
-                                leptos_router::Method::Post => post(s),
-                                leptos_router::Method::Put => put(s),
-                                leptos_router::Method::Delete => delete(s),
-                                leptos_router::Method::Patch => patch(s),
-                            }
-                        }
-                        SsrMode::Async => {
-                            let s = render_app_async_with_context(
-                                options.clone(),
-                                additional_context.clone(),
-                                app_fn.clone(),
-                            );
-                            match method {
-                                leptos_router::Method::Get => get(s),
-                                leptos_router::Method::Post => post(s),
-                                leptos_router::Method::Put => put(s),
-                                leptos_router::Method::Delete => delete(s),
-                                leptos_router::Method::Patch => patch(s),
-                            }
-                        }
-                    },
-                );
-            }
+        for (path, mode) in paths.iter() {
+            router = router.route(
+                path,
+                match mode {
+                    SsrMode::OutOfOrder => {
+                        get(render_app_to_stream_with_context(
+                            options.clone(),
+                            additional_context.clone(),
+                            app_fn.clone(),
+                        ))
+                    }
+                    SsrMode::InOrder => {
+                        get(render_app_to_stream_in_order_with_context(
+                            options.clone(),
+                            additional_context.clone(),
+                            app_fn.clone(),
+                        ))
+                    }
+                    SsrMode::Async => get(render_app_async_with_context(
+                        options.clone(),
+                        additional_context.clone(),
+                        app_fn.clone(),
+                    )),
+                },
+            );
         }
         router
     }
 
-    #[tracing::instrument(level = "trace", fields(error), skip_all)]
     fn leptos_routes_with_handler<H, T>(
         self,
-        paths: Vec<RouteListing>,
+        paths: Vec<(String, SsrMode)>,
         handler: H,
     ) -> Self
     where
@@ -1219,28 +1136,15 @@ impl LeptosRoutes for axum::Router {
         T: 'static,
     {
         let mut router = self;
-        for listing in paths.iter() {
-            for method in listing.methods() {
-                router = router.route(
-                    listing.path(),
-                    match method {
-                        leptos_router::Method::Get => get(handler.clone()),
-                        leptos_router::Method::Post => post(handler.clone()),
-                        leptos_router::Method::Put => put(handler.clone()),
-                        leptos_router::Method::Delete => {
-                            delete(handler.clone())
-                        }
-                        leptos_router::Method::Patch => patch(handler.clone()),
-                    },
-                );
-            }
+        for (path, _) in paths.iter() {
+            router = router.route(path, get(handler.clone()));
         }
         router
     }
 }
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+
 fn get_leptos_pool() -> LocalPoolHandle {
-    static LOCAL_POOL: OnceCell<LocalPoolHandle> = OnceCell::new();
+    static LOCAL_POOL: OnceLock<LocalPoolHandle> = OnceLock::new();
     LOCAL_POOL
         .get_or_init(|| {
             tokio_util::task::LocalPoolHandle::new(

integrations/utils/Cargo.toml

@@ -13,4 +13,3 @@ leptos = { workspace = true, features = ["ssr"] }
 leptos_hot_reload = { workspace = true }
 leptos_meta = { workspace = true, features = ["ssr"] }
 leptos_config = { workspace = true }
-tracing="0.1.37"

integrations/utils/src/lib.rs

@@ -3,9 +3,6 @@ use leptos::{use_context, RuntimeId, ScopeId};
 use leptos_config::LeptosOptions;
 use leptos_meta::MetaContext;
 
-extern crate tracing;
-
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
 fn autoreload(options: &LeptosOptions) -> String {
     let site_ip = &options.site_addr.ip().to_string();
     let reload_port = options.reload_port;
@@ -42,7 +39,7 @@ fn autoreload(options: &LeptosOptions) -> String {
         false => "".to_string(),
     }
 }
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
+
 pub fn html_parts(
     options: &LeptosOptions,
     meta: Option<&MetaContext>,
@@ -51,10 +48,10 @@ pub fn html_parts(
     let output_name = &options.output_name;
 
     // Because wasm-pack adds _bg to the end of the WASM filename, and we want to mantain compatibility with it's default options
-    // we add _bg to the wasm files if cargo-leptos doesn't set the env var LEPTOS_OUTPUT_NAME at compile time
-    // Otherwise we need to add _bg because wasm_pack always does.
+    // we add _bg to the wasm files if cargo-leptos doesn't set the env var LEPTOS_OUTPUT_NAME
+    // Otherwise we need to add _bg because wasm_pack always does. This is not the same as options.output_name, which is set regardless
     let mut wasm_output_name = output_name.clone();
-    if std::option_env!("LEPTOS_OUTPUT_NAME").is_none() {
+    if std::env::var("LEPTOS_OUTPUT_NAME").is_err() {
         wasm_output_name.push_str("_bg");
     }
 
@@ -78,7 +75,6 @@ pub fn html_parts(
     (head, tail)
 }
 
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub fn html_parts_separated(
     options: &LeptosOptions,
     meta: Option<&MetaContext>,
@@ -119,7 +115,6 @@ pub fn html_parts_separated(
     (head, tail)
 }
 
-#[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub async fn build_async_response(
     stream: impl Stream<Item = String> + 'static,
     options: &LeptosOptions,

integrations/viz/src/lib.rs

@@ -216,14 +216,16 @@ async fn handle_server_fns_inner(
                                 Encoding::GetJSON | Encoding::GetCBOR => &query,
                             };
 
-                            let res = match (server_fn.trait_obj)(cx, data)
-                                .await
-                            {
+                            match (server_fn.trait_obj)(cx, data).await {
                                 Ok(serialized) => {
                                     // If ResponseOptions are set, add the headers and status to the request
                                     let res_options =
                                         use_context::<ResponseOptions>(cx);
 
+                                    // clean up the scope, which we only needed to run the server fn
+                                    disposer.dispose();
+                                    runtime.dispose();
+
                                     // if this is Accept: application/json then send a serialized JSON response
                                     let accept_header = headers
                                         .get("Accept")
@@ -303,11 +305,7 @@ async fn handle_server_fns_inner(
                                         serde_json::to_string(&e)
                                             .unwrap_or_else(|_| e.to_string()),
                                     )),
-                            };
-                            // clean up the scope
-                            disposer.dispose();
-                            runtime.dispose();
-                            res
+                            }
                         } else {
                             Response::builder()
                                 .status(StatusCode::BAD_REQUEST)
@@ -946,25 +944,12 @@ where
 /// as an argument so it can walk you app tree. This version is tailored to generate Viz compatible paths.
 pub async fn generate_route_list<IV>(
     app_fn: impl FnOnce(Scope) -> IV + 'static,
-) -> Vec<RouteListing>
-where
-    IV: IntoView + 'static,
-{
-    generate_route_list_with_exclusions(app_fn, None).await
-}
-
-/// Generates a list of all routes defined in Leptos's Router in your app. We can then use this to automatically
-/// create routes in Viz's Router without having to use wildcard matching or fallbacks. Takes in your root app Element
-/// as an argument so it can walk you app tree. This version is tailored to generate Viz compatible paths.
-pub async fn generate_route_list_with_exclusions<IV>(
-    app_fn: impl FnOnce(Scope) -> IV + 'static,
-    excluded_routes: Option<Vec<String>>,
-) -> Vec<RouteListing>
+) -> Vec<(String, SsrMode)>
 where
     IV: IntoView + 'static,
 {
     #[derive(Default, Clone, Debug)]
-    pub struct Routes(pub Arc<RwLock<Vec<RouteListing>>>);
+    pub struct Routes(pub Arc<RwLock<Vec<(String, SsrMode)>>>);
 
     let routes = Routes::default();
     let routes_inner = routes.clone();
@@ -986,32 +971,20 @@ where
 
     let routes = routes.0.read().to_owned();
     // Viz's Router defines Root routes as "/" not ""
-    let mut routes = routes
+    let routes = routes
         .into_iter()
-        .map(|listing| {
-            let path = listing.path();
-            if path.is_empty() {
-                RouteListing::new(
-                    "/",
-                    Default::default(),
-                    [leptos_router::Method::Get],
-                )
+        .map(|(s, m)| {
+            if s.is_empty() {
+                ("/".to_string(), m)
             } else {
-                listing
+                (s, m)
             }
         })
         .collect::<Vec<_>>();
 
     if routes.is_empty() {
-        vec![RouteListing::new(
-            "/",
-            Default::default(),
-            [leptos_router::Method::Get],
-        )]
+        vec![("/".to_string(), Default::default())]
     } else {
-        if let Some(excluded_routes) = excluded_routes {
-            routes.retain(|p| !excluded_routes.iter().any(|e| e == p.path()))
-        }
         routes
     }
 }
@@ -1022,7 +995,7 @@ pub trait LeptosRoutes {
     fn leptos_routes<IV>(
         self,
         options: LeptosOptions,
-        paths: Vec<RouteListing>,
+        paths: Vec<(String, SsrMode)>,
         app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + Sync + 'static,
     ) -> Self
     where
@@ -1031,7 +1004,7 @@ pub trait LeptosRoutes {
     fn leptos_routes_with_context<IV>(
         self,
         options: LeptosOptions,
-        paths: Vec<RouteListing>,
+        paths: Vec<(String, SsrMode)>,
         additional_context: impl Fn(leptos::Scope) + Clone + Send + Sync + 'static,
         app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + Sync + 'static,
     ) -> Self
@@ -1040,7 +1013,7 @@ pub trait LeptosRoutes {
 
     fn leptos_routes_with_handler<H, O>(
         self,
-        paths: Vec<RouteListing>,
+        paths: Vec<(String, SsrMode)>,
         handler: H,
     ) -> Self
     where
@@ -1053,7 +1026,7 @@ impl LeptosRoutes for Router {
     fn leptos_routes<IV>(
         self,
         options: LeptosOptions,
-        paths: Vec<RouteListing>,
+        paths: Vec<(String, SsrMode)>,
         app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + Sync + 'static,
     ) -> Self
     where
@@ -1065,93 +1038,52 @@ impl LeptosRoutes for Router {
     fn leptos_routes_with_context<IV>(
         self,
         options: LeptosOptions,
-        paths: Vec<RouteListing>,
+        paths: Vec<(String, SsrMode)>,
         additional_context: impl Fn(leptos::Scope) + Clone + Send + Sync + 'static,
         app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + Sync + 'static,
     ) -> Self
     where
         IV: IntoView + 'static,
     {
-        paths.iter().fold(self, |router, listing| {
-            let path = listing.path();
-            let mode = listing.mode();
-
-            listing.methods().fold(router, |router, method| match mode {
-                SsrMode::OutOfOrder => {
-                    let s = render_app_to_stream_with_context(
-                        options.clone(),
-                        additional_context.clone(),
-                        app_fn.clone(),
-                    );
-                    match method {
-                        leptos_router::Method::Get => router.get(path, s),
-                        leptos_router::Method::Post => router.post(path, s),
-                        leptos_router::Method::Put => router.put(path, s),
-                        leptos_router::Method::Delete => router.delete(path, s),
-                        leptos_router::Method::Patch => router.patch(path, s),
-                    }
-                }
-                SsrMode::InOrder => {
-                    let s = render_app_to_stream_in_order_with_context(
-                        options.clone(),
-                        additional_context.clone(),
-                        app_fn.clone(),
-                    );
-                    match method {
-                        leptos_router::Method::Get => router.get(path, s),
-                        leptos_router::Method::Post => router.post(path, s),
-                        leptos_router::Method::Put => router.put(path, s),
-                        leptos_router::Method::Delete => router.delete(path, s),
-                        leptos_router::Method::Patch => router.patch(path, s),
-                    }
-                }
-                SsrMode::Async => {
-                    let s = render_app_async_with_context(
-                        options.clone(),
-                        additional_context.clone(),
-                        app_fn.clone(),
-                    );
-                    match method {
-                        leptos_router::Method::Get => router.get(path, s),
-                        leptos_router::Method::Post => router.post(path, s),
-                        leptos_router::Method::Put => router.put(path, s),
-                        leptos_router::Method::Delete => router.delete(path, s),
-                        leptos_router::Method::Patch => router.patch(path, s),
-                    }
-                }
-            })
+        paths.iter().fold(self, |router, (path, mode)| match mode {
+            SsrMode::OutOfOrder => router.get(
+                path,
+                render_app_to_stream_with_context(
+                    options.clone(),
+                    additional_context.clone(),
+                    app_fn.clone(),
+                ),
+            ),
+            SsrMode::InOrder => router.get(
+                path,
+                render_app_to_stream_in_order_with_context(
+                    options.clone(),
+                    additional_context.clone(),
+                    app_fn.clone(),
+                ),
+            ),
+            SsrMode::Async => router.get(
+                path,
+                render_app_async_with_context(
+                    options.clone(),
+                    additional_context.clone(),
+                    app_fn.clone(),
+                ),
+            ),
         })
     }
 
     fn leptos_routes_with_handler<H, O>(
         self,
-        paths: Vec<RouteListing>,
+        paths: Vec<(String, SsrMode)>,
         handler: H,
     ) -> Self
     where
         H: Handler<Request, Output = Result<O>> + Clone,
         O: IntoResponse + Send + Sync + 'static,
     {
-        paths.iter().fold(self, |router, listing| {
-            listing
-                .methods()
-                .fold(router, |router, method| match method {
-                    leptos_router::Method::Get => {
-                        router.get(listing.path(), handler.clone())
-                    }
-                    leptos_router::Method::Post => {
-                        router.post(listing.path(), handler.clone())
-                    }
-                    leptos_router::Method::Put => {
-                        router.put(listing.path(), handler.clone())
-                    }
-                    leptos_router::Method::Delete => {
-                        router.delete(listing.path(), handler.clone())
-                    }
-                    leptos_router::Method::Patch => {
-                        router.patch(listing.path(), handler.clone())
-                    }
-                })
-        })
+        paths
+            .iter()
+            .fold(self, |router, (path, _)| router.get(path, handler.clone()))
     }
 }

leptos/Cargo.toml

@@ -13,11 +13,11 @@ cfg-if = "1"
 leptos_dom = { workspace = true }
 leptos_macro = { workspace = true }
 leptos_reactive = { workspace = true }
-leptos_server = { workspace = true, default-features = false }
+leptos_server = { workspace = true }
 leptos_config = { workspace = true }
 tracing = "0.1"
 typed-builder = "0.14"
-server_fn = { workspace = true, default-features = false }
+server_fn = { workspace = true }
 
 [dev-dependencies]
 leptos = { path = ".", default-features = false }
@@ -36,8 +36,6 @@ hydrate = [
   "leptos_reactive/hydrate",
   "leptos_server/hydrate",
 ]
-default-tls = ["leptos_server/default-tls", "server_fn/default-tls"]
-rustls = ["leptos_server/rustls", "server_fn/rustls"]
 ssr = [
   "leptos_dom/ssr",
   "leptos_macro/ssr",
@@ -95,8 +93,4 @@ skip_feature_sets = [
     "serde-lite",
     "rkyv",
   ],
-  [
-    "default-tls",
-    "rustls",
-  ],
 ]