initial work on Actix middleware support

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

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

.github/workflows/ci-examples.yml

@@ -24,4 +24,4 @@ jobs:
     with:
       directory: ${{ matrix.directory }}
       cargo_make_task: "ci"
-      toolchain: nightly-2024-01-29
+      toolchain: nightly

.github/workflows/ci.yml

@@ -40,4 +40,4 @@ jobs:
     with:
       directory: ${{ matrix.directory }}
       cargo_make_task: "ci"
-      toolchain: nightly-2024-01-29
+      toolchain: nightly

Cargo.toml

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

README.md

@@ -40,25 +40,6 @@ pub fn SimpleCounter(initial_value: i32) -> impl IntoView {
     }
 }
 
-// we also support a builder syntax rather than the JSX-like `view` macro
-#[component]
-pub fn SimpleCounterWithBuilder(initial_value: i32) -> impl IntoView {
-    use leptos::html::*;
-
-    let (value, set_value) = create_signal(initial_value);
-    let clear = move |_| set_value(0);
-    let decrement = move |_| set_value.update(|value| *value -= 1);
-    let increment = move |_| set_value.update(|value| *value += 1);
-
-    // the `view` macro above expands to this builder syntax
-    div().child((
-        button().on(ev::click, clear).child("Clear"),
-        button().on(ev::click, decrement).child("-1"),
-        span().child(("Value: ", value, "!")),
-        button().on(ev::click, increment).child("+1")
-    ))
-}
-
 // Easy to use with Trunk (trunkrs.dev) or with a simple wasm-bindgen setup
 pub fn main() {
     mount_to_body(|| view! {
@@ -150,7 +131,7 @@ There are several people in the community using Leptos right now for internal ap
 
 ### Can I use this for native GUI?
 
-Sure! Obviously the `view` macro is for generating DOM nodes but you can use the reactive system to drive any native GUI toolkit that uses the same kind of object-oriented, event-callback-based framework as the DOM pretty easily. The principles are the same:
+Sure! Obviously the `view` macro is for generating DOM nodes but you can use the reactive system to drive native any GUI toolkit that uses the same kind of object-oriented, event-callback-based framework as the DOM pretty easily. The principles are the same:
 
 - Use signals, derived signals, and memos to create your reactive system
 - Create GUI widgets
@@ -159,27 +140,35 @@ Sure! Obviously the `view` macro is for generating DOM nodes but you can use the
 
 I've put together a [very simple GTK example](https://github.com/leptos-rs/leptos/blob/main/examples/gtk/src/main.rs) so you can see what I mean.
 
-The new rendering approach being developed for 0.7 supports “universal rendering,” i.e., it can use any rendering library that supports a small set of 6-8 functions. (This is intended as a layer over typical retained-mode, OOP-style GUI toolkits like the DOM, GTK, etc.) That future rendering work will allow creating native UI in a way that is much more similar to the declarative approach used by the web framework.
+### How is this different from Yew/Dioxus?
 
-### How is this different from Yew?
-
-Yew is the most-used library for Rust web UI development, but there are several differences between Yew and Leptos, in philosophy, approach, and performance. 
+On the surface level, these libraries may seem similar. Yew is, of course, the most mature Rust library for web UI development and has a huge ecosystem. Dioxus is similar in many ways, being heavily inspired by React. Here are some conceptual differences between Leptos and these frameworks:
 
 - **VDOM vs. fine-grained:** Yew is built on the virtual DOM (VDOM) model: state changes cause components to re-render, generating a new virtual DOM tree. Yew diffs this against the previous VDOM, and applies those patches to the actual DOM. Component functions rerun whenever state changes. Leptos takes an entirely different approach. Components run once, creating (and returning) actual DOM nodes and setting up a reactive system to update those DOM nodes.
-- **Performance:** This has huge performance implications: Leptos is simply much faster at both creating and updating the UI than Yew is.
-- **Server integration:** Yew was created in an era in which browser-rendered single-page apps (SPAs) were the dominant paradigm. While Leptos supports client-side rendering, it also focuses on integrating with the server side of your application via server functions and multiple modes of serving HTML, including out-of-order streaming.
+- **Performance:** This has huge performance implications: Leptos is simply much faster at both creating and updating the UI than Yew is. (Dioxus has made huge advances in performance with its recent 0.3 release, and is now roughly on par with Leptos.)
+- **Mental model:** Adopting fine-grained reactivity also tends to simplify the mental model. There are no surprising component re-renders because there are no re-renders. You can call functions, create timeouts, etc. within the body of your component functions because they won’t be re-run. You don’t need to think about manual dependency tracking for effects; fine-grained reactivity tracks dependencies automatically.
 
-- ### How is this different from Dioxus?
+### How is this different from Sycamore?
 
-Like Leptos, Dioxus is a framework for building UIs using web technologies. However, there are significant differences in approach and features.
+Conceptually, these two frameworks are very similar: because both are built on fine-grained reactivity, most apps will end up looking very similar between the two, and Sycamore or Leptos apps will both look a lot like SolidJS apps, in the same way that Yew or Dioxus can look a lot like React.
 
-- **VDOM vs. fine-grained:** While Dioxus has a performant virtual DOM (VDOM), it still uses coarse-grained/component-scoped reactivity: changing a stateful value reruns the component function and diffs the old UI against the new one. Leptos components use a different mental model, creating (and returning) actual DOM nodes and setting up a reactive system to update those DOM nodes.
-- **Web vs. desktop priorities:** Dioxus uses Leptos server functions in its fullstack mode, but does not have the same `<Suspense>`-based support for things like streaming HTML rendering, or share the same focus on holistic web performance. Leptos tends to prioritize holistic web performance (streaming HTML rendering, smaller WASM binary sizes, etc.), whereas Dioxus has an unparalleled experience when building desktop apps, because your application logic runs as a native Rust binary.
+There are some practical differences that make a significant difference:
 
-- ### How is this different from Sycamore?
+- **Templating:** Leptos uses a JSX-like template format (built on [syn-rsx](https://github.com/stoically/syn-rsx)) for its `view` macro. Sycamore offers the choice of its own templating DSL or a builder syntax.
+- **Server integration:** Leptos provides primitives that encourage HTML streaming and allow for easy async integration and RPC calls, even without WASM enabled, making it easy to opt into integrations between your frontend and backend code without pushing you toward any particular metaframework patterns.
+- **Read-write segregation:** Leptos, like Solid, encourages read-write segregation between signal getters and setters, so you end up accessing signals with tuples like `let (count, set_count) = create_signal(0);` _(If you prefer or if it's more convenient for your API, you can use [`create_rw_signal`](https://docs.rs/leptos/latest/leptos/fn.create_rw_signal.html) to give a unified read/write signal.)_
+- **Signals are functions:** In Leptos, you can call a signal to access it rather than calling a specific method (so, `count()` instead of `count.get()`) This creates a more consistent mental model: accessing a reactive value is always a matter of calling a function. For example:
 
-Sycamore and Leptos are both heavily influenced by SolidJS. At this point, Leptos has a larger community and ecosystem and is more actively developed. Other differences:
+  ```rust
+  let (count, set_count) = create_signal(0); // a signal
+  let double_count = move || count() * 2; // a derived signal
+  let memoized_count = create_memo(move |_| count() * 3); // a memo
+  // all are accessed by calling them
+  assert_eq!(count(), 0);
+  assert_eq!(double_count(), 0);
+  assert_eq!(memoized_count(), 0);
+  // this function can accept any of those signals
+  fn do_work_on_signal(my_signal: impl Fn() -> i32) { ... }
+  ```
 
-- **Templating DSLs:** Sycamore uses a custom templating language for its views, while Leptos uses a JSX-like template format.
-- **`'static` signals:** One of Leptos’s main innovations was the creation of `Copy + 'static` signals, which have excellent ergonomics. Sycamore is in the process of adopting the same pattern, but this is not yet released.
-- **Perseus vs. server functions:** The Perseus metaframework provides an opinionated way to build Sycamore apps that include server functionality. Leptos instead provides primitives like server functions in the core of the framework. 
+- **Signals and scopes are `'static`:** Both Leptos and Sycamore ease the pain of moving signals in closures (in particular, event listeners) by making them `Copy`, to avoid the `{ let count = count.clone(); move |_| ... }` that's very familiar in Rust UI code. Sycamore does this by using bump allocation to tie the lifetimes of its signals to its scopes: since references are `Copy`, `&'a Signal<T>` can be moved into a closure. Leptos does this by using arena allocation and passing around indices: types like `ReadSignal<T>`, `WriteSignal<T>`, and `Memo<T>` are actually wrappers for indices into an arena. This means that both scopes and signals are both `Copy` and `'static` in Leptos, which means that they can be moved easily into closures without adding lifetime complexity.

cargo-make/check.toml

@@ -3,5 +3,5 @@ alias = "check-all"
 
 [tasks.check-all]
 command = "cargo"
-args = ["+nightly-2024-01-29", "check-all-features"]
+args = ["+nightly", "check-all-features"]
 install_crate = "cargo-all-features"

cargo-make/test.toml

@@ -3,5 +3,5 @@ alias = "test-all"
 
 [tasks.test-all]
 command = "cargo"
-args = ["+nightly-2024-01-29", "test-all-features"]
+args = ["+nightly", "test-all-features"]
 install_crate = "cargo-all-features"

examples/cargo-make/cargo-leptos.toml

@@ -15,13 +15,13 @@ clear = true
 dependencies = ["check-debug", "check-release"]
 
 [tasks.check-debug]
-toolchain = "nightly-2024-01-29"
+toolchain = "nightly"
 command = "cargo"
 args = ["check-all-features"]
 install_crate = "cargo-all-features"
 
 [tasks.check-release]
-toolchain = "nightly-2024-01-29"
+toolchain = "nightly"
 command = "cargo"
 args = ["check-all-features", "--release"]
 install_crate = "cargo-all-features"

examples/cargo-make/compile.toml

@@ -1,11 +1,11 @@
 [tasks.build]
-toolchain = "nightly-2024-01-29"
+toolchain = "nightly"
 command = "cargo"
 args = ["build-all-features"]
 install_crate = "cargo-all-features"
 
 [tasks.check]
-toolchain = "nightly-2024-01-29"
+toolchain = "nightly"
 command = "cargo"
 args = ["check-all-features"]
 install_crate = "cargo-all-features"

examples/cargo-make/lint.toml

@@ -1,5 +1,5 @@
 [tasks.pre-clippy]
-env = { CARGO_MAKE_CLIPPY_ARGS = "--no-deps --all-targets --all-features -- -D warnings" }
+env = { CARGO_MAKE_CLIPPY_ARGS = "--all-targets --all-features -- -D warnings" }
 
 [tasks.check-style]
 dependencies = ["check-format-flow", "clippy-flow"]

examples/counter/rust-toolchain.toml

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

examples/counter_isomorphic/Cargo.toml

@@ -69,7 +69,7 @@ reload-port = 3001
 end2end-cmd = "npx playwright test"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/counter_isomorphic/src/counters.rs

@@ -118,9 +118,9 @@ pub fn Counters() -> impl IntoView {
 // This is the typical pattern for a CRUD app
 #[component]
 pub fn Counter() -> impl IntoView {
-    let dec = create_action(|_: &()| adjust_server_count(-1, "decing".into()));
-    let inc = create_action(|_: &()| adjust_server_count(1, "incing".into()));
-    let clear = create_action(|_: &()| clear_server_count());
+    let dec = create_action(|_| adjust_server_count(-1, "decing".into()));
+    let inc = create_action(|_| adjust_server_count(1, "incing".into()));
+    let clear = create_action(|_| clear_server_count());
     let counter = create_resource(
         move || {
             (
@@ -132,6 +132,15 @@ pub fn Counter() -> impl IntoView {
         |_| get_server_count(),
     );
 
+    let value =
+        move || counter.get().map(|count| count.unwrap_or(0)).unwrap_or(0);
+    let error_msg = move || {
+        counter.get().and_then(|res| match res {
+            Ok(_) => None,
+            Err(e) => Some(e),
+        })
+    };
+
     view! {
         <div>
             <h2>"Simple Counter"</h2>
@@ -141,21 +150,15 @@ pub fn Counter() -> impl IntoView {
             <div>
                 <button on:click=move |_| clear.dispatch(())>"Clear"</button>
                 <button on:click=move |_| dec.dispatch(())>"-1"</button>
-                <Suspense fallback=move |_| view!{ <span>"Value: "</span>}>
-                  <span>"Value: " { counter.get().map(|count| count.unwrap_or(0)).unwrap_or(0);} "!"</span>
-                </Suspense>
+                <span>"Value: " {value} "!"</span>
                 <button on:click=move |_| inc.dispatch(())>"+1"</button>
             </div>
-            <Suspense>
-              {move || {
-                counter.get().and_then(|res| match res {
-                  Ok(_) => None,
-                  Err(e) => Some(e),
-                }).map(|msg| {
-                  view! { <p>"Error: " {msg.to_string()}</p> }
-                })
-              }}
-            </Suspense>
+            {move || {
+                error_msg()
+                    .map(|msg| {
+                        view! { <p>"Error: " {msg.to_string()}</p> }
+                    })
+            }}
         </div>
     }
 }
@@ -219,10 +222,9 @@ pub fn FormCounter() -> impl IntoView {
 #[component]
 pub fn MultiuserCounter() -> impl IntoView {
     let dec =
-        create_action(|_: &()| adjust_server_count(-1, "dec dec goose".into()));
-    let inc =
-        create_action(|_: &()| adjust_server_count(1, "inc inc moose".into()));
-    let clear = create_action(|_: &()| clear_server_count());
+        create_action(|_| adjust_server_count(-1, "dec dec goose".into()));
+    let inc = create_action(|_| adjust_server_count(1, "inc inc moose".into()));
+    let clear = create_action(|_| clear_server_count());
 
     #[cfg(not(feature = "ssr"))]
     let multiplayer_value = {

examples/counter_url_query/rust-toolchain.toml

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

examples/counters/rust-toolchain.toml

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

examples/directives/rust-toolchain.toml

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

examples/directives/src/lib.rs

@@ -1,6 +1,5 @@
 use leptos::{ev::click, html::AnyElement, *};
 
-// no extra parameter
 pub fn highlight(el: HtmlElement<AnyElement>) {
     let mut highlighted = false;
 
@@ -15,7 +14,6 @@ pub fn highlight(el: HtmlElement<AnyElement>) {
     });
 }
 
-// one extra parameter
 pub fn copy_to_clipboard(el: HtmlElement<AnyElement>, content: &str) {
     let content = content.to_string();
 
@@ -33,35 +31,6 @@ pub fn copy_to_clipboard(el: HtmlElement<AnyElement>, content: &str) {
     });
 }
 
-// custom parameter
-
-#[derive(Clone)]
-pub struct Amount(usize);
-
-impl From<usize> for Amount {
-    fn from(value: usize) -> Self {
-        Self(value)
-    }
-}
-
-// a 'default' value if no value is passed in
-impl From<()> for Amount {
-    fn from(_: ()) -> Self {
-        Self(1)
-    }
-}
-
-// .into() will automatically be called on the parameter
-pub fn add_dot(el: HtmlElement<AnyElement>, amount: Amount) {
-    _ = el.clone().on(click, move |_| {
-        el.set_inner_text(&format!(
-            "{}{}",
-            el.inner_text(),
-            ".".repeat(amount.0)
-        ))
-    })
-}
-
 #[component]
 pub fn SomeComponent() -> impl IntoView {
     view! {
@@ -77,11 +46,6 @@ pub fn App() -> impl IntoView {
 
     view! {
         <a href="#" use:copy_to_clipboard=data>"Copy \"" {data} "\" to clipboard"</a>
-        // automatically applies the directive to every root element in `SomeComponent`
         <SomeComponent use:highlight />
-        // no value will default to `().into()`
-        <button use:add_dot>"Add a dot"</button>
-        // `5.into()` automatically called
-        <button use:add_dot=5>"Add 5 dots"</button>
     }
 }

examples/error_boundary/README.md

@@ -8,7 +8,7 @@ See the [Examples README](../README.md) for setup and run instructions.
 
 ## Testing
 
-This project is configured to run start and stop of processes for integration tests without the use of Cargo Leptos or Node.
+This project is configured to run start and stop of processes for integration tests wihtout the use of Cargo Leptos or Node.
 
 ## Quick Start
 

examples/error_boundary/rust-toolchain.toml

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

examples/errors_axum/Cargo.toml

@@ -61,7 +61,7 @@ reload-port = 3001
 end2end-cmd = "npx playwright test"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/errors_axum/rust-toolchain.toml

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

examples/fetch/rust-toolchain.toml

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

examples/hackernews/Cargo.toml

@@ -70,7 +70,7 @@ reload-port = 3001
 end2end-cmd = "npx playwright test"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/hackernews/rust-toolchain.toml

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

examples/hackernews/src/routes/stories.rs

@@ -62,18 +62,16 @@ pub fn Stories() -> impl IntoView {
                     }}
                 </span>
                 <span>"page " {page}</span>
-                <Suspense>
-                    <span class="page-link"
-                        class:disabled=hide_more_link
-                        aria-hidden=hide_more_link
+                <span class="page-link"
+                    class:disabled=hide_more_link
+                    aria-hidden=hide_more_link
+                >
+                    <a href=move || format!("/{}?page={}", story_type(), page() + 1)
+                        aria-label="Next Page"
                     >
-                        <a href=move || format!("/{}?page={}", story_type(), page() + 1)
-                            aria-label="Next Page"
-                        >
-                            "more >"
-                        </a>
-                    </span>
-                </Suspense>
+                        "more >"
+                    </a>
+                </span>
             </div>
             <main class="news-list">
                 <div>

examples/hackernews_axum/Cargo.toml

@@ -71,7 +71,7 @@ reload-port = 3001
 end2end-cmd = "npx playwright test"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/hackernews_axum/rust-toolchain.toml

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

examples/hackernews_islands_axum/Cargo.toml

@@ -81,7 +81,7 @@ reload-port = 3001
 end2end-cmd = "npx playwright test"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/hackernews_islands_axum/rust-toolchain.toml

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

examples/hackernews_islands_axum/src/main.rs

@@ -21,7 +21,7 @@ async fn main() {
 
     // run our app with hyper
     // `axum::Server` is a re-export of `hyper::Server`
-    println!("listening on {}", addr);
+    leptos::logging::log!("listening on {}", addr);
     let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
     axum::serve(listener, app.into_make_service())
         .await

examples/hackernews_js_fetch/Cargo.toml

@@ -11,22 +11,21 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-console_log = "1.0.0"
-console_error_panic_hook = "0.1.7"
-cfg-if = "1.0.0"
-leptos = { version = "0.5", features = ["nightly"] }
-leptos_axum = { version = "0.5", default-features = false, optional = true }
-leptos_meta = { version = "0.5", features = ["nightly"] }
-leptos_router = { version = "0.5", features = ["nightly"] }
-log = "0.4.17"
-simple_logger = "4.0.0"
-serde = { version = "1.0.148", features = ["derive"] }
+console_log = "1.0"
+console_error_panic_hook = "0.1"
+leptos = { path = "../../leptos", features = ["nightly"] }
+leptos_axum = { path = "../../integrations/axum", default-features = false, optional = true }
+leptos_meta = { path = "../../meta", features = ["nightly"] }
+leptos_router = { path = "../../router", features = ["nightly"] }
+log = "0.4"
+simple_logger = "4.0"
+serde = { version = "1.0", features = ["derive"] }
 tracing = "0.1"
-gloo-net = { version = "0.4.0", features = ["http"] }
-reqwest = { version = "0.11.13", features = ["json"] }
-axum = { version = "0.6", default-features = false, optional = true }
-tower = { version = "0.4.13", optional = true }
-http = { version = "0.2.11", optional = true }
+gloo-net = { version = "0.4", features = ["http"] }
+reqwest = { version = "0.11", features = ["json"] }
+axum = { version = "0.7", default-features = false, optional = true }
+tower = { version = "0.4", optional = true }
+http = { version = "1.0", optional = true }
 web-sys = { version = "0.3", features = [
   "AbortController",
   "AbortSignal",
@@ -34,10 +33,10 @@ web-sys = { version = "0.3", features = [
   "Response",
 ] }
 wasm-bindgen = "0.2"
-wasm-bindgen-futures = { version = "0.4.37", features = [
+wasm-bindgen-futures = { version = "0.4", features = [
   "futures-core-03-stream",
 ], optional = true }
-axum-js-fetch = { version = "0.2.1", optional = true }
+axum-js-fetch = { version = "0.2", optional = true }
 lazy_static = "1.4.0"
 
 [features]
@@ -78,7 +77,7 @@ reload-port = 3001
 end2end-cmd = "npx playwright test"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/hackernews_js_fetch/README.md

@@ -2,8 +2,6 @@
 
 This example uses the basic Hacker News example as its basis, but shows how to run the server side as WASM running in a JS environment. In this example, Deno is used as the runtime.
 
-**NOTE**: This example is slightly out of date pending an update to [`axum-js-fetch`](https://github.com/seanaye/axum-js-fetch/), which was waiting on a version of `gloo-net` that uses `http` 1.0. It still works with Leptos 0.5 and Axum 0.6, but not with the versions of Leptos (0.6 and later) that support Axum 1.0.
-
 ## Server Side Rendering with Deno
 
 To run the Deno version, run

examples/hackernews_js_fetch/src/lib.rs

@@ -40,7 +40,7 @@ pub fn hydrate() {
 #[cfg(feature = "ssr")]
 mod ssr_imports {
     use crate::App;
-    use axum::{routing::post, Router};
+    use axum::Router;
     use leptos::*;
     use leptos_axum::{generate_route_list, LeptosRoutes};
     use log::{info, Level};
@@ -52,7 +52,7 @@ mod ssr_imports {
     #[wasm_bindgen]
     impl Handler {
         pub async fn new() -> Self {
-            _ = console_log::init_with_level(Level::Debug);
+            console_log::init_with_level(Level::Debug);
             console_error_panic_hook::set_once();
 
             let leptos_options = LeptosOptions::builder()
@@ -62,9 +62,8 @@ mod ssr_imports {
             let routes = generate_route_list(App);
 
             // build our application with a route
-            let app: axum::Router<(), axum::body::Body> = Router::new()
-                .leptos_routes(&leptos_options, routes, || view! { <App/> })
-                .route("/api/*fn_name", post(leptos_axum::handle_server_fns))
+            let app: axum::Router = Router::new()
+                .leptos_routes(&leptos_options, routes, App)
                 .with_state(leptos_options);
 
             info!("creating handler instance");

examples/js-framework-benchmark/Makefile.toml

@@ -5,13 +5,13 @@ extend = [
 ]
 
 [tasks.build]
-toolchain = "nightly-2024-01-29"
+toolchain = "nightly"
 command = "cargo"
 args = ["build-all-features", "--target", "wasm32-unknown-unknown"]
 install_crate = "cargo-all-features"
 
 [tasks.check]
-toolchain = "nightly-2024-01-29"
+toolchain = "nightly"
 command = "cargo"
 args = ["check-all-features", "--target", "wasm32-unknown-unknown"]
 install_crate = "cargo-all-features"

examples/js-framework-benchmark/rust-toolchain.toml

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

examples/parent_child/rust-toolchain.toml

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

examples/portal/rust-toolchain.toml

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

examples/router/rust-toolchain.toml

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

examples/server_fns_axum/Cargo.toml

@@ -15,7 +15,7 @@ leptos = { path = "../../leptos", features = ["nightly"] }
 leptos_axum = { path = "../../integrations/axum", optional = true }
 leptos_meta = { path = "../../meta", features = ["nightly"] }
 leptos_router = { path = "../../router", features = ["nightly"] }
-server_fn = { path = "../../server_fn", features = ["serde-lite", "rkyv", "multipart"] }
+server_fn = { path = "../../server_fn", features = ["serde-lite", "rkyv", "multipart" ]}
 log = "0.4"
 simple_logger = "4.0"
 serde = { version = "1", features = ["derive"] }
@@ -31,9 +31,6 @@ web-sys = { version = "0.3.67", features = ["FileList", "File"] }
 strum = { version = "0.25.0", features = ["strum_macros", "derive"] }
 notify = { version = "6.1.1", optional = true }
 pin-project-lite = "0.2.13"
-dashmap = { version = "5.5.3", optional = true }
-once_cell = { version = "1.19.0", optional = true }
-async-broadcast = { version = "0.6.0", optional = true }
 
 [features]
 hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
@@ -46,11 +43,9 @@ ssr = [
 	"leptos_meta/ssr",
 	"leptos_router/ssr",
 	"dep:leptos_axum",
-	"dep:notify",
-	"dep:dashmap",
-	"dep:once_cell",
-	"dep:async-broadcast",
+	"dep:notify"
 ]
+notify = ["dep:notify"]
 
 [package.metadata.cargo-all-features]
 denylist = ["axum", "tower", "tower-http", "tokio", "leptos_axum"]
@@ -77,7 +72,7 @@ end2end-cmd = "cargo make test-ui"
 end2end-dir = "e2e"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/server_fns_axum/Makefile.toml

@@ -1,8 +1,12 @@
 extend = [
     { path = "../cargo-make/main.toml" },
-    { path = "../cargo-make/cargo-leptos.toml" },
+    { path = "../cargo-make/cargo-leptos-webdriver-test.toml" },
 ]
 
 [env]
+CLIENT_PROCESS_NAME = "todo_app_sqlite_axum"
 
-CLIENT_PROCESS_NAME = "server_fns_axum"
+[tasks.test-ui]
+cwd = "./e2e"
+command = "cargo"
+args = ["make", "test-ui", "${@}"]

examples/server_fns_axum/e2e/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "todo_app_sqlite_axum_e2e"
+version = "0.1.0"
+edition = "2021"
+
+[dev-dependencies]
+anyhow = "1.0.72"
+async-trait = "0.1.72"
+cucumber = "0.19.1"
+fantoccini = "0.19.3"
+pretty_assertions = "1.4.0"
+serde_json = "1.0.104"
+tokio = { version = "1.29.1", features = ["macros", "rt-multi-thread", "time"] }
+url = "2.4.0"
+
+[[test]]
+name = "app_suite"
+harness = false    # Allow Cucumber to print output instead of libtest

examples/server_fns_axum/e2e/Makefile.toml

@@ -0,0 +1,20 @@
+extend = { path = "../../cargo-make/main.toml" }
+
+[tasks.test]
+env = { RUN_AUTOMATICALLY = false }
+condition = { env_true = ["RUN_AUTOMATICALLY"] }
+
+[tasks.ci]
+
+[tasks.test-ui]
+command = "cargo"
+args = [
+    "test",
+    "--test",
+    "app_suite",
+    "--",
+    "--retry",
+    "2",
+    "--fail-fast",
+    "${@}",
+]

examples/server_fns_axum/e2e/README.md

@@ -0,0 +1,34 @@
+# E2E Testing
+
+This example demonstrates e2e testing with Rust using executable requirements.
+
+## Testing Stack
+
+|    |      Role      |  Description |
+|---|---|---|
+| [Cucumber](https://github.com/cucumber-rs/cucumber/tree/main) | Test Runner | Run [Gherkin](https://cucumber.io/docs/gherkin/reference/) specifications as Rust tests |
+| [Fantoccini](https://github.com/jonhoo/fantoccini/tree/main) | Browser Client | Interact with web pages through WebDriver |
+| [Cargo Leptos ](https://github.com/leptos-rs/cargo-leptos) | Build Tool |  Compile example and start the server and end-2-end tests |
+| [chromedriver](https://chromedriver.chromium.org/downloads) | WebDriver | Provide WebDriver for Chrome
+
+## Testing Organization
+
+Testing is organized around what a user can do and see/not see. Test scenarios are grouped by the **user action** and the **object** of that action. This makes it easier to locate and reason about requirements.
+
+Here is a brief overview of how things fit together.
+
+```bash
+features
+└── {action}_{object}.feature   # Specify test scenarios
+tests
+├── fixtures
+│   ├── action.rs               # Perform a user action (click, type, etc.)
+│   ├── check.rs                # Assert what a user can see/not see
+│   ├── find.rs                 # Query page elements
+│   ├── mod.rs
+│   └── world
+│       ├── action_steps.rs     # Map Gherkin steps to user actions
+│       ├── check_steps.rs      # Map Gherkin steps to user expectations
+│       └── mod.rs
+└── app_suite.rs                # Test main 
+```

examples/server_fns_axum/e2e/features/add_todo.feature

@@ -0,0 +1,16 @@
+@add_todo
+Feature: Add Todo
+
+    Background:
+        Given I see the app
+
+    @add_todo-see
+    Scenario: Should see the todo
+        Given I set the todo as Buy Bread
+        When I click the Add button
+        Then I see the todo named Buy Bread
+
+    @add_todo-style
+    Scenario: Should see the pending todo
+        When I add a todo as Buy Oranges
+        Then I see the pending todo

examples/server_fns_axum/e2e/features/delete_todo.feature

@@ -0,0 +1,18 @@
+@delete_todo
+Feature: Delete Todo
+
+    Background:
+        Given I see the app
+
+    @serial
+    @delete_todo-remove
+    Scenario: Should not see the deleted todo
+        Given I add a todo as Buy Yogurt
+        When I delete the todo named Buy Yogurt
+        Then I do not see the todo named Buy Yogurt
+
+    @serial
+    @delete_todo-message
+    Scenario: Should see the empty list message
+        When I empty the todo list
+        Then I see the empty list message is No tasks were found.

examples/server_fns_axum/e2e/features/open_app.feature

@@ -0,0 +1,12 @@
+@open_app
+Feature: Open App
+
+  @open_app-title
+  Scenario: Should see the home page title
+    When I open the app
+    Then I see the page title is My Tasks
+
+  @open_app-label
+  Scenario: Should see the input label
+    When I open the app
+    Then I see the label of the input is Add a Todo

examples/server_fns_axum/e2e/tests/app_suite.rs

@@ -0,0 +1,14 @@
+mod fixtures;
+
+use anyhow::Result;
+use cucumber::World;
+use fixtures::world::AppWorld;
+
+#[tokio::main]
+async fn main() -> Result<()> {
+    AppWorld::cucumber()
+        .fail_on_skipped()
+        .run_and_exit("./features")
+        .await;
+    Ok(())
+}

examples/server_fns_axum/e2e/tests/fixtures/action.rs

@@ -0,0 +1,60 @@
+use super::{find, world::HOST};
+use anyhow::Result;
+use fantoccini::Client;
+use std::result::Result::Ok;
+use tokio::{self, time};
+
+pub async fn goto_path(client: &Client, path: &str) -> Result<()> {
+    let url = format!("{}{}", HOST, path);
+    client.goto(&url).await?;
+
+    Ok(())
+}
+
+pub async fn add_todo(client: &Client, text: &str) -> Result<()> {
+    fill_todo(client, text).await?;
+    click_add_button(client).await?;
+    Ok(())
+}
+
+pub async fn fill_todo(client: &Client, text: &str) -> Result<()> {
+    let textbox = find::todo_input(client).await;
+    textbox.send_keys(text).await?;
+
+    Ok(())
+}
+
+pub async fn click_add_button(client: &Client) -> Result<()> {
+    let add_button = find::add_button(client).await;
+    add_button.click().await?;
+
+    Ok(())
+}
+
+pub async fn empty_todo_list(client: &Client) -> Result<()> {
+    let todos = find::todos(client).await;
+
+    for _todo in todos {
+        let _ = delete_first_todo(client).await?;
+    }
+
+    Ok(())
+}
+
+pub async fn delete_first_todo(client: &Client) -> Result<()> {
+    if let Some(element) = find::first_delete_button(client).await {
+        element.click().await.expect("Failed to delete todo");
+        time::sleep(time::Duration::from_millis(250)).await;
+    }
+
+    Ok(())
+}
+
+pub async fn delete_todo(client: &Client, text: &str) -> Result<()> {
+    if let Some(element) = find::delete_button(client, text).await {
+        element.click().await?;
+        time::sleep(time::Duration::from_millis(250)).await;
+    }
+
+    Ok(())
+}

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

@@ -0,0 +1,57 @@
+use super::find;
+use anyhow::{Ok, Result};
+use fantoccini::{Client, Locator};
+use pretty_assertions::assert_eq;
+
+pub async fn text_on_element(
+    client: &Client,
+    selector: &str,
+    expected_text: &str,
+) -> Result<()> {
+    let element = client
+        .wait()
+        .for_element(Locator::Css(selector))
+        .await
+        .expect(
+            format!("Element not found by Css selector `{}`", selector)
+                .as_str(),
+        );
+
+    let actual = element.text().await?;
+    assert_eq!(&actual, expected_text);
+
+    Ok(())
+}
+
+pub async fn todo_present(
+    client: &Client,
+    text: &str,
+    expected: bool,
+) -> Result<()> {
+    let todo_present = is_todo_present(client, text).await;
+
+    assert_eq!(todo_present, expected);
+
+    Ok(())
+}
+
+async fn is_todo_present(client: &Client, text: &str) -> bool {
+    let todos = find::todos(client).await;
+
+    for todo in todos {
+        let todo_title = todo.text().await.expect("Todo title not found");
+        if todo_title == text {
+            return true;
+        }
+    }
+
+    false
+}
+
+pub async fn todo_is_pending(client: &Client) -> Result<()> {
+    if let None = find::pending_todo(client).await {
+        assert!(false, "Pending todo not found");
+    }
+
+    Ok(())
+}

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

@@ -0,0 +1,63 @@
+use fantoccini::{elements::Element, Client, Locator};
+
+pub async fn todo_input(client: &Client) -> Element {
+    let textbox = client
+        .wait()
+        .for_element(Locator::Css("input[name='title"))
+        .await
+        .expect("Todo textbox not found");
+
+    textbox
+}
+
+pub async fn add_button(client: &Client) -> Element {
+    let button = client
+        .wait()
+        .for_element(Locator::Css("input[value='Add']"))
+        .await
+        .expect("");
+
+    button
+}
+
+pub async fn first_delete_button(client: &Client) -> Option<Element> {
+    if let Ok(element) = client
+        .wait()
+        .for_element(Locator::Css("li:first-child input[value='X']"))
+        .await
+    {
+        return Some(element);
+    }
+
+    None
+}
+
+pub async fn delete_button(client: &Client, text: &str) -> Option<Element> {
+    let selector = format!("//*[text()='{text}']//input[@value='X']");
+    if let Ok(element) =
+        client.wait().for_element(Locator::XPath(&selector)).await
+    {
+        return Some(element);
+    }
+
+    None
+}
+
+pub async fn pending_todo(client: &Client) -> Option<Element> {
+    if let Ok(element) =
+        client.wait().for_element(Locator::Css(".pending")).await
+    {
+        return Some(element);
+    }
+
+    None
+}
+
+pub async fn todos(client: &Client) -> Vec<Element> {
+    let todos = client
+        .find_all(Locator::Css("li"))
+        .await
+        .expect("Todo List not found");
+
+    todos
+}

examples/server_fns_axum/e2e/tests/fixtures/mod.rs

@@ -0,0 +1,4 @@
+pub mod action;
+pub mod check;
+pub mod find;
+pub mod world;

examples/server_fns_axum/e2e/tests/fixtures/world/action_steps.rs

@@ -0,0 +1,57 @@
+use crate::fixtures::{action, world::AppWorld};
+use anyhow::{Ok, Result};
+use cucumber::{given, when};
+
+#[given("I see the app")]
+#[when("I open the app")]
+async fn i_open_the_app(world: &mut AppWorld) -> Result<()> {
+    let client = &world.client;
+    action::goto_path(client, "").await?;
+
+    Ok(())
+}
+
+#[given(regex = "^I add a todo as (.*)$")]
+#[when(regex = "^I add a todo as (.*)$")]
+async fn i_add_a_todo_titled(world: &mut AppWorld, text: String) -> Result<()> {
+    let client = &world.client;
+    action::add_todo(client, text.as_str()).await?;
+
+    Ok(())
+}
+
+#[given(regex = "^I set the todo as (.*)$")]
+async fn i_set_the_todo_as(world: &mut AppWorld, text: String) -> Result<()> {
+    let client = &world.client;
+    action::fill_todo(client, &text).await?;
+
+    Ok(())
+}
+
+#[when(regex = "I click the Add button$")]
+async fn i_click_the_button(world: &mut AppWorld) -> Result<()> {
+    let client = &world.client;
+    action::click_add_button(client).await?;
+
+    Ok(())
+}
+
+#[when(regex = "^I delete the todo named (.*)$")]
+async fn i_delete_the_todo_named(
+    world: &mut AppWorld,
+    text: String,
+) -> Result<()> {
+    let client = &world.client;
+    action::delete_todo(client, text.as_str()).await?;
+
+    Ok(())
+}
+
+#[given("the todo list is empty")]
+#[when("I empty the todo list")]
+async fn i_empty_the_todo_list(world: &mut AppWorld) -> Result<()> {
+    let client = &world.client;
+    action::empty_todo_list(client).await?;
+
+    Ok(())
+}

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

@@ -0,0 +1,67 @@
+use crate::fixtures::{check, world::AppWorld};
+use anyhow::{Ok, Result};
+use cucumber::then;
+
+#[then(regex = "^I see the page title is (.*)$")]
+async fn i_see_the_page_title_is(
+    world: &mut AppWorld,
+    text: String,
+) -> Result<()> {
+    let client = &world.client;
+    check::text_on_element(client, "h1", &text).await?;
+
+    Ok(())
+}
+
+#[then(regex = "^I see the label of the input is (.*)$")]
+async fn i_see_the_label_of_the_input_is(
+    world: &mut AppWorld,
+    text: String,
+) -> Result<()> {
+    let client = &world.client;
+    check::text_on_element(client, "label", &text).await?;
+
+    Ok(())
+}
+
+#[then(regex = "^I see the todo named (.*)$")]
+async fn i_see_the_todo_is_present(
+    world: &mut AppWorld,
+    text: String,
+) -> Result<()> {
+    let client = &world.client;
+    check::todo_present(client, text.as_str(), true).await?;
+
+    Ok(())
+}
+
+#[then("I see the pending todo")]
+async fn i_see_the_pending_todo(world: &mut AppWorld) -> Result<()> {
+    let client = &world.client;
+
+    check::todo_is_pending(client).await?;
+
+    Ok(())
+}
+
+#[then(regex = "^I see the empty list message is (.*)$")]
+async fn i_see_the_empty_list_message_is(
+    world: &mut AppWorld,
+    text: String,
+) -> Result<()> {
+    let client = &world.client;
+    check::text_on_element(client, "ul p", &text).await?;
+
+    Ok(())
+}
+
+#[then(regex = "^I do not see the todo named (.*)$")]
+async fn i_do_not_see_the_todo_is_present(
+    world: &mut AppWorld,
+    text: String,
+) -> Result<()> {
+    let client = &world.client;
+    check::todo_present(client, text.as_str(), false).await?;
+
+    Ok(())
+}

examples/server_fns_axum/e2e/tests/fixtures/world/mod.rs

@@ -0,0 +1,39 @@
+pub mod action_steps;
+pub mod check_steps;
+
+use anyhow::Result;
+use cucumber::World;
+use fantoccini::{
+    error::NewSessionError, wd::Capabilities, Client, ClientBuilder,
+};
+
+pub const HOST: &str = "http://127.0.0.1:3000";
+
+#[derive(Debug, World)]
+#[world(init = Self::new)]
+pub struct AppWorld {
+    pub client: Client,
+}
+
+impl AppWorld {
+    async fn new() -> Result<Self, anyhow::Error> {
+        let webdriver_client = build_client().await?;
+
+        Ok(Self {
+            client: webdriver_client,
+        })
+    }
+}
+
+async fn build_client() -> Result<Client, NewSessionError> {
+    let mut cap = Capabilities::new();
+    let arg = serde_json::from_str("{\"args\": [\"-headless\"]}").unwrap();
+    cap.insert("goog:chromeOptions".to_string(), arg);
+
+    let client = ClientBuilder::native()
+        .capabilities(cap)
+        .connect("http://localhost:4444")
+        .await?;
+
+    Ok(client)
+}

examples/server_fns_axum/rust-toolchain.toml

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

examples/server_fns_axum/src/app.rs

@@ -1,19 +1,11 @@
 use futures::StreamExt;
-use http::Method;
 use leptos::{html::Input, *};
 use leptos_meta::{provide_meta_context, Link, Meta, Stylesheet};
 use leptos_router::{ActionForm, Route, Router, Routes};
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
-use server_fn::{
-    client::{browser::BrowserClient, Client},
-    codec::{
-        Encoding, FromReq, FromRes, GetUrl, IntoReq, IntoRes, MultipartData,
-        MultipartFormData, Rkyv, SerdeLite, StreamingText, TextStream,
-    },
-    request::{browser::BrowserRequest, ClientReq, Req},
-    response::{browser::BrowserResponse, ClientRes, Res},
+use server_fn::codec::{
+    GetUrl, MultipartData, MultipartFormData, Rkyv, SerdeLite, StreamingText,
+    TextStream,
 };
-use std::future::Future;
 #[cfg(feature = "ssr")]
 use std::sync::{
     atomic::{AtomicU8, Ordering},
@@ -57,10 +49,7 @@ pub fn HomePage() -> impl IntoView {
         <ServerFnArgumentExample/>
         <RkyvExample/>
         <FileUpload/>
-        <FileUploadWithProgress/>
         <FileWatcher/>
-        <CustomEncoding/>
-        <CustomClientExample/>
     }
 }
 
@@ -179,12 +168,15 @@ pub fn WithAnAction() -> impl IntoView {
         <button
             on:click=move |_| {
                 let text = input_ref.get().unwrap().value();
-                action.dispatch(text.into());
+                action.dispatch(text);
                 // note: technically, this `action` takes `AddRow` (the server fn type) as its
                 // argument
                 //
-                // however, for any one-argument server functions, `From<_>` is implemented between
-                // the server function type and the type of this single argument
+                // however, `.dispatch()` takes `impl Into<I>`, and for any one-argument server
+                // functions, `From<_>` is implemented between the server function type and the
+                // type of this single argument
+                //
+                // so `action.dispatch(text)` means `action.dispatch(AddRow { text })`
             }
         >
             Submit
@@ -320,7 +312,7 @@ pub fn RkyvExample() -> impl IntoView {
                 set_input(value);
             }
         >
-            Click to capitalize
+            Click to see length
         </button>
         <p>{input}</p>
         <Transition>
@@ -335,8 +327,8 @@ pub fn FileUpload() -> impl IntoView {
     ///
     /// On the server, this uses the `multer` crate, which provides a streaming API.
     #[server(
-        input = MultipartFormData,
-    )]
+    input = MultipartFormData,
+)]
     pub async fn file_length(
         data: MultipartData,
     ) -> Result<usize, ServerFnError> {
@@ -394,168 +386,6 @@ pub fn FileUpload() -> impl IntoView {
     }
 }
 
-/// This component uses server functions to upload a file, while streaming updates on the upload
-/// progress.
-#[component]
-pub fn FileUploadWithProgress() -> impl IntoView {
-    /// In theory, you could create a single server function which
-    /// 1) received multipart form data
-    /// 2) returned a stream that contained updates on the progress
-    ///
-    /// In reality, browsers do not actually support duplexing requests in this way. In other
-    /// words, every existing browser actually requires that the request stream be complete before
-    /// it begins processing the response stream.
-    ///
-    /// Instead, we can create two separate server functions:
-    /// 1) one that receives multipart form data and begins processing the upload
-    /// 2) a second that returns a stream of updates on the progress
-    ///
-    /// This requires us to store some global state of all the uploads. In a real app, you probably
-    /// shouldn't do exactly what I'm doing here in the demo. For example, this map just
-    /// distinguishes between files by filename, not by user.
-
-    #[cfg(feature = "ssr")]
-    mod progress {
-        use async_broadcast::{broadcast, Receiver, Sender};
-        use dashmap::DashMap;
-        use futures::Stream;
-        use once_cell::sync::Lazy;
-
-        struct File {
-            total: usize,
-            tx: Sender<usize>,
-            rx: Receiver<usize>,
-        }
-
-        static FILES: Lazy<DashMap<String, File>> = Lazy::new(DashMap::new);
-
-        pub async fn add_chunk(filename: &str, len: usize) {
-            println!("[{filename}]\tadding {len}");
-            let mut entry =
-                FILES.entry(filename.to_string()).or_insert_with(|| {
-                    println!("[{filename}]\tinserting channel");
-                    let (tx, rx) = broadcast(128);
-                    File { total: 0, tx, rx }
-                });
-            entry.total += len;
-            let new_total = entry.total;
-
-            // we're about to do an async broadcast, so we don't want to hold a lock across it
-            let tx = entry.tx.clone();
-            drop(entry);
-
-            // now we send the message and don't have to worry about it
-            tx.broadcast(new_total)
-                .await
-                .expect("couldn't send a message over channel");
-        }
-
-        pub fn for_file(filename: &str) -> impl Stream<Item = usize> {
-            let entry =
-                FILES.entry(filename.to_string()).or_insert_with(|| {
-                    println!("[{filename}]\tinserting channel");
-                    let (tx, rx) = broadcast(128);
-                    File { total: 0, tx, rx }
-                });
-            entry.rx.clone()
-        }
-    }
-
-    #[server(
-        input = MultipartFormData,
-    )]
-    pub async fn upload_file(data: MultipartData) -> Result<(), ServerFnError> {
-        let mut data = data.into_inner().unwrap();
-
-        while let Ok(Some(mut field)) = data.next_field().await {
-            let name =
-                field.file_name().expect("no filename on field").to_string();
-            while let Ok(Some(chunk)) = field.chunk().await {
-                let len = chunk.len();
-                println!("[{name}]\t{len}");
-                progress::add_chunk(&name, len).await;
-                // in a real server function, you'd do something like saving the file here
-            }
-        }
-
-        Ok(())
-    }
-
-    #[server(output = StreamingText)]
-    pub async fn file_progress(
-        filename: String,
-    ) -> Result<TextStream, ServerFnError> {
-        println!("getting progress on {filename}");
-        // get the stream of current length for the file
-        let progress = progress::for_file(&filename);
-        // separate each number with a newline
-        // the HTTP response might pack multiple lines of this into a single chunk
-        // we need some way of dividing them up
-        let progress = progress.map(|bytes| Ok(format!("{bytes}\n")));
-        Ok(TextStream::new(progress))
-    }
-
-    let (filename, set_filename) = create_signal(None);
-    let (max, set_max) = create_signal(None);
-    let (current, set_current) = create_signal(None);
-    let on_submit = move |ev: SubmitEvent| {
-        ev.prevent_default();
-        let target = ev.target().unwrap().unchecked_into::<HtmlFormElement>();
-        let form_data = FormData::new_with_form(&target).unwrap();
-        let file = form_data
-            .get("file_to_upload")
-            .unchecked_into::<web_sys::File>();
-        let filename = file.name();
-        let size = file.size() as usize;
-        set_filename(Some(filename.clone()));
-        set_max(Some(size));
-        set_current(None::<usize>);
-
-        spawn_local(async move {
-            let mut progress = file_progress(filename)
-                .await
-                .expect("couldn't initialize stream")
-                .into_inner();
-            while let Some(Ok(len)) = progress.next().await {
-                // the TextStream from the server function will be a series of `usize` values
-                // however, the response itself may pack those chunks into a smaller number of
-                // chunks, each with more text in it
-                // so we've padded them with newspace, and will split them out here
-                // each value is the latest total, so we'll just take the last one
-                let len = len
-                    .split('\n')
-                    .filter(|n| !n.is_empty())
-                    .last()
-                    .expect(
-                        "expected at least one non-empty value from \
-                         newline-delimited rows",
-                    )
-                    .parse::<usize>()
-                    .expect("invalid length");
-                set_current(Some(len));
-            }
-        });
-        spawn_local(async move {
-            upload_file(form_data.into())
-                .await
-                .expect("couldn't upload file");
-        });
-    };
-
-    view! {
-        <h3>File Upload with Progress</h3>
-        <p>A file upload with progress can be handled with two separate server functions.</p>
-        <aside>See the doc comment on the component for an explanation.</aside>
-        <form on:submit=on_submit>
-            <input type="file" name="file_to_upload"/>
-            <input type="submit"/>
-        </form>
-        {move || filename().map(|filename| view! { <p>Uploading {filename}</p> })}
-        {move || max().map(|max| view! {
-            <progress max=max value=move || current().unwrap_or_default()/>
-        })}
-    }
-}
 #[component]
 pub fn FileWatcher() -> impl IntoView {
     #[server(input = GetUrl, output = StreamingText)]
@@ -676,177 +506,3 @@ pub fn CustomErrorTypes() -> impl IntoView {
         </p>
     }
 }
-
-/// Server function encodings are just types that implement a few traits.
-/// This means that you can implement your own encodings, by implementing those traits!
-///
-/// Here, we'll create a custom encoding that serializes and deserializes the server fn
-/// using TOML. Why would you ever want to do this? I don't know, but you can!
-pub struct Toml;
-
-/// A newtype wrapper around server fn data that will be TOML-encoded.
-///
-/// This is needed because of Rust rules around implementing foreign traits for foreign types.
-/// It will be fed into the `custom = ` argument to the server fn below.
-#[derive(Serialize, Deserialize)]
-pub struct TomlEncoded<T>(T);
-
-impl Encoding for Toml {
-    const CONTENT_TYPE: &'static str = "application/toml";
-    const METHOD: Method = Method::POST;
-}
-
-impl<T, Request, Err> IntoReq<Toml, Request, Err> for TomlEncoded<T>
-where
-    Request: ClientReq<Err>,
-    T: Serialize,
-{
-    fn into_req(
-        self,
-        path: &str,
-        accepts: &str,
-    ) -> Result<Request, ServerFnError<Err>> {
-        let data = toml::to_string(&self.0)
-            .map_err(|e| ServerFnError::Serialization(e.to_string()))?;
-        Request::try_new_post(path, Toml::CONTENT_TYPE, accepts, data)
-    }
-}
-
-impl<T, Request, Err> FromReq<Toml, Request, Err> for TomlEncoded<T>
-where
-    Request: Req<Err> + Send,
-    T: DeserializeOwned,
-{
-    async fn from_req(req: Request) -> Result<Self, ServerFnError<Err>> {
-        let string_data = req.try_into_string().await?;
-        toml::from_str::<T>(&string_data)
-            .map(TomlEncoded)
-            .map_err(|e| ServerFnError::Args(e.to_string()))
-    }
-}
-
-impl<T, Response, Err> IntoRes<Toml, Response, Err> for TomlEncoded<T>
-where
-    Response: Res<Err>,
-    T: Serialize + Send,
-{
-    async fn into_res(self) -> Result<Response, ServerFnError<Err>> {
-        let data = toml::to_string(&self.0)
-            .map_err(|e| ServerFnError::Serialization(e.to_string()))?;
-        Response::try_from_string(Toml::CONTENT_TYPE, data)
-    }
-}
-
-impl<T, Response, Err> FromRes<Toml, Response, Err> for TomlEncoded<T>
-where
-    Response: ClientRes<Err> + Send,
-    T: DeserializeOwned,
-{
-    async fn from_res(res: Response) -> Result<Self, ServerFnError<Err>> {
-        let data = res.try_into_string().await?;
-        toml::from_str(&data)
-            .map(TomlEncoded)
-            .map_err(|e| ServerFnError::Deserialization(e.to_string()))
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct WhyNotResult {
-    original: String,
-    modified: String,
-}
-
-#[server(
-    input = Toml,
-    output = Toml,
-    custom = TomlEncoded
-)]
-pub async fn why_not(
-    original: String,
-    addition: String,
-) -> Result<TomlEncoded<WhyNotResult>, ServerFnError> {
-    // insert a simulated wait
-    tokio::time::sleep(std::time::Duration::from_millis(250)).await;
-    Ok(TomlEncoded(WhyNotResult {
-        modified: format!("{original}{addition}"),
-        original,
-    }))
-}
-
-#[component]
-pub fn CustomEncoding() -> impl IntoView {
-    let input_ref = NodeRef::<Input>::new();
-    let (result, set_result) = create_signal("foo".to_string());
-
-    view! {
-        <h3>Custom encodings</h3>
-        <p>
-            "This example creates a custom encoding that sends server fn data using TOML. Why? Well... why not?"
-        </p>
-        <input node_ref=input_ref placeholder="Type something here."/>
-        <button
-            on:click=move |_| {
-                let value = input_ref.get().unwrap().value();
-                spawn_local(async move {
-                let new_value = why_not(value, ", but in TOML!!!".to_string()).await.unwrap();
-                    set_result(new_value.0.modified);
-                });
-            }
-        >
-            Submit
-        </button>
-        <p>{result}</p>
-    }
-}
-
-/// Middleware lets you modify the request/response on the server.
-///
-/// On the client, you might also want to modify the request. For example, you may need to add a
-/// custom header for authentication on every request. You can do this by creating a "custom
-/// client."
-#[component]
-pub fn CustomClientExample() -> impl IntoView {
-    // Define a type for our client.
-    pub struct CustomClient;
-
-    // Implement the `Client` trait for it.
-    impl<CustErr> Client<CustErr> for CustomClient {
-        // BrowserRequest and BrowserResponse are the defaults used by other server functions.
-        // They are wrappers for the underlying Web Fetch API types.
-        type Request = BrowserRequest;
-        type Response = BrowserResponse;
-
-        // Our custom `send()` implementation does all the work.
-        fn send(
-            req: Self::Request,
-        ) -> impl Future<Output = Result<Self::Response, ServerFnError<CustErr>>>
-               + Send {
-            // BrowserRequest derefs to the underlying Request type from gloo-net,
-            // so we can get access to the headers here
-            let headers = req.headers();
-            // modify the headers by appending one
-            headers.append("X-Custom-Header", "foobar");
-            // delegate back out to BrowserClient to send the modified request
-            BrowserClient::send(req)
-        }
-    }
-
-    // Specify our custom client with `client = `
-    #[server(client = CustomClient)]
-    pub async fn fn_with_custom_client() -> Result<(), ServerFnError> {
-        use http::header::HeaderMap;
-        use leptos_axum::extract;
-
-        let headers: HeaderMap = extract().await?;
-        let custom_header = headers.get("X-Custom-Header");
-        println!("X-Custom-Header = {custom_header:?}");
-        Ok(())
-    }
-
-    view! {
-        <h3>Custom clients</h3>
-        <p>You can define a custom server function client to do something like adding a header to every request.</p>
-        <p>Check the network request in your browser devtools to see how this client adds a custom header.</p>
-        <button on:click=|_| spawn_local(async { fn_with_custom_client().await.unwrap() })>Click me</button>
-    }
-}

examples/session_auth_axum/Cargo.toml

@@ -19,7 +19,7 @@ leptos_router = { path = "../../router", features = ["nightly"] }
 log = "0.4"
 simple_logger = "4.0"
 serde = { version = "1.0", features = ["derive"] }
-axum = { version = "0.7", optional = true, features = ["macros"] }
+axum = { version = "0.7", optional = true, features=["macros"] }
 tower = { version = "0.4", optional = true }
 tower-http = { version = "0.5", features = ["fs"], optional = true }
 tokio = { version = "1", features = ["full"], optional = true }
@@ -83,7 +83,7 @@ reload-port = 3001
 end2end-cmd = "npx playwright test"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/session_auth_axum/rust-toolchain.toml

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

examples/session_auth_axum/src/auth.rs

@@ -51,7 +51,7 @@ pub mod ssr {
             .await
             .ok()?;
 
-            //lets just get all the tokens the user can use, we will only use the full permissions if modifying them.
+            //lets just get all the tokens the user can use, we will only use the full permissions if modifing them.
             let sql_user_perms = sqlx::query_as::<_, SqlPermissionTokens>(
                 "SELECT token FROM user_permissions WHERE user_id = ?;",
             )
@@ -75,7 +75,7 @@ pub mod ssr {
             .await
             .ok()?;
 
-            //lets just get all the tokens the user can use, we will only use the full permissions if modifying them.
+            //lets just get all the tokens the user can use, we will only use the full permissions if modifing them.
             let sql_user_perms = sqlx::query_as::<_, SqlPermissionTokens>(
                 "SELECT token FROM user_permissions WHERE user_id = ?;",
             )

examples/slots/rust-toolchain.toml

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

examples/slots/src/lib.rs

@@ -1,6 +1,6 @@
 use leptos::*;
 
-// Slots are created in similar manner to components, except that they use the #[slot] macro.
+// Slots are created in simillar manner to components, except that they use the #[slot] macro.
 #[slot]
 struct Then {
     children: ChildrenFn,

examples/sso_auth_axum/Cargo.toml

@@ -7,39 +7,40 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-oauth2 = { version = "4.4.2", optional = true }
+oauth2 = {version="4.4.2",optional=true}
 anyhow = "1.0.66"
 console_log = "1.0.0"
 rand = { version = "0.8.5", features = ["min_const_gen"], optional = true }
 console_error_panic_hook = "0.1.7"
 futures = "0.3.25"
-leptos = { path = "../../leptos" }
+cfg-if = "1.0.0"
+leptos = { path = "../../leptos"}
 leptos_meta = { path = "../../meta" }
 leptos_axum = { path = "../../integrations/axum", optional = true }
-leptos_router = { path = "../../router" }
+leptos_router = { path = "../../router"}
 log = "0.4.17"
 simple_logger = "4.0.0"
 serde = { version = "1.0.148", features = ["derive"] }
-serde_json = { version = "1.0.108", optional = true }
-axum = { version = "0.7", optional = true, features = ["macros"] }
-tower = { version = "0.4", optional = true }
-tower-http = { version = "0.5", features = ["fs"], optional = true }
+serde_json = {version="1.0.108", optional = true }
+axum = { version = "0.6.1", optional = true, features=["macros"] }
+tower = { version = "0.4.13", optional = true }
+tower-http = { version = "0.4", features = ["fs"], optional = true }
 tokio = { version = "1.22.0", features = ["full"], optional = true }
-http = { version = "1" }
+http = { version = "0.2.8" }
 sqlx = { version = "0.7", features = [
 	"runtime-tokio-rustls",
 	"sqlite",
 ], optional = true }
 thiserror = "1.0.38"
 wasm-bindgen = "0.2"
-axum_session_auth = { version = "0.12", features = [
+axum_session_auth = { version = "0.9", features = [
 	"sqlite-rustls",
 ], optional = true }
-axum_session = { version = "0.12", features = [
+axum_session = { version = "0.9", features = [
 	"sqlite-rustls",
 ], optional = true }
 async-trait = { version = "0.1.64", optional = true }
-reqwest = { version = "0.11", optional = true, features = ["json"] }
+reqwest= {version="0.11",optional=true, features=["json"]}
 
 [features]
 hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
@@ -62,9 +63,7 @@ ssr = [
 	"dep:leptos_axum",
 ]
 
-[package.metadata.cargo-all-features]
-denylist = ["axum", "tower", "tower-http", "tokio", "sqlx", "leptos_axum"]
-skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]
+
 
 [package.metadata.leptos]
 # The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name
@@ -86,7 +85,7 @@ reload-port = 3001
 end2end-cmd = "npx playwright test"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/sso_auth_axum/Makefile.toml

@@ -1,8 +1,11 @@
-extend = [
-	{ path = "../cargo-make/main.toml" },
-	{ path = "../cargo-make/cargo-leptos.toml" },
-]
+extend = { path = "../cargo-make/main.toml" }
 
-[env]
+[tasks.build]
+command = "cargo"
+args = ["+nightly", "build-all-features"]
+install_crate = "cargo-all-features"
 
-CLIENT_PROCESS_NAME = "sso_auth_axum"
+[tasks.check]
+command = "cargo"
+args = ["+nightly", "check-all-features"]
+install_crate = "cargo-all-features"

examples/sso_auth_axum/src/auth.rs

@@ -1,6 +1,14 @@
+use cfg_if::cfg_if;
 use serde::{Deserialize, Serialize};
 use std::collections::HashSet;
 
+cfg_if! {
+if #[cfg(feature = "ssr")] {
+    use sqlx::SqlitePool;
+    use axum_session_auth::{SessionSqlitePool, Authentication, HasPermission};
+    pub type AuthSession = axum_session_auth::AuthSession<User, i64, SessionSqlitePool, SqlitePool>;
+}}
+
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct User {
     pub id: i64,
@@ -20,58 +28,38 @@ impl Default for User {
     }
 }
 
-#[cfg(feature = "ssr")]
-pub mod ssr_imports {
-    use super::User;
-    pub use axum_session_auth::{
-        Authentication, HasPermission, SessionSqlitePool,
-    };
-    pub use sqlx::SqlitePool;
-    use std::collections::HashSet;
-    pub type AuthSession = axum_session_auth::AuthSession<
-        User,
-        i64,
-        SessionSqlitePool,
-        SqlitePool,
-    >;
-
+cfg_if! {
+if #[cfg(feature = "ssr")] {
     use async_trait::async_trait;
 
     impl User {
         pub async fn get(id: i64, pool: &SqlitePool) -> Option<Self> {
-            let sqluser = sqlx::query_as::<_, SqlUser>(
-                "SELECT * FROM users WHERE id = ?",
-            )
-            .bind(id)
-            .fetch_one(pool)
-            .await
-            .ok()?;
+            let sqluser = sqlx::query_as::<_, SqlUser>("SELECT * FROM users WHERE id = ?")
+                .bind(id)
+                .fetch_one(pool)
+                .await
+                .ok()?;
 
-            //lets just get all the tokens the user can use, we will only use the full permissions if modifying them.
+            //lets just get all the tokens the user can use, we will only use the full permissions if modifing them.
             let sql_user_perms = sqlx::query_as::<_, SqlPermissionTokens>(
                 "SELECT token FROM user_permissions WHERE user_id = ?;",
             )
-            .bind(id)
-            .fetch_all(pool)
-            .await
-            .ok()?;
+                .bind(id)
+                .fetch_all(pool)
+                .await
+                .ok()?;
 
             Some(sqluser.into_user(Some(sql_user_perms)))
         }
 
-        pub async fn get_from_email(
-            email: &str,
-            pool: &SqlitePool,
-        ) -> Option<Self> {
-            let sqluser = sqlx::query_as::<_, SqlUser>(
-                "SELECT * FROM users WHERE email = ?",
-            )
-            .bind(email)
-            .fetch_one(pool)
-            .await
-            .ok()?;
+        pub async fn get_from_email(email: &str, pool: &SqlitePool) -> Option<Self> {
+            let sqluser = sqlx::query_as::<_, SqlUser>("SELECT * FROM users WHERE email = ?")
+                .bind(email)
+                .fetch_one(pool)
+                .await
+                .ok()?;
 
-            //lets just get all the tokens the user can use, we will only use the full permissions if modifying them.
+            //lets just get all the tokens the user can use, we will only use the full permissions if modifing them.
             let sql_user_perms = sqlx::query_as::<_, SqlPermissionTokens>(
                 "SELECT token FROM user_permissions WHERE user_id = ?;",
             )
@@ -96,10 +84,7 @@ pub mod ssr_imports {
 
     #[async_trait]
     impl Authentication<User, i64, SqlitePool> for User {
-        async fn load_user(
-            userid: i64,
-            pool: Option<&SqlitePool>,
-        ) -> Result<User, anyhow::Error> {
+        async fn load_user(userid: i64, pool: Option<&SqlitePool>) -> Result<User, anyhow::Error> {
             let pool = pool.unwrap();
 
             User::get(userid, pool)
@@ -138,11 +123,9 @@ pub mod ssr_imports {
         pub secret: String,
     }
 
+
     impl SqlUser {
-        pub fn into_user(
-            self,
-            sql_user_perms: Option<Vec<SqlPermissionTokens>>,
-        ) -> User {
+        pub fn into_user(self, sql_user_perms: Option<Vec<SqlPermissionTokens>>) -> User {
             User {
                 id: self.id,
                 email: self.email,
@@ -158,3 +141,4 @@ pub mod ssr_imports {
         }
     }
 }
+}

examples/sso_auth_axum/src/error_template.rs

@@ -14,6 +14,7 @@ pub fn error_template(errors: RwSignal<Errors>) -> View {
           children= move | (_, error)| {
           let error_string = error.to_string();
             view! {
+
               <p>"Error: " {error_string}</p>
             }
           }

examples/sso_auth_axum/src/fallback.rs

@@ -1,49 +1,47 @@
-use crate::error_template::error_template;
-use axum::{
-    body::Body,
-    extract::State,
-    http::{Request, Response, StatusCode, Uri},
-    response::{IntoResponse, Response as AxumResponse},
-};
-use leptos::*;
-use tower::ServiceExt;
-use tower_http::services::ServeDir;
+use cfg_if::cfg_if;
 
-pub async fn file_and_error_handler(
-    uri: Uri,
-    State(options): State<LeptosOptions>,
-    req: Request<Body>,
-) -> AxumResponse {
-    let root = options.site_root.clone();
-    let res = get_static_file(uri.clone(), &root).await.unwrap();
+cfg_if! {
+if #[cfg(feature = "ssr")] {
+    use axum::{
+        body::{boxed, Body, BoxBody},
+        extract::State,
+        response::IntoResponse,
+        http::{Request, Response, StatusCode, Uri},
+    };
+    use axum::response::Response as AxumResponse;
+    use tower::ServiceExt;
+    use tower_http::services::ServeDir;
+    use leptos::*;
+    use crate::error_template::error_template;
 
-    if res.status() == StatusCode::OK {
-        res.into_response()
-    } else {
-        leptos::logging::log!("{:?}:{}", res.status(), uri);
-        let handler =
-            leptos_axum::render_app_to_stream(options.to_owned(), || {
-                error_template(create_rw_signal(leptos::Errors::default()))
-            });
-        handler(req).await.into_response()
-    }
-}
-
-async fn get_static_file(
-    uri: Uri,
-    root: &str,
-) -> Result<Response<Body>, (StatusCode, String)> {
-    let req = Request::builder()
-        .uri(uri.clone())
-        .body(Body::empty())
-        .unwrap();
-    // `ServeDir` implements `tower::Service` so we can call it with `tower::ServiceExt::oneshot`
-    // This path is relative to the cargo root
-    match ServeDir::new(root).oneshot(req).await {
-        Ok(res) => Ok(res.into_response()),
-        Err(err) => Err((
-            StatusCode::INTERNAL_SERVER_ERROR,
-            format!("Something went wrong: {}", err),
-        )),
+    pub async fn file_and_error_handler(uri: Uri, State(options): State<LeptosOptions>, req: Request<Body>) -> AxumResponse {
+        let root = options.site_root.clone();
+        let res = get_static_file(uri.clone(), &root).await.unwrap();
+
+        if res.status() == StatusCode::OK {
+            res.into_response()
+        } else {
+            leptos::logging::log!("{:?}:{}",res.status(),uri);
+            let handler = leptos_axum::render_app_to_stream(
+                options.to_owned(),
+                || error_template(create_rw_signal(leptos::Errors::default())
+                )
+            );
+            handler(req).await.into_response()
+        }
+    }
+
+    async fn get_static_file(uri: Uri, root: &str) -> Result<Response<BoxBody>, (StatusCode, String)> {
+        let req = Request::builder().uri(uri.clone()).body(Body::empty()).unwrap();
+        // `ServeDir` implements `tower::Service` so we can call it with `tower::ServiceExt::oneshot`
+        // This path is relative to the cargo root
+        match ServeDir::new(root).oneshot(req).await {
+            Ok(res) => Ok(res.map(boxed)),
+            Err(err) => Err((
+                StatusCode::INTERNAL_SERVER_ERROR,
+                format!("Something went wrong: {}", err),
+            )),
+        }
+    }
     }
 }

examples/sso_auth_axum/src/lib.rs

@@ -1,30 +1,36 @@
+use cfg_if::cfg_if;
+
 pub mod auth;
 pub mod error_template;
-#[cfg(feature = "ssr")]
 pub mod fallback;
 pub mod sign_in_sign_up;
-#[cfg(feature = "ssr")]
 pub mod state;
 use leptos::{leptos_dom::helpers::TimeoutHandle, *};
 use leptos_meta::*;
 use leptos_router::*;
 use sign_in_sign_up::*;
 
-#[cfg(feature = "ssr")]
-mod ssr_imports {
-    pub use crate::auth::ssr_imports::{AuthSession, SqlRefreshToken};
-    pub use leptos::{use_context, ServerFnError};
-    pub use oauth2::{reqwest::async_http_client, TokenResponse};
-    pub use sqlx::SqlitePool;
+cfg_if! {
+    if #[cfg(feature = "ssr")] {
+        use crate::{
+            state::AppState,
+            auth::{AuthSession,User,SqlRefreshToken}
+        };
+        use oauth2::{
+            reqwest::async_http_client,
+            TokenResponse
+        };
+        use sqlx::SqlitePool;
 
-    pub fn pool() -> Result<SqlitePool, ServerFnError> {
-        use_context::<SqlitePool>()
-            .ok_or_else(|| ServerFnError::new("Pool missing."))
-    }
+        pub fn pool() -> Result<SqlitePool, ServerFnError> {
+           use_context::<SqlitePool>()
+                .ok_or_else(|| ServerFnError::ServerError("Pool missing.".into()))
+        }
 
-    pub fn auth() -> Result<AuthSession, ServerFnError> {
-        use_context::<AuthSession>()
-            .ok_or_else(|| ServerFnError::new("Auth session missing."))
+        pub fn auth() -> Result<AuthSession, ServerFnError> {
+            use_context::<AuthSession>()
+                .ok_or_else(|| ServerFnError::ServerError("Auth session missing.".into()))
+        }
     }
 }
 
@@ -34,14 +40,11 @@ pub struct Email(RwSignal<Option<String>>);
 pub struct ExpiresIn(RwSignal<u64>);
 #[server]
 pub async fn refresh_token(email: String) -> Result<u64, ServerFnError> {
-    use crate::{auth::User, state::AppState};
-    use ssr_imports::*;
-
     let pool = pool()?;
     let oauth_client = expect_context::<AppState>().client;
     let user = User::get_from_email(&email, &pool)
         .await
-        .ok_or(ServerFnError::new("User not found"))?;
+        .ok_or(ServerFnError::ServerError("User not found".to_string()))?;
 
     let refresh_secret = sqlx::query_as::<_, SqlRefreshToken>(
         "SELECT secret FROM google_refresh_tokens WHERE user_id = ?",
@@ -74,7 +77,6 @@ pub async fn refresh_token(email: String) -> Result<u64, ServerFnError> {
     .await?;
     Ok(expires_in)
 }
-
 #[component]
 pub fn App() -> impl IntoView {
     provide_meta_context();
@@ -141,11 +143,20 @@ pub fn App() -> impl IntoView {
     }
 }
 
-#[cfg(feature = "hydrate")]
-#[wasm_bindgen::prelude::wasm_bindgen]
-pub fn hydrate() {
-    _ = console_log::init_with_level(log::Level::Debug);
-    console_error_panic_hook::set_once();
+// 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 wasm_bindgen::prelude::wasm_bindgen;
+        use leptos::view;
 
-    leptos::mount_to_body(App);
+        #[wasm_bindgen]
+        pub fn hydrate() {
+            _ = console_log::init_with_level(log::Level::Debug);
+            console_error_panic_hook::set_once();
+
+            leptos::mount_to_body(|| {
+                view! {  <App/> }
+            });
+        }
+    }
 }

examples/sso_auth_axum/src/main.rs

@@ -1,154 +1,136 @@
-use crate::ssr_imports::*;
-use axum::{
-    body::Body as AxumBody,
-    extract::{Path, State},
-    http::Request,
-    response::IntoResponse,
-    routing::get,
-    Router,
-};
-use axum_session::{Key, SessionConfig, SessionLayer, SessionStore};
-use axum_session_auth::{AuthConfig, AuthSessionLayer, SessionSqlitePool};
-use leptos::{get_configuration, logging::log, provide_context, view};
-use leptos_axum::{
-    generate_route_list, handle_server_fns_with_context, LeptosRoutes,
-};
-use sqlx::{sqlite::SqlitePoolOptions, SqlitePool};
-use sso_auth_axum::{
-    auth::*, fallback::file_and_error_handler, state::AppState,
-};
+use cfg_if::cfg_if;
 
-async fn server_fn_handler(
-    State(app_state): State<AppState>,
-    auth_session: AuthSession,
-    path: Path<String>,
-    request: Request<AxumBody>,
-) -> impl IntoResponse {
-    log!("{:?}", path);
+// boilerplate to run in different modes
+cfg_if! {
+if #[cfg(feature = "ssr")] {
+    use axum::{
+        response::{IntoResponse},
+        routing::get,
+        extract::{Path, State, RawQuery},
+        http::{Request, header::HeaderMap},
+        body::Body as AxumBody,
+        Router,
+    };
+    use sso_auth_axum::auth::*;
+    use sso_auth_axum::state::AppState;
+    use sso_auth_axum::fallback::file_and_error_handler;
+    use leptos_axum::{generate_route_list, handle_server_fns_with_context, LeptosRoutes};
+    use leptos::{logging::log, view, provide_context, get_configuration};
+    use sqlx::{SqlitePool, sqlite::SqlitePoolOptions};
+    use axum_session::{SessionConfig, SessionLayer, SessionStore,Key, SecurityMode};
+    use axum_session_auth::{AuthSessionLayer, AuthConfig, SessionSqlitePool};
 
-    handle_server_fns_with_context(
-        move || {
+    async fn server_fn_handler(State(app_state): State<AppState>, auth_session: AuthSession, path: Path<String>, headers: HeaderMap, raw_query: RawQuery,
+    request: Request<AxumBody>) -> impl IntoResponse {
+
+        log!("{:?}", path);
+
+        handle_server_fns_with_context(path, headers, raw_query, move || {
             provide_context(app_state.clone());
             provide_context(auth_session.clone());
             provide_context(app_state.pool.clone());
-        },
-        request,
-    )
-    .await
-}
+        }, request).await
+    }
 
-pub async fn leptos_routes_handler(
-    auth_session: AuthSession,
-    State(app_state): State<AppState>,
-    axum::extract::State(option): axum::extract::State<leptos::LeptosOptions>,
-    request: Request<AxumBody>,
-) -> axum::response::Response {
-    let handler = leptos_axum::render_app_async_with_context(
-        option.clone(),
-        move || {
-            provide_context(app_state.clone());
-            provide_context(auth_session.clone());
-            provide_context(app_state.pool.clone());
-        },
-        move || view! {  <sso_auth_axum::App/> },
-    );
+    pub async fn leptos_routes_handler(
+        auth_session: AuthSession,
+        State(app_state): State<AppState>,
+        axum::extract::State(option): axum::extract::State<leptos::LeptosOptions>,
+        request: Request<AxumBody>,
+    ) -> axum::response::Response {
+        let handler = leptos_axum::render_app_async_with_context(
+            option.clone(),
+            move || {
+                provide_context(app_state.clone());
+                provide_context(auth_session.clone());
+                provide_context(app_state.pool.clone());
+                },
+            move || view! {  <sso_auth_axum::App/> },
+        );
 
-    handler(request).await.into_response()
-}
+        handler(request).await.into_response()
+    }
 
-#[tokio::main]
-async fn main() {
-    simple_logger::init_with_level(log::Level::Info)
-        .expect("couldn't initialize logging");
 
-    let pool = SqlitePoolOptions::new()
-        .connect("sqlite:sso.db")
-        .await
-        .expect("Could not make pool.");
+    #[tokio::main]
+    async fn main() {
+        simple_logger::init_with_level(log::Level::Info).expect("couldn't initialize logging");
 
-    // Auth section
-    let session_config = SessionConfig::default()
-        .with_table_name("sessions_table")
-        .with_key(Key::generate())
-        .with_database_key(Key::generate());
-    // .with_security_mode(SecurityMode::PerSession); // FIXME did this disappear?
+        let pool = SqlitePoolOptions::new()
+            .connect("sqlite:sso.db")
+            .await
+            .expect("Could not make pool.");
 
-    let auth_config = AuthConfig::<i64>::default();
-    let session_store = SessionStore::<SessionSqlitePool>::new(
-        Some(pool.clone().into()),
-        session_config,
-    )
-    .await
-    .unwrap();
+        // Auth section
+        let session_config = SessionConfig::default()
+            .with_table_name("sessions_table")
+            .with_key(Key::generate())
+            .with_database_key(Key::generate())
+            .with_security_mode(SecurityMode::PerSession);
 
-    sqlx::migrate!()
-        .run(&pool)
-        .await
-        .expect("could not run SQLx migrations");
+        let auth_config = AuthConfig::<i64>::default();
+        let session_store = SessionStore::<SessionSqlitePool>::new(Some(pool.clone().into()), session_config).await.unwrap();
 
-    // 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 = conf.leptos_options;
-    let addr = leptos_options.site_addr;
-    let routes = generate_route_list(sso_auth_axum::App);
+        sqlx::migrate!()
+            .run(&pool)
+            .await
+            .expect("could not run SQLx migrations");
 
-    // We create our client using provided environment variables.
+
+
+        // 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 = conf.leptos_options;
+        let addr = leptos_options.site_addr;
+        let routes = generate_route_list(sso_auth_axum::App);
+
+            // We create our client using provided environment variables.
     let client = oauth2::basic::BasicClient::new(
-        oauth2::ClientId::new(
-            std::env::var("G_AUTH_CLIENT_ID")
-                .expect("G_AUTH_CLIENT Env var to be set."),
-        ),
-        Some(oauth2::ClientSecret::new(
-            std::env::var("G_AUTH_SECRET")
-                .expect("G_AUTH_SECRET Env var to be set"),
-        )),
+        oauth2::ClientId::new(std::env::var("G_AUTH_CLIENT_ID").expect("G_AUTH_CLIENT Env var to be set.")),
+        Some(oauth2::ClientSecret::new(std::env::var("G_AUTH_SECRET").expect("G_AUTH_SECRET Env var to be set"))),
         oauth2::AuthUrl::new(
             "https://accounts.google.com/o/oauth2/v2/auth".to_string(),
         )
         .unwrap(),
         Some(
-            oauth2::TokenUrl::new(
-                "https://oauth2.googleapis.com/token".to_string(),
-            )
-            .unwrap(),
+            oauth2::TokenUrl::new("https://oauth2.googleapis.com/token".to_string())
+                .unwrap(),
         ),
     )
-    .set_redirect_uri(
-        oauth2::RedirectUrl::new(
-            std::env::var("REDIRECT_URL")
-                .expect("REDIRECT_URL Env var to be set"),
-        )
-        .unwrap(),
-    );
+    .set_redirect_uri(oauth2::RedirectUrl::new(std::env::var("REDIRECT_URL").expect("REDIRECT_URL Env var to be set")).unwrap());
 
-    let app_state = AppState {
-        leptos_options,
-        pool: pool.clone(),
-        client,
-    };
 
-    // build our application with a route
-    let app = Router::new()
-        .route(
-            "/api/*fn_name",
-            get(server_fn_handler).post(server_fn_handler),
-        )
-        .leptos_routes_with_handler(routes, get(leptos_routes_handler))
-        .fallback(file_and_error_handler)
-        .layer(
-            AuthSessionLayer::<User, i64, SessionSqlitePool, SqlitePool>::new(
-                Some(pool.clone()),
-            )
-            .with_config(auth_config),
-        )
-        .layer(SessionLayer::new(session_store))
-        .with_state(app_state);
+        let app_state = AppState{
+            leptos_options,
+            pool: pool.clone(),
+            client,
+        };
 
-    // run our app with hyper
-    // `axum::Server` is a re-export of `hyper::Server`
-    let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
-    log!("listening on http://{}", &addr);
-    axum::serve(listener, app.into_make_service())
-        .await
-        .unwrap();
+        // build our application with a route
+        let app = Router::new()
+            .route("/api/*fn_name", get(server_fn_handler).post(server_fn_handler))
+            .leptos_routes_with_handler(routes, get(leptos_routes_handler) )
+            .fallback(file_and_error_handler)
+            .layer(AuthSessionLayer::<User, i64, SessionSqlitePool, SqlitePool>::new(Some(pool.clone()))
+            .with_config(auth_config))
+            .layer(SessionLayer::new(session_store))
+            .with_state(app_state);
+
+        // run our app with hyper
+        // `axum::Server` is a re-export of `hyper::Server`
+        log!("listening on http://{}", &addr);
+        axum::Server::bind(&addr)
+            .serve(app.into_make_service())
+            .await
+            .unwrap();
+    }
+}
+
+    // client-only stuff for Trunk
+    else {
+        pub fn main() {
+            // This example cannot be built as a trunk standalone CSR-only app.
+            // Only the server may directly connect to the database.
+        }
+    }
 }

examples/sso_auth_axum/src/sign_in_sign_up.rs

@@ -1,23 +1,23 @@
 use super::*;
 
-#[cfg(feature = "ssr")]
-pub mod ssr_imports {
-    pub use crate::{
-        auth::{ssr_imports::SqlCsrfToken, User},
-        state::AppState,
-    };
-    pub use oauth2::{
-        reqwest::async_http_client, AuthorizationCode, CsrfToken, Scope,
-        TokenResponse,
-    };
-    pub use serde_json::Value;
+cfg_if! {
+    if #[cfg(feature="ssr")]{
+        use oauth2::{
+            AuthorizationCode,
+            TokenResponse,
+            reqwest::async_http_client,
+            CsrfToken,
+            Scope,
+        };
+        use serde_json::Value;
+        use crate::{
+            auth::{User,SqlCsrfToken},
+            state::AppState
+        };
+    }
 }
-
 #[server]
 pub async fn google_sso() -> Result<String, ServerFnError> {
-    use crate::ssr_imports::*;
-    use ssr_imports::*;
-
     let oauth_client = expect_context::<AppState>().client;
     let pool = pool()?;
 
@@ -80,9 +80,6 @@ pub async fn handle_g_auth_redirect(
     provided_csrf: String,
     code: String,
 ) -> Result<(String, u64), ServerFnError> {
-    use crate::ssr_imports::*;
-    use ssr_imports::*;
-
     let oauth_client = expect_context::<AppState>().client;
     let pool = pool()?;
     let auth_session = auth()?;
@@ -93,7 +90,9 @@ pub async fn handle_g_auth_redirect(
     .bind(provided_csrf)
     .fetch_one(&pool)
     .await
-    .map_err(|err| ServerFnError::new(format!("CSRF_TOKEN error : {err:?}")))?;
+    .map_err(|err| {
+        ServerFnError::ServerError(format!("CSRF_TOKEN error : {err:?}"))
+    })?;
 
     let token_response = oauth_client
         .exchange_code(AuthorizationCode::new(code.clone()))
@@ -119,7 +118,7 @@ pub async fn handle_g_auth_redirect(
             .expect("email to parse to string")
             .to_string()
     } else {
-        return Err(ServerFnError::new(format!(
+        return Err(ServerFnError::ServerError(format!(
             "Response from google has status of {}",
             response.status()
         )));
@@ -194,8 +193,6 @@ pub fn HandleGAuth() -> impl IntoView {
 
 #[server]
 pub async fn logout() -> Result<(), ServerFnError> {
-    use crate::ssr_imports::*;
-
     let auth = auth()?;
     auth.logout_user();
     leptos_axum::redirect("/");

examples/sso_auth_axum/src/state.rs

@@ -1,12 +1,18 @@
-use axum::extract::FromRef;
+use cfg_if::cfg_if;
+
+cfg_if! {
+    if #[cfg(feature = "ssr")] {
 use leptos::LeptosOptions;
 use sqlx::SqlitePool;
+use axum::extract::FromRef;
 
 /// This takes advantage of Axum's SubStates feature by deriving FromRef. This is the only way to have more than one
 /// item in Axum's State. Leptos requires you to have leptosOptions in your State struct for the leptos route handlers
 #[derive(FromRef, Debug, Clone)]
-pub struct AppState {
+pub struct AppState{
     pub leptos_options: LeptosOptions,
     pub pool: SqlitePool,
-    pub client: oauth2::basic::BasicClient,
+    pub client:oauth2::basic::BasicClient,
+}
+    }
 }

examples/ssr_modes/rust-toolchain.toml

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

examples/ssr_modes_axum/Cargo.toml

@@ -20,7 +20,7 @@ thiserror = "1"
 axum = { version = "0.7", optional = true }
 tower = { version = "0.4", optional = true }
 tower-http = { version = "0.5", features = ["fs"], optional = true }
-tokio = { version = "1", features = ["rt-multi-thread", "macros", "time"], optional = true }
+tokio = { version = "1", features = ["time"], optional = true }
 wasm-bindgen = "0.2"
 
 [features]

examples/ssr_modes_axum/rust-toolchain.toml

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

examples/suspense_tests/src/app.rs

@@ -98,7 +98,6 @@ pub fn App() -> impl IntoView {
                     </Route>
                 </Routes>
             </main>
-            <footer><p>"Does the footer hydrate correctly?"</p></footer>
         </Router>
     }
 }

examples/tailwind_actix/Cargo.toml

@@ -8,6 +8,7 @@ crate-type = ["cdylib", "rlib"]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+
 [dependencies]
 leptos = { path = "../../leptos", features = ["nightly"] }
 leptos_actix = { path = "../../integrations/actix", optional = true }
@@ -16,12 +17,12 @@ leptos_router = { path = "../../router", features = ["nightly"] }
 gloo-net = { version = "0.2", features = ["http"] }
 log = "0.4"
 
-# dependencies for client (enable when csr or hydrate set)
+# dependecies for client (enable when csr or hydrate set)
 wasm-bindgen = { version = "0.2", optional = true }
 console_log = { version = "1", optional = true }
 console_error_panic_hook = { version = "0.1", optional = true }
 
-# dependencies for server (enable when ssr set)
+# dependecies for server (enable when ssr set)
 actix-files = { version = "0.6", optional = true }
 actix-web = { version = "4", features = ["macros"], optional = true }
 futures = { version = "0.3", optional = true }
@@ -96,7 +97,7 @@ 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 that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/tailwind_actix/rust-toolchain.toml

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

examples/tailwind_axum/Cargo.toml

@@ -16,7 +16,7 @@ leptos_axum = { path = "../../integrations/axum", optional = true }
 leptos_router = { path = "../../router", features = ["nightly"] }
 log = "0.4.17"
 simple_logger = "4"
-tokio = { version = "1", features = ["rt-multi-thread", "macros"], optional = true }
+tokio = { version = "1", optional = true }
 tower = { version = "0.4", optional = true }
 tower-http = { version = "0.5", features = ["fs"], optional = true }
 wasm-bindgen = "0.2"

examples/tailwind_axum/README.md

@@ -1,4 +1,4 @@
-# Leptos with Axum + TailwindCSS Template
+# Leptos with Axum + TailwindCSS Tempate
 
 This is a template demonstrating how to integrate [TailwindCSS](https://tailwindcss.com/) with the [Leptos](https://github.com/leptos-rs/leptos) web framework, Axum server, and the [cargo-leptos](https://github.com/akesson/cargo-leptos) tool.
 

examples/tailwind_axum/rust-toolchain.toml

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

examples/tailwind_csr/Cargo.toml

@@ -10,7 +10,9 @@ leptos_router = { path = "../../router", features = ["csr", "nightly"] }
 log = "0.4"
 gloo-net = { version = "0.2", features = ["http"] }
 
-# dependencies for client (enable when csr or hydrate set)
+
+# dependecies for client (enable when csr or hydrate set)
 wasm-bindgen = { version = "0.2" }
-console_log = { version = "1" }
-console_error_panic_hook = { version = "0.1" }
+console_log = { version = "1"}
+console_error_panic_hook = { version = "0.1"}
+

examples/tailwind_csr/rust-toolchain.toml

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

examples/timer/rust-toolchain.toml

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

examples/todo_app_sqlite/Cargo.toml

@@ -67,7 +67,7 @@ end2end-cmd = "cargo make test-ui"
 end2end-dir = "e2e"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/todo_app_sqlite/rust-toolchain.toml

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

examples/todo_app_sqlite/src/lib.rs

@@ -1,3 +1,5 @@
+#[cfg(feature = "ssr")]
+pub mod middleware;
 pub mod todo;
 
 #[cfg(feature = "hydrate")]

examples/todo_app_sqlite/src/middleware.rs

@@ -0,0 +1,58 @@
+use actix_web::{
+    dev::{forward_ready, Service, ServiceRequest, ServiceResponse, Transform},
+    Error,
+};
+use std::{
+    future::{ready, Future, Ready},
+    pin::Pin,
+};
+
+pub struct LoggingLayer;
+
+impl<S, B> Transform<S, ServiceRequest> for LoggingLayer
+where
+    S: Service<ServiceRequest, Response = ServiceResponse<B>, Error = Error>,
+    S::Future: 'static,
+    B: 'static,
+{
+    type Response = ServiceResponse<B>;
+    type Error = Error;
+    type InitError = ();
+    type Transform = LoggingService<S>;
+    type Future = Ready<Result<Self::Transform, Self::InitError>>;
+
+    fn new_transform(&self, service: S) -> Self::Future {
+        ready(Ok(LoggingService { service }))
+    }
+}
+
+pub struct LoggingService<S> {
+    service: S,
+}
+
+impl<S, B> Service<ServiceRequest> for LoggingService<S>
+where
+    S: Service<ServiceRequest, Response = ServiceResponse<B>, Error = Error>,
+    S::Future: 'static,
+    B: 'static,
+{
+    type Response = ServiceResponse<B>;
+    type Error = Error;
+    type Future =
+        Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>>>>;
+
+    forward_ready!(service);
+
+    fn call(&self, req: ServiceRequest) -> Self::Future {
+        println!("1. Middleware running before server fn.");
+
+        let fut = self.service.call(req);
+
+        Box::pin(async move {
+            let res = fut.await?;
+            println!("3. Middleware running after server fn.");
+            Ok(res)
+        })
+    }
+}
+

examples/todo_app_sqlite/src/todo.rs

@@ -49,6 +49,7 @@ pub async fn get_todos() -> Result<Vec<Todo>, ServerFnError> {
 }
 
 #[server]
+#[middleware(crate::middleware::LoggingLayer)]
 pub async fn add_todo(title: String) -> Result<(), ServerFnError> {
     use self::ssr::*;
 

examples/todo_app_sqlite_axum/Cargo.toml

@@ -69,7 +69,7 @@ end2end-cmd = "cargo make test-ui"
 end2end-dir = "e2e"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/todo_app_sqlite_axum/rust-toolchain.toml

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

examples/todo_app_sqlite_csr/Cargo.toml

@@ -70,7 +70,7 @@ end2end-cmd = "cargo make test-ui"
 end2end-dir = "e2e"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/todo_app_sqlite_csr/rust-toolchain.toml

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

examples/todomvc/rust-toolchain.toml

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

integrations/actix/src/lib.rs

@@ -150,6 +150,14 @@ pub fn redirect(path: &str) {
              to redirect()."
         );
     }
+    if let Some(response_options) = use_context::<ResponseOptions>() {
+        response_options.set_status(StatusCode::FOUND);
+        response_options.insert_header(
+            header::LOCATION,
+            header::HeaderValue::from_str(path)
+                .expect("Failed to create HeaderValue"),
+        );
+    }
 }
 
 /// An Actix [struct@Route](actix_web::Route) that listens for a `POST` request with
@@ -1361,7 +1369,8 @@ impl LeptosRoutes for &mut ServiceConfig {
     }
 }
 
-/// A helper to make it easier to use Actix extractors in server functions.
+/// A helper to make it easier to use Axum extractors in server functions, with a
+/// simpler API than [`extract()`].
 ///
 /// It is generic over some type `T` that implements [`FromRequest`] and can
 /// therefore be used in an extractor. The compiler can often infer this type.
@@ -1374,21 +1383,19 @@ impl LeptosRoutes for &mut ServiceConfig {
 /// pub async fn query_extract() -> Result<MyQuery, ServerFnError> {
 ///     use actix_web::web::Query;
 ///     use leptos_actix::*;
-///
 ///     let Query(data) = extract().await?;
-///
-///     // do something with the data
-///
 ///     Ok(data)
 /// }
 /// ```
-pub async fn extract<T>() -> Result<T, ServerFnError>
+pub async fn extract<T, CustErr>() -> Result<T, ServerFnError<CustErr>>
 where
     T: actix_web::FromRequest,
     <T as FromRequest>::Error: Display,
 {
     let req = use_context::<HttpRequest>().ok_or_else(|| {
-        ServerFnError::new("HttpRequest should have been provided via context")
+        ServerFnError::ServerError(
+            "HttpRequest should have been provided via context".to_string(),
+        )
     })?;
 
     T::extract(&req)

integrations/axum/Cargo.toml

@@ -14,7 +14,7 @@ axum = { version = "0.7", default-features = false, features = [
 futures = "0.3"
 http-body-util = "0.1"
 leptos = { workspace = true, features = ["ssr"] }
-server_fn = { workspace = true, features = ["axum-no-default"] }
+server_fn = { workspace = true, features = ["axum"] }
 leptos_macro = { workspace = true, features = ["axum"] }
 leptos_meta = { workspace = true, features = ["ssr"] }
 leptos_router = { workspace = true, features = ["ssr"] }
@@ -34,5 +34,5 @@ tokio = { version = "1", features = ["net"] }
 [features]
 nonce = ["leptos/nonce"]
 wasm = []
-default = ["tokio/fs", "tokio/sync"]
+default = ["tokio/full", "axum/macros"]
 experimental-islands = ["leptos_integration_utils/experimental-islands"]

integrations/axum/src/lib.rs

@@ -7,7 +7,7 @@
 //! To run in this environment, you need to disable the default feature set and enable
 //! the `wasm` feature on `leptos_axum` in your `Cargo.toml`.
 //! ```toml
-//! leptos_axum = { version = "0.6.0", default-features = false, features = ["wasm"] }
+//! leptos_axum = { version = "0.6.0-beta", default-features = false, features = ["wasm"] }
 //! ```
 //!
 //! ## Features
@@ -54,8 +54,11 @@ use leptos_meta::{generate_head_metadata_separated, MetaContext};
 use leptos_router::*;
 use once_cell::sync::OnceCell;
 use parking_lot::RwLock;
-use server_fn::{error::NoCustomError, redirect::REDIRECT_HEADER};
-use std::{fmt::Debug, io, pin::Pin, sync::Arc, thread::available_parallelism};
+use server_fn::redirect::REDIRECT_HEADER;
+use std::{
+    error::Error, fmt::Debug, io, pin::Pin, sync::Arc,
+    thread::available_parallelism,
+};
 use tokio_util::task::LocalPoolHandle;
 use tracing::Instrument;
 
@@ -161,7 +164,7 @@ pub fn generate_request_and_parts(
 }
 
 /// An Axum handlers to listens for a request with Leptos server function arguments in the body,
-/// run the server function if found, and return the resulting [`Response`].
+/// run the server function if found, and return the resulting [Response].
 ///
 /// This can then be set up at an appropriate route in your application:
 ///
@@ -221,7 +224,7 @@ macro_rules! spawn_task {
 }
 
 /// An Axum handlers to listens for a request with Leptos server function arguments in the body,
-/// run the server function if found, and return the resulting [`Response`].
+/// run the server function if found, and return the resulting [Response].
 ///
 /// This can then be set up at an appropriate route in your application:
 ///
@@ -231,16 +234,15 @@ macro_rules! spawn_task {
 /// of one that should work much like this one.
 ///
 /// **NOTE**: If your server functions expect a context, make sure to provide it both in
-/// [`handle_server_fns_with_context`] **and** in
-/// [`leptos_routes_with_context`](LeptosRoutes::leptos_routes_with_context) (or whatever
+/// [`handle_server_fns_with_context`] **and** in [`leptos_routes_with_context`] (or whatever
 /// rendering method you are using). During SSR, server functions are called by the rendering
 /// method, while subsequent calls from the client are handled by the server function handler.
 /// The same context needs to be provided to both handlers.
 ///
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
-/// - [`Parts`]
-/// - [`ResponseOptions`]
+/// - [RequestParts]
+/// - [ResponseOptions]
 #[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub async fn handle_server_fns_with_context(
     additional_context: impl Fn() + 'static + Clone + Send,
@@ -329,15 +331,7 @@ async fn handle_server_fns_inner(
         _ = tx.send(res);
     });
 
-    rx.await.unwrap_or_else(|e| {
-        (
-            StatusCode::INTERNAL_SERVER_ERROR,
-            ServerFnError::<NoCustomError>::ServerError(e.to_string())
-                .ser()
-                .unwrap_or_default(),
-        )
-            .into_response()
-    })
+    rx.await.unwrap()
 }
 
 pub type PinnedHtmlStream =
@@ -389,10 +383,10 @@ pub type PinnedHtmlStream =
 ///
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
-/// - [`Parts`]
-/// - [`ResponseOptions`]
-/// - [`MetaContext`](leptos_meta::MetaContext)
-/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
+/// - [RequestParts]
+/// - [ResponseOptions]
+/// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
 #[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub fn render_app_to_stream<IV>(
     options: LeptosOptions,
@@ -480,10 +474,10 @@ where
 ///
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
-/// - [`Parts`]
-/// - [`ResponseOptions`]
-/// - [`MetaContext`](leptos_meta::MetaContext)
-/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
+/// - [Parts]
+/// - [ResponseOptions]
+/// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
 #[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub fn render_app_to_stream_in_order<IV>(
     options: LeptosOptions,
@@ -521,10 +515,10 @@ where
 ///
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
-/// - [`Parts`]
-/// - [`ResponseOptions`]
-/// - [`MetaContext`](leptos_meta::MetaContext)
-/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
+/// - [Parts]
+/// - [ResponseOptions]
+/// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
 #[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub fn render_app_to_stream_with_context<IV>(
     options: LeptosOptions,
@@ -632,10 +626,10 @@ where
 ///
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
-/// - [`Parts`]
-/// - [`ResponseOptions`]
-/// - [`MetaContext`](leptos_meta::MetaContext)
-/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
+/// - [Parts]
+/// - [ResponseOptions]
+/// - [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,
@@ -793,10 +787,10 @@ async fn forward_stream(
 ///
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
-/// - [`Parts`]
-/// - [`ResponseOptions`]
-/// - [`MetaContext`](leptos_meta::MetaContext)
-/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
+/// - [Parts]
+/// - [ResponseOptions]
+/// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
 #[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub fn render_app_to_stream_in_order_with_context<IV>(
     options: LeptosOptions,
@@ -923,10 +917,10 @@ fn provide_contexts(
 ///
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
-/// - [`Parts`]
-/// - [`ResponseOptions`]
-/// - [`MetaContext`](leptos_meta::MetaContext)
-/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
+/// - [Parts]
+/// - [ResponseOptions]
+/// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
 #[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub fn render_app_async<IV>(
     options: LeptosOptions,
@@ -965,10 +959,10 @@ where
 ///
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
-/// - [`Parts`]
-/// - [`ResponseOptions`]
-/// - [`MetaContext`](leptos_meta::MetaContext)
-/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
+/// - [Parts]
+/// - [ResponseOptions]
+/// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
 #[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub fn render_app_async_stream_with_context<IV>(
     options: LeptosOptions,
@@ -1094,10 +1088,10 @@ where
 ///
 /// ## Provided Context Types
 /// This function always provides context values including the following types:
-/// - [`Parts`]
-/// - [`ResponseOptions`]
-/// - [`MetaContext`](leptos_meta::MetaContext)
-/// - [`RouterIntegrationContext`](leptos_router::RouterIntegrationContext)
+/// - [Parts]
+/// - [ResponseOptions]
+/// - [MetaContext](leptos_meta::MetaContext)
+/// - [RouterIntegrationContext](leptos_router::RouterIntegrationContext)
 #[tracing::instrument(level = "trace", fields(error), skip_all)]
 pub fn render_app_async_with_context<IV>(
     options: LeptosOptions,
@@ -1594,14 +1588,6 @@ where
     where
         IV: IntoView + 'static,
     {
-        // S represents the router's finished state allowing us to provide
-        // it to the user's server functions.
-        let state = options.clone();
-        let cx_with_state = move || {
-            provide_context::<S>(state.clone());
-            additional_context();
-        };
-
         let mut router = self;
 
         // register router paths
@@ -1617,7 +1603,7 @@ where
                             path,
                             LeptosOptions::from_ref(options),
                             app_fn.clone(),
-                            cx_with_state.clone(),
+                            additional_context.clone(),
                             method,
                             static_mode,
                         )
@@ -1637,7 +1623,7 @@ where
                         SsrMode::OutOfOrder => {
                             let s = render_app_to_stream_with_context(
                                 LeptosOptions::from_ref(options),
-                                cx_with_state.clone(),
+                                additional_context.clone(),
                                 app_fn.clone(),
                             );
                             match method {
@@ -1651,7 +1637,7 @@ where
                         SsrMode::PartiallyBlocked => {
                             let s = render_app_to_stream_with_context_and_replace_blocks(
                                 LeptosOptions::from_ref(options),
-                                cx_with_state.clone(),
+                                additional_context.clone(),
                                 app_fn.clone(),
                                 true
                             );
@@ -1666,7 +1652,7 @@ where
                         SsrMode::InOrder => {
                             let s = render_app_to_stream_in_order_with_context(
                                 LeptosOptions::from_ref(options),
-                                cx_with_state.clone(),
+                                additional_context.clone(),
                                 app_fn.clone(),
                             );
                             match method {
@@ -1680,7 +1666,7 @@ where
                         SsrMode::Async => {
                             let s = render_app_async_with_context(
                                 LeptosOptions::from_ref(options),
-                                cx_with_state.clone(),
+                                additional_context.clone(),
                                 app_fn.clone(),
                             );
                             match method {
@@ -1699,9 +1685,9 @@ where
 
         // register server functions
         for (path, method) in server_fn::axum::server_fn_paths() {
-            let cx_with_state = cx_with_state.clone();
+            let additional_context = additional_context.clone();
             let handler = move |req: Request<Body>| async move {
-                handle_server_fns_with_context(cx_with_state, req).await
+                handle_server_fns_with_context(additional_context, req).await
             };
             router = router.route(
                 path,
@@ -1780,17 +1766,18 @@ fn get_leptos_pool() -> LocalPoolHandle {
 /// pub async fn query_extract() -> Result<MyQuery, ServerFnError> {
 ///     use axum::{extract::Query, http::Method};
 ///     use leptos_axum::*;
-///     let Query(query) = extract().await?;
+///     let Query(query) = extractor().await?;
 ///
 ///     Ok(query)
 /// }
 /// ```
-pub async fn extract<T>() -> Result<T, ServerFnError>
+pub async fn extractor<T, CustErr>() -> Result<T, ServerFnError>
 where
     T: Sized + FromRequestParts<()>,
     T::Rejection: Debug,
+    CustErr: Error + 'static,
 {
-    extract_with_state::<T, ()>(&()).await
+    extractor_with_state::<T, (), CustErr>(&()).await
 }
 
 /// A helper to make it easier to use Axum extractors in server functions. This
@@ -1807,22 +1794,26 @@ where
 /// pub async fn query_extract() -> Result<MyQuery, ServerFnError> {
 ///     use axum::{extract::Query, http::Method};
 ///     use leptos_axum::*;
-///     let Query(query) = extract().await?;
+///     let Query(query) = extractor().await?;
 ///
 ///     Ok(query)
 /// }
 /// ```
-pub async fn extract_with_state<T, S>(state: &S) -> Result<T, ServerFnError>
+pub async fn extractor_with_state<T, S, CustErr>(
+    state: &S,
+) -> Result<T, ServerFnError>
 where
     T: Sized + FromRequestParts<S>,
     T::Rejection: Debug,
+    CustErr: Error + 'static,
 {
     let mut parts = use_context::<Parts>().ok_or_else(|| {
-        ServerFnError::new(
-            "should have had Parts provided by the leptos_axum integration",
+        ServerFnError::ServerError::<CustErr>(
+            "should have had Parts provided by the leptos_axum integration"
+                .to_string(),
         )
     })?;
-    T::from_request_parts(&mut parts, state)
+    T::from_request_parts(&mut parts, &state)
         .await
         .map_err(|e| ServerFnError::ServerError(format!("{e:?}")))
 }

leptos/src/suspense_component.rs

@@ -245,7 +245,6 @@ where
 
     HydrationCtx::continue_from(current_id);
     HydrationCtx::next_component();
-    HydrationCtx::next_component();
 
     leptos_dom::View::Suspense(current_id, core_component)
 }

leptos/tests/ssr.rs

@@ -206,5 +206,3 @@ fn ssr_option() {
 
     runtime.dispose();
 }
-
-// TODO: remove simulated change

leptos_config/src/lib.rs

@@ -13,7 +13,7 @@ use typed_builder::TypedBuilder;
 
 /// A Struct to allow us to parse LeptosOptions from the file. Not really needed, most interactions should
 /// occur with LeptosOptions
-#[derive(Clone, Debug, serde::Deserialize, Default)]
+#[derive(Clone, Debug, serde::Deserialize)]
 #[serde(rename_all = "kebab-case")]
 pub struct ConfFile {
     pub leptos_options: LeptosOptions,
@@ -27,7 +27,7 @@ pub struct ConfFile {
 #[serde(rename_all = "kebab-case")]
 pub struct LeptosOptions {
     /// The name of the WASM and JS files generated by wasm-bindgen. Defaults to the crate name with underscores instead of dashes
-    #[builder(setter(into), default=default_output_name())]
+    #[builder(setter(into))]
     pub output_name: String,
     /// The path of the all the files generated by cargo-leptos. This defaults to '.' for convenience when integrating with other
     /// tools.
@@ -112,16 +112,6 @@ impl LeptosOptions {
     }
 }
 
-impl Default for LeptosOptions {
-    fn default() -> Self {
-        LeptosOptions::builder().build()
-    }
-}
-
-fn default_output_name() -> String {
-    env!("CARGO_CRATE_NAME").replace('-', "_")
-}
-
 fn default_site_root() -> String {
     ".".to_string()
 }

leptos_dom/src/html.rs

@@ -276,14 +276,6 @@ impl ElementDescriptor for Custom {
 cfg_if! {
   if #[cfg(all(target_arch = "wasm32", feature = "web"))] {
     /// Represents an HTML element.
-    ///### Beginner's tip:
-    /// `HtmlElement<El>` implements [`std::ops::Deref`] where `El` implements [`std::ops::Deref`].
-    /// When `El` has a corresponding [`web_sys::HtmlElement`] -> `El` will implement [`std::ops::Deref`] for it.
-    /// For instance [`leptos::HtmlElement<Div>`] implements [`std::ops::Deref`] for [`web_sys::HtmlDivElement`]
-    /// Because of [Deref Coercion](https://doc.rust-lang.org/std/ops/trait.Deref.html#deref-coercion) you can call applicable [`web_sys::HtmlElement`] methods on `HtmlElement<El>` as if it were that type.
-    /// If both `HtmlElement<El>` and one of its derefs have a method with the same name, the dot syntax will call the method on the inherent impl (i.e. `HtmlElement<El>` or it's [`std::ops::Deref`] Target).
-    /// You may need to manually deref to access other methods, for example, `(*el).style()` to get the `CssStyleDeclaration` instead of calling [`leptos::HtmlElement::style`].
-
     #[must_use = "You are creating an HtmlElement<_> but not using it. An unused view can \
     cause your view to be rendered as () unexpectedly, and it can \
     also cause issues with client-side hydration."]

leptos_dom/src/ssr.rs

@@ -363,13 +363,6 @@ fn fragments_to_chunks(
 
 impl View {
     /// Consumes the node and renders it into an HTML string.
-    ///
-    /// This is __NOT__ the same as [`render_to_string`]. This
-    /// functions differs in that it assumes a runtime is in scope.
-    /// [`render_to_string`] creates, and disposes of a runtime for you.
-    ///
-    /// # Panics
-    /// When called in a scope without a runtime. Use [`render_to_string`] instead.
     #[cfg_attr(
         any(debug_assertions, feature = "ssr"),
         instrument(level = "trace", skip_all,)