preliminary work

Cargo.toml

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

Makefile.toml

@@ -69,11 +69,7 @@ dependencies = [
 
 [tasks.test]
 clear = true
-dependencies = [
-	"test-all",
-	"test-leptos_macro-example",
-	"doc-leptos_macro-example",
-]
+dependencies = ["test-all", "test-leptos_macro-example", "doc-leptos_macro-example"]
 
 [tasks.test-all]
 command = "cargo"
@@ -106,15 +102,9 @@ cwd = "examples"
 command = "cargo"
 args = ["make", "verify-flow"]
 
-[tasks.clean-examples]
-description = "Clean all example projects"
-cwd = "examples"
-command = "cargo"
-args = ["make", "clean-all"]
-
 [env]
 RUSTFLAGS = ""
-LEPTOS_OUTPUT_NAME = "ci" # allows examples to check/build without cargo-leptos
+LEPTOS_OUTPUT_NAME="ci" # allows examples to check/build without cargo-leptos
 
 [env.github-actions]
 RUSTFLAGS = "-D warnings"

docs/book/src/15_global_state.md

@@ -171,4 +171,4 @@ data flow and of fine-grained reactive updates.
 
 [Click to open CodeSandbox.](https://codesandbox.io/p/sandbox/1-basic-component-forked-8bte19?selection=%5B%7B%22endColumn%22%3A1%2C%22endLineNumber%22%3A2%2C%22startColumn%22%3A1%2C%22startLineNumber%22%3A2%7D%5D&file=%2Fsrc%2Fmain.rs)
 
-<iframe src="https://codesandbox.io/p/sandbox/1-basic-component-forked-8bte19?selection=%5B%7B%22endColumn%22%3A1%2C%22endLineNumber%22%3A2%2C%22startColumn%22%3A1%2C%22startLineNumber%22%3A2%7D%5D&file=%2Fsrc%2Fmain.rs" width="100%" height="1000px" style="max-height: 100vh"></iframe>
+<iframe src="https://codesandbox.io/p/sandbox/1-basic-component-forked-8bte19?selection=%5B%7B%22endColumn%22%3A1%2C%22endLineNumber%22%3A2%2C%22startColumn%22%3A1%2C%22startLineNumber%22%3A2%7D%5D&file=%2Fsrc%2Fmain.rs" width="100%" height="1000px" style="max-height: 100vh">

docs/book/src/SUMMARY.md

@@ -34,10 +34,9 @@
   - [`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 Bugs](./ssr/24_hydration_bugs.md)
-- [Working with the Server](./server/README.md)
-  - [Server Functions](./server/25_server_functions.md)
-  - [Request/Response]()
+  - [Hydration Footguns](./ssr/24_hydration_bugs.md)
+- [Server Functions]()
+- [Request/Response]()
   - [Extractors]()
     - [Axum]()
     - [Actix]()
@@ -47,6 +46,6 @@
   - [Actions]()
   - [Forms]()
   - [`<ActionForm/>`s]()
-  - [Turning off WebAssembly: Progressive Enhancement and Graceful Degradation]()
+  - [Turning off WebAssembly]()
 - [Advanced Reactivity]()
 - [Appendix: Optimizing WASM Binary Size](./appendix_binary_size.md)

docs/book/src/appendix_binary_size.md

@@ -41,14 +41,6 @@ build-std = ["std", "panic_abort", "core", "alloc"]
 build-std-features = ["panic_immediate_abort"]
 ```
 
-Note that if you're using this with SSR too, the same Cargo profile will be applied. You'll need to explicitly specify your target:
-```toml
-[build]
-target = "x86_64-unknown-linux-gnu" # or whatever
-```
-
-And you'll need to add `panic = "abort"` to `[profile.release]` in `Cargo.toml`. Note that this applies the same `build-std` and panic settings to your server binary, which may not be desirable. Some further exploration is probably needed here.
-
 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

docs/book/src/async/README.md

@@ -2,8 +2,8 @@
 
 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
-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.
-
-Asynchronous data is notoriously hard to integrate with the synchronous parts of your code. Leptos provides a cross-platform [`spawn_local`](https://docs.rs/leptos/latest/leptos/fn.spawn_local.html) function that makes it easy to run a `Future`, but there’s much more to it than that.
+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.
 
+Asynchronous data is notoriously hard to integrate with the synchronous parts of your code.
 In this chapter, we’ll see how Leptos helps smooth out that process for you.

docs/book/src/server/25_server_functions.md

@@ -1,125 +0,0 @@
-# Server Functions
-
-If you’re creating anything beyond a toy app, you’ll need to run code on the server all the time: reading from or writing to a database that only runs on the server, running expensive computations using libraries you don’t want to ship down to the client, accessing APIs that need to be called from the server rather than the client for CORS reasons or because you need a secret API key that’s stored on the server and definitely shouldn’t be shipped down to a user’s browser.
-
-Traditionally, this is done by separating your server and client code, and by setting up something like a REST API or GraphQL API to allow your client to fetch and mutate data on the server. This is fine, but it requires you to write and maintain your code in multiple separate places (client-side code for fetching, server-side functions to run), as well as creating a third thing to manage, which is the API contract between the two.
-
-Leptos is one of a number of modern frameworks that introduce the concept of **server functions**. Server functions have two key characteristics:
-
-1. Server functions are **co-located** with your component code, so that you can organize your work by feature, not by technology. For example, you might have a “dark mode” feature that should persist a user’s dark/light mode preference across sessions, and be applied during server rendering so there’s no flicker. This requires a component that needs to be interactive on the client, and some work to be done on the server (setting a cookie, maybe even storing a user in a database.) Traditionally, this feature might end up being split between two different locations in your code, one in your “frontend” and one in your “backend.” With server functions, you’ll probably just write them both in one `dark_mode.rs` and forget about it.
-2. Server functions are **isomorphic**, i.e., they can be called either from the server or the browser. This is done by generating code differently for the two platforms. On the server, a server function simply runs. In the browser, the server function’s body is replaced with a stub that actually makes a fetch request to the server, serializing the arguments into the request and deserializing the return value from the response. But on either end, the function can simply be called: you can create an `add_todo` function that writes to your database, and simply call it from a click handler on a button in the browser!
-
-## Using Server Functions
-
-Actually, I kind of like that example. What would it look like? It’s pretty simple, actually.
-
-```rust
-// todo.rs
-
-#[server(AddTodo, "/api")]
-pub async fn add_todo(title: String) -> Result<(), ServerFnError> {
-    let mut conn = db().await?;
-
-    match sqlx::query("INSERT INTO todos (title, completed) VALUES ($1, false)")
-        .bind(title)
-        .execute(&mut conn)
-        .await
-    {
-        Ok(_row) => Ok(()),
-        Err(e) => Err(ServerFnError::ServerError(e.to_string())),
-    }
-}
-
-#[component]
-pub fn BusyButton(cx: Scope) -> impl IntoView {
-	view! {
-        cx,
-        <button on:click=move |_| {
-            spawn_local(async {
-                add_todo("So much to do!".to_string()).await;
-            });
-        }>
-            "Add Todo"
-        </button>
-	}
-}
-
-// somewhere in main.rs
-fn main() {
-	// ...
-
-	AddTodo::register();
-
-	// ...
-}
-```
-
-You’ll notice a couple things here right away:
-
-- Server functions can use server-only dependencies, like `sqlx`, and can access server-only resources, like our database.
-- Server functions are `async`. Even if they only did synchronous work on the server, the function signature would still need to be `async`, because calling them from the browser _must_ be asynchronous.
-- Server functions return `Result<T, ServerFnError>`. Again, even if they only do infallible work on the server, this is true, because `ServerFnError`’s variants include the various things that can be wrong during the process of making a network request.
-- Server functions can be called from the client. Take a look at our click handler. This is code that will _only ever_ run on the client. But it can call the function `add_todo` (using `spawn_local` to run the `Future`) as if it were an ordinary async function:
-
-```rust
-move |_| {
-	spawn_local(async {
-		add_todo("So much to do!".to_string()).await;
-	});
-}
-```
-
-- Server functions are top-level functions defined with `fn`. Unlike event listeners, derived signals, and most everything else in Leptos, they are not closures! As `fn` calls, they have no access to the reactive state of your app or anything else that is not passed in as an argument. And again, this makes perfect sense: When you make a request to the server, the server doesn’t have access to client state unless you send it explicitly. (Otherwise we’d have to serialize the whole reactive system and send it across the wire with every request, which—while it served classic ASP for a while—is a really bad idea.)
-- Server function arguments and return values both need to be serializable with `serde`. Again, hopefully this makes sense: while function arguments in general don’t need to be serialized, calling a server function from the browser means serializing the arguments and sending them over HTTP.
-
-There are a few things to note about the way you define a server function, too.
-
-- Server functions are created by using the [`#[server]` macro](https://docs.rs/leptos_server/latest/leptos_server/index.html#server) to annotate a top-level function, which can be defined anywhere.
-- We provide the macro a type name. The type name is used to register the server function (in `main.rs`), and it’s used internally as a container to hold, serialize, and deserialize the arguments.
-- We provide the macro a path. This is a prefix for the path at which we’ll mount a server function handler on our server. (See examples for [Actix](https://github.com/leptos-rs/leptos/blob/main/examples/todo_app_sqlite/src/main.rs#L44) and [Axum](https://github.com/leptos-rs/leptos/blob/598523cd9d0d775b017cb721e41ebae9349f01e2/examples/todo_app_sqlite_axum/src/main.rs#L51).)
-- You’ll need to have `serde` as a dependency with the `derive` featured enabled for the macro to work properly. You can easily add it to `Cargo.toml` with `cargo add serde --features=derive`.
-
-## Server Function Encodings
-
-By default, the server function call is a `POST` request that serializes the arguments as URL-encoded form data in the body of the request. (This means that server functions can be called from HTML forms, which we’ll see in a future chapter.) But there are a few other methods supported. Optionally, we can provide another argument to the `#[server]` macro to specify an alternate encoding:
-
-```rust
-#[server(AddTodo, "/api", "Url")]
-#[server(AddTodo, "/api", "GetJson")]
-#[server(AddTodo, "/api", "Cbor")]
-#[server(AddTodo, "/api", "GetCbor")]
-```
-
-The four options use different combinations of HTTP verbs and encoding methods:
-
-| Name              | Method | Request     | Response |
-| ----------------- | ------ | ----------- | -------- |
-| **Url** (default) | POST   | URL encoded | JSON     |
-| **GetJson**       | GET    | URL encoded | JSON     |
-| **Cbor**          | POST   | CBOR        | CBOR     |
-| **GetCbor**       | GET    | URL encoded | CBOR     |
-
-In other words, you have two choices:
-
-- `GET` or `POST`? This has implications for things like browser or CDN caching; while `POST` requests should not be cached, `GET` requests can be.
-- Plain text (arguments sent with URL/form encoding, results sent as JSON) or a binary format (CBOR, encoded as a base64 string)?
-
-**But remember**: Leptos will handle all the details of this encoding and decoding for you. When you use a server function, it looks just like calling any other asynchronous function!
-
-## An Important Note on Security
-
-Server functions are a cool technology, but it’s very important to remember. **Server functions are not magic; they’re syntax sugar for defining a public API.** The _body_ of a server function is never made public; it’s just part of your server binary. But the server function is a publicly accessible API endpoint, and it’s return value is just a JSON or similar blob. You should _never_ return something sensitive from a server function.
-
-## Integrating Server Functions with Leptos
-
-So far, everything I’ve said is actually framework agnostic. (And in fact, the Leptos server function crate has been integrated into Dioxus as well!) Server functions are simply a way of defining a function-like RPC call that leans on Web standards like HTTP requests and URL encoding.
-
-But in a way, they also provide the last missing primitive in our story so far. Because a server function is just a plain Rust async function, it integrates perfectly with the async Leptos primitives we discussed [earlier](../async/README.md). So you can easily integrate your server functions with the rest of your applications:
-
-- Create **resources** that call the server function to load data from the server
-- Read these resources under `<Suspense/>` or `<Transition/>` to enable streaming SSR and fallback states while data loads.
-- Create **actions** that call the server function to mutate data on the server
-
-The final section of this book will make this a little more concrete by introducing patterns that use progressively-enhanced HTML forms to run these server actions.
-
-But in the next few chapters, we’ll actually take a look at some of the details of what you might want to do with your server functions, including the best ways to integrate with the powerful extractors provided by the Actix and Axum server frameworks.

docs/book/src/server/README.md

@@ -1,11 +0,0 @@
-# Working with the Server
-
-The previous section described the process of server-side rendering, using the server to generate an HTML version of the page that will become interactive in the browser. So far, everything has been “isomorphic” or “universal”; in other words, your app has had the “same (_iso_) shape (_morphe_)” on the client and the server.
-
-But a server can do a lot more than just render HTML! In fact, a server can do a whole bunch of things your browser _can’t,_ like reading from and writing to a SQL database.
-
-If you’re used to building JavaScript frontend apps, you’re probably used to calling out to some kind of REST API to do this sort of server work. If you’re used to building sites with PHP or Python or Ruby (or Java or C# or...), this server-side work is your bread and butter, and it’s the client-side interactivity that tends to be an afterthought.
-
-With Leptos, you can do both: not only in the same language, not only sharing the same types, but even in the same files!
-
-This section will talk about how to build the uniquely-server-side parts of your application.

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

@@ -32,6 +32,6 @@ 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/cargo-leptos/blob/main/README.md).
+`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/view/02_dynamic_attributes.md

@@ -1,10 +1,10 @@
-# `view`: Dynamic Classes, Styles and Attributes
+# `view`: Dynamic Attributes and Classes
 
 So far we’ve seen how to use the `view` macro to create event listeners and to
 create dynamic text by passing a function (such as a signal) into the view.
 
 But of course there are other things you might want to update in your user interface.
-In this section, we’ll look at how to update classes, styles and attributes dynamically,
+In this section, we’ll look at how to update attributes and classes dynamically,
 and we’ll introduce the concept of a **derived signal**.
 
 Let’s start with a simple component that should be familiar: click a button to
@@ -52,42 +52,12 @@ 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.
 
-Some CSS class names can’t be directly parsed by the `view` macro, especially if they include a mix of dashes and numbers or other characters. In that case, you can use a tuple syntax: `class=("name", value)` still directly updates a single class.
-
-```rust
-class=("button-20", move || count() % 2 == 1)
-```
-
 > If you’re following along, make sure you go into your `index.html` and add something like this:
->
+> 
 > ```html
-> <style>
->   .red {
->     color: red;
->   }
-> </style>
+> <style>.red { color: red; }</style>
 > ```
 
-## Dynamic Styles
-
-Individual CSS properties can be directly updated with a similar `style:` syntax.
-
-```rust
-let (x, set_x) = create_signal(cx, 0);
-let (y, set_y) = create_signal(cx, 0);
-view! { cx,
-    <div
-        style="position: absolute"
-        style:left=move || format!("{}px", x() + 100)
-        style:top=move || format!("{}px", y() + 100)
-        style:background-color=move || format!("rgb({}, {}, 100)", x(), y())
-        style=("--columns", x)
-    >
-        "Moves when coordinates change"
-    </div>
-}
-```
-
 ## Dynamic Attributes
 
 The same applies to plain attributes. Passing a plain string or primitive value to

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

@@ -15,7 +15,7 @@ You _could_ do this by just creating two `<progress>` elements:
 let (count, set_count) = create_signal(cx, 0);
 let double_count = move || count() * 2;
 
-view! { cx,
+view! {
     <progress
         max="50"
         value=count

examples/Makefile.toml

@@ -31,7 +31,7 @@ CARGO_MAKE_CRATE_WORKSPACE_MEMBERS = [
 
 [tasks.verify-flow]
 description = "Provides pre and post hooks for verify"
-dependencies = ["pre-verify", "verify", "post-verify"]
+dependencies = ["pre-verify-flow", "verify", "post-verify-flow"]
 
 [tasks.verify]
 description = "Run all quality checks and tests"
@@ -41,17 +41,16 @@ dependencies = ["check-style", "test-unit-and-web"]
 description = "Run all unit and web tests"
 dependencies = ["test-flow", "web-test-flow"]
 
-[tasks.pre-verify]
+[tasks.pre-verify-flow]
 
-[tasks.post-verify]
-dependencies = ["clean-all"]
+[tasks.post-verify-flow]
 
 [tasks.web-test-flow]
 description = "Provides pre and post hooks for web-test"
-dependencies = ["pre-web-test", "web-test", "post-web-test"]
+dependencies = ["pre-web-test-flow", "web-test", "post-web-test-flow"]
 
-[tasks.pre-web-test]
+[tasks.pre-web-test-flow]
 
 [tasks.web-test]
 
-[tasks.post-web-test]
+[tasks.post-web-test-flow]

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

@@ -1,5 +0,0 @@
-[tasks.web-test]
-dependencies = ["cargo-leptos-e2e"]
-
-[tasks.clean-all]
-dependencies = ["clean-cargo", "clean-node_modules", "clean-playwright"]

examples/cargo-make/common.toml

@@ -1,16 +1,10 @@
 [env]
-END2END_DIR = "end2end"
-
-[tasks.pre-clippy]
-env = { CARGO_MAKE_CLIPPY_ARGS = "--all-targets --all-features -- -D warnings" }
+CARGO_MAKE_CLIPPY_ARGS = "--all-targets -- -D warnings"
 
 [tasks.check-style]
 description = "Check for style violations"
 dependencies = ["check-format-flow", "clippy-flow"]
 
-[tasks.check-format]
-args = ["fmt", "--", "--check", "--config-path", "../../"]
-
 [tasks.verify-local]
 description = "Run all quality checks and tests from an example directory"
 dependencies = ["check-style", "test-local"]
@@ -18,63 +12,3 @@ dependencies = ["check-style", "test-local"]
 [tasks.test-local]
 description = "Run all tests from an example directory"
 dependencies = ["test", "web-test"]
-
-[tasks.clean-cargo]
-description = "Runs the cargo clean command."
-category = "Cleanup"
-command = "cargo"
-args = ["clean"]
-
-[tasks.clean-trunk]
-description = "Runs the trunk clean command."
-category = "Cleanup"
-command = "trunk"
-args = ["clean"]
-
-[tasks.clean-node_modules]
-description = "Delete all node_modules directories"
-category = "Cleanup"
-script = '''
-find . -type d -name node_modules | xargs rm -rf
-'''
-
-[tasks.clean-playwright]
-description = "Delete playwright directories"
-category = "Cleanup"
-cwd = "${END2END_DIR}"
-command = "rm"
-args = ["-rf", "playwright", "playwright/.cache", "test-results"]
-
-[tasks.clean-all]
-description = "Delete all temporary directories"
-category = "Cleanup"
-dependencies = ["clean-cargo"]
-
-[tasks.wasm-web-test]
-env = { CARGO_MAKE_WASM_TEST_ARGS = "--headless --chrome" }
-command = "cargo"
-args = ["make", "wasm-pack-test"]
-
-[tasks.cargo-leptos-e2e]
-description = "Runs end to end tests with cargo leptos"
-command = "cargo"
-args = ["leptos", "end-to-end"]
-
-[tasks.setup]
-description = "Setup e2e dependencies"
-cwd = "${END2END_DIR}"
-script = '''
-    BOLD="\e[1m"
-    GREEN="\e[0;32m"
-    RED="\e[0;31m"
-    RESET="\e[0m"
-
-    if command -v pnpm; then
-        pnpm install
-    elif command -v npm; then
-        npm install
-    else
-        echo "${RED}${BOLD}ERROR${RESET} - pnpm or npm is required by this task"
-        exit 1
-    fi
-'''

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

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

examples/counter_isomorphic/src/main.rs

@@ -37,7 +37,7 @@ cfg_if! {
             // when not using cargo-leptos None must be replaced with Some("Cargo.toml")
             let conf = get_configuration(None).await.unwrap();
 
-            let addr = conf.leptos_options.site_addr;
+            let addr = conf.leptos_options.site_addr.clone();
             let routes = generate_route_list(|cx| view! { cx, <Counters/> });
 
             HttpServer::new(move || {
@@ -48,7 +48,7 @@ cfg_if! {
                     .service(counter_events)
                     .route("/api/{tail:.*}", leptos_actix::handle_server_fns())
                     .leptos_routes(leptos_options.to_owned(), routes.to_owned(), |cx| view! { cx, <Counters/> })
-                    .service(Files::new("/", site_root))
+                    .service(Files::new("/", &site_root))
                     //.wrap(middleware::Compress::default())
             })
             .bind(&addr)?

examples/counters/src/lib.rs

@@ -1,4 +1,4 @@
-use leptos::{For, *};
+use leptos::{For, ForProps, *};
 
 const MANY_COUNTERS: usize = 1000;
 

examples/errors_axum/Cargo.toml

@@ -10,12 +10,12 @@ crate-type = ["cdylib", "rlib"]
 console_log = "1.0.0"
 console_error_panic_hook = "0.1.7"
 cfg-if = "1.0.0"
-leptos = { path = "../../leptos", default-features = false, features = [
+leptos = { path = "../../../leptos/leptos", default-features = false, features = [
   "serde",
 ] }
-leptos_axum = { path = "../../integrations/axum", default-features = false, optional = true }
-leptos_meta = { path = "../../meta", default-features = false }
-leptos_router = { path = "../../router", default-features = false }
+leptos_axum = { path = "../../../leptos/integrations/axum", default-features = false, optional = true }
+leptos_meta = { path = "../../../leptos/meta", default-features = false }
+leptos_router = { path = "../../../leptos/router", default-features = false }
 log = "0.4.17"
 serde = { version = "1", features = ["derive"] }
 simple_logger = "4.0.0"

examples/errors_axum/Makefile.toml

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

examples/errors_axum/src/fallback.rs

@@ -3,7 +3,7 @@ use cfg_if::cfg_if;
 cfg_if! { if #[cfg(feature = "ssr")] {
     use axum::{
         body::{boxed, Body, BoxBody},
-        extract::State,
+        extract::Extension,
         response::IntoResponse,
         http::{Request, Response, StatusCode, Uri},
     };
@@ -11,10 +11,10 @@ cfg_if! { if #[cfg(feature = "ssr")] {
     use tower::ServiceExt;
     use tower_http::services::ServeDir;
     use std::sync::Arc;
-    use leptos::{LeptosOptions, view};
-    use crate::landing::App;
+    use leptos::{LeptosOptions, Errors, view};
+    use crate::landing::{App, AppProps};
 
-    pub async fn file_and_error_handler(uri: Uri, State(options): State<Arc<LeptosOptions>>, req: Request<Body>) -> AxumResponse {
+    pub async fn file_and_error_handler(uri: Uri, Extension(options): Extension<Arc<LeptosOptions>>, req: Request<Body>) -> AxumResponse {
         let options = &*options;
         let root = options.site_root.clone();
         let res = get_static_file(uri.clone(), &root).await.unwrap();

examples/errors_axum/src/landing.rs

@@ -1,4 +1,7 @@
-use crate::{error_template::ErrorTemplate, errors::AppError};
+use crate::{
+    error_template::{ErrorTemplate, ErrorTemplateProps},
+    errors::AppError,
+};
 use leptos::*;
 use leptos_meta::*;
 use leptos_router::*;
@@ -51,8 +54,7 @@ pub fn App(cx: Scope) -> impl IntoView {
 
 #[component]
 pub fn ExampleErrors(cx: Scope) -> impl IntoView {
-    let generate_internal_error =
-        create_server_action::<CauseInternalServerError>(cx);
+    let generate_internal_error = create_server_action::<CauseInternalServerError>(cx);
 
     view! { cx,
         <p>

examples/errors_axum/src/lib.rs

@@ -1,4 +1,5 @@
 use cfg_if::cfg_if;
+use leptos::*;
 pub mod error_template;
 pub mod errors;
 pub mod fallback;
@@ -7,7 +8,6 @@ pub mod landing;
 // Needs to be in lib.rs AFAIK because wasm-bindgen needs us to be compiling a lib. I may be wrong.
 cfg_if! {
     if #[cfg(feature = "hydrate")] {
-        use leptos::*;
         use wasm_bindgen::prelude::wasm_bindgen;
         use crate::landing::*;
 

examples/errors_axum/src/main.rs

@@ -5,7 +5,7 @@ cfg_if! { if #[cfg(feature = "ssr")] {
     use crate::landing::*;
     use axum::body::Body as AxumBody;
     use axum::{
-        extract::{State, Path},
+        extract::{Extension, Path},
         http::Request,
         response::{IntoResponse, Response},
         routing::{get, post},
@@ -21,7 +21,7 @@ cfg_if! { if #[cfg(feature = "ssr")] {
 #[cfg(feature = "ssr")]
 async fn custom_handler(
     Path(id): Path<String>,
-    State(options): State<Arc<LeptosOptions>>,
+    Extension(options): Extension<Arc<LeptosOptions>>,
     req: Request<AxumBody>,
 ) -> Response {
     let handler = leptos_axum::render_app_to_stream_with_context(
@@ -37,14 +37,13 @@ async fn custom_handler(
 #[cfg(feature = "ssr")]
 #[tokio::main]
 async fn main() {
-    simple_logger::init_with_level(log::Level::Debug)
-        .expect("couldn't initialize logging");
+    simple_logger::init_with_level(log::Level::Debug).expect("couldn't initialize logging");
 
     crate::landing::register_server_functions();
 
     // Setting this to None means we'll be using cargo-leptos and its env vars
     let conf = get_configuration(None).await.unwrap();
-    let leptos_options = Arc::new(conf.leptos_options);
+    let leptos_options = conf.leptos_options;
     let addr = leptos_options.site_addr;
     let routes = generate_route_list(|cx| view! { cx, <App/> }).await;
 
@@ -52,13 +51,9 @@ async fn main() {
     let app = Router::new()
         .route("/api/*fn_name", post(leptos_axum::handle_server_fns))
         .route("/special/:id", get(custom_handler))
-        .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)
-        .with_state(leptos_options);
+        .layer(Extension(Arc::new(leptos_options)));
 
     // run our app with hyper
     // `axum::Server` is a re-export of `hyper::Server`

examples/fetch/Makefile.toml

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

examples/fetch/src/lib.rs

@@ -14,7 +14,7 @@ pub enum FetchError {
     #[error("Error loading data from serving.")]
     Request,
     #[error("Error deserializaing cat data from request.")]
-    Json,
+    Json
 }
 
 async fn fetch_cats(count: u32) -> Result<Vec<String>, FetchError> {

examples/hackernews/Makefile.toml

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

examples/hackernews/src/lib.rs

@@ -4,7 +4,10 @@ use leptos_meta::*;
 use leptos_router::*;
 mod api;
 mod routes;
-use routes::{nav::*, stories::*, story::*, users::*};
+use routes::nav::*;
+use routes::stories::*;
+use routes::story::*;
+use routes::users::*;
 
 #[component]
 pub fn App(cx: Scope) -> impl IntoView {

examples/hackernews/src/main.rs

@@ -7,7 +7,7 @@ cfg_if! {
     if #[cfg(feature = "ssr")] {
         use actix_files::{Files};
         use actix_web::*;
-        use hackernews::{App};
+        use hackernews::{App,AppProps};
         use leptos_actix::{LeptosRoutes, generate_route_list};
 
         #[get("/style.css")]
@@ -24,7 +24,7 @@ cfg_if! {
             // Setting this to None means we'll be using cargo-leptos and its env vars.
             let conf = get_configuration(None).await.unwrap();
 
-            let addr = conf.leptos_options.site_addr;
+            let addr = conf.leptos_options.site_addr.clone();
             // Generate the list of routes in your Leptos App
             let routes = generate_route_list(|cx| view! { cx, <App/> });
 
@@ -37,7 +37,7 @@ cfg_if! {
                     .service(favicon)
                     .route("/api/{tail:.*}", leptos_actix::handle_server_fns())
                     .leptos_routes(leptos_options.to_owned(), routes.to_owned(), |cx| view! { cx, <App/> })
-                    .service(Files::new("/", site_root))
+                    .service(Files::new("/", &site_root))
                 //.wrap(middleware::Compress::default())
             })
             .bind(&addr)?
@@ -46,7 +46,7 @@ cfg_if! {
         }
     } else {
         fn main() {
-            use hackernews::{App};
+            use hackernews::{App, AppProps};
 
             _ = console_log::init_with_level(log::Level::Debug);
             console_error_panic_hook::set_once();

examples/hackernews/src/routes/stories.rs

@@ -1,7 +1,8 @@
-use crate::api;
 use leptos::*;
 use leptos_router::*;
 
+use crate::api;
+
 fn category(from: &str) -> &'static str {
     match from {
         "new" => "newest",
@@ -36,10 +37,8 @@ pub fn Stories(cx: Scope) -> impl IntoView {
     );
     let (pending, set_pending) = create_signal(cx, false);
 
-    let hide_more_link = move |cx| {
-        pending()
-            || stories.read(cx).unwrap_or(None).unwrap_or_default().len() < 28
-    };
+    let hide_more_link =
+        move |cx| pending() || stories.read(cx).unwrap_or(None).unwrap_or_default().len() < 28;
 
     view! {
         cx,

examples/hackernews/src/routes/story.rs

@@ -13,20 +13,11 @@ pub fn Story(cx: Scope) -> impl IntoView {
             if id.is_empty() {
                 None
             } else {
-                api::fetch_api::<api::Story>(
-                    cx,
-                    &api::story(&format!("item/{id}")),
-                )
-                .await
+                api::fetch_api::<api::Story>(cx, &api::story(&format!("item/{id}"))).await
             }
         },
     );
-    let meta_description = move || {
-        story
-            .read(cx)
-            .and_then(|story| story.map(|story| story.title))
-            .unwrap_or_else(|| "Loading story...".to_string())
-    };
+    let meta_description = move || story.read(cx).and_then(|story| story.map(|story| story.title)).unwrap_or_else(|| "Loading story...".to_string());
 
     view! { cx,
         <>

examples/hackernews/src/routes/users.rs

@@ -31,7 +31,7 @@ pub fn User(cx: Scope) -> impl IntoView {
                                 <li>
                                 <span class="label">"Karma: "</span> {user.karma}
                                 </li>
-                                <li inner_html={user.about} class="about"></li>
+                                {user.about.as_ref().map(|about| view! { cx,  <li inner_html=about class="about"></li> })}
                             </ul>
                             <p class="links">
                                 <a href=format!("https://news.ycombinator.com/submitted?id={}", user.id)>"submissions"</a>

examples/hackernews_axum/Makefile.toml

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

examples/hackernews_axum/src/api.rs

@@ -1,4 +1,4 @@
-use leptos::{Scope, Serializable};
+use leptos::{on_cleanup, Scope, Serializable};
 use serde::{Deserialize, Serialize};
 
 pub fn story(path: &str) -> String {
@@ -29,7 +29,7 @@ where
 
     // abort in-flight requests if the Scope is disposed
     // i.e., if we've navigated away from this page
-    leptos::on_cleanup(cx, move || {
+    on_cleanup(cx, move || {
         if let Some(abort_controller) = abort_controller {
             abort_controller.abort()
         }
@@ -38,7 +38,7 @@ where
 }
 
 #[cfg(feature = "ssr")]
-pub async fn fetch_api<T>(_cx: Scope, path: &str) -> Option<T>
+pub async fn fetch_api<T>(cx: Scope, path: &str) -> Option<T>
 where
     T: Serializable,
 {

examples/hackernews_axum/src/error_template.rs

@@ -1,4 +1,7 @@
-use leptos::{view, Errors, For, IntoView, RwSignal, Scope, View};
+use leptos::{
+    signal_prelude::*, view, Errors, For, ForProps, IntoView, RwSignal, Scope,
+    View,
+};
 
 // A basic function to display errors served by the error boundaries. Feel free to do more complicated things
 // here than just displaying them

examples/hackernews_axum/src/fallback.rs

@@ -4,7 +4,7 @@ cfg_if! {
 if #[cfg(feature = "ssr")] {
     use axum::{
         body::{boxed, Body, BoxBody},
-        extract::State,
+        extract::Extension,
         response::IntoResponse,
         http::{Request, Response, StatusCode, Uri},
     };
@@ -15,13 +15,13 @@ if #[cfg(feature = "ssr")] {
     use leptos::{LeptosOptions};
     use crate::error_template::error_template;
 
-    pub async fn file_and_error_handler(uri: Uri, State(options): State<Arc<LeptosOptions>>, req: Request<Body>) -> AxumResponse {
+    pub async fn file_and_error_handler(uri: Uri, Extension(options): Extension<Arc<LeptosOptions>>, req: Request<Body>) -> AxumResponse {
         let options = &*options;
         let root = options.site_root.clone();
         let res = get_static_file(uri.clone(), &root).await.unwrap();
 
         if res.status() == StatusCode::OK {
-            res.into_response()
+           res.into_response()
         } else{
             let handler = leptos_axum::render_app_to_stream(options.to_owned(), |cx| error_template(cx, None));
             handler(req).await.into_response()

examples/hackernews_axum/src/lib.rs

@@ -7,7 +7,10 @@ pub mod error_template;
 pub mod fallback;
 pub mod handlers;
 mod routes;
-use routes::{nav::*, stories::*, story::*, users::*};
+use routes::nav::*;
+use routes::stories::*;
+use routes::story::*;
+use routes::users::*;
 
 #[component]
 pub fn App(cx: Scope) -> impl IntoView {

examples/hackernews_axum/src/main.rs

@@ -7,6 +7,7 @@ if #[cfg(feature = "ssr")] {
     use axum::{
         Router,
         routing::get,
+        extract::Extension,
     };
     use leptos_axum::{generate_route_list, LeptosRoutes};
     use std::sync::Arc;
@@ -17,8 +18,8 @@ if #[cfg(feature = "ssr")] {
         use hackernews_axum::*;
 
         let conf = get_configuration(Some("Cargo.toml")).await.unwrap();
-        let leptos_options = Arc::new(conf.leptos_options);
-        let addr = leptos_options.site_addr;
+        let leptos_options = conf.leptos_options;
+        let addr = leptos_options.site_addr.clone();
         let routes = generate_route_list(|cx| view! { cx, <App/> }).await;
 
         simple_logger::init_with_level(log::Level::Debug).expect("couldn't initialize logging");
@@ -28,7 +29,7 @@ if #[cfg(feature = "ssr")] {
         .route("/favicon.ico", get(file_and_error_handler))
         .leptos_routes(leptos_options.clone(), routes, |cx| view! { cx, <App/> } )
         .fallback(file_and_error_handler)
-        .with_state(leptos_options);
+        .layer(Extension(Arc::new(leptos_options)));
 
         // run our app with hyper
         // `axum::Server` is a re-export of `hyper::Server`

examples/hackernews_axum/src/routes/nav.rs

@@ -1,4 +1,4 @@
-use leptos::{component, view, IntoView, Scope};
+use leptos::{component, Scope, IntoView, view};
 use leptos_router::*;
 
 #[component]

examples/hackernews_axum/src/routes/stories.rs

@@ -1,7 +1,8 @@
-use crate::api;
 use leptos::*;
 use leptos_router::*;
 
+use crate::api;
+
 fn category(from: &str) -> &'static str {
     match from {
         "new" => "newest",
@@ -36,10 +37,8 @@ pub fn Stories(cx: Scope) -> impl IntoView {
     );
     let (pending, set_pending) = create_signal(cx, false);
 
-    let hide_more_link = move || {
-        pending()
-            || stories.read(cx).unwrap_or(None).unwrap_or_default().len() < 28
-    };
+    let hide_more_link =
+        move || pending() || stories.read(cx).unwrap_or(None).unwrap_or_default().len() < 28;
 
     view! {
         cx,

examples/hackernews_axum/src/routes/story.rs

@@ -13,20 +13,11 @@ pub fn Story(cx: Scope) -> impl IntoView {
             if id.is_empty() {
                 None
             } else {
-                api::fetch_api::<api::Story>(
-                    cx,
-                    &api::story(&format!("item/{id}")),
-                )
-                .await
+                api::fetch_api::<api::Story>(cx, &api::story(&format!("item/{id}"))).await
             }
         },
     );
-    let meta_description = move || {
-        story
-            .read(cx)
-            .and_then(|story| story.map(|story| story.title))
-            .unwrap_or_else(|| "Loading story...".to_string())
-    };
+    let meta_description = move || story.read(cx).and_then(|story| story.map(|story| story.title)).unwrap_or_else(|| "Loading story...".to_string());
 
     view! { cx,
         <>

examples/login_with_token_csr_only/Makefile.toml

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

examples/login_with_token_csr_only/api-boundary/Makefile.toml

@@ -1 +0,0 @@
-extend = { path = "../../cargo-make/common.toml" }

examples/login_with_token_csr_only/client/Makefile.toml

@@ -1 +0,0 @@
-extend = { path = "../../cargo-make/common.toml" }

examples/login_with_token_csr_only/client/src/api.rs

@@ -1,8 +1,9 @@
-use api_boundary::*;
 use gloo_net::http::{Request, Response};
 use serde::de::DeserializeOwned;
 use thiserror::Error;
 
+use api_boundary::*;
+
 #[derive(Clone, Copy)]
 pub struct UnauthorizedApi {
     url: &'static str,

examples/login_with_token_csr_only/client/src/components/credentials.rs

@@ -20,56 +20,54 @@ pub fn CredentialsForm(
     });
 
     view! { cx,
-        <form on:submit=|ev| ev.prevent_default()>
-            <p>{title}</p>
-            {move || {
-                error
-                    .get()
-                    .map(|err| {
-                        view! { cx, <p style="color:red;">{err}</p> }
-                    })
-            }}
-            <input
-                type="email"
-                required
-                placeholder="Email address"
-                prop:disabled=move || disabled.get()
-                on:keyup=move |ev: ev::KeyboardEvent| {
-                    let val = event_target_value(&ev);
-                    set_email.update(|v| *v = val);
+      <form on:submit=|ev|ev.prevent_default()>
+        <p>{ title }</p>
+        {move || error.get().map(|err| view!{ cx,
+          <p style ="color:red;" >{ err }</p>
+        })}
+        <input
+          type = "email"
+          required
+          placeholder = "Email address"
+          prop:disabled = move || disabled.get()
+          on:keyup = move |ev: ev::KeyboardEvent| {
+            let val = event_target_value(&ev);
+            set_email.update(|v|*v = val);
+          }
+          // The `change` event fires when the browser fills the form automatically,
+          on:change = move |ev| {
+            let val = event_target_value(&ev);
+            set_email.update(|v|*v = val);
+          }
+        />
+        <input
+          type = "password"
+          required
+          placeholder = "Password"
+          prop:disabled = move || disabled.get()
+          on:keyup = move |ev: ev::KeyboardEvent| {
+            match &*ev.key() {
+                "Enter" => {
+                   dispatch_action();
                 }
-                on:change=move |ev| {
-                    let val = event_target_value(&ev);
-                    set_email.update(|v| *v = val);
+                _=> {
+                   let val = event_target_value(&ev);
+                   set_password.update(|p|*p = val);
                 }
-            />
-            <input
-                type="password"
-                required
-                placeholder="Password"
-                prop:disabled=move || disabled.get()
-                on:keyup=move |ev: ev::KeyboardEvent| {
-                    match &*ev.key() {
-                        "Enter" => {
-                            dispatch_action();
-                        }
-                        _ => {
-                            let val = event_target_value(&ev);
-                            set_password.update(|p| *p = val);
-                        }
-                    }
-                }
-                on:change=move |ev| {
-                    let val = event_target_value(&ev);
-                    set_password.update(|p| *p = val);
-                }
-            />
-            <button
-                prop:disabled=move || button_is_disabled.get()
-                on:click=move |_| dispatch_action()
-            >
-                {action_label}
-            </button>
-        </form>
+            }
+          }
+          // The `change` event fires when the browser fills the form automatically,
+          on:change = move |ev| {
+            let val = event_target_value(&ev);
+            set_password.update(|p|*p = val);
+          }
+        />
+        <button
+          prop:disabled = move || button_is_disabled.get()
+          on:click = move |_| dispatch_action()
+        >
+        { action_label }
+        </button>
+      </form>
     }
 }

examples/login_with_token_csr_only/client/src/components/navbar.rs

@@ -1,7 +1,8 @@
-use crate::Page;
 use leptos::*;
 use leptos_router::*;
 
+use crate::Page;
+
 #[component]
 pub fn NavBar<F>(
     cx: Scope,
@@ -12,27 +13,20 @@ where
     F: Fn() + 'static + Clone,
 {
     view! { cx,
-        <nav>
-            <Show
-                when=move || logged_in.get()
-                fallback=|cx| {
-                    view! { cx,
-                        <A href=Page::Login.path()>"Login"</A>
-                        " | "
-                        <A href=Page::Register.path()>"Register"</A>
-                    }
-                }
-            >
-                <a
-                    href="#"
-                    on:click={
-                        let on_logout = on_logout.clone();
-                        move |_| on_logout()
-                    }
-                >
-                    "Logout"
-                </a>
-            </Show>
-        </nav>
+      <nav>
+        <Show
+          when = move || logged_in.get()
+          fallback = |cx| view! { cx,
+            <A href=Page::Login.path() >"Login"</A>
+            " | "
+            <A href=Page::Register.path() >"Register"</A>
+          }
+        >
+          <a href="#" on:click={
+            let on_logout = on_logout.clone();
+            move |_| on_logout()
+          }>"Logout"</a>
+        </Show>
+      </nav>
     }
 }

examples/login_with_token_csr_only/client/src/lib.rs

@@ -1,8 +1,9 @@
-use api_boundary::*;
 use gloo_storage::{LocalStorage, Storage};
 use leptos::*;
 use leptos_router::*;
 
+use api_boundary::*;
+
 mod api;
 mod components;
 mod pages;
@@ -85,51 +86,45 @@ pub fn App(cx: Scope) -> impl IntoView {
                     .expect("LocalStorage::set");
             }
             None => {
-                log::debug!(
-                    "API is no longer authorized: delete token from \
-                     LocalStorage"
-                );
+                log::debug!("API is no longer authorized: delete token from LocalStorage");
                 LocalStorage::delete(API_TOKEN_STORAGE_KEY);
             }
         }
     });
 
     view! { cx,
-        <Router>
-            <NavBar logged_in on_logout/>
-            <main>
-                <Routes>
-                    <Route
-                        path=Page::Home.path()
-                        view=move |cx| {
-                            view! { cx, <Home user_info=user_info.into()/> }
-                        }
-                    />
-                    <Route
-                        path=Page::Login.path()
-                        view=move |cx| {
-                            view! { cx,
-                                <Login
-                                    api=unauthorized_api
-                                    on_success=move |api| {
-                                        log::info!("Successfully logged in");
-                                        authorized_api.update(|v| *v = Some(api));
-                                        let navigate = use_navigate(cx);
-                                        navigate(Page::Home.path(), Default::default()).expect("Home route");
-                                        fetch_user_info.dispatch(());
-                                    }
-                                />
-                            }
-                        }
-                    />
-                    <Route
-                        path=Page::Register.path()
-                        view=move |cx| {
-                            view! { cx, <Register api=unauthorized_api/> }
-                        }
-                    />
-                </Routes>
-            </main>
-        </Router>
+      <Router>
+        <NavBar logged_in on_logout />
+        <main>
+          <Routes>
+            <Route
+              path=Page::Home.path()
+              view=move |cx| view! { cx,
+                <Home user_info = user_info.into() />
+              }
+            />
+            <Route
+              path=Page::Login.path()
+              view=move |cx| view! { cx,
+                <Login
+                  api = unauthorized_api
+                  on_success = move |api| {
+                      log::info!("Successfully logged in");
+                      authorized_api.update(|v| *v = Some(api));
+                      let navigate = use_navigate(cx);
+                      navigate(Page::Home.path(), Default::default()).expect("Home route");
+                      fetch_user_info.dispatch(());
+                  } />
+              }
+            />
+            <Route
+              path=Page::Register.path()
+              view=move |cx| view! { cx,
+                <Register api = unauthorized_api />
+              }
+            />
+          </Routes>
+        </main>
+      </Router>
     }
 }

examples/login_with_token_csr_only/client/src/main.rs

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

examples/login_with_token_csr_only/client/src/pages/home.rs

@@ -6,19 +6,15 @@ use leptos_router::*;
 #[component]
 pub fn Home(cx: Scope, user_info: Signal<Option<UserInfo>>) -> impl IntoView {
     view! { cx,
-        <h2>"Leptos Login example"</h2>
-        {move || match user_info.get() {
-            Some(info) => {
-                view! { cx, <p>"You are logged in with " {info.email} "."</p> }
-                    .into_view(cx)
-            }
-            None => {
-                view! { cx,
-                    <p>"You are not logged in."</p>
-                    <A href=Page::Login.path()>"Login now."</A>
-                }
-                    .into_view(cx)
-            }
-        }}
+      <h2>"Leptos Login example"</h2>
+      {move || match user_info.get() {
+        Some(info) => view!{ cx,
+          <p>"You are logged in with "{ info.email }"."</p>
+        }.into_view(cx),
+        None => view!{ cx,
+          <p>"You are not logged in."</p>
+          <A href=Page::Login.path() >"Login now."</A>
+        }.into_view(cx)
+      }}
     }
 }

examples/login_with_token_csr_only/client/src/pages/login.rs

@@ -1,11 +1,13 @@
+use leptos::*;
+use leptos_router::*;
+
+use api_boundary::*;
+
 use crate::{
     api::{self, AuthorizedApi, UnauthorizedApi},
     components::credentials::*,
     Page,
 };
-use api_boundary::*;
-use leptos::*;
-use leptos_router::*;
 
 #[component]
 pub fn Login<F>(cx: Scope, api: UnauthorizedApi, on_success: F) -> impl IntoView
@@ -51,14 +53,14 @@ where
     let disabled = Signal::derive(cx, move || wait_for_response.get());
 
     view! { cx,
-        <CredentialsForm
-            title="Please login to your account"
-            action_label="Login"
-            action=login_action
-            error=login_error.into()
-            disabled
-        />
-        <p>"Don't have an account?"</p>
-        <A href=Page::Register.path()>"Register"</A>
+      <CredentialsForm
+        title = "Please login to your account"
+        action_label = "Login"
+        action = login_action
+        error = login_error.into()
+        disabled
+      />
+      <p>"Don't have an account?"</p>
+      <A href=Page::Register.path()>"Register"</A>
     }
 }

examples/login_with_token_csr_only/client/src/pages/register.rs

@@ -1,11 +1,13 @@
+use leptos::*;
+use leptos_router::*;
+
+use api_boundary::*;
+
 use crate::{
     api::{self, UnauthorizedApi},
     components::credentials::*,
     Page,
 };
-use api_boundary::*;
-use leptos::*;
-use leptos_router::*;
 
 #[component]
 pub fn Register(cx: Scope, api: UnauthorizedApi) -> impl IntoView {
@@ -50,24 +52,26 @@ pub fn Register(cx: Scope, api: UnauthorizedApi) -> impl IntoView {
     let disabled = Signal::derive(cx, move || wait_for_response.get());
 
     view! { cx,
-        <Show
-            when=move || register_response.get().is_some()
-            fallback=move |_| {
-                view! { cx,
-                    <CredentialsForm
-                        title="Please enter the desired credentials"
-                        action_label="Register"
-                        action=register_action
-                        error=register_error.into()
-                        disabled
-                    />
-                    <p>"Your already have an account?"</p>
-                    <A href=Page::Login.path()>"Login"</A>
-                }
-            }
-        >
-            <p>"You have successfully registered."</p>
-            <p>"You can now " <A href=Page::Login.path()>"login"</A> " with your new account."</p>
-        </Show>
+      <Show
+        when = move || register_response.get().is_some()
+        fallback = move |_| view!{ cx,
+          <CredentialsForm
+            title = "Please enter the desired credentials"
+            action_label = "Register"
+            action = register_action
+            error = register_error.into()
+            disabled
+          />
+          <p>"Your already have an account?"</p>
+          <A href=Page::Login.path()>"Login"</A>
+        }
+      >
+        <p>"You have successfully registered."</p>
+        <p>
+         "You can now "
+         <A href=Page::Login.path()>"login"</A>
+         " with your new account."
+        </p>
+      </Show>
     }
 }

examples/login_with_token_csr_only/server/Makefile.toml

@@ -1 +0,0 @@
-extend = { path = "../../cargo-make/common.toml" }

examples/login_with_token_csr_only/server/src/adapters.rs

@@ -2,7 +2,8 @@ use crate::{application::*, Error};
 use api_boundary as json;
 use axum::{
     http::StatusCode,
-    response::{IntoResponse, Json, Response},
+    response::Json,
+    response::{IntoResponse, Response},
 };
 use thiserror::Error;
 

examples/login_with_token_csr_only/server/src/main.rs

@@ -1,4 +1,5 @@
-use api_boundary as json;
+use std::{env, sync::Arc};
+
 use axum::{
     extract::{State, TypedHeader},
     headers::{authorization::Bearer, Authorization},
@@ -7,9 +8,10 @@ use axum::{
     routing::{get, post},
     Router,
 };
-use std::{env, sync::Arc};
 use tower_http::cors::{Any, CorsLayer};
 
+use api_boundary as json;
+
 mod adapters;
 mod application;
 
@@ -23,10 +25,7 @@ async fn main() -> anyhow::Result<()> {
                 env::set_var("RUST_LOG", "debug");
             }
             env::VarError::NotUnicode(_) => {
-                return Err(anyhow::anyhow!(
-                    "The value of 'RUST_LOG' does not contain valid unicode \
-                     data."
-                ));
+                return Err(anyhow::anyhow!("The value of 'RUST_LOG' does not contain valid unicode data."));
             }
         }
     }

examples/router/Makefile.toml

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

examples/router/src/lib.rs

@@ -107,7 +107,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
+            <AnimatedOutlet 
                 class="outlet"
                 outro="fadeOut"
                 intro="fadeIn"

examples/session_auth_axum/Makefile.toml

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

examples/session_auth_axum/src/auth.rs

@@ -1,7 +1,9 @@
+use std::collections::HashSet;
+
 use cfg_if::cfg_if;
 use leptos::*;
+
 use serde::{Deserialize, Serialize};
-use std::collections::HashSet;
 
 cfg_if! {
 if #[cfg(feature = "ssr")] {
@@ -166,9 +168,7 @@ pub async fn login(
         .ok_or("User does not exist.")
         .map_err(|e| ServerFnError::ServerError(e.to_string()))?;
 
-    match verify(password, &user.password)
-        .map_err(|e| ServerFnError::ServerError(e.to_string()))?
-    {
+    match verify(password, &user.password).map_err(|e| ServerFnError::ServerError(e.to_string()))? {
         true => {
             auth.login_user(user.id);
             auth.remember_user(remember.is_some());

examples/session_auth_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/session_auth_axum/src/fallback.rs

@@ -4,7 +4,7 @@ cfg_if! {
 if #[cfg(feature = "ssr")] {
     use axum::{
         body::{boxed, Body, BoxBody},
-        extract::State,
+        extract::Extension,
         response::IntoResponse,
         http::{Request, Response, StatusCode, Uri},
     };
@@ -13,16 +13,16 @@ if #[cfg(feature = "ssr")] {
     use tower_http::services::ServeDir;
     use std::sync::Arc;
     use leptos::{LeptosOptions, Errors, view};
-    use crate::error_template::ErrorTemplate;
+    use crate::error_template::{ErrorTemplate, ErrorTemplateProps};
     use crate::errors::TodoAppError;
 
-    pub async fn file_and_error_handler(uri: Uri, State(options): State<Arc<LeptosOptions>>, req: Request<Body>) -> AxumResponse {
+    pub async fn file_and_error_handler(uri: Uri, Extension(options): Extension<Arc<LeptosOptions>>, req: Request<Body>) -> AxumResponse {
         let options = &*options;
         let root = options.site_root.clone();
         let res = get_static_file(uri.clone(), &root).await.unwrap();
 
         if res.status() == StatusCode::OK {
-            res.into_response()
+           res.into_response()
         } else{
             let mut errors = Errors::default();
             errors.insert_with_default_key(TodoAppError::NotFound);

examples/session_auth_axum/src/main.rs

@@ -5,8 +5,8 @@ cfg_if! {
 if #[cfg(feature = "ssr")] {
     use axum::{
         response::{Response, IntoResponse},
-        routing::get,
-        extract::{Path, State, Extension, RawQuery},
+        routing::{post, get},
+        extract::{Path, Extension, RawQuery},
         http::{Request, header::HeaderMap},
         body::Body as AxumBody,
         Router,
@@ -16,7 +16,7 @@ if #[cfg(feature = "ssr")] {
     use session_auth_axum::*;
     use session_auth_axum::fallback::file_and_error_handler;
     use leptos_axum::{generate_route_list, LeptosRoutes, handle_server_fns_with_context};
-    use leptos::{log, view, provide_context, LeptosOptions, get_configuration};
+    use leptos::{log, view, provide_context, LeptosOptions, get_configuration, ServerFnError};
     use std::sync::Arc;
     use sqlx::{SqlitePool, sqlite::SqlitePoolOptions};
     use axum_database_sessions::{SessionConfig, SessionLayer, SessionStore};
@@ -33,7 +33,7 @@ if #[cfg(feature = "ssr")] {
         }, request).await
     }
 
-    async fn leptos_routes_handler(Extension(pool): Extension<SqlitePool>, auth_session: AuthSession, State(options): State<Arc<LeptosOptions>>, req: Request<AxumBody>) -> Response{
+    async fn leptos_routes_handler(Extension(pool): Extension<SqlitePool>, auth_session: AuthSession, Extension(options): Extension<Arc<LeptosOptions>>, req: Request<AxumBody>) -> Response{
             let handler = leptos_axum::render_app_to_stream_with_context((*options).clone(),
             move |cx| {
                 provide_context(cx, auth_session.clone());
@@ -68,7 +68,7 @@ if #[cfg(feature = "ssr")] {
 
         // Setting this to None means we'll be using cargo-leptos and its env vars
         let conf = get_configuration(None).await.unwrap();
-        let leptos_options = Arc::new(conf.leptos_options);
+        let leptos_options = conf.leptos_options;
         let addr = leptos_options.site_addr;
         let routes = generate_route_list(|cx| view! { cx, <TodoApp/> }).await;
 
@@ -80,8 +80,8 @@ if #[cfg(feature = "ssr")] {
         .layer(AuthSessionLayer::<User, i64, SessionSqlitePool, SqlitePool>::new(Some(pool.clone()))
                     .with_config(auth_config))
         .layer(SessionLayer::new(session_store))
-        .layer(Extension(pool))
-        .with_state(leptos_options);
+        .layer(Extension(Arc::new(leptos_options)))
+        .layer(Extension(pool));
 
         // run our app with hyper
         // `axum::Server` is a re-export of `hyper::Server`

examples/session_auth_axum/src/todo.rs

@@ -1,4 +1,5 @@
-use crate::{auth::*, error_template::ErrorTemplate};
+use crate::auth::*;
+use crate::error_template::{ErrorTemplate, ErrorTemplateProps};
 use cfg_if::cfg_if;
 use leptos::*;
 use leptos_meta::*;
@@ -20,15 +21,15 @@ if #[cfg(feature = "ssr")] {
     use sqlx::SqlitePool;
 
     pub fn pool(cx: Scope) -> Result<SqlitePool, ServerFnError> {
-       use_context::<SqlitePool>(cx)
+        Ok(use_context::<SqlitePool>(cx)
             .ok_or("Pool missing.")
-            .map_err(|e| ServerFnError::ServerError(e.to_string()))
+            .map_err(|e| ServerFnError::ServerError(e.to_string()))?)
     }
 
     pub fn auth(cx: Scope) -> Result<AuthSession, ServerFnError> {
-        use_context::<AuthSession>(cx)
+        Ok(use_context::<AuthSession>(cx)
             .ok_or("Auth session missing.")
-            .map_err(|e| ServerFnError::ServerError(e.to_string()))
+            .map_err(|e| ServerFnError::ServerError(e.to_string()))?)
     }
 
     pub fn register_server_functions() {
@@ -72,8 +73,7 @@ pub async fn get_todos(cx: Scope) -> Result<Vec<Todo>, ServerFnError> {
     let pool = pool(cx)?;
 
     let mut todos = Vec::new();
-    let mut rows =
-        sqlx::query_as::<_, SqlTodo>("SELECT * FROM todos").fetch(&pool);
+    let mut rows = sqlx::query_as::<_, SqlTodo>("SELECT * FROM todos").fetch(&pool);
 
     while let Some(row) = rows
         .try_next()
@@ -111,13 +111,11 @@ pub async fn add_todo(cx: Scope, title: String) -> Result<(), ServerFnError> {
     // fake API delay
     std::thread::sleep(std::time::Duration::from_millis(1250));
 
-    match sqlx::query(
-        "INSERT INTO todos (title, user_id, completed) VALUES (?, ?, false)",
-    )
-    .bind(title)
-    .bind(id)
-    .execute(&pool)
-    .await
+    match sqlx::query("INSERT INTO todos (title, user_id, completed) VALUES (?, ?, false)")
+        .bind(title)
+        .bind(id)
+        .execute(&pool)
+        .await
     {
         Ok(_row) => Ok(()),
         Err(e) => Err(ServerFnError::ServerError(e.to_string())),
@@ -306,10 +304,7 @@ pub fn Todos(cx: Scope) -> impl IntoView {
 }
 
 #[component]
-pub fn Login(
-    cx: Scope,
-    action: Action<Login, Result<(), ServerFnError>>,
-) -> impl IntoView {
+pub fn Login(cx: Scope, action: Action<Login, Result<(), ServerFnError>>) -> impl IntoView {
     view! {
         cx,
         <ActionForm action=action>
@@ -335,10 +330,7 @@ pub fn Login(
 }
 
 #[component]
-pub fn Signup(
-    cx: Scope,
-    action: Action<Signup, Result<(), ServerFnError>>,
-) -> impl IntoView {
+pub fn Signup(cx: Scope, action: Action<Signup, Result<(), ServerFnError>>) -> impl IntoView {
     view! {
         cx,
         <ActionForm action=action>
@@ -370,10 +362,7 @@ pub fn Signup(
 }
 
 #[component]
-pub fn Logout(
-    cx: Scope,
-    action: Action<Logout, Result<(), ServerFnError>>,
-) -> impl IntoView {
+pub fn Logout(cx: Scope, action: Action<Logout, Result<(), ServerFnError>>) -> impl IntoView {
     view! {
         cx,
         <div id="loginbox">

examples/ssr_modes/Makefile.toml

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

examples/ssr_modes/src/main.rs

@@ -12,8 +12,8 @@ async fn main() -> std::io::Result<()> {
     // Generate the list of routes in your Leptos App
     let routes = generate_route_list(|cx| view! { cx, <App/> });
 
-    let _ = GetPost::register();
-    let _ = ListPostMetadata::register();
+    GetPost::register();
+    ListPostMetadata::register();
 
     HttpServer::new(move || {
         let leptos_options = &conf.leptos_options;

examples/ssr_modes_axum/Makefile.toml

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

examples/ssr_modes_axum/src/fallback.rs

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

examples/ssr_modes_axum/src/main.rs

@@ -1,7 +1,11 @@
 #[cfg(feature = "ssr")]
 #[tokio::main]
 async fn main() {
-    use axum::{routing::post, Router};
+    use axum::{
+        extract::{Extension, Path},
+        routing::{get, post},
+        Router,
+    };
     use leptos::*;
     use leptos_axum::{generate_route_list, LeptosRoutes};
     use ssr_modes_axum::{app::*, fallback::file_and_error_handler};
@@ -9,12 +13,12 @@ async fn main() {
 
     let conf = get_configuration(None).await.unwrap();
     let addr = conf.leptos_options.site_addr;
-    let leptos_options = Arc::new(conf.leptos_options);
+    let leptos_options = conf.leptos_options;
     // Generate the list of routes in your Leptos App
     let routes = generate_route_list(|cx| view! { cx, <App/> }).await;
 
-    let _ = GetPost::register();
-    let _ = ListPostMetadata::register();
+    GetPost::register();
+    ListPostMetadata::register();
 
     let app = Router::new()
         .route("/api/*fn_name", post(leptos_axum::handle_server_fns))
@@ -24,7 +28,7 @@ async fn main() {
             |cx| view! { cx, <App/> },
         )
         .fallback(file_and_error_handler)
-        .with_state(leptos_options);
+        .layer(Extension(Arc::new(leptos_options)));
 
     // run our app with hyper
     // `axum::Server` is a re-export of `hyper::Server`

examples/tailwind/.gitignore

@@ -8,10 +8,3 @@ Cargo.lock
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
-
-# Support playwright testing
-node_modules/
-test-results/
-end2end/playwright-report/
-playwright/.cache/
-pnpm-lock.yaml

examples/tailwind/Cargo.toml

@@ -96,7 +96,6 @@ site-addr = "127.0.0.1:3000"
 reload-port = 3001
 # [Optional] Command to use when running end2end tests. It will run in the end2end dir.
 end2end-cmd = "npx playwright test"
-end2end-dir = "end2end"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
 # Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head

examples/tailwind/Makefile.toml

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

examples/tailwind/README.md

@@ -104,8 +104,3 @@ You'll need to install trunk to client side render this bundle.
 ## Attribution
 
 Many thanks to GreatGreg for putting together this guide. You can find the original, with added details, [here](https://github.com/leptos-rs/leptos/discussions/125).
-
-## Playwright Testing
-
-- Run `cargo make setup` to install dependencies
-- Run `cargo leptos test` or `cargo leptos end-to-end` to run the tests

examples/tailwind/end2end/tests/example.spec.ts

@@ -1,7 +1,9 @@
 import { test, expect } from "@playwright/test";
 
-test("should see the welcome message", async ({ page }) => {
+test("homepage has title and links to intro page", async ({ page }) => {
   await page.goto("http://localhost:3000/");
 
-  await expect(page.locator("h2")).toHaveText("Welcome to Leptos with Tailwind");
+  await expect(page).toHaveTitle("Cargo Leptos");
+
+  await expect(page.locator("h1")).toHaveText("Hi from your Leptos WASM!");
 });

examples/tailwind/src/main.rs

@@ -20,7 +20,7 @@ cfg_if! {
             // Setting this to None means we'll be using cargo-leptos and its env vars.
             let conf = get_configuration(None).await.unwrap();
 
-            let addr = conf.leptos_options.site_addr;
+            let addr = conf.leptos_options.site_addr.clone();
 
             // Generate the list of routes in your Leptos App
             let routes = generate_route_list(|cx| view! { cx, <App/> });
@@ -32,7 +32,7 @@ cfg_if! {
                 App::new()
                     .service(css)
                     .leptos_routes(leptos_options.to_owned(), routes.to_owned(), |cx| view! { cx, <App/> })
-                    .service(Files::new("/", site_root))
+                    .service(Files::new("/", &site_root))
                     .wrap(middleware::Compress::default())
             })
             .bind(&addr)?

examples/tailwind_csr_trunk/README.md

@@ -5,7 +5,7 @@ This is a template demonstrating how to integrate [TailwindCSS](https://tailwind
 
 Install Tailwind and build the CSS:
 
-`Trunk.toml` is configured to build the CSS automatically.
+`npx tailwindcss -i ./input.css -o ./style/output.css --watch`
 
 Install trunk to client side render this bundle.
 

examples/tailwind_csr_trunk/Trunk.toml

@@ -1,4 +0,0 @@
-[[hooks]]
-stage = "pre_build"
-command = "sh"
-command_arguments = ["-c", "npx tailwindcss -i input.css -o style/output.css"]

examples/tailwind_csr_trunk/style/output.css

@@ -1,5 +1,5 @@
 /*
-! tailwindcss v3.3.2 | MIT License | https://tailwindcss.com
+! tailwindcss v3.2.7 | MIT License | https://tailwindcss.com
 */
 
 /*
@@ -31,7 +31,6 @@
 3. Use a more readable tab size.
 4. Use the user's configured `sans` font-family by default.
 5. Use the user's configured `sans` font-feature-settings by default.
-6. Use the user's configured `sans` font-variation-settings by default.
 */
 
 html {
@@ -48,8 +47,6 @@ html {
   /* 4 */
   font-feature-settings: normal;
   /* 5 */
-  font-variation-settings: normal;
-  /* 6 */
 }
 
 /*
@@ -436,9 +433,6 @@ video {
   --tw-pan-y:  ;
   --tw-pinch-zoom:  ;
   --tw-scroll-snap-strictness: proximity;
-  --tw-gradient-from-position:  ;
-  --tw-gradient-via-position:  ;
-  --tw-gradient-to-position:  ;
   --tw-ordinal:  ;
   --tw-slashed-zero:  ;
   --tw-numeric-figure:  ;
@@ -486,9 +480,6 @@ video {
   --tw-pan-y:  ;
   --tw-pinch-zoom:  ;
   --tw-scroll-snap-strictness: proximity;
-  --tw-gradient-from-position:  ;
-  --tw-gradient-via-position:  ;
-  --tw-gradient-to-position:  ;
   --tw-ordinal:  ;
   --tw-slashed-zero:  ;
   --tw-numeric-figure:  ;

examples/todo_app_sqlite/Cargo.toml

@@ -8,7 +8,7 @@ crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 actix-files = { version = "0.6.2", optional = true }
-actix-web = { version = "4.2.1", optional = true, features = ["macros"] }
+actix-web = { version = "4.2.1", features = ["macros"] }
 anyhow = "1.0.68"
 broadcaster = "1.0.0"
 console_log = "1.0.0"
@@ -19,7 +19,7 @@ cfg-if = "1.0.0"
 leptos = { path = "../../leptos", default-features = false, features = [
 	"serde",
 ] }
-leptos_actix = { path = "../../integrations/actix", optional = true }
+leptos_actix = { path = "../../integrations/actix" }
 leptos_meta = { path = "../../meta", default-features = false }
 leptos_router = { path = "../../router", default-features = false }
 log = "0.4.17"
@@ -36,10 +36,8 @@ default = ["ssr"]
 hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
 ssr = [
 	"dep:actix-files",
-	"dep:actix-web",
 	"dep:sqlx",
 	"leptos/ssr",
-	"leptos_actix",
 	"leptos_meta/ssr",
 	"leptos_router/ssr",
 ]

examples/todo_app_sqlite/Makefile.toml

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

examples/todo_app_sqlite/src/lib.rs

@@ -1,10 +1,10 @@
 use cfg_if::cfg_if;
+use leptos::*;
 pub mod todo;
 
 // Needs to be in lib.rs AFAIK because wasm-bindgen needs us to be compiling a lib. I may be wrong.
 cfg_if! {
     if #[cfg(feature = "hydrate")] {
-        use leptos::*;
         use wasm_bindgen::prelude::wasm_bindgen;
         use crate::todo::*;
 

examples/todo_app_sqlite/src/main.rs

@@ -29,7 +29,7 @@ cfg_if! {
             // Setting this to None means we'll be using cargo-leptos and its env vars.
             let conf = get_configuration(None).await.unwrap();
 
-            let addr = conf.leptos_options.site_addr;
+            let addr = conf.leptos_options.site_addr.clone();
 
             // Generate the list of routes in your Leptos App
             let routes = generate_route_list(|cx| view! { cx, <TodoApp/> });
@@ -43,7 +43,7 @@ cfg_if! {
                     .service(css)
                     .route("/api/{tail:.*}", leptos_actix::handle_server_fns())
                     .leptos_routes(leptos_options.to_owned(), routes.to_owned(), |cx| view! { cx, <TodoApp/> })
-                    .service(Files::new("/", site_root))
+                    .service(Files::new("/", &site_root))
                     //.wrap(middleware::Compress::default())
             })
             .bind(addr)?

examples/todo_app_sqlite/src/todo.rs

@@ -9,7 +9,7 @@ cfg_if! {
         use sqlx::{Connection, SqliteConnection};
 
         pub async fn db() -> Result<SqliteConnection, ServerFnError> {
-            SqliteConnection::connect("sqlite:Todos.db").await.map_err(|e| ServerFnError::ServerError(e.to_string()))
+            Ok(SqliteConnection::connect("sqlite:Todos.db").await.map_err(|e| ServerFnError::ServerError(e.to_string()))?)
         }
 
         pub fn register_server_functions() {
@@ -37,18 +37,18 @@ cfg_if! {
 #[server(GetTodos, "/api")]
 pub async fn get_todos(cx: Scope) -> Result<Vec<Todo>, ServerFnError> {
     // this is just an example of how to access server context injected in the handlers
-    let req = use_context::<actix_web::HttpRequest>(cx);
-
-    if let Some(req) = req {
-        println!("req.path = {:#?}", req.path());
+    let req =
+        use_context::<actix_web::HttpRequest>(cx);
+    
+    if let Some(req) = req{
+    println!("req.path = {:#?}", req.path());
     }
     use futures::TryStreamExt;
 
     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
@@ -73,7 +73,7 @@ pub async fn add_todo(title: String) -> Result<(), ServerFnError> {
         .execute(&mut conn)
         .await
     {
-        Ok(_row) => Ok(()),
+        Ok(row) => Ok(()),
         Err(e) => Err(ServerFnError::ServerError(e.to_string())),
     }
 }
@@ -107,6 +107,9 @@ pub fn TodoApp(cx: Scope) -> impl IntoView {
                         cx,
                         <Todos/>
                     }/>
+                    <Api path="bananas" route=web::get().to(|req: HttpRequest| async move {
+                        req.path()
+                    })
                 </Routes>
             </main>
         </Router>
@@ -130,7 +133,7 @@ pub fn Todos(cx: Scope) -> impl IntoView {
         cx,
         <div>
             <MultiActionForm
-                // we can handle client-side validation in the on:submit event
+                // we can handle client-side validation in the on:submit event 
                 // leptos_router implements a `FromFormData` trait that lets you
                 // parse deserializable types from form data and check them
                 on:submit=move |ev| {

examples/todo_app_sqlite_axum/Makefile.toml

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

examples/todo_app_sqlite_axum/src/fallback.rs

@@ -4,7 +4,7 @@ cfg_if! {
 if #[cfg(feature = "ssr")] {
     use axum::{
         body::{boxed, Body, BoxBody},
-        extract::State,
+        extract::Extension,
         response::IntoResponse,
         http::{Request, Response, StatusCode, Uri},
     };
@@ -13,16 +13,16 @@ if #[cfg(feature = "ssr")] {
     use tower_http::services::ServeDir;
     use std::sync::Arc;
     use leptos::{LeptosOptions, Errors, view};
-    use crate::error_template::ErrorTemplate;
+    use crate::error_template::{ErrorTemplate, ErrorTemplateProps};
     use crate::errors::TodoAppError;
 
-    pub async fn file_and_error_handler(uri: Uri, State(options): State<Arc<LeptosOptions>>, req: Request<Body>) -> AxumResponse {
+    pub async fn file_and_error_handler(uri: Uri, Extension(options): Extension<Arc<LeptosOptions>>, req: Request<Body>) -> AxumResponse {
         let options = &*options;
         let root = options.site_root.clone();
         let res = get_static_file(uri.clone(), &root).await.unwrap();
 
         if res.status() == StatusCode::OK {
-            res.into_response()
+           res.into_response()
         } else{
             let mut errors = Errors::default();
             errors.insert_with_default_key(TodoAppError::NotFound);

examples/todo_app_sqlite_axum/src/lib.rs

@@ -1,4 +1,5 @@
 use cfg_if::cfg_if;
+use leptos::*;
 pub mod error_template;
 pub mod errors;
 pub mod fallback;
@@ -7,7 +8,6 @@ pub mod todo;
 // Needs to be in lib.rs AFAIK because wasm-bindgen needs us to be compiling a lib. I may be wrong.
 cfg_if! {
     if #[cfg(feature = "hydrate")] {
-        use leptos::*;
         use wasm_bindgen::prelude::wasm_bindgen;
         use crate::todo::*;
 

examples/todo_app_sqlite_axum/src/main.rs

@@ -1,11 +1,11 @@
 use cfg_if::cfg_if;
+use leptos::*;
 // boilerplate to run in different modes
 cfg_if! {
-    if #[cfg(feature = "ssr")] {
-    use leptos::*;
+if #[cfg(feature = "ssr")] {
     use axum::{
         routing::{post, get},
-        extract::{State, Path},
+        extract::{Extension, Path},
         http::Request,
         response::{IntoResponse, Response},
         Router,
@@ -18,7 +18,7 @@ cfg_if! {
     use std::sync::Arc;
 
     //Define a handler to test extractor with state
-    async fn custom_handler(Path(id): Path<String>, State(options): State<Arc<LeptosOptions>>, req: Request<AxumBody>) -> Response{
+    async fn custom_handler(Path(id): Path<String>, Extension(options): Extension<Arc<LeptosOptions>>, req: Request<AxumBody>) -> Response{
             let handler = leptos_axum::render_app_to_stream_with_context((*options).clone(),
             move |cx| {
                 provide_context(cx, id.clone());
@@ -32,7 +32,7 @@ cfg_if! {
     async fn main() {
         simple_logger::init_with_level(log::Level::Debug).expect("couldn't initialize logging");
 
-        let _conn = db().await.expect("couldn't connect to DB");
+        let conn = db().await.expect("couldn't connect to DB");
         /* sqlx::migrate!()
             .run(&mut conn)
             .await
@@ -42,7 +42,7 @@ cfg_if! {
 
         // Setting this to None means we'll be using cargo-leptos and its env vars
         let conf = get_configuration(None).await.unwrap();
-        let leptos_options = Arc::new(conf.leptos_options);
+        let leptos_options = conf.leptos_options;
         let addr = leptos_options.site_addr;
         let routes = generate_route_list(|cx| view! { cx, <TodoApp/> }).await;
 
@@ -52,7 +52,7 @@ cfg_if! {
         .route("/special/:id", get(custom_handler))
         .leptos_routes(leptos_options.clone(), routes, |cx| view! { cx, <TodoApp/> } )
         .fallback(file_and_error_handler)
-        .with_state(leptos_options);
+        .layer(Extension(Arc::new(leptos_options)));
 
         // run our app with hyper
         // `axum::Server` is a re-export of `hyper::Server`

examples/todo_app_sqlite_axum/src/todo.rs

@@ -1,4 +1,4 @@
-use crate::error_template::ErrorTemplate;
+use crate::error_template::{ErrorTemplate, ErrorTemplateProps};
 use cfg_if::cfg_if;
 use leptos::*;
 use leptos_meta::*;
@@ -146,8 +146,11 @@ pub fn TodoApp(cx: Scope) -> impl IntoView {
             </header>
             <main>
                 <Routes>
-                    <Route path="" view=|cx| view! { cx,
-                        <Todos/>
+                    <Route path="" view=|cx| view! {
+                        cx,
+                        <ErrorBoundary fallback=|cx, errors| view!{cx, <ErrorTemplate errors=errors/>}>
+                            <Todos/>
+                        </ErrorBoundary>
                     }/> //Route
                     <Route path="weird" methods=&[Method::Get, Method::Post]
                         ssr=SsrMode::Async
@@ -200,65 +203,63 @@ pub fn Todos(cx: Scope) -> impl IntoView {
                 <input type="submit" value="Add"/>
             </MultiActionForm>
             <Transition fallback=move || view! {cx, <p>"Loading..."</p> }>
-                <ErrorBoundary fallback=|cx, errors| view!{cx, <ErrorTemplate errors=errors/>}>
-                    {move || {
-                        let existing_todos = {
-                            move || {
-                                todos.read(cx)
-                                    .map(move |todos| match todos {
-                                        Err(e) => {
-                                            view! { cx, <pre class="error">"Server Error: " {e.to_string()}</pre>}.into_view(cx)
+                {move || {
+                    let existing_todos = {
+                        move || {
+                            todos.read(cx)
+                                .map(move |todos| match todos {
+                                    Err(e) => {
+                                        view! { cx, <pre class="error">"Server Error: " {e.to_string()}</pre>}.into_view(cx)
+                                    }
+                                    Ok(todos) => {
+                                        if todos.is_empty() {
+                                            view! { cx, <p>"No tasks were found."</p> }.into_view(cx)
+                                        } else {
+                                            todos
+                                                .into_iter()
+                                                .map(move |todo| {
+                                                    view! {
+                                                        cx,
+                                                        <li>
+                                                            {todo.title}
+                                                            <ActionForm action=delete_todo>
+                                                                <input type="hidden" name="id" value={todo.id}/>
+                                                                <input type="submit" value="X"/>
+                                                            </ActionForm>
+                                                        </li>
+                                                    }
+                                                })
+                                                .collect_view(cx)
                                         }
-                                        Ok(todos) => {
-                                            if todos.is_empty() {
-                                                view! { cx, <p>"No tasks were found."</p> }.into_view(cx)
-                                            } else {
-                                                todos
-                                                    .into_iter()
-                                                    .map(move |todo| {
-                                                        view! {
-                                                            cx,
-                                                            <li>
-                                                                {todo.title}
-                                                                <ActionForm action=delete_todo>
-                                                                    <input type="hidden" name="id" value={todo.id}/>
-                                                                    <input type="submit" value="X"/>
-                                                                </ActionForm>
-                                                            </li>
-                                                        }
-                                                    })
-                                                    .collect_view(cx)
-                                            }
-                                        }
-                                    })
-                                    .unwrap_or_default()
-                            }
-                        };
-
-                        let pending_todos = move || {
-                            submissions
-                            .get()
-                            .into_iter()
-                            .filter(|submission| submission.pending().get())
-                            .map(|submission| {
-                                view! {
-                                    cx,
-                                    <li class="pending">{move || submission.input.get().map(|data| data.title) }</li>
-                                }
-                            })
-                            .collect_view(cx)
-                        };
-
-                        view! {
-                            cx,
-                            <ul>
-                                {existing_todos}
-                                {pending_todos}
-                            </ul>
+                                    }
+                                })
+                                .unwrap_or_default()
                         }
+                    };
+
+                    let pending_todos = move || {
+                        submissions
+                        .get()
+                        .into_iter()
+                        .filter(|submission| submission.pending().get())
+                        .map(|submission| {
+                            view! {
+                                cx,
+                                <li class="pending">{move || submission.input.get().map(|data| data.title) }</li>
+                            }
+                        })
+                        .collect_view(cx)
+                    };
+
+                    view! {
+                        cx,
+                        <ul>
+                            {existing_todos}
+                            {pending_todos}
+                        </ul>
                     }
                 }
-                </ErrorBoundary>
+            }
             </Transition>
         </div>
     }

examples/todo_app_sqlite_viz/Makefile.toml

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

examples/todo_app_sqlite_viz/src/fallback.rs

@@ -3,7 +3,7 @@ use cfg_if::cfg_if;
 cfg_if! {
 if #[cfg(feature = "ssr")] {
     use crate::{
-        error_template::ErrorTemplate,
+        error_template::{ErrorTemplate, ErrorTemplateProps},
         errors::TodoAppError,
     };
     use http::Uri;
@@ -22,7 +22,7 @@ if #[cfg(feature = "ssr")] {
             Error::Responder(Response::text("missing state type LeptosOptions")),
         )?;
         let root = &options.site_root;
-        let resp = get_static_file(uri, root, headers, route_info).await?;
+        let resp = get_static_file(uri, &root, headers, route_info).await?;
         let status = resp.status();
 
         if status.is_success() || status.is_redirection() {

examples/todo_app_sqlite_viz/src/lib.rs

@@ -1,4 +1,5 @@
 use cfg_if::cfg_if;
+use leptos::*;
 pub mod error_template;
 pub mod errors;
 pub mod fallback;
@@ -7,7 +8,6 @@ pub mod todo;
 // Needs to be in lib.rs AFAIK because wasm-bindgen needs us to be compiling a lib. I may be wrong.
 cfg_if! {
     if #[cfg(feature = "hydrate")] {
-        use leptos::*;
         use wasm_bindgen::prelude::wasm_bindgen;
         use crate::todo::*;
 

examples/todo_app_sqlite_viz/src/main.rs

@@ -1,9 +1,8 @@
 use cfg_if::cfg_if;
-
+use leptos::*;
 // boilerplate to run in different modes
 cfg_if! {
-    if #[cfg(feature = "ssr")] {
-    use leptos::*;
+if #[cfg(feature = "ssr")] {
     use crate::fallback::file_and_error_handler;
     use crate::todo::*;
     use leptos_viz::{generate_route_list, LeptosRoutes};
@@ -35,7 +34,7 @@ cfg_if! {
         simple_logger::init_with_level(log::Level::Debug)
             .expect("couldn't initialize logging");
 
-        let _conn = db().await.expect("couldn't connect to DB");
+        let conn = db().await.expect("couldn't connect to DB");
         /* sqlx::migrate!()
         .run(&mut conn)
         .await

examples/todo_app_sqlite_viz/src/todo.rs

@@ -1,4 +1,4 @@
-use crate::error_template::ErrorTemplate;
+use crate::error_template::{ErrorTemplate, ErrorTemplateProps};
 use cfg_if::cfg_if;
 use leptos::*;
 use leptos_meta::*;

examples/todomvc/Makefile.toml

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

examples/todomvc/src/lib.rs

@@ -43,7 +43,7 @@ impl Todos {
     }
 
     pub fn remove(&mut self, id: Uuid) {
-        self.retain(|todo| todo.id != id);
+        self.0.retain(|todo| todo.id != id);
     }
 
     pub fn remaining(&self) -> usize {
@@ -76,23 +76,7 @@ impl Todos {
     }
 
     fn clear_completed(&mut self) {
-        self.retain(|todo| !todo.completed.get());
-    }
-
-    fn retain(&mut self, mut f: impl FnMut(&Todo) -> bool) {
-        self.0.retain(|todo| {
-            let retain = f(todo);
-            // because these signals are created at the top level,
-            // they are owned by the <TodoMVC/> component and not
-            // by the individual <Todo/> components. This means
-            // that if they are not manually disposed when removed, they
-            // will be held onto until the <TodoMVC/> is unmounted.
-            if !retain {
-                todo.title.dispose();
-                todo.completed.dispose();
-            }
-            retain
-        })
+        self.0.retain(|todo| !todo.completed.get());
     }
 }
 
@@ -152,7 +136,7 @@ pub fn TodoMVC(cx: Scope) -> impl IntoView {
 
     // Handle the three filter modes: All, Active, and Completed
     let (mode, set_mode) = create_signal(cx, Mode::All);
-    window_event_listener(ev::hashchange, move |_| {
+    window_event_listener("hashchange", move |_| {
         let new_mode =
             location_hash().map(|hash| route(&hash)).unwrap_or_default();
         set_mode(new_mode);
@@ -218,15 +202,15 @@ pub fn TodoMVC(cx: Scope) -> impl IntoView {
         }
     });
 
-    // focus the main input on load
+    // 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
+            // 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 || {
-                let _ = input.focus();
+                input.focus();
             });
         }
     });
@@ -364,14 +348,19 @@ pub fn Todo(cx: Scope, todo: Todo) -> impl IntoView {
     }
 }
 
-#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum Mode {
     Active,
     Completed,
-    #[default]
     All,
 }
 
+impl Default for Mode {
+    fn default() -> Self {
+        Mode::All
+    }
+}
+
 pub fn route(hash: &str) -> Mode {
     match hash {
         "/active" => Mode::Active,

examples/todomvc/src/storage.rs

@@ -1,27 +1,33 @@
 use crate::Todo;
-use leptos::{signal_prelude::*, Scope};
-use serde::{Deserialize, Serialize};
+use leptos::{
+  signal_prelude::*,
+  Scope,
+};
+use serde::{
+  Deserialize,
+  Serialize,
+};
 use uuid::Uuid;
 
 #[derive(Serialize, Deserialize)]
 pub struct TodoSerialized {
-    pub id: Uuid,
-    pub title: String,
-    pub completed: bool,
+  pub id: Uuid,
+  pub title: String,
+  pub completed: bool,
 }
 
 impl TodoSerialized {
-    pub fn into_todo(self, cx: Scope) -> Todo {
-        Todo::new_with_completed(cx, self.id, self.title, self.completed)
-    }
+  pub fn into_todo(self, cx: Scope) -> Todo {
+    Todo::new_with_completed(cx, self.id, self.title, self.completed)
+  }
 }
 
 impl From<&Todo> for TodoSerialized {
-    fn from(todo: &Todo) -> Self {
-        Self {
-            id: todo.id,
-            title: todo.title.get(),
-            completed: todo.completed.get(),
-        }
+  fn from(todo: &Todo) -> Self {
+    Self {
+      id: todo.id,
+      title: todo.title.get(),
+      completed: todo.completed.get(),
     }
+  }
 }

integrations/actix/Cargo.toml

@@ -8,7 +8,6 @@ repository = "https://github.com/leptos-rs/leptos"
 description = "Actix integrations for the Leptos web framework."
 
 [dependencies]
-actix-http = "3"
 actix-web = "4"
 futures = "0.3"
 leptos = { workspace = true, features = ["ssr"] }

integrations/actix/src/lib.rs

@@ -16,9 +16,9 @@ use actix_web::{
 use futures::{Stream, StreamExt};
 use http::StatusCode;
 use leptos::{
+    leptos_dom::{Transparent, ssr::render_to_stream_with_prefix_undisposed_with_context},
     leptos_server::{server_fn_by_path, Payload},
     server_fn::Encoding,
-    ssr::render_to_stream_with_prefix_undisposed_with_context_and_block_replacement,
     *,
 };
 use leptos_integration_utils::{build_async_response, html_parts_separated};
@@ -185,7 +185,7 @@ pub fn handle_server_fns_with_context(
                     .and_then(|value| value.to_str().ok());
 
                 if let Some(server_fn) = server_fn_by_path(path.as_str()) {
-                    let body_ref: &[u8] = &body;
+                    let body: &[u8] = &body;
 
                     let runtime = create_runtime();
                     let (cx, disposer) = raw_scope_and_disposer(runtime);
@@ -198,28 +198,10 @@ pub fn handle_server_fns_with_context(
                     provide_context(cx, req.clone());
                     provide_context(cx, res_options.clone());
 
-                    // we consume the body here (using the web::Bytes extractor), but it is required for things
-                    // like MultipartForm
-                    if req
-                        .headers()
-                        .get("Content-Type")
-                        .and_then(|value| value.to_str().ok())
-                        .and_then(|value| {
-                            Some(
-                                value.starts_with(
-                                    "multipart/form-data; boundary=",
-                                ),
-                            )
-                        })
-                        == Some(true)
-                    {
-                        provide_context(cx, body.clone());
-                    }
-
                     let query = req.query_string().as_bytes();
 
                     let data = match &server_fn.encoding {
-                        Encoding::Url | Encoding::Cbor => body_ref,
+                        Encoding::Url | Encoding::Cbor => body,
                         Encoding::GetJSON | Encoding::GetCBOR => query,
                     };
                     let res = match (server_fn.trait_obj)(cx, data).await {
@@ -532,43 +514,6 @@ pub fn render_app_to_stream_with_context<IV>(
     app_fn: impl Fn(leptos::Scope) -> IV + Clone + 'static,
     method: Method,
 ) -> Route
-where
-    IV: IntoView,
-{
-    render_app_to_stream_with_context_and_replace_blocks(
-        options,
-        additional_context,
-        app_fn,
-        method,
-        false,
-    )
-}
-
-/// Returns an Actix [Route](actix_web::Route) that listens for a `GET` request and tries
-/// to route it using [leptos_router], serving an HTML stream of your application.
-///
-/// This function allows you to provide additional information to Leptos for your route.
-/// It could be used to pass in Path Info, Connection Info, or anything your heart desires.
-///
-/// `replace_blocks` additionally lets you specify whether `<Suspense/>` fragments that read
-/// from blocking resources should be retrojected into the HTML that's initially served, rather
-/// than dynamically inserting them with JavaScript on the client. This means you will have
-/// better support if JavaScript is not enabled, in exchange for a marginally slower response time.
-///
-/// ## Provided Context Types
-/// This function always provides context values including the following types:
-/// - [ResponseOptions]
-/// - [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_and_replace_blocks<IV>(
-    options: LeptosOptions,
-    additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
-    app_fn: impl Fn(leptos::Scope) -> IV + Clone + 'static,
-    method: Method,
-    replace_blocks: bool,
-) -> Route
 where
     IV: IntoView,
 {
@@ -588,14 +533,7 @@ where
                 }
             };
 
-            stream_app(
-                &options,
-                app,
-                res_options,
-                additional_context,
-                replace_blocks,
-            )
-            .await
+            stream_app(&options, app, res_options, additional_context).await
         }
     };
     match method {
@@ -715,6 +653,103 @@ where
     }
 }
 
+/// Returns an Actix [Route](actix_web::Route) that listens for a `GET` request and tries
+/// to route it using [leptos_router], serving an HTML stream of your application.
+///
+/// The provides a [MetaContext] and a [RouterIntegrationContext] to app’s context before
+/// rendering it, and includes any meta tags injected using [leptos_meta].
+///
+/// The HTML stream is rendered using [render_to_stream](leptos::ssr::render_to_stream), and
+/// includes everything described in the documentation for that function.
+///
+/// This can then be set up at an appropriate route in your application:
+/// ```
+/// use actix_web::{App, HttpServer};
+/// use leptos::*;
+/// use leptos_actix::DataResponse;
+/// use std::{env, net::SocketAddr};
+///
+/// #[component]
+/// fn MyApp(cx: Scope, data: &'static str) -> impl IntoView {
+///     view! { cx, <main>"Hello, world!"</main> }
+/// }
+///
+/// # if false { // don't actually try to run a server in a doctest...
+/// #[actix_web::main]
+/// async fn main() -> std::io::Result<()> {
+///     let conf = get_configuration(Some("Cargo.toml")).await.unwrap();
+///     let addr = conf.leptos_options.site_addr.clone();
+///     HttpServer::new(move || {
+///         let leptos_options = &conf.leptos_options;
+///
+///         App::new()
+///             // {tail:.*} passes the remainder of the URL as the route
+///             // the actual routing will be handled by `leptos_router`
+///             .route(
+///                 "/{tail:.*}",
+///                 leptos_actix::render_preloaded_data_app(
+///                     leptos_options.to_owned(),
+///                     |req| async move {
+///                         Ok(DataResponse::Data(
+///                             "async func that can preload data",
+///                         ))
+///                     },
+///                     |cx, data| view! { cx, <MyApp data/> },
+///                 ),
+///             )
+///     })
+///     .bind(&addr)?
+///     .run()
+///     .await
+/// }
+/// # }
+/// ```
+///
+/// ## Provided Context Types
+/// This function always provides context values including the following types:
+/// - [ResponseOptions]
+/// - [HttpRequest](actix_web::HttpRequest)
+/// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
+#[deprecated = "You can now use `render_app_async` with `create_resource` and \
+                `<Suspense/>` to achieve async rendering without manually \
+                preloading data."]
+pub fn render_preloaded_data_app<Data, Fut, IV>(
+    options: LeptosOptions,
+    data_fn: impl Fn(HttpRequest) -> Fut + Clone + 'static,
+    app_fn: impl Fn(leptos::Scope, Data) -> IV + Clone + Send + 'static,
+) -> Route
+where
+    Data: 'static,
+    Fut: Future<Output = Result<DataResponse<Data>, actix_web::Error>>,
+    IV: IntoView + 'static,
+{
+    web::get().to(move |req: HttpRequest| {
+        let options = options.clone();
+        let app_fn = app_fn.clone();
+        let data_fn = data_fn.clone();
+        let res_options = ResponseOptions::default();
+
+        async move {
+            let data = match data_fn(req.clone()).await {
+                Err(e) => return HttpResponse::from_error(e),
+                Ok(DataResponse::Response(r)) => return r.into(),
+                Ok(DataResponse::Data(d)) => d,
+            };
+
+            let app = {
+                let app_fn = app_fn.clone();
+                let res_options = res_options.clone();
+                move |cx| {
+                    provide_contexts(cx, &req, res_options);
+                    (app_fn)(cx, data).into_view(cx)
+                }
+            };
+
+            stream_app(&options, app, res_options, |_cx| {}).await
+        }
+    })
+}
 #[tracing::instrument(level = "trace", fields(error), skip_all)]
 fn provide_contexts(
     cx: leptos::Scope,
@@ -746,14 +781,12 @@ async fn stream_app(
     app: impl FnOnce(leptos::Scope) -> View + 'static,
     res_options: ResponseOptions,
     additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
-    replace_blocks: bool,
 ) -> HttpResponse<BoxBody> {
     let (stream, runtime, scope) =
-        render_to_stream_with_prefix_undisposed_with_context_and_block_replacement(
+        render_to_stream_with_prefix_undisposed_with_context(
             app,
             move |cx| generate_head_metadata_separated(cx).1.into(),
             additional_context,
-            replace_blocks
         );
 
     build_stream_response(options, res_options, stream, runtime, scope).await
@@ -889,7 +922,7 @@ pub fn generate_route_list_with_exclusions<IV>(
 where
     IV: IntoView + 'static,
 {
-    let mut routes = leptos_router::generate_route_list_inner(app_fn);
+    let (mut routes, mut api_routes) = leptos_router::generate_route_list_inner(app_fn);
 
     // Empty strings screw with Actix pathing, they need to be "/"
     routes = routes
@@ -952,6 +985,22 @@ pub trait LeptosRoutes {
     where
         IV: IntoView + 'static;
 
+    #[deprecated = "You can now use `leptos_routes` and a `<Route \
+                    mode=SsrMode::Async/>`
+                    to achieve async rendering without manually preloading \
+                    data."]
+    fn leptos_preloaded_data_routes<Data, Fut, IV>(
+        self,
+        options: LeptosOptions,
+        paths: Vec<String>,
+        data_fn: impl Fn(HttpRequest) -> Fut + Clone + 'static,
+        app_fn: impl Fn(leptos::Scope, Data) -> IV + Clone + Send + 'static,
+    ) -> Self
+    where
+        Data: 'static,
+        Fut: Future<Output = Result<DataResponse<Data>, actix_web::Error>>,
+        IV: IntoView + 'static;
+
     fn leptos_routes_with_context<IV>(
         self,
         options: LeptosOptions,
@@ -986,7 +1035,34 @@ 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,
+        paths: Vec<String>,
+        data_fn: impl Fn(HttpRequest) -> Fut + Clone + 'static,
+        app_fn: impl Fn(leptos::Scope, Data) -> IV + Clone + Send + 'static,
+    ) -> Self
+    where
+        Data: 'static,
+        Fut: Future<Output = Result<DataResponse<Data>, actix_web::Error>>,
+        IV: IntoView + 'static,
+    {
+        let mut router = self;
 
+        for path in paths.iter() {
+            router = router.route(
+                path,
+                #[allow(deprecated)]
+                render_preloaded_data_app(
+                    options.clone(),
+                    data_fn.clone(),
+                    app_fn.clone(),
+                ),
+            );
+        }
+        router
+    }
     #[tracing::instrument(level = "trace", fields(error), skip_all)]
     fn leptos_routes_with_context<IV>(
         self,
@@ -1015,15 +1091,6 @@ where
                                 method,
                             )
                         }
-                        SsrMode::PartiallyBlocked => {
-                            render_app_to_stream_with_context_and_replace_blocks(
-                                options.clone(),
-                                additional_context.clone(),
-                                app_fn.clone(),
-                                method,
-                                true,
-                            )
-                        }
                         SsrMode::InOrder => {
                             render_app_to_stream_in_order_with_context(
                                 options.clone(),
@@ -1046,7 +1113,15 @@ where
     }
 }
 
-/// A helper to make it easier to use Actix extractors in server functions. This takes
+/// Defines an API route, which mounts the given route handler at this path.
+#[component(transparent)]
+pub fn Api<P>(cx: leptos::Scope, path: P, route: actix_web::Route) -> impl IntoView
+where P: Into<String>
+{
+    Transparent::new(ApiRouteListing::new(path.into(), route))
+}
+
+/// 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.
@@ -1090,17 +1165,9 @@ where
 {
     let req = use_context::<actix_web::HttpRequest>(cx)
         .expect("HttpRequest should have been provided via context");
-
-    let input = if let Some(body) = use_context::<Bytes>(cx) {
-        let (_, mut payload) = actix_http::h1::Payload::create(false);
-        payload.unread_data(body);
-        E::from_request(&req, &mut dev::Payload::from(payload))
-    } else {
-        E::extract(&req)
-    }
-    .await
-    .map_err(|e| ServerFnError::ServerError(e.to_string()))?;
-
+    let input = E::extract(&req)
+        .await
+        .map_err(|e| ServerFnError::ServerError(e.to_string()))?;
     Ok(f.call(input).await)
 }
 

integrations/axum/src/lib.rs

@@ -129,6 +129,23 @@ pub fn redirect(cx: leptos::Scope, path: &str) {
     }
 }
 
+/// Decomposes an HTTP request into its parts, allowing you to read its headers
+/// and other data without consuming the body.
+#[deprecated(note = "Replaced with generate_request_and_parts() to allow for \
+                     putting LeptosRequest in the Context")]
+pub async fn generate_request_parts(req: Request<Body>) -> RequestParts {
+    // provide request headers as context in server scope
+    let (parts, body) = req.into_parts();
+    let body = body::to_bytes(body).await.unwrap_or_default();
+    RequestParts {
+        method: parts.method,
+        uri: parts.uri,
+        headers: parts.headers,
+        version: parts.version,
+        body,
+    }
+}
+
 /// Decomposes an HTTP request into its parts, allowing you to read its headers
 /// and other data without consuming the body. Creates a new Request from the
 /// original parts for further processing
@@ -605,54 +622,6 @@ pub fn render_app_to_stream_with_context<IV>(
        + 'static
 where
     IV: IntoView,
-{
-    render_app_to_stream_with_context_and_replace_blocks(
-        options,
-        additional_context,
-        app_fn,
-        false,
-    )
-}
-
-/// Returns an Axum [Handler](axum::handler::Handler) that listens for a `GET` request and tries
-/// to route it using [leptos_router], serving an HTML stream of your application.
-///
-/// This version allows us to pass Axum State/Extension/Extractor or other infro from Axum or network
-/// layers above Leptos itself. To use it, you'll need to write your own handler function that provides
-/// the data to leptos in a closure.
-///
-/// `replace_blocks` additionally lets you specify whether `<Suspense/>` fragments that read
-/// from blocking resources should be retrojected into the HTML that's initially served, rather
-/// than dynamically inserting them with JavaScript on the client. This means you will have
-/// better support if JavaScript is not enabled, in exchange for a marginally slower response time.
-///
-/// Otherwise, this function is identical to [render_app_to_stream_with_context].
-///
-/// ## Provided Context Types
-/// This function always provides context values including the following types:
-/// - [RequestParts]
-/// - [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_and_replace_blocks<IV>(
-    options: LeptosOptions,
-    additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
-    app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + 'static,
-    replace_blocks: bool,
-) -> impl Fn(
-    Request<Body>,
-) -> Pin<
-    Box<
-        dyn Future<Output = Response<StreamBody<PinnedHtmlStream>>>
-            + Send
-            + 'static,
-    >,
-> + Clone
-       + Send
-       + 'static
-where
-    IV: IntoView,
 {
     move |req: Request<Body>| {
         Box::pin({
@@ -682,11 +651,10 @@ where
                     }
                 };
                 let (bundle, runtime, scope) =
-                    leptos::leptos_dom::ssr::render_to_stream_with_prefix_undisposed_with_context_and_block_replacement(
+                    leptos::leptos_dom::ssr::render_to_stream_with_prefix_undisposed_with_context(
                         app,
                         |cx| generate_head_metadata_separated(cx).1.into(),
                         add_context,
-                        replace_blocks
                     );
 
                     forward_stream(&options, res_options2, bundle, runtime, scope, tx).await;
@@ -695,7 +663,6 @@ where
         })
     }
 }
-
 #[tracing::instrument(level = "info", fields(error), skip_all)]
 async fn generate_response(
     res_options: ResponseOptions,
@@ -1101,9 +1068,9 @@ where
             let path = listing.path();
             if path.is_empty() {
                 RouteListing::new(
-                    "/".to_string(),
-                    listing.mode(),
-                    listing.methods(),
+                    "/",
+                    Default::default(),
+                    [leptos_router::Method::Get],
                 )
             } else {
                 listing
@@ -1126,39 +1093,12 @@ where
     }
 }
 
-/// This trait allows one to use your custom struct in Axum's router, provided it can provide the
-/// `LeptosOptions` to use for the `LeptosRoutes` trait functions.
-pub trait LeptosOptionProvider {
-    fn options(&self) -> LeptosOptions;
-}
-
-/// Implement `LeptosOptionProvider` trait for `LeptosOptions` itself.
-impl LeptosOptionProvider for LeptosOptions {
-    fn options(&self) -> LeptosOptions {
-        self.clone()
-    }
-}
-
-/// Implement `LeptosOptionProvider` trait for any type wrapped in an Arc, if that type implements
-/// `LeptosOptionProvider` as states in axum are often provided wrapped in an Arc.
-impl<T> LeptosOptionProvider for Arc<T>
-where
-    T: LeptosOptionProvider,
-{
-    fn options(&self) -> LeptosOptions {
-        (**self).options()
-    }
-}
-
 /// This trait allows one to pass a list of routes and a render function to Axum's router, letting us avoid
 /// having to use wildcards or manually define all routes in multiple places.
-pub trait LeptosRoutes<OP>
-where
-    OP: LeptosOptionProvider,
-{
+pub trait LeptosRoutes {
     fn leptos_routes<IV>(
         self,
-        options: OP,
+        options: LeptosOptions,
         paths: Vec<RouteListing>,
         app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + 'static,
     ) -> Self
@@ -1167,7 +1107,7 @@ where
 
     fn leptos_routes_with_context<IV>(
         self,
-        options: OP,
+        options: LeptosOptions,
         paths: Vec<RouteListing>,
         additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
         app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + 'static,
@@ -1181,20 +1121,16 @@ where
         handler: H,
     ) -> Self
     where
-        H: axum::handler::Handler<T, OP, axum::body::Body>,
+        H: axum::handler::Handler<T, (), axum::body::Body>,
         T: 'static;
 }
-
 /// The default implementation of `LeptosRoutes` which takes in a list of paths, and dispatches GET requests
 /// to those paths to Leptos's renderer.
-impl<OP> LeptosRoutes<OP> for axum::Router<OP>
-where
-    OP: LeptosOptionProvider + Clone + Send + Sync + 'static,
-{
+impl LeptosRoutes for axum::Router {
     #[tracing::instrument(level = "info", fields(error), skip_all)]
     fn leptos_routes<IV>(
         self,
-        options: OP,
+        options: LeptosOptions,
         paths: Vec<RouteListing>,
         app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + 'static,
     ) -> Self
@@ -1207,7 +1143,7 @@ where
     #[tracing::instrument(level = "trace", fields(error), skip_all)]
     fn leptos_routes_with_context<IV>(
         self,
-        options: OP,
+        options: LeptosOptions,
         paths: Vec<RouteListing>,
         additional_context: impl Fn(leptos::Scope) + 'static + Clone + Send,
         app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + 'static,
@@ -1225,7 +1161,7 @@ where
                     match listing.mode() {
                         SsrMode::OutOfOrder => {
                             let s = render_app_to_stream_with_context(
-                                options.options(),
+                                options.clone(),
                                 additional_context.clone(),
                                 app_fn.clone(),
                             );
@@ -1237,24 +1173,9 @@ where
                                 leptos_router::Method::Patch => patch(s),
                             }
                         }
-                        SsrMode::PartiallyBlocked => {
-                            let s = render_app_to_stream_with_context_and_replace_blocks(
-                                options.options(),
-                                additional_context.clone(),
-                                app_fn.clone(),
-                                true
-                            );
-                            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.options(),
+                                options.clone(),
                                 additional_context.clone(),
                                 app_fn.clone(),
                             );
@@ -1268,7 +1189,7 @@ where
                         }
                         SsrMode::Async => {
                             let s = render_app_async_with_context(
-                                options.options(),
+                                options.clone(),
                                 additional_context.clone(),
                                 app_fn.clone(),
                             );
@@ -1294,7 +1215,7 @@ where
         handler: H,
     ) -> Self
     where
-        H: axum::handler::Handler<T, OP, axum::body::Body>,
+        H: axum::handler::Handler<T, (), axum::body::Body>,
         T: 'static,
     {
         let mut router = self;
@@ -1317,7 +1238,6 @@ where
         router
     }
 }
-
 #[tracing::instrument(level = "trace", fields(error), skip_all)]
 fn get_leptos_pool() -> LocalPoolHandle {
     static LOCAL_POOL: OnceCell<LocalPoolHandle> = OnceCell::new();

integrations/viz/src/lib.rs

@@ -506,48 +506,6 @@ pub fn render_app_to_stream_with_context<IV>(
        + 'static
 where
     IV: IntoView,
-{
-    render_app_to_stream_with_context_and_replace_blocks(
-        options,
-        additional_context,
-        app_fn,
-        false,
-    )
-}
-
-/// Returns a Viz [Handler](viz::Handler) that listens for a `GET` request and tries
-/// to route it using [leptos_router], serving an HTML stream of your application.
-///
-/// This version allows us to pass Viz State/Extractor or other infro from Viz or network
-/// layers above Leptos itself. To use it, you'll need to write your own handler function that provides
-/// the data to leptos in a closure.
-///
-/// `replace_blocks` additionally lets you specify whether `<Suspense/>` fragments that read
-/// from blocking resources should be retrojected into the HTML that's initially served, rather
-/// than dynamically inserting them with JavaScript on the client. This means you will have
-/// better support if JavaScript is not enabled, in exchange for a marginally slower response time.
-///
-/// Otherwise, this function is identical to [render_app_to_stream_with_context].
-///
-/// ## Provided Context Types
-/// This function always provides context values including the following types:
-/// - [RequestParts]
-/// - [ResponseOptions]
-/// - [MetaContext](leptos_meta::MetaContext)
-/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
-pub fn render_app_to_stream_with_context_and_replace_blocks<IV>(
-    options: LeptosOptions,
-    additional_context: impl Fn(leptos::Scope) + Clone + Send + 'static,
-    app_fn: impl Fn(leptos::Scope) -> IV + Clone + Send + 'static,
-    replace_blocks: bool,
-) -> impl Fn(
-    Request,
-) -> Pin<Box<dyn Future<Output = Result<Response>> + Send + 'static>>
-       + Clone
-       + Send
-       + 'static
-where
-    IV: IntoView,
 {
     move |req: Request| {
         Box::pin({
@@ -590,11 +548,10 @@ where
                                             };
 
                                             let (bundle, runtime, scope) =
-                                                leptos::leptos_dom::ssr::render_to_stream_with_prefix_undisposed_with_context_and_block_replacement(
+                                                leptos::leptos_dom::ssr::render_to_stream_with_prefix_undisposed_with_context(
                                                     app,
                                                     |cx| generate_head_metadata_separated(cx).1.into(),
                                                     add_context,
-                                                    replace_blocks
                                                 );
 
                                                 forward_stream(&options, res_options2, bundle, runtime, scope, tx).await;
@@ -1035,9 +992,9 @@ where
             let path = listing.path();
             if path.is_empty() {
                 RouteListing::new(
-                    "/".to_string(),
-                    listing.mode(),
-                    listing.methods(),
+                    "/",
+                    Default::default(),
+                    [leptos_router::Method::Get],
                 )
             } else {
                 listing
@@ -1134,22 +1091,6 @@ impl LeptosRoutes for Router {
                         leptos_router::Method::Patch => router.patch(path, s),
                     }
                 }
-                SsrMode::PartiallyBlocked => {
-                    let s =
-                        render_app_to_stream_with_context_and_replace_blocks(
-                            options.clone(),
-                            additional_context.clone(),
-                            app_fn.clone(),
-                            true,
-                        );
-                    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(),

leptos/src/lib.rs

@@ -12,10 +12,6 @@
 //!
 //! And you can do all three of these **using the same Leptos code.**
 //!
-//! Take a look at the [Leptos Book](https://leptos-rs.github.io/leptos/) for a walkthrough of the framework.
-//! Join us on our [Discord Channel](https://discord.gg/v38Eef6sWG) to see what the community is building.
-//! Explore our [Examples](https://github.com/leptos-rs/leptos/tree/main/examples) to see Leptos in action.
-//!
 //! # `nightly` Note
 //! Most of the examples assume you’re using `nightly` Rust. If you’re on stable, note the following:
 //! 1. You need to enable the `"stable"` flag in `Cargo.toml`: `leptos = { version = "0.0", features = ["stable"] }`
@@ -156,6 +152,7 @@ pub use leptos_config::{self, get_configuration, LeptosOptions};
 pub mod ssr {
     pub use leptos_dom::{ssr::*, ssr_in_order::*};
 }
+#[allow(deprecated)]
 pub use leptos_dom::{
     self, create_node_ref, debug_warn, document, error, ev,
     helpers::{
@@ -164,10 +161,11 @@ pub use leptos_dom::{
         request_idle_callback, request_idle_callback_with_handle, set_interval,
         set_interval_with_handle, set_timeout, set_timeout_with_handle,
         window_event_listener, window_event_listener_untyped,
+        window_event_listener_with_precast,
     },
     html, log, math, mount_to, mount_to_body, svg, warn, window, Attribute,
     Class, CollectView, Errors, Fragment, HtmlElement, IntoAttribute,
-    IntoClass, IntoProperty, IntoStyle, IntoView, NodeRef, Property, View,
+    IntoClass, IntoProperty, IntoView, NodeRef, Property, View,
 };
 pub use leptos_macro::*;
 pub use leptos_reactive::*;

leptos/src/suspense.rs

@@ -1,11 +1,7 @@
 use cfg_if::cfg_if;
 use leptos_dom::{DynChild, Fragment, HydrationCtx, IntoView};
 use leptos_macro::component;
-#[cfg(any(feature = "csr", feature = "hydrate"))]
-use leptos_reactive::ScopeDisposer;
 use leptos_reactive::{provide_context, Scope, SuspenseContext};
-#[cfg(any(feature = "csr", feature = "hydrate"))]
-use std::cell::RefCell;
 use std::rc::Rc;
 
 /// If any [Resources](leptos_reactive::Resource) are read in the `children` of this
@@ -56,17 +52,16 @@ use std::rc::Rc;
     tracing::instrument(level = "info", skip_all)
 )]
 #[component(transparent)]
-pub fn Suspense<F, E, V>(
+pub fn Suspense<F, E>(
     cx: Scope,
     /// Returns a fallback UI that will be shown while `async` [Resources](leptos_reactive::Resource) are still loading.
     fallback: F,
     /// Children will be displayed once all `async` [Resources](leptos_reactive::Resource) have resolved.
-    children: Box<dyn Fn(Scope) -> V>,
+    children: Box<dyn Fn(Scope) -> Fragment>,
 ) -> impl IntoView
 where
     F: Fn() -> E + 'static,
     E: IntoView,
-    V: IntoView + 'static,
 {
     let context = SuspenseContext::new(cx);
 
@@ -75,9 +70,8 @@ where
 
     let orig_child = Rc::new(children);
 
+    let before_me = HydrationCtx::peek();
     let current_id = HydrationCtx::next_component();
-    #[cfg(any(feature = "csr", feature = "hydrate"))]
-    let prev_disposer = Rc::new(RefCell::new(None::<ScopeDisposer>));
 
     let child = DynChild::new({
         #[cfg(not(any(feature = "csr", feature = "hydrate")))]
@@ -85,33 +79,22 @@ where
         move || {
             cfg_if! {
                 if #[cfg(any(feature = "csr", feature = "hydrate"))] {
-                    if let Some(disposer) = prev_disposer.take() {
-                        disposer.dispose();
-                    }
-                    let (view, disposer) =
-                        cx.run_child_scope(|cx| if context.ready() {
+                    if context.ready() {
                         Fragment::lazy(Box::new(|| vec![orig_child(cx).into_view(cx)])).into_view(cx)
                     } else {
                         Fragment::lazy(Box::new(|| vec![fallback().into_view(cx)])).into_view(cx)
-                    });
-                    *prev_disposer.borrow_mut() = Some(disposer);
-                    view
-
+                    }
                 } else {
                     use leptos_reactive::signal_prelude::*;
 
                     // run the child; we'll probably throw this away, but it will register resource reads
-                    let _child = orig_child(cx).into_view(cx);
+                    let child = orig_child(cx).into_view(cx);
                     let after_original_child = HydrationCtx::id();
 
                     let initial = {
                         // no resources were read under this, so just return the child
                         if context.pending_resources.get() == 0 {
-                            let orig_child = Rc::clone(&orig_child);
-                            HydrationCtx::continue_from(current_id.clone());
-                            Fragment::lazy(Box::new(move || {
-                                vec![DynChild::new(move || orig_child(cx)).into_view(cx)]
-                            })).into_view(cx)
+                            child
                         }
                         // show the fallback, but also prepare to stream HTML
                         else {
@@ -165,7 +148,7 @@ where
         _ => unreachable!(),
     };
 
-    HydrationCtx::continue_from(current_id.clone());
+    HydrationCtx::continue_from(before_me);
 
     leptos_dom::View::Suspense(current_id, core_component)
 }