clarify templating

.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-rc1"
 
 [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-rc1" }
+leptos_dom = { path = "./leptos_dom", version = "0.6.0-rc1" }
+leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.6.0-rc1" }
+leptos_macro = { path = "./leptos_macro", version = "0.6.0-rc1" }
+leptos_reactive = { path = "./leptos_reactive", version = "0.6.0-rc1" }
+leptos_server = { path = "./leptos_server", version = "0.6.0-rc1" }
+server_fn = { path = "./server_fn", version = "0.6.0-rc1" }
+server_fn_macro = { path = "./server_fn_macro", version = "0.6.0-rc1" }
 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-rc1" }
+leptos_router = { path = "./router", version = "0.6.0-rc1" }
+leptos_meta = { path = "./meta", version = "0.6.0-rc1" }
+leptos_integration_utils = { path = "./integrations/utils", version = "0.6.0-rc1" }
 
 [profile.release]
 codegen-units = 1

README.md

@@ -150,7 +150,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

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

@@ -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>
     }
 }

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_js_fetch/Cargo.toml

@@ -78,7 +78,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/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,10 +43,7 @@ ssr = [
 	"leptos_meta/ssr",
 	"leptos_router/ssr",
 	"dep:leptos_axum",
-	"dep:notify",
-	"dep:dashmap",
-	"dep:once_cell",
-	"dep:async-broadcast",
+	"dep:notify"
 ]
 
 [package.metadata.cargo-all-features]
@@ -77,7 +71,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/rust-toolchain.toml

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

examples/server_fns_axum/src/app.rs

@@ -5,15 +5,13 @@ 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},
+    request::{ClientReq, Req},
+    response::{ClientRes, Res},
 };
-use std::future::Future;
 #[cfg(feature = "ssr")]
 use std::sync::{
     atomic::{AtomicU8, Ordering},
@@ -57,10 +55,8 @@ pub fn HomePage() -> impl IntoView {
         <ServerFnArgumentExample/>
         <RkyvExample/>
         <FileUpload/>
-        <FileUploadWithProgress/>
         <FileWatcher/>
         <CustomEncoding/>
-        <CustomClientExample/>
     }
 }
 
@@ -320,7 +316,7 @@ pub fn RkyvExample() -> impl IntoView {
                 set_input(value);
             }
         >
-            Click to capitalize
+            Click to see length
         </button>
         <p>{input}</p>
         <Transition>
@@ -335,8 +331,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 +390,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)]
@@ -798,55 +632,3 @@ pub fn CustomEncoding() -> impl IntoView {
         <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

@@ -86,7 +86,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/src/auth.rs

@@ -47,7 +47,7 @@ pub mod ssr_imports {
             .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 = ?;",
             )
@@ -71,7 +71,7 @@ pub mod ssr_imports {
             .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/ssr_modes/rust-toolchain.toml

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

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/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_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,7 @@ 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.
 ///
 /// 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.
@@ -1382,13 +1390,15 @@ impl LeptosRoutes for &mut ServiceConfig {
 ///     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"] }

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-rc1", 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;
 
@@ -329,15 +332,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 =
@@ -1594,14 +1589,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 +1604,7 @@ where
                             path,
                             LeptosOptions::from_ref(options),
                             app_fn.clone(),
-                            cx_with_state.clone(),
+                            additional_context.clone(),
                             method,
                             static_mode,
                         )
@@ -1637,7 +1624,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 +1638,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 +1653,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 +1667,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 +1686,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,
@@ -1785,12 +1772,13 @@ fn get_leptos_pool() -> LocalPoolHandle {
 ///     Ok(query)
 /// }
 /// ```
-pub async fn extract<T>() -> Result<T, ServerFnError>
+pub async fn extract<T, CustErr>() -> Result<T, ServerFnError>
 where
     T: Sized + FromRequestParts<()>,
     T::Rejection: Debug,
+    CustErr: Error + 'static,
 {
-    extract_with_state::<T, ()>(&()).await
+    extract_with_state::<T, (), CustErr>(&()).await
 }
 
 /// A helper to make it easier to use Axum extractors in server functions. This
@@ -1812,14 +1800,18 @@ where
 ///     Ok(query)
 /// }
 /// ```
-pub async fn extract_with_state<T, S>(state: &S) -> Result<T, ServerFnError>
+pub async fn extract_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)

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_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_macro/Makefile.toml

@@ -11,13 +11,13 @@ dependencies = [
 [tasks.test-leptos_macro-example]
 description = "Tests the leptos_macro/example to check if macro handles doc comments correctly"
 command = "cargo"
-args = ["+nightly-2024-01-29", "test", "--doc"]
+args = ["+nightly", "test", "--doc"]
 cwd = "example"
 install_crate = false
 
 [tasks.doc-leptos_macro-example]
 description = "Docs the leptos_macro/example to check if macro handles doc comments correctly"
 command = "cargo"
-args = ["+nightly-2024-01-29", "doc"]
+args = ["+nightly", "doc"]
 cwd = "example"
 install_crate = false

leptos_macro/src/lib.rs

@@ -915,16 +915,6 @@ pub fn slot(args: proc_macro::TokenStream, s: TokenStream) -> TokenStream {
 /// Whatever encoding is provided to `input` should implement `IntoReq` and `FromReq`. Whatever encoding is provided
 /// to `output` should implement `IntoRes` and `FromRes`.
 ///
-/// ## Default Values for Parameters
-///
-/// Individual function parameters can be annotated with `#[server(default)]`, which will pass
-/// through `#[serde(default)]`. This is useful for the empty values of arguments with some
-/// encodings. The URL encoding, for example, omits a field entirely if it is an empty `Vec<_>`,
-/// but this causes a deserialization error: the correct solution is to add `#[server(default)]`.
-/// ```rust,ignore
-/// pub async fn with_default_value(#[server(default)] values: Vec<u32>) /* etc. */
-/// ```
-///
 /// ## Important Notes
 /// - **Server functions must be `async`.** Even if the work being done inside the function body
 ///   can run synchronously on the server, from the client’s perspective it involves an asynchronous

leptos_macro/src/view/mod.rs

@@ -1,7 +1,7 @@
 use crate::{attribute_value, Mode};
 use convert_case::{Case::Snake, Casing};
 use proc_macro2::{Ident, Span, TokenStream, TokenTree};
-use quote::{quote, quote_spanned};
+use quote::{format_ident, quote, quote_spanned};
 use rstml::node::{KeyedAttribute, Node, NodeElement, NodeName};
 use syn::{spanned::Spanned, Expr, Expr::Tuple, ExprLit, ExprPath, Lit};
 
@@ -534,12 +534,12 @@ pub(crate) fn directive_call_from_attribute_node(
     attr: &KeyedAttribute,
     directive_name: &str,
 ) -> TokenStream {
-    let handler = syn::Ident::new(directive_name, attr.key.span());
+    let handler = format_ident!("{directive_name}", span = attr.key.span());
 
     let param = if let Some(value) = attr.value() {
-        quote! { ::std::convert::Into::into(#value) }
+        quote! { #value.into() }
     } else {
-        quote! { ().into() }
+        quote! { () }
     };
 
     quote! { .directive(#handler, #param) }

leptos_reactive/src/resource.rs

@@ -385,10 +385,7 @@ where
     // client
     create_render_effect({
         let r = Rc::clone(&r);
-        move |_| {
-            source.track();
-            r.load(false, id)
-        }
+        move |_| r.load(false, id)
     });
 
     Resource {

leptos_reactive/src/runtime.rs

@@ -281,7 +281,7 @@ impl Runtime {
                     let source_map = self.node_sources.borrow();
                     for effect in subs.borrow().iter() {
                         if let Some(effect_sources) = source_map.get(*effect) {
-                            effect_sources.borrow_mut().swap_remove(&node);
+                            effect_sources.borrow_mut().remove(&node);
                         }
                     }
                 }
@@ -308,18 +308,7 @@ impl Runtime {
             let subs = self.node_subscribers.borrow();
             for source in sources.borrow().iter() {
                 if let Some(source) = subs.get(*source) {
-                    // Using `.shift_remove()` here guarantees that dependencies
-                    // of a signal are always triggered in the same order.
-                    // This is important for cases in which, for example, the first effect
-                    // conditionally checks that the signal value is `Some(_)`, and the
-                    // second one unwraps its value; if they maintain this order, then the check
-                    // will always run first, and will cancel the unwrap if it is None. But if the
-                    // order can be inverted (by using .swap_remove() here), the unwrap will
-                    // run first on a subsequent run.
-                    //
-                    // Maintaining execution order is the intention of using an IndexSet here anyway,
-                    // but using .swap_remove() would undermine that goal.
-                    source.borrow_mut().shift_remove(&node_id);
+                    source.borrow_mut().remove(&node_id);
                 }
             }
         }

meta/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_meta"
-version = "0.6.5"
+version = "0.6.0-rc1"
 edition = "2021"
 authors = ["Greg Johnston"]
 license = "MIT"

meta/src/lib.rs

@@ -158,7 +158,7 @@ impl MetaTagsContext {
                     move || {
                         let head = document().head().unwrap_throw();
                         _ = head.remove_child(&el);
-                        els.borrow_mut().swap_remove(&id);
+                        els.borrow_mut().remove(&id);
                     }
                 });
 

router/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_router"
-version = "0.6.5"
+version = "0.6.0-rc1"
 edition = "2021"
 authors = ["Greg Johnston"]
 license = "MIT"

router/src/components/form.rs

@@ -421,7 +421,7 @@ fn current_window_origin() -> String {
 #[component]
 pub fn ActionForm<ServFn>(
     /// The action from which to build the form. This should include a URL, which can be generated
-    /// by default using [`create_server_action`](leptos_server::create_server_action) or added
+    /// by default using [`create_server_action`](l:eptos_server::create_server_action) or added
     /// manually using [`using_server_fn`](leptos_server::Action::using_server_fn).
     action: Action<
         ServFn,
@@ -593,38 +593,21 @@ where
     action_form
 }
 
-fn form_data_from_event(
-    ev: &SubmitEvent,
-) -> Result<FormData, FromFormDataError> {
-    let submitter = ev.submitter();
-    let mut submitter_name_value = None;
-    let opt_form = match &submitter {
+fn form_from_event(ev: &SubmitEvent) -> Option<HtmlFormElement> {
+    let submitter = ev.unchecked_ref::<SubmitEvent>().submitter();
+    match &submitter {
         Some(el) => {
             if let Some(form) = el.dyn_ref::<HtmlFormElement>() {
                 Some(form.clone())
-            } else if let Some(input) = el.dyn_ref::<HtmlInputElement>() {
-                submitter_name_value = Some((input.name(), input.value()));
-                Some(ev.target().unwrap().unchecked_into())
-            } else if let Some(button) = el.dyn_ref::<HtmlButtonElement>() {
-                submitter_name_value = Some((button.name(), button.value()));
+            } else if el.is_instance_of::<HtmlInputElement>()
+                || el.is_instance_of::<HtmlButtonElement>()
+            {
                 Some(ev.target().unwrap().unchecked_into())
             } else {
                 None
             }
         }
         None => ev.target().map(|form| form.unchecked_into()),
-    };
-    match opt_form.as_ref().map(FormData::new_with_form) {
-        None => Err(FromFormDataError::MissingForm(ev.clone().into())),
-        Some(Err(e)) => Err(FromFormDataError::FormData(e)),
-        Some(Ok(form_data)) => {
-            if let Some((name, value)) = submitter_name_value {
-                form_data
-                    .append_with_str(&name, &value)
-                    .map_err(FromFormDataError::FormData)?;
-            }
-            Ok(form_data)
-        }
     }
 }
 
@@ -772,8 +755,10 @@ where
         tracing::instrument(level = "trace", skip_all,)
     )]
     fn from_event(ev: &Event) -> Result<Self, FromFormDataError> {
-        let submit_ev = ev.unchecked_ref();
-        let form_data = form_data_from_event(submit_ev)?;
+        let form = form_from_event(ev.unchecked_ref())
+            .ok_or_else(|| FromFormDataError::MissingForm(ev.clone()))?;
+        let form_data = FormData::new_with_form(&form)
+            .map_err(FromFormDataError::FormData)?;
         Self::from_form_data(&form_data)
             .map_err(FromFormDataError::Deserialization)
     }

router/src/history/params.rs

@@ -30,8 +30,6 @@ impl ParamsMap {
     /// Inserts a value into the map.
     #[inline(always)]
     pub fn insert(&mut self, key: String, value: String) -> Option<String> {
-        use crate::history::url::unescape;
-        let value = unescape(&value);
         self.0.insert(key, value)
     }
 
@@ -78,14 +76,12 @@ impl Default for ParamsMap {
 ///
 /// ```
 /// # use leptos_router::params_map;
-/// # #[cfg(feature = "ssr")] {
 /// let map = params_map! {
 ///     "crate" => "leptos",
 ///     42 => true, // where key & val: core::fmt::Display
 /// };
 /// assert_eq!(map.get("crate"), Some(&"leptos".to_string()));
 /// assert_eq!(map.get("42"), Some(&true.to_string()))
-/// # }
 /// ```
 // Original implementation included the below credits.
 //

router/src/history/url.rs

@@ -15,14 +15,6 @@ pub struct Url {
     pub hash: String,
 }
 
-#[cfg(feature = "ssr")]
-pub fn unescape(s: &str) -> String {
-    percent_encoding::percent_decode_str(s)
-        .decode_utf8()
-        .unwrap()
-        .to_string()
-}
-
 #[cfg(not(feature = "ssr"))]
 pub fn unescape(s: &str) -> String {
     js_sys::decode_uri(s).unwrap().into()

router/tests/matcher.rs

@@ -42,21 +42,6 @@ cfg_if! {
             );
         }
 
-        #[test]
-        fn create_matcher_should_build_params_collection_and_decode() {
-            let matcher = Matcher::new("/foo/:id");
-            let matched = matcher.test("/foo/%E2%89%A1abc%20123");
-            assert_eq!(
-                matched,
-                Some(PathMatch {
-                    path: "/foo/%E2%89%A1abc%20123".into(),
-                    params: params_map!(
-                        "id" => "≡abc 123"
-                    )
-                })
-            );
-        }
-
         #[test]
         fn create_matcher_should_match_past_end_when_ending_in_asterisk() {
             let matcher = Matcher::new("/foo/bar/*");

rustfmt.toml

@@ -1,4 +1,3 @@
-edition = "2021"
 imports_granularity = "Crate"
 max_width = 80
 format_strings = true

server_fn/Cargo.toml

@@ -2,14 +2,14 @@
 name = "server_fn"
 version = { workspace = true }
 edition = "2021"
-authors = ["Greg Johnston", "Ben Wishovich"]
+authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "RPC for any web framework."
 readme = "../README.md"
 
 [dependencies]
-server_fn_macro_default = { workspace = true }
+server_fn_macro_default = "0.6.0-rc1"
 # used for hashing paths in #[server] macro
 const_format = "0.2"
 xxhash-rust = { version = "0.8", features = ["const_xxh64"] }
@@ -18,7 +18,7 @@ serde = { version = "1", features = ["derive"] }
 send_wrapper = { version = "0.6", features = ["futures"], optional = true }
 
 # registration system
-inventory = { version = "0.3", optional = true }
+inventory = {version="0.3",optional=true}
 dashmap = "5"
 once_cell = "1"
 
@@ -27,7 +27,7 @@ once_cell = "1"
 actix-web = { version = "4", optional = true }
 
 # axum
-axum = { version = "0.7", optional = true, default-features = false, features = ["multipart"] }
+axum = { version = "0.7", optional = true, features = ["multipart"] }
 tower = { version = "0.4", optional = true }
 tower-layer = { version = "0.3", optional = true }
 
@@ -72,21 +72,17 @@ reqwest = { version = "0.11", default-features = false, optional = true, feature
 url = "2"
 
 [features]
-default = ["json", "cbor"]
+default = [ "json", "cbor"]
 form-redirects = []
 actix = ["ssr", "dep:actix-web", "dep:send_wrapper"]
-axum-no-default = [
-  "ssr",
+axum = [
+  "ssr", 
   "dep:axum",
   "dep:hyper",
   "dep:http-body-util",
   "dep:tower",
   "dep:tower-layer",
 ]
-axum = [
-  "axum/default",
-  "axum-no-default",
-]
 browser = [
   "dep:gloo-net",
   "dep:js-sys",
@@ -113,21 +109,4 @@ all-features = true
 # disables some feature combos for testing in CI
 [package.metadata.cargo-all-features]
 denylist = ["rustls", "default-tls", "form-redirects"]
-skip_feature_sets = [
-  [
-    "actix",
-    "axum",
-  ],
-  [
-    "browser",
-    "actix",
-  ],
-  [
-    "browser",
-    "axum",
-  ],
-  [
-    "browser",
-    "reqwest",
-  ],
-]
+skip_feature_sets = [["actix", "axum"], ["browser", "actix"], ["browser", "axum"], ["browser", "reqwest"]]

server_fn/src/error.rs

@@ -175,6 +175,7 @@ impl<E> ViaError<E> for WrapError<E> {
 /// This means that other error types can easily be converted into it using the
 /// `?` operator.
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(tag = "type")]
 pub enum ServerFnError<E = NoCustomError> {
     /// A user-defined custom error type, which defaults to [`NoCustomError`].
     WrappedServerError(E),

server_fn/src/lib.rs

@@ -117,7 +117,7 @@ pub mod response;
 #[cfg(feature = "actix")]
 #[doc(hidden)]
 pub use ::actix_web as actix_export;
-#[cfg(feature = "axum-no-default")]
+#[cfg(feature = "axum")]
 #[doc(hidden)]
 pub use ::axum as axum_export;
 use client::Client;
@@ -456,7 +456,7 @@ impl<Req: 'static, Res: 'static> inventory::Collect
 }
 
 /// Axum integration.
-#[cfg(feature = "axum-no-default")]
+#[cfg(feature = "axum")]
 pub mod axum {
     use crate::{
         middleware::{BoxedService, Service},

server_fn/src/middleware/mod.rs

@@ -26,7 +26,7 @@ pub trait Service<Request, Response> {
     ) -> Pin<Box<dyn Future<Output = Response> + Send>>;
 }
 
-#[cfg(feature = "axum-no-default")]
+#[cfg(feature = "axum")]
 mod axum {
     use super::{BoxedService, Service};
     use crate::{response::Res, ServerFnError};

server_fn/src/request/browser.rs

@@ -5,7 +5,6 @@ use futures::{Stream, StreamExt};
 pub use gloo_net::http::Request;
 use js_sys::{Reflect, Uint8Array};
 use send_wrapper::SendWrapper;
-use std::ops::{Deref, DerefMut};
 use wasm_bindgen::JsValue;
 use wasm_streams::ReadableStream;
 use web_sys::{FormData, Headers, RequestInit, UrlSearchParams};
@@ -20,32 +19,6 @@ impl From<Request> for BrowserRequest {
     }
 }
 
-impl From<BrowserRequest> for Request {
-    fn from(value: BrowserRequest) -> Self {
-        value.0.take()
-    }
-}
-
-impl From<BrowserRequest> for web_sys::Request {
-    fn from(value: BrowserRequest) -> Self {
-        value.0.take().into()
-    }
-}
-
-impl Deref for BrowserRequest {
-    type Target = Request;
-
-    fn deref(&self) -> &Self::Target {
-        self.0.deref()
-    }
-}
-
-impl DerefMut for BrowserRequest {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        self.0.deref_mut()
-    }
-}
-
 /// The `FormData` type available in the browser.
 #[derive(Debug)]
 pub struct BrowserFormData(pub(crate) SendWrapper<FormData>);

server_fn/src/request/mod.rs

@@ -7,7 +7,7 @@ use std::{borrow::Cow, future::Future};
 #[cfg(feature = "actix")]
 pub mod actix;
 /// Request types for Axum.
-#[cfg(feature = "axum-no-default")]
+#[cfg(feature = "axum")]
 pub mod axum;
 /// Request types for the browser.
 #[cfg(feature = "browser")]

server_fn/src/request/spin.rs

@@ -1,62 +0,0 @@
-use crate::{error::ServerFnError, request::Req};
-use axum::body::{Body, Bytes};
-use futures::{Stream, StreamExt};
-use http::{
-    header::{ACCEPT, CONTENT_TYPE, REFERER},
-    Request,
-};
-use http_body_util::BodyExt;
-use std::borrow::Cow;
-
-impl<CustErr> Req<CustErr> for IncomingRequest
-where
-    CustErr: 'static,
-{
-    fn as_query(&self) -> Option<&str> {
-        self.uri().query()
-    }
-
-    fn to_content_type(&self) -> Option<Cow<'_, str>> {
-        self.headers()
-            .get(CONTENT_TYPE)
-            .map(|h| String::from_utf8_lossy(h.as_bytes()))
-    }
-
-    fn accepts(&self) -> Option<Cow<'_, str>> {
-        self.headers()
-            .get(ACCEPT)
-            .map(|h| String::from_utf8_lossy(h.as_bytes()))
-    }
-
-    fn referer(&self) -> Option<Cow<'_, str>> {
-        self.headers()
-            .get(REFERER)
-            .map(|h| String::from_utf8_lossy(h.as_bytes()))
-    }
-
-    async fn try_into_bytes(self) -> Result<Bytes, ServerFnError<CustErr>> {
-        let (_parts, body) = self.into_parts();
-
-        body.collect()
-            .await
-            .map(|c| c.to_bytes())
-            .map_err(|e| ServerFnError::Deserialization(e.to_string()))
-    }
-
-    async fn try_into_string(self) -> Result<String, ServerFnError<CustErr>> {
-        let bytes = self.try_into_bytes().await?;
-        String::from_utf8(bytes.to_vec())
-            .map_err(|e| ServerFnError::Deserialization(e.to_string()))
-    }
-
-    fn try_into_stream(
-        self,
-    ) -> Result<
-        impl Stream<Item = Result<Bytes, ServerFnError>> + Send + 'static,
-        ServerFnError<CustErr>,
-    > {
-        Ok(self.into_body().into_data_stream().map(|chunk| {
-            chunk.map_err(|e| ServerFnError::Deserialization(e.to_string()))
-        }))
-    }
-}

server_fn/src/response/mod.rs

@@ -5,7 +5,7 @@ pub mod actix;
 #[cfg(feature = "browser")]
 pub mod browser;
 /// Response types for Axum.
-#[cfg(feature = "axum-no-default")]
+#[cfg(feature = "axum")]
 pub mod http;
 /// Response types for [`reqwest`].
 #[cfg(feature = "reqwest")]

server_fn_macro/src/lib.rs

@@ -55,54 +55,6 @@ pub fn server_macro_impl(
         }
     });
 
-    let fields = body
-        .inputs
-        .iter_mut()
-        .map(|f| {
-            let typed_arg = match f {
-                FnArg::Receiver(_) => {
-                    return Err(syn::Error::new(
-                        f.span(),
-                        "cannot use receiver types in server function macro",
-                    ))
-                }
-                FnArg::Typed(t) => t,
-            };
-
-            // strip `mut`, which is allowed in fn args but not in struct fields
-            if let Pat::Ident(ident) = &mut *typed_arg.pat {
-                ident.mutability = None;
-            }
-
-            // allow #[server(default)] on fields
-            let mut default = false;
-            let mut other_attrs = Vec::new();
-            for attr in typed_arg.attrs.iter() {
-                if !attr.path().is_ident("server") {
-                    other_attrs.push(attr.clone());
-                    continue;
-                }
-                attr.parse_nested_meta(|meta| {
-                    if meta.path.is_ident("default") && meta.input.is_empty() {
-                        default = true;
-                        Ok(())
-                    } else {
-                        Err(meta.error(
-                            "Unrecognized #[server] attribute, expected \
-                             #[server(default)]",
-                        ))
-                    }
-                })?;
-            }
-            typed_arg.attrs = other_attrs;
-            if default {
-                Ok(quote! { #[serde(default)] pub #typed_arg })
-            } else {
-                Ok(quote! { pub #typed_arg })
-            }
-        })
-        .collect::<Result<Vec<_>>>()?;
-
     let dummy = body.to_dummy_output();
     let dummy_name = body.to_dummy_ident();
     let args = syn::parse::<ServerFnArgs>(args.into())?;
@@ -178,11 +130,60 @@ pub fn server_macro_impl(
         };
 
     // build struct for type
+    let mut body = body;
     let fn_name = &body.ident;
     let fn_name_as_str = body.ident.to_string();
     let vis = body.vis;
     let attrs = body.attrs;
 
+    let fields = body
+        .inputs
+        .iter_mut()
+        .map(|f| {
+            let typed_arg = match f {
+                FnArg::Receiver(_) => {
+                    return Err(syn::Error::new(
+                        f.span(),
+                        "cannot use receiver types in server function macro",
+                    ))
+                }
+                FnArg::Typed(t) => t,
+            };
+
+            // strip `mut`, which is allowed in fn args but not in struct fields
+            if let Pat::Ident(ident) = &mut *typed_arg.pat {
+                ident.mutability = None;
+            }
+
+            // allow #[server(default)] on fields — TODO is this documented?
+            let mut default = false;
+            let mut other_attrs = Vec::new();
+            for attr in typed_arg.attrs.iter() {
+                if !attr.path().is_ident("server") {
+                    other_attrs.push(attr.clone());
+                    continue;
+                }
+                attr.parse_nested_meta(|meta| {
+                    if meta.path.is_ident("default") && meta.input.is_empty() {
+                        default = true;
+                        Ok(())
+                    } else {
+                        Err(meta.error(
+                            "Unrecognized #[server] attribute, expected \
+                             #[server(default)]",
+                        ))
+                    }
+                })?;
+            }
+            typed_arg.attrs = other_attrs;
+            if default {
+                Ok(quote! { #[serde(default)] pub #typed_arg })
+            } else {
+                Ok(quote! { pub #typed_arg })
+            }
+        })
+        .collect::<Result<Vec<_>>>()?;
+
     let fn_args = body
         .inputs
         .iter()
@@ -434,7 +435,7 @@ pub fn server_macro_impl(
         quote! {
             #server_fn_path::request::BrowserMockReq
         }
-    } else if cfg!(feature = "axum-no-default") {
+    } else if cfg!(feature = "axum") {
         quote! {
             #server_fn_path::axum_export::http::Request<#server_fn_path::axum_export::body::Body>
         }
@@ -458,7 +459,7 @@ pub fn server_macro_impl(
         quote! {
             #server_fn_path::response::BrowserMockRes
         }
-    } else if cfg!(feature = "axum-no-default") {
+    } else if cfg!(feature = "axum") {
         quote! {
             #server_fn_path::axum_export::http::Response<#server_fn_path::axum_export::body::Body>
         }
@@ -636,20 +637,18 @@ fn err_type(return_ty: &Type) -> Result<Option<&GenericArgument>> {
                 else if let GenericArgument::Type(Type::Path(pat)) =
                     &args.args[1]
                 {
-                    if let Some(segment) = pat.path.segments.last() {
-                        if segment.ident == "ServerFnError" {
-                            let args = &pat.path.segments[0].arguments;
-                            match args {
-                                // Result<T, ServerFnError>
-                                PathArguments::None => return Ok(None),
-                                // Result<T, ServerFnError<E>>
-                                PathArguments::AngleBracketed(args) => {
-                                    if args.args.len() == 1 {
-                                        return Ok(Some(&args.args[0]));
-                                    }
+                    if pat.path.segments[0].ident == "ServerFnError" {
+                        let args = &pat.path.segments[0].arguments;
+                        match args {
+                            // Result<T, ServerFnError>
+                            PathArguments::None => return Ok(None),
+                            // Result<T, ServerFnError<E>>
+                            PathArguments::AngleBracketed(args) => {
+                                if args.args.len() == 1 {
+                                    return Ok(Some(&args.args[0]));
                                 }
-                                _ => {}
                             }
+                            _ => {}
                         }
                     }
                 }