fix: closing element names wrong for svg::, math::, and use_ (closes #1403)

CONTRIBUTING.md

@@ -70,25 +70,6 @@ are a few guidelines that will make it a better experience for everyone:
   `cargo-make` and using `cargo make check && cargo make test && cargo make
 check-examples`.
 
-## Before Submitting a PR
-
-We have a fairly extensive CI setup that runs both lints (like `rustfmt` and `clippy`) 
-and tests on PRs. You can run most of these locally if you have `cargo-make` installed.
-
-If you added an example, make sure to add it to the list in `examples/Makefile.toml`.
-
-From the root directory of the repo, run 
-- `cargo +nightly fmt`
-- `cargo +nightly make check`
-- `cargo +nightly make test`
-- `cargo +nightly make check-examples`
-- `cargo +nightly make --profile=github-actions ci`
-
-If you modified an example:
-- `cd examples/your_example`
-- `cargo +nightly fmt -- --config-path ../..`
-- `cargo +nightly make --profile=github-actions verify-flow`
-
 ## Architecture
 
 See [ARCHITECTURE.md](./ARCHITECTURE.md).

Cargo.toml

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

Makefile.toml

@@ -20,18 +20,6 @@ cwd = "examples"
 command = "cargo"
 args = ["make", "ci-clean"]
 
-[tasks.check-examples]
-workspace = false
-cwd = "examples"
-command = "cargo"
-args = ["make", "check-clean"]
-
-[tasks.build-examples]
-workspace = false
-cwd = "examples"
-command = "cargo"
-args = ["make", "build-clean"]
-
 [tasks.clean-examples]
 workspace = false
 cwd = "examples"

docs/book/src/router/16_routes.md

@@ -24,7 +24,7 @@ use leptos_router::*;
 
 Routing behavior is provided by the [`<Router/>`](https://docs.rs/leptos_router/latest/leptos_router/fn.Router.html) component. This should usually be somewhere near the root of your application, the rest of the app.
 
-> You shouldn’t try to use multiple `<Router/>`s in your app. Remember that the router drives global state: if you have multiple routers, which one decides what to do when the URL changes?
+> You shouldn’t try to use multiple `<Router/>`s in your app. Remember that the router drives global state: if you have multiple routers, which ones decides what to do when the URL changes?
 
 Let’s start with a simple `<App/>` component using the router:
 
@@ -87,17 +87,15 @@ The `view` is a function that takes a `Scope` and returns a view.
 
 ```rust
 <Routes>
-  <Route path="/" view=Home/>
-  <Route path="/users" view=Users/>
-  <Route path="/users/:id" view=UserProfile/>
-  <Route path="/*any" view=NotFound/>
+  <Route path="/" view=|cx| view! { cx, <Home/> }/>
+  <Route path="/users" view=|cx| view! { cx, <Users/> }/>
+  <Route path="/users/:id" view=|cx| view! { cx, <UserProfile/> }/>
+  <Route path="/*any" view=|cx| view! { cx, <NotFound/> }/>
 </Routes>
 ```
 
-> `view` takes a `Fn(Scope) -> impl IntoView`. If a component has no props, it is a function that takes `Scope` and returns `impl IntoView`, so it can be passed directly into the `view`. In this case, `view=Home` is just a shorthand for `|cx| view! { cx, <Home/> }`.
+> The router scores each route to see how good a match it is, so you can define your routes in any order.
 
 Now if you navigate to `/` or to `/users` you’ll get the home page or the `<Users/>`. If you go to `/users/3` or `/blahblah` you’ll get a user profile or your 404 page (`<NotFound/>`). On every navigation, the router determines which `<Route/>` should be matched, and therefore what content should be displayed where the `<Routes/>` component is defined.
 
-Note that you can define your routes in any order. The router scores each route to see how good a match it is, rather than simply trying to match them top to bottom.
-
 Simple enough?

docs/book/src/router/17_nested_routing.md

@@ -4,10 +4,10 @@ We just defined the following set of routes:
 
 ```rust
 <Routes>
-  <Route path="/" view=Home/>
-  <Route path="/users" view=Users/>
-  <Route path="/users/:id" view=UserProfile/>
-  <Route path="/*any" view=NotFound/>
+  <Route path="/" view=|cx| view! { cx, <Home /> }/>
+  <Route path="/users" view=|cx| view! { cx, <Users /> }/>
+  <Route path="/users/:id" view=|cx| view! { cx, <UserProfile /> }/>
+  <Route path="/*any" view=|cx| view! { cx, <NotFound /> }/>
 </Routes>
 ```
 
@@ -17,11 +17,11 @@ Well... you can!
 
 ```rust
 <Routes>
-  <Route path="/" view=Home/>
-  <Route path="/users" view=Users>
-    <Route path=":id" view=UserProfile/>
+  <Route path="/" view=|cx| view! { cx, <Home /> }/>
+  <Route path="/users" view=|cx| view! { cx, <Users /> }>
+    <Route path=":id" view=|cx| view! { cx, <UserProfile /> }/>
   </Route>
-  <Route path="/*any" view=NotFound/>
+  <Route path="/*any" view=|cx| view! { cx, <NotFound /> }/>
 </Routes>
 ```
 
@@ -39,8 +39,8 @@ Let’s look back at our practical example.
 
 ```rust
 <Routes>
-  <Route path="/users" view=Users/>
-  <Route path="/users/:id" view=UserProfile/>
+  <Route path="/users" view=|cx| view! { cx, <Users /> }/>
+  <Route path="/users/:id" view=|cx| view! { cx, <UserProfile /> }/>
 </Routes>
 ```
 
@@ -53,8 +53,8 @@ Let’s say I use nested routes instead:
 
 ```rust
 <Routes>
-  <Route path="/users" view=Users>
-    <Route path=":id" view=UserProfile/>
+  <Route path="/users" view=|cx| view! { cx, <Users /> }>
+    <Route path=":id" view=|cx| view! { cx, <UserProfile /> }/>
   </Route>
 </Routes>
 ```
@@ -68,9 +68,9 @@ I actually need to add a fallback route
 
 ```rust
 <Routes>
-  <Route path="/users" view=Users>
-    <Route path=":id" view=UserProfile/>
-    <Route path="" view=NoUser/>
+  <Route path="/users" view=|cx| view! { cx, <Users /> }>
+    <Route path=":id" view=|cx| view! { cx, <UserProfile /> }/>
+    <Route path="" view=|cx| view! { cx, <NoUser /> }/>
   </Route>
 </Routes>
 ```
@@ -94,8 +94,8 @@ You can easily define this with nested routes
 
 ```rust
 <Routes>
-  <Route path="/contacts" view=ContactList>
-    <Route path=":id" view=ContactInfo/>
+  <Route path="/contacts" view=|cx| view! { cx, <ContactList/> }>
+    <Route path=":id" view=|cx| view! { cx, <ContactInfo/> }/>
     <Route path="" view=|cx| view! { cx,
       <p>"Select a contact to view more info."</p>
     }/>
@@ -107,11 +107,11 @@ You can go even deeper. Say you want to have tabs for each contact’s address,
 
 ```rust
 <Routes>
-  <Route path="/contacts" view=ContactList>
-    <Route path=":id" view=ContactInfo>
-      <Route path="" view=EmailAndPhone/>
-      <Route path="address" view=Address/>
-      <Route path="messages" view=Messages/>
+  <Route path="/contacts" view=|cx| view! { cx, <ContactList/> }>
+    <Route path=":id" view=|cx| view! { cx, <ContactInfo/> }>
+      <Route path="" view=|cx| view! { cx, <EmailAndPhone/> }/>
+      <Route path="address" view=|cx| view! { cx, <Address/> }/>
+      <Route path="messages" view=|cx| view! { cx, <Messages/> }/>
     </Route>
     <Route path="" view=|cx| view! { cx,
       <p>"Select a contact to view more info."</p>
@@ -201,9 +201,12 @@ fn App(cx: Scope) -> impl IntoView {
                     // /contacts has nested routes
                     <Route
                         path="/contacts"
-                        view=ContactList
+                        view=|cx| view! { cx, <ContactList/> }
+                    >
                         // if no id specified, fall back
-                        <Route path=":id" view=ContactInfo>
+                        <Route path=":id" view=|cx| view! { cx,
+                            <ContactInfo/>
+                        }>
                             <Route path="" view=|cx| view! { cx,
                                 <div class="tab">
                                     "(Contact Info)"

docs/book/src/router/18_params_and_queries.md

@@ -36,14 +36,6 @@ struct ContactSearch {
 ```
 
 > Note: The `Params` derive macro is located at `leptos::Params`, and the `Params` trait is at `leptos_router::Params`. If you avoid using glob imports like `use leptos::*;`, make sure you’re importing the right one for the derive macro.
->
-> If you are not using the `nightly` feature, you will get the error
->
-> ```
-> no function or associated item named `into_param` found for struct `std::string::String` in the current scope
-> ```
->
-> At the moment, supporting both `T: FromStr` and `Option<T>` for typed params requires a nightly feature. You can fix this by simply changing the struct to use `q: Option<String>` instead of `q: String`.
 
 Now we can use them in a component. Imagine a URL that has both params and a query, like `/contacts/:id?q=Search`.
 
@@ -116,10 +108,12 @@ fn App(cx: Scope) -> impl IntoView {
                     // /contacts has nested routes
                     <Route
                         path="/contacts"
-                        view=ContactList
+                        view=|cx| view! { cx, <ContactList/> }
                     >
                         // if no id specified, fall back
-                        <Route path=":id" view=ContactInfo>
+                        <Route path=":id" view=|cx| view! { cx,
+                            <ContactInfo/>
+                        }>
                             <Route path="" view=|cx| view! { cx,
                                 <div class="tab">
                                     "(Contact Info)"

docs/book/src/router/19_a.md

@@ -11,8 +11,6 @@ The router will bail out of handling an `<a>` click under a number of situations
 
 In other words, the router will only try to do a client-side navigation when it’s pretty sure it can handle it, and it will upgrade every `<a>` element to get this special behavior.
 
-> This also means that if you need to opt out of client-side routing, you can do so easily. For example, if you have a link to another page on the same domain, but which isn’t part of your Leptos app, you can just use `<a rel="external">` to tell the router it isn’t something it can handle.
-
 The router also provides an [`<A>`](https://docs.rs/leptos_router/latest/leptos_router/fn.A.html) component, which does two additional things:
 
 1. Correctly resolves relative nested routes. Relative routing with ordinary `<a>` tags can be tricky. For example, if you have a route like `/post/:id`, `<A href="1">` will generate the correct relative route, but `<a href="1">` likely will not (depending on where it appears in your view.) `<A/>` resolves routes relative to the path of the nested route within which it appears.
@@ -54,10 +52,12 @@ fn App(cx: Scope) -> impl IntoView {
                     // /contacts has nested routes
                     <Route
                         path="/contacts"
-                        view=ContactList
+                        view=|cx| view! { cx, <ContactList/> }
                     >
                         // if no id specified, fall back
-                        <Route path=":id" view=ContactInfo>
+                        <Route path=":id" view=|cx| view! { cx,
+                            <ContactInfo/>
+                        }>
                             <Route path="" view=|cx| view! { cx,
                                 <div class="tab">
                                     "(Contact Info)"

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

@@ -80,7 +80,7 @@ fn App(cx: Scope) -> impl IntoView {
             <h1><code>"<Form/>"</code></h1>
             <main>
                 <Routes>
-                    <Route path="" view=FormExample/>
+                    <Route path="" view=|cx| view! { cx, <FormExample/> }/>
                 </Routes>
             </main>
         </Router>

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

@@ -113,7 +113,7 @@ Server functions are a cool technology, but it’s very important to remember. *
 
 So far, everything I’ve said is actually framework agnostic. (And in fact, the Leptos server function crate has been integrated into Dioxus as well!) Server functions are simply a way of defining a function-like RPC call that leans on Web standards like HTTP requests and URL encoding.
 
-But in a way, they also provide the last missing primitive in our story so far. Because a server function is just a plain Rust async function, it integrates perfectly with the async Leptos primitives we discussed [earlier](https://leptos-rs.github.io/leptos/async/index.html). So you can easily integrate your server functions with the rest of your applications:
+But in a way, they also provide the last missing primitive in our story so far. Because a server function is just a plain Rust async function, it integrates perfectly with the async Leptos primitives we discussed [earlier](../async/README.md). So you can easily integrate your server functions with the rest of your applications:
 
 - Create **resources** that call the server function to load data from the server
 - Read these resources under `<Suspense/>` or `<Transition/>` to enable streaming SSR and fallback states while data loads.

docs/book/src/server/26_extractors.md

@@ -6,9 +6,9 @@ The server functions we looked at in the last chapter showed how to run code on
 
 We call Leptos a “full-stack” framework, but “full-stack” is always a misnomer (after all, it never means everything from the browser to your power company.) For us, “full stack” means that your Leptos app can run in the browser, and can run on the server, and can integrate the two, drawing together the unique features available in each; as we’ve seen in the book so far, a button click on the browser can drive a database read on the server, both written in the same Rust module. But Leptos itself doesn’t provide the server (or the database, or the operating system, or the firmware, or the electrical cables...)
 
-Instead, Leptos provides integrations for the two most popular Rust web server frameworks, Actix Web ([`leptos_actix`](https://docs.rs/leptos_actix/latest/leptos_actix/)) and Axum ([`leptos_axum`](https://docs.rs/leptos_axum/latest/leptos_axum/)). We’ve built integrations with each server’s router so that you can simply plug your Leptos app into an existing server with `.leptos_routes()`, and easily handle server function calls.
+Instead, Leptos provides integrations for the two most popular Rust web server frameworks, Actix Web ([`leptos_actix`](https://docs.rs/leptos_actix/latest/leptos_actix/)) and Axum ([`leptos_axum`](https://docs.rs/leptos_actix/latest/leptos_axum/)). We’ve built integrations with each server’s router so that you can simply plug your Leptos app into an existing server with `.leptos_routes()`, and easily handle server function calls.
 
-> If you haven’t seen our [Actix](https://github.com/leptos-rs/start) and [Axum](https://github.com/leptos-rs/start-axum) templates, now’s a good time to check them out.
+> If haven’t seen our [Actix](https://github.com/leptos-rs/start) and [Axum](https://github.com/leptos-rs/start-axum) templates, now’s a good time to check them out.
 
 ## Using Extractors
 
@@ -43,7 +43,7 @@ pub async fn actix_extract(cx: Scope) -> Result<String, ServerFnError> {
 
 ## Axum Extractors
 
-The syntax for the [`leptos_axum::extract`](https://docs.rs/leptos_axum/latest/leptos_axum/fn.extract.html) function is very similar. (**Note**: This is available on the git main branch, but has not been released as of writing.) Note that Axum extractors return a `Result`, so you’ll need to add something to handle the error case.
+The syntax for the `leptos_axum::extract` function is very similar. (**Note**: This is available on the git main branch, but has not been released as of writing.) Note that Axum extractors return a `Result`, so you’ll need to add something to handle the error case.
 
 ```rust
 #[server(AxumExtract, "/api")]

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

@@ -8,12 +8,7 @@ If you’ve ever listened to streaming music or watched a video online, I’m su
 
 Let me say a little more about what I mean.
 
-Leptos supports all four different modes of rendering HTML that includes asynchronous data:
-
-1. [Synchronous Rendering](#synchronous-rendering)
-1. [Async Rendering](#async-rendering)
-1. [In-Order streaming](#in-order-streaming)
-1. [Out-of-Order Streaming](#out-of-order-streaming)
+Leptos supports all four different of these different ways to render HTML that includes asynchronous data.
 
 ## Synchronous Rendering
 
@@ -69,7 +64,7 @@ If you’re using server-side rendering, the synchronous mode is almost never wh
 
 5. **Partially-blocked streaming**: “Partially-blocked” streaming is useful when you have multiple separate `<Suspense/>` components on the page. If one of them reads from one or more “blocking resources” (see below), the fallback will not be sent; rather, the server will wait until that `<Suspense/>` has resolved and then replace the fallback with the resolved fragment on the server, which means that it is included in the initial HTML response and appears even if JavaScript is disabled or not supported. Other `<Suspense/>` stream in out of order as usual.
 
-This is useful when you have multiple `<Suspense/>` on the page, and one is more important than the other: think of a blog post and comments, or product information and reviews. It is _not_ useful if there’s only one `<Suspense/>`, or if every `<Suspense/>` reads from blocking resources. In those cases it is a slower form of `async` rendering.
+This is useful when you have multiple `<Suspense/>` on the page, and one is more important than the other: think of a blog post and comments, or product information and reviews. It is *not* useful if there’s only one `<Suspense/>`, or if every `<Suspense/>` reads from blocking resources. In those cases it is a slower form of `async` rendering.
 
 - _Pros_: Works if JavaScript is disabled or not supported on the user’s device.
 - _Cons_
@@ -84,13 +79,13 @@ Because it offers the best blend of performance characteristics, Leptos defaults
 ```rust
 <Routes>
 	// We’ll load the home page with out-of-order streaming and <Suspense/>
-	<Route path="" view=HomePage
+	<Route path="" view=|cx| view! { cx, <HomePage/> }/>
 
 	// We'll load the posts with async rendering, so they can set
 	// the title and metadata *after* loading the data
 	<Route
 		path="/post/:id"
-		view=Post
+		view=|cx| view! { cx, <Post/> }
 		ssr=SsrMode::Async
 	/>
 </Routes>

docs/book/src/view/01_basic_component.md

@@ -139,7 +139,7 @@ view! { cx,
 Remember—and this is _very important_—only functions are reactive. This means that
 `{count}` and `{count()}` do very different things in your view. `{count}` passes
 in a function, telling the framework to update the view every time `count` changes.
-`{count()}` accesses the value of `count` once, and passes an `i32` into the view,
+`{count()}` access the value of `count` once, and passes an `i32` into the view,
 rendering it once, unreactively. You can see the difference in the CodeSandbox below!
 
 Let’s make one final change. `set_count(3)` is a pretty useless thing for a click handler to do. Let’s replace “set this value to 3” with “increment this value by 1”:

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

@@ -219,25 +219,9 @@ where
 This is a perfectly reasonable way to write this component: `progress` now takes
 any value that implements this `Fn()` trait.
 
-This generic can also be specified inline:
-
-```rust
-#[component]
-fn ProgressBar<F: Fn() -> i32 + 'static>(
-    cx: Scope,
-    #[prop(default = 100)] max: u16,
-    progress: F,
-) -> impl IntoView {
-    view! { cx,
-        <progress
-            max=max
-            value=progress
-        />
-    }
-}
-```
-
-> Note that generic component props _can’t_ be specified with an `impl` yet (`progress: impl Fn() -> i32 + 'static,`), in part because they’re actually used to generate a `struct ProgressBarProps`, and struct fields cannot be `impl` types. The `#[component]` macro may be further improved in the future to allow inline `impl` generic props.
+> Note that generic component props _cannot_ be specified inline (as `<F: Fn() -> i32>`)
+> or as `progress: impl Fn() -> i32 + 'static,`, in part because they’re actually used to generate
+> a `struct ProgressBarProps`, and struct fields cannot be `impl` types.
 
 ### `into` Props
 
@@ -287,81 +271,6 @@ fn App(cx: Scope) -> impl IntoView {
 }
 ```
 
-### Optional Generic Props
-
-Note that you can’t specify optional generic props for a component. Let’s see what would happen if you try:
-
-```rust,compile_fail
-#[component]
-fn ProgressBar<F: Fn() -> i32 + 'static>(
-    cx: Scope,
-    #[prop(optional)] progress: Option<F>,
-) -> impl IntoView {
-    progress.map(|progress| {
-        view! { cx,
-            <progress
-                max=100
-                value=progress
-            />
-        }
-    })
-}
-
-#[component]
-pub fn App(cx: Scope) -> impl IntoView {
-    view! { cx,
-        <ProgressBar/>
-    }
-}
-```
-
-Rust helpfully gives the error
-
-```
-xx |         <ProgressBar/>
-   |          ^^^^^^^^^^^ cannot infer type of the type parameter `F` declared on the function `ProgressBar`
-   |
-help: consider specifying the generic argument
-   |
-xx |         <ProgressBar::<F>/>
-   |                     +++++
-```
-
-There are just two problems:
-
-1. Leptos’s view macro doesn’t support specifying a generic on a component with this turbofish syntax.
-2. Even if you could, specifying the correct type here is not possible; closures and functions in general are unnameable types. The compiler can display them with a shorthand, but you can’t specify them.
-
-However, you can get around this by providing a concrete type using `Box<dyn _>` or `&dyn _`:
-
-```rust
-#[component]
-fn ProgressBar(
-    cx: Scope,
-    #[prop(optional)] progress: Option<Box<dyn Fn() -> i32>>,
-) -> impl IntoView {
-    progress.map(|progress| {
-        view! { cx,
-            <progress
-                max=100
-                value=progress
-            />
-        }
-    })
-}
-
-#[component]
-pub fn App(cx: Scope) -> impl IntoView {
-    view! { cx,
-        <ProgressBar/>
-    }
-}
-```
-
-Because the Rust compiler now knows the concrete type of the prop, and therefore its size in memory even in the `None` case, this compiles fine.
-
-> In this particular case, `&dyn Fn() -> i32` will cause lifetime issues, but in other cases, it may be a possibility.
-
 ## Documenting Components
 
 This is one of the least essential but most important sections of this book.

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

@@ -115,11 +115,11 @@ Calling it like this will create a list:
 
 ```rust
 view! { cx,
-    <WrapsChildren>
+    <WrappedChildren>
         "A"
         "B"
         "C"
-    </WrapsChildren>
+    </WrappedChildren>
 }
 ```
 

examples/Makefile.toml

@@ -5,12 +5,10 @@ CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
 CARGO_MAKE_CARGO_BUILD_TEST_FLAGS = ""
 CARGO_MAKE_WORKSPACE_EMULATION = true
 CARGO_MAKE_CRATE_WORKSPACE_MEMBERS = [
-    "animated_show",
     "counter",
     "counter_isomorphic",
     "counters",
     "counters_stable",
-    "counter_url_query,
     "counter_without_macros",
     "error_boundary",
     "errors_axum",
@@ -47,75 +45,3 @@ grep -v gtk |
 jq -R -s -c 'split("\n")[:-1]')
 echo "CARGO_MAKE_CRATE_WORKSPACE_MEMBERS = $examples"
 '''
-
-[tasks.test-info]
-workspace = false
-description = "report ci test runners for each example - Option [all]"
-script = '''
-BOLD="\e[1m"
-GREEN="\e[0;32m"
-ITALIC="\e[3m"
-YELLOW="\e[0;33m"
-RESET="\e[0m"
-
-echo
-echo "${YELLOW}CI test runners by example...${RESET}"
-echo
-
-examples=$(ls | 
-grep -v README.md | 
-grep -v Makefile.toml | 
-grep -v cargo-make | 
-grep -v gtk |
-sort -u | 
-awk '{print $0 ", "}')
-
-example_root_dir=$(pwd)
-
-for example_dir in $examples
-do
-  clean_name=$(echo $example_dir | sed 's%,%%')
-  cd $clean_name
-
-  c_tests=$(grep -rl --fixed-strings "#[test]" | wc -l)
-  rs_tests=$(grep -rl --fixed-strings "#[rstest]" | wc -l)
-  w_configs=$(grep -rl "\/wasm-test.toml\"" | wc -l)
-  pw_configs=$(grep -rl "\/playwright-test.toml\"" | wc -l)
-  cl_configs=$(grep -rl "\/cargo-leptos-test.toml\"" | wc -l)
-
-  test_runner=
-
-  if [ $c_tests -gt 0 ]; then
-    test_runner="-C"
-  fi
-
-  if [ $rs_tests -gt 0 ]; then
-    test_runner=$test_runner"-R"
-  fi
-
-  if [ $w_configs -gt 0 ]; then
-    test_runner=$test_runner"-W"
-  fi
-
-  if [ $pw_configs -gt 0 ]; then
-    test_runner=$test_runner"-P"
-  fi
-
-  if [ $cl_configs -gt 0 ]; then
-    test_runner=$test_runner"-L"
-  fi
-  
-  if [ ! -z "$1" ]; then
-    # Show all examples
-    echo "$clean_name ${BOLD}${test_runner}${RESET}"
-  elif [ ! -z $test_runner ]; then
-    # Filter out examples that do not run tests in `ci`
-    echo "$clean_name ${BOLD}${test_runner}${RESET}"
-  fi
-
-  cd $example_root_dir
-done
-echo
-echo "${ITALIC}Test Runners: C = Cargo Test, L = Cargo Leptos Test, P = Playwright Test, R = RS Test, W = WASM Test${RESET}"
-echo
-'''

examples/animated_show/Cargo.toml

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

examples/animated_show/Makefile.toml

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

examples/animated_show/README.md

@@ -1,9 +0,0 @@
-# `<AnimatedShow>` combined with CSS animations
-
-This is a very simple example of the `<AnimatedShow>` component.
-
-This component is an extension for the `<Show>` component and it will not take in a fallback, but it will unmount the
-component from the DOM after a given duration. This makes it possible to have really easy unmount animations with just
-CSS.
-
-Just execute `trunk serve` to start the demo.

examples/animated_show/index.html

@@ -1,42 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<link data-trunk rel="rust" data-wasm-opt="z"/>
-		<link data-trunk rel="icon" type="image/ico" href="/public/favicon.ico"/>
-		<style>
-			.hover-me {
-				width: 100px;
-				margin: 1rem;
-				padding: 1rem;
-				text-align: center;
-				cursor: pointer;
-				border: 1px solid grey;
-			}
-			.here-i-am {
-				width: 100px;
-				margin: 1rem;
-				padding: 1rem;
-				text-align: center;
-				color: white;
-				font-weight: bold;
-				background: black;
-			}
-
-			@keyframes fade-in {
-				from { opacity: 0; }
-				to { opacity: 1; }
-			}
-			@keyframes fade-out {
-				from { opacity: 1; }
-				to { opacity: 0; }
-			}
-			.fade-in-1000 {
-				animation: 1000ms fade-in forwards;
-			}
-			.fade-out-1000 {
-				animation: 1000ms fade-out forwards;
-			}
-		</style>
-	</head>
-	<body></body>
-</html>

examples/animated_show/src/lib.rs

@@ -1,34 +0,0 @@
-use core::time::Duration;
-use leptos::*;
-
-#[component]
-pub fn App(cx: Scope) -> impl IntoView {
-    let show = create_rw_signal(cx, false);
-
-    // the CSS classes in this example are just written directly inside the `index.html`
-    view! { cx,
-        <div
-            class="hover-me"
-            on:mouseenter=move |_| show.set(true)
-            on:mouseleave=move |_| show.set(false)
-        >
-            "Hover Me"
-        </div>
-
-        <AnimatedShow
-            when=show
-            // optional CSS class which will be applied if `when == true`
-            show_class="fade-in-1000"
-            // optional CSS class which will be applied if `when == false` and before the
-            // `hide_delay` starts -> makes CSS unmount animations really easy
-            hide_class="fade-out-1000"
-            // the given unmount delay which should match your unmount animation duration
-            hide_delay=Duration::from_millis(1000)
-        >
-            // provide any `Children` inside here
-            <div class="here-i-am">
-                "Here I Am!"
-            </div>
-        </AnimatedShow>
-    }
-}

examples/animated_show/src/main.rs

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

examples/cargo-make/compile.toml

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

examples/cargo-make/main.toml

@@ -1,5 +1,4 @@
 extend = [
-    { path = "../cargo-make/compile.toml" },
     { path = "../cargo-make/clean.toml" },
     { path = "../cargo-make/lint.toml" },
     { path = "../cargo-make/node.toml" },
@@ -10,6 +9,9 @@ extend = [
 [tasks.ci]
 dependencies = ["prepare", "lint", "build", "test-flow", "integration-test"]
 
+[tasks.ci-clean]
+dependencies = ["ci", "clean"]
+
 [tasks.prepare]
 dependencies = ["setup-node"]
 
@@ -18,17 +20,6 @@ dependencies = ["check-style"]
 
 [tasks.integration-test]
 
-# Support Local Runs
-
-[tasks.ci-clean]
-dependencies = ["ci", "clean"]
-
-[tasks.check-clean]
-dependencies = ["check", "clean"]
-
-[tasks.build-clean]
-dependencies = ["build", "clean"]
-
 # ALIASES
 
 [tasks.verify-flow]

examples/counter/Makefile.toml

@@ -2,3 +2,13 @@ extend = [
     { path = "../cargo-make/main.toml" },
     { path = "../cargo-make/wasm-test.toml" },
 ]
+
+[tasks.build]
+command = "cargo"
+args = ["+nightly", "build-all-features"]
+install_crate = "cargo-all-features"
+
+[tasks.check]
+command = "cargo"
+args = ["+nightly", "check-all-features"]
+install_crate = "cargo-all-features"

examples/counter_isomorphic/Makefile.toml

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

examples/counter_url_query/Cargo.toml

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

examples/counter_url_query/Makefile.toml

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

examples/counter_url_query/README.md

@@ -1,7 +0,0 @@
-# Leptos Query Counter Example
-
-This example creates a simple counter whose state is persisted and synced in the url with query params.
-
-To run it, just issue the `trunk serve --open` command in the example root. This will build the app, run it, and open a new browser to serve it.
-
-> If you don't have `trunk` installed, [click here for install instructions.](https://trunkrs.dev/)

examples/counter_url_query/index.html

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

examples/counter_url_query/src/lib.rs

@@ -1,39 +0,0 @@
-use leptos::*;
-use leptos_router::*;
-
-/// A simple counter component.
-///
-/// You can use doc comments like this to document your component.
-#[component]
-pub fn SimpleQueryCounter(cx: Scope) -> impl IntoView {
-    let (count, set_count) = create_query_signal::<i32>(cx, "count");
-    let clear = move |_| set_count(None);
-    let decrement = move |_| set_count(Some(count().unwrap_or(0) - 1));
-    let increment = move |_| set_count(Some(count().unwrap_or(0) + 1));
-
-    let (msg, set_msg) = create_query_signal::<String>(cx, "message");
-    let update_msg = move |ev| {
-        let new_msg = event_target_value(&ev);
-        if new_msg.is_empty() {
-            set_msg(None);
-        } else {
-            set_msg(Some(new_msg));
-        }
-    };
-
-    view! { cx,
-        <div>
-            <button on:click=clear>"Clear"</button>
-            <button on:click=decrement>"-1"</button>
-            <span>"Value: " {move || count().unwrap_or(0)} "!"</span>
-            <button on:click=increment>"+1"</button>
-
-            <br />
-
-            <input
-                prop:value=move || msg().unwrap_or_default()
-                on:input=update_msg
-            />
-        </div>
-    }
-}

examples/counter_url_query/src/main.rs

@@ -1,17 +0,0 @@
-use counter_url_query::SimpleQueryCounter;
-use leptos::*;
-use leptos_router::*;
-
-pub fn main() {
-    _ = console_log::init_with_level(log::Level::Debug);
-    console_error_panic_hook::set_once();
-    mount_to_body(|cx| {
-        view! { cx,
-            <Router>
-                <Routes>
-                    <Route path="" view=SimpleQueryCounter />
-                </Routes>
-            </Router>
-        }
-    })
-}

examples/counter_without_macros/Makefile.toml

@@ -4,13 +4,11 @@ extend = [
 ]
 
 [tasks.build]
-toolchain = "stable"
 command = "cargo"
-args = ["build-all-features"]
+args = ["+stable", "build-all-features"]
 install_crate = "cargo-all-features"
 
 [tasks.check]
-toolchain = "stable"
 command = "cargo"
-args = ["check-all-features"]
+args = ["+stable", "check-all-features"]
 install_crate = "cargo-all-features"

examples/counters/Makefile.toml

@@ -2,3 +2,13 @@ extend = [
     { path = "../cargo-make/main.toml" },
     { path = "../cargo-make/wasm-test.toml" },
 ]
+
+[tasks.build]
+command = "cargo"
+args = ["+nightly", "build-all-features"]
+install_crate = "cargo-all-features"
+
+[tasks.check]
+command = "cargo"
+args = ["+nightly", "check-all-features"]
+install_crate = "cargo-all-features"

examples/counters_stable/Makefile.toml

@@ -6,13 +6,6 @@ extend = [
 ]
 
 [tasks.build]
-toolchain = "stable"
 command = "cargo"
-args = ["build-all-features"]
-install_crate = "cargo-all-features"
-
-[tasks.check]
-toolchain = "stable"
-command = "cargo"
-args = ["check-all-features"]
+args = ["+stable", "build-all-features"]
 install_crate = "cargo-all-features"

examples/error_boundary/Makefile.toml

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

examples/errors_axum/Makefile.toml

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

examples/errors_axum/src/landing.rs

@@ -34,7 +34,7 @@ pub fn App(cx: Scope) -> impl IntoView {
             </header>
             <main>
                 <Routes>
-                    <Route path="" view=ExampleErrors/>
+                    <Route path="" view=|cx| view! { cx, <ExampleErrors/> }/>
                 </Routes>
             </main>
         </Router>

examples/fetch/Makefile.toml

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

examples/hackernews/Makefile.toml

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

examples/hackernews_axum/Makefile.toml

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

examples/js-framework-benchmark/Makefile.toml

@@ -4,15 +4,13 @@ extend = [
 ]
 
 [tasks.build]
-toolchain = "nightly"
 command = "cargo"
-args = ["build-all-features", "--target", "wasm32-unknown-unknown"]
+args = ["+nightly", "build-all-features", "--target", "wasm32-unknown-unknown"]
 install_crate = "cargo-all-features"
 
 [tasks.check]
-toolchain = "nightly"
 command = "cargo"
-args = ["check-all-features", "--target", "wasm32-unknown-unknown"]
+args = ["+nightly", "check-all-features", "--target", "wasm32-unknown-unknown"]
 install_crate = "cargo-all-features"
 
 [tasks.pre-clippy]

examples/leptos-tailwind-axum/Makefile.toml

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

examples/login_with_token_csr_only/Makefile.toml

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

examples/parent_child/Makefile.toml

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

examples/router/Makefile.toml

@@ -3,3 +3,13 @@ extend = [
     { path = "../cargo-make/trunk_server.toml" },
     { path = "../cargo-make/playwright-test.toml" },
 ]
+
+[tasks.build]
+command = "cargo"
+args = ["+nightly", "build-all-features"]
+install_crate = "cargo-all-features"
+
+[tasks.check]
+command = "cargo"
+args = ["+nightly", "check-all-features"]
+install_crate = "cargo-all-features"

examples/session_auth_axum/Makefile.toml

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

examples/session_auth_axum/src/todo.rs

@@ -170,7 +170,7 @@ pub fn TodoApp(cx: Scope) -> impl IntoView {
             <hr/>
             <main>
                 <Routes>
-                    <Route path="" view=Todos/> //Route
+                    <Route path="" view=|cx| view! { cx, <Todos/> }/> //Route
                     <Route path="signup" view=move |cx| view! {
                         cx,
                         <Signup action=signup/>

examples/slots/Makefile.toml

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

examples/ssr_modes/Makefile.toml

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

examples/ssr_modes_axum/Makefile.toml

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

examples/tailwind/Makefile.toml

@@ -2,3 +2,13 @@ extend = [
     { path = "../cargo-make/main.toml" },
     { path = "../cargo-make/cargo-leptos-test.toml" },
 ]
+
+[tasks.build]
+command = "cargo"
+args = ["+nightly", "build-all-features"]
+install_crate = "cargo-all-features"
+
+[tasks.check]
+command = "cargo"
+args = ["+nightly", "check-all-features"]
+install_crate = "cargo-all-features"

examples/tailwind_csr_trunk/Makefile.toml

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

examples/timer/Makefile.toml

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

examples/todo_app_sqlite/Makefile.toml

@@ -1,17 +1,20 @@
 extend = { path = "../cargo-make/main.toml" }
 
+[tasks.build]
+command = "cargo"
+args = ["+nightly", "build-all-features"]
+install_crate = "cargo-all-features"
+
 [tasks.check]
 clear = true
 dependencies = ["check-debug", "check-release"]
 
 [tasks.check-debug]
-toolchain = "nightly"
 command = "cargo"
-args = ["check-all-features"]
+args = ["+nightly", "check-all-features"]
 install_crate = "cargo-all-features"
 
 [tasks.check-release]
-toolchain = "nightly"
 command = "cargo"
-args = ["check-all-features", "--release"]
+args = ["+nightly", "check-all-features", "--release"]
 install_crate = "cargo-all-features"

examples/todo_app_sqlite_axum/Makefile.toml

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

examples/todo_app_sqlite_axum/src/todo.rs

@@ -104,7 +104,7 @@ pub fn TodoApp(cx: Scope) -> impl IntoView {
             </header>
             <main>
                 <Routes>
-                    <Route path="" view=Todos/>
+                    <Route path="" view=|cx| view! { cx, <Todos/> }/>
                 </Routes>
             </main>
         </Router>

examples/todo_app_sqlite_viz/Makefile.toml

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

examples/todo_app_sqlite_viz/src/todo.rs

@@ -104,7 +104,10 @@ pub fn TodoApp(cx: Scope) -> impl IntoView {
             </header>
             <main>
                 <Routes>
-                    <Route path="" view=Todos/> //Route
+                    <Route path="" view=|cx| view! {
+                        cx,
+                            <Todos/>
+                    }/> //Route
                 </Routes>
             </main>
         </Router>

examples/todomvc/Makefile.toml

@@ -3,3 +3,13 @@ extend = { path = "../cargo-make/main.toml" }
 [tasks.setup-node]
 env = { SETUP_NODE = false }
 condition = { env_true = ["SETUP_NODE"] }
+
+[tasks.build]
+command = "cargo"
+args = ["+nightly", "build-all-features"]
+install_crate = "cargo-all-features"
+
+[tasks.check]
+command = "cargo"
+args = ["+nightly", "check-all-features"]
+install_crate = "cargo-all-features"

leptos/Cargo.toml

@@ -46,7 +46,6 @@ ssr = [
   "leptos_macro/ssr",
   "leptos_reactive/ssr",
   "leptos_server/ssr",
-  "server_fn/ssr",
 ]
 nightly = [
   "leptos_dom/nightly",

leptos/src/animated_show.rs

@@ -1,111 +0,0 @@
-use crate::Show;
-use core::time::Duration;
-use leptos::component;
-use leptos_dom::{helpers::TimeoutHandle, Fragment, IntoView};
-use leptos_macro::view;
-use leptos_reactive::{
-    create_effect, on_cleanup, signal_prelude::*, store_value, Scope,
-    StoredValue,
-};
-
-/// A component that will show its children when the `when` condition is `true`.
-/// Additionally, you need to specify a `hide_delay`. If the `when` condition changes to `false`,
-/// the unmounting of the children will be delayed by the specified Duration.
-/// If you provide the optional `show_class` and `hide_class`, you can create very easy mount /
-/// unmount animations.
-///
-/// ```rust
-/// # use core::time::Duration;
-/// # use leptos::*;
-/// # #[component]
-/// # pub fn App(cx: Scope) -> impl IntoView {
-/// let show = create_rw_signal(cx, false);
-///
-/// view! { cx,
-///     <div
-///         class="hover-me"
-///         on:mouseenter=move |_| show.set(true)
-///         on:mouseleave=move |_| show.set(false)
-///     >
-///         "Hover Me"
-///     </div>
-///
-///     <AnimatedShow
-///        when=show
-///        show_class="fade-in-1000"
-///        hide_class="fade-out-1000"
-///        hide_delay=Duration::from_millis(1000)
-///     >
-///        <div class="here-i-am">
-///            "Here I Am!"
-///        </div>
-///     </AnimatedShow>
-/// }
-/// # }
-/// ```
-#[cfg_attr(
-    any(debug_assertions, feature = "ssr"),
-    tracing::instrument(level = "info", skip_all)
-)]
-#[component]
-pub fn AnimatedShow(
-    /// The scope the component is running in
-    cx: Scope,
-    /// The components Show wraps
-    children: Box<dyn Fn(Scope) -> Fragment>,
-    /// If the component should show or not
-    #[prop(into)]
-    when: MaybeSignal<bool>,
-    /// Optional CSS class to apply if `when == true`
-    #[prop(optional)]
-    show_class: &'static str,
-    /// Optional CSS class to apply if `when == false`
-    #[prop(optional)]
-    hide_class: &'static str,
-    /// The timeout after which the component will be unmounted if `when == false`
-    hide_delay: Duration,
-) -> impl IntoView {
-    let handle: StoredValue<Option<TimeoutHandle>> = store_value(cx, None);
-    let cls = create_rw_signal(
-        cx,
-        if when.get_untracked() {
-            show_class
-        } else {
-            hide_class
-        },
-    );
-    let show = create_rw_signal(cx, when.get_untracked());
-
-    create_effect(cx, move |_| {
-        if when.get() {
-            // clear any possibly active timer
-            if let Some(h) = handle.get_value() {
-                h.clear();
-            }
-
-            cls.set(show_class);
-            show.set(true);
-        } else {
-            cls.set(hide_class);
-
-            let h = leptos_dom::helpers::set_timeout_with_handle(
-                move || show.set(false),
-                hide_delay,
-            )
-            .expect("set timeout in AnimatedShow");
-            handle.set_value(Some(h));
-        }
-    });
-
-    on_cleanup(cx, move || {
-        if let Some(h) = handle.get_value() {
-            h.clear();
-        }
-    });
-
-    view! { cx,
-        <Show when=move || show.get() fallback=|_| ()>
-            <div class=move || cls.get()>{children(cx)}</div>
-        </Show>
-    }
-}

leptos/src/lib.rs

@@ -189,14 +189,12 @@ pub use typed_builder;
 pub use {leptos_macro::template, wasm_bindgen, web_sys};
 mod error_boundary;
 pub use error_boundary::*;
-mod animated_show;
 mod for_loop;
 mod show;
-pub use animated_show::*;
 pub use for_loop::*;
 pub use show::*;
-pub use suspense_component::*;
 mod suspense_component;
+pub use suspense_component::*;
 mod text_prop;
 mod transition;
 pub use text_prop::TextProp;

leptos/tests/test_examples/suspense-tests/src/app.rs

@@ -52,12 +52,12 @@ pub fn App(cx: Scope) -> impl IntoView {
                             <Outlet/>
                         }
                     >
-                        <Route path="" view=Nested
-                        <Route path="inside" view=NestedResourceInside
-                        <Route path="single" view=Single
-                        <Route path="parallel" view=Parallel
-                        <Route path="inside-component" view=InsideComponent
-                        <Route path="none" view=None
+                        <Route path="" view=|cx| view! { cx, <Nested/> }/>
+                        <Route path="inside" view=|cx| view! { cx, <NestedResourceInside/> }/>
+                        <Route path="single" view=|cx| view! { cx, <Single/> }/>
+                        <Route path="parallel" view=|cx| view! { cx, <Parallel/> }/>
+                        <Route path="inside-component" view=|cx| view! { cx, <InsideComponent/> }/>
+                        <Route path="none" view=|cx| view! { cx, <None/> }/>
                     </Route>
                     // in-order
                     <Route
@@ -69,12 +69,12 @@ pub fn App(cx: Scope) -> impl IntoView {
                             <Outlet/>
                         }
                     >
-                        <Route path="" view=Nested
-                        <Route path="inside" view=NestedResourceInside
-                        <Route path="single" view=Single
-                        <Route path="parallel" view=Parallel
-                        <Route path="inside-component" view=InsideComponent
-                        <Route path="none" view=None
+                        <Route path="" view=|cx| view! { cx, <Nested/> }/>
+                        <Route path="inside" view=|cx| view! { cx, <NestedResourceInside/> }/>
+                        <Route path="single" view=|cx| view! { cx, <Single/> }/>
+                        <Route path="parallel" view=|cx| view! { cx, <Parallel/> }/>
+                        <Route path="inside-component" view=|cx| view! { cx, <InsideComponent/> }/>
+                        <Route path="none" view=|cx| view! { cx, <None/> }/>
                     </Route>
                     // async
                     <Route
@@ -86,12 +86,12 @@ pub fn App(cx: Scope) -> impl IntoView {
                             <Outlet/>
                         }
                     >
-                        <Route path="" view=Nested
-                        <Route path="inside" view=NestedResourceInside
-                        <Route path="single" view=Single
-                        <Route path="parallel" view=Parallel
-                        <Route path="inside-component" view=InsideComponent
-                        <Route path="none" view=None
+                        <Route path="" view=|cx| view! { cx, <Nested/> }/>
+                        <Route path="inside" view=|cx| view! { cx, <NestedResourceInside/> }/>
+                        <Route path="single" view=|cx| view! { cx, <Single/> }/>
+                        <Route path="parallel" view=|cx| view! { cx, <Parallel/> }/>
+                        <Route path="inside-component" view=|cx| view! { cx, <InsideComponent/> }/>
+                        <Route path="none" view=|cx| view! { cx, <None/> }/>
                     </Route>
                 </Routes>
             </main>

leptos_dom/src/lib.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::incorrect_clone_impl_on_copy_type)]
 #![deny(missing_docs)]
 #![forbid(unsafe_code)]
 #![cfg_attr(feature = "nightly", feature(fn_traits))]

leptos_dom/src/node_ref.rs

@@ -147,7 +147,7 @@ impl<T: ElementDescriptor + 'static> NodeRef<T> {
 
 impl<T: ElementDescriptor> Clone for NodeRef<T> {
     fn clone(&self) -> Self {
-        *self
+        Self(self.0)
     }
 }
 

leptos_hot_reload/Cargo.toml

@@ -19,7 +19,7 @@ syn = { version = "2", features = [
 	"printing",
 ] }
 quote = "1"
-rstml = "0.11.0"
+rstml = "0.10.6"
 proc-macro2 = { version = "1", features = ["span-locations", "nightly"] }
 parking_lot = "0.12"
 walkdir = "2"

leptos_macro/Cargo.toml

@@ -21,7 +21,7 @@ proc-macro-error = "1"
 proc-macro2 = "1"
 quote = "1"
 syn = { version = "2", features = ["full"] }
-rstml = "0.11.0"
+rstml = "0.10.6"
 leptos_hot_reload = { workspace = true }
 server_fn_macro = { workspace = true }
 convert_case = "0.6.0"
@@ -35,9 +35,10 @@ trybuild = "1"
 leptos = { path = "../leptos" }
 
 [features]
+default = ["ssr"]
 csr = []
 hydrate = []
-ssr = ["server_fn_macro/ssr"]
+ssr = []
 nightly = ["server_fn_macro/nightly"]
 tracing = []
 

leptos_macro/src/lib.rs

@@ -169,26 +169,14 @@ mod template;
 /// # });
 /// ```
 ///
-/// Class names can include dashes, and since leptos v0.5.0 can include a dash-separated segment of only numbers.
-/// ```rust
-/// # use leptos::*;
-/// # run_scope(create_runtime(), |cx| {
-/// # if !cfg!(any(feature = "csr", feature = "hydrate")) {
-/// let (count, set_count) = create_signal(cx, 2);
-/// view! { cx, <div class:hidden-div-25={move || count.get() < 3}>"Now you see me, now you don’t."</div> }
-/// # ;
-/// # }
-/// # });
-/// ```
-///
-/// Class names cannot include special symbols.
+/// Class names can include dashes, but cannot (at the moment) include a dash-separated segment of only numbers.
 /// ```rust,compile_fail
 /// # use leptos::*;
 /// # run_scope(create_runtime(), |cx| {
 /// # if !cfg!(any(feature = "csr", feature = "hydrate")) {
 /// let (count, set_count) = create_signal(cx, 2);
-/// // class:hidden-[div]-25 is invalid attribute name
-/// view! { cx, <div class:hidden-[div]-25={move || count.get() < 3}>"Now you see me, now you don’t."</div> }
+/// // `hidden-div-25` is invalid at the moment
+/// view! { cx, <div class:hidden-div-25={move || count.get() < 3}>"Now you see me, now you don’t."</div> }
 /// # ;
 /// # }
 /// # });
@@ -933,8 +921,8 @@ pub fn params_derive(
 }
 
 pub(crate) fn attribute_value(attr: &KeyedAttribute) -> &syn::Expr {
-    match attr.value() {
-        Some(value) => value,
+    match &attr.possible_value {
+        Some(value) => &value.value,
         None => abort!(attr.key, "attribute should have value"),
     }
 }

leptos_macro/src/view.rs

@@ -20,19 +20,32 @@ enum TagType {
     Math,
 }
 
-// Keep list alphabetized for binary search
 const TYPED_EVENTS: [&str; 126] = [
-    "DOMContentLoaded",
-    "abort",
     "afterprint",
+    "beforeprint",
+    "beforeunload",
+    "gamepadconnected",
+    "gamepaddisconnected",
+    "hashchange",
+    "languagechange",
+    "message",
+    "messageerror",
+    "offline",
+    "online",
+    "pagehide",
+    "pageshow",
+    "popstate",
+    "rejectionhandled",
+    "storage",
+    "unhandledrejection",
+    "unload",
+    "abort",
     "animationcancel",
     "animationend",
     "animationiteration",
     "animationstart",
     "auxclick",
     "beforeinput",
-    "beforeprint",
-    "beforeunload",
     "blur",
     "canplay",
     "canplaythrough",
@@ -43,12 +56,8 @@ const TYPED_EVENTS: [&str; 126] = [
     "compositionstart",
     "compositionupdate",
     "contextmenu",
-    "copy",
     "cuechange",
-    "cut",
     "dblclick",
-    "devicemotion",
-    "deviceorientation",
     "drag",
     "dragend",
     "dragenter",
@@ -64,25 +73,17 @@ const TYPED_EVENTS: [&str; 126] = [
     "focusin",
     "focusout",
     "formdata",
-    "fullscreenchange",
-    "fullscreenerror",
-    "gamepadconnected",
-    "gamepaddisconnected",
     "gotpointercapture",
-    "hashchange",
     "input",
     "invalid",
     "keydown",
     "keypress",
     "keyup",
-    "languagechange",
     "load",
     "loadeddata",
     "loadedmetadata",
     "loadstart",
     "lostpointercapture",
-    "message",
-    "messageerror",
     "mousedown",
     "mouseenter",
     "mouseleave",
@@ -90,12 +91,6 @@ const TYPED_EVENTS: [&str; 126] = [
     "mouseout",
     "mouseover",
     "mouseup",
-    "offline",
-    "online",
-    "orientationchange",
-    "pagehide",
-    "pageshow",
-    "paste",
     "pause",
     "play",
     "playing",
@@ -103,17 +98,12 @@ const TYPED_EVENTS: [&str; 126] = [
     "pointerdown",
     "pointerenter",
     "pointerleave",
-    "pointerlockchange",
-    "pointerlockerror",
     "pointermove",
     "pointerout",
     "pointerover",
     "pointerup",
-    "popstate",
     "progress",
     "ratechange",
-    "readystatechange",
-    "rejectionhandled",
     "reset",
     "resize",
     "scroll",
@@ -125,7 +115,6 @@ const TYPED_EVENTS: [&str; 126] = [
     "selectstart",
     "slotchange",
     "stalled",
-    "storage",
     "submit",
     "suspend",
     "timeupdate",
@@ -138,9 +127,6 @@ const TYPED_EVENTS: [&str; 126] = [
     "transitionend",
     "transitionrun",
     "transitionstart",
-    "unhandledrejection",
-    "unload",
-    "visibilitychange",
     "volumechange",
     "waiting",
     "webkitanimationend",
@@ -148,10 +134,21 @@ const TYPED_EVENTS: [&str; 126] = [
     "webkitanimationstart",
     "webkittransitionend",
     "wheel",
+    "DOMContentLoaded",
+    "devicemotion",
+    "deviceorientation",
+    "orientationchange",
+    "copy",
+    "cut",
+    "paste",
+    "fullscreenchange",
+    "fullscreenerror",
+    "pointerlockchange",
+    "pointerlockerror",
+    "readystatechange",
+    "visibilitychange",
 ];
 
-const CUSTOM_EVENT: &str = "Custom";
-
 pub(crate) fn render_view(
     cx: &Ident,
     nodes: &[Node],
@@ -351,13 +348,10 @@ fn root_element_to_tokens_ssr(
         // We can use open_tag.span(), to provide simmilar(to name span) diagnostic
         // in case of expansion error, but it will also higlight "<" token.
         let typed_element_name = if is_custom_element {
-            Ident::new(CUSTOM_EVENT, Span::call_site())
+            Ident::new("Custom", Span::call_site())
         } else {
             let camel_cased = camel_case_tag_name(
-                tag_name
-                    .trim_start_matches("svg::")
-                    .trim_start_matches("math::")
-                    .trim_end_matches('_'),
+                &tag_name.replace("svg::", "").replace("math::", ""),
             );
             Ident::new(&camel_cased, Span::call_site())
         };
@@ -523,17 +517,6 @@ fn element_to_tokens_ssr(
                                 &value.replace('{', "\\{").replace('}', "\\}"),
                             );
                         }
-                        Node::RawText(r) => {
-                            let value = r.to_string_best();
-                            let value = if is_script_or_style {
-                                value.into()
-                            } else {
-                                html_escape::encode_safe(&value)
-                            };
-                            template.push_str(
-                                &value.replace('{', "\\{").replace('}', "\\}"),
-                            );
-                        }
                         Node::Block(NodeBlock::ValidBlock(block)) => {
                             if let Some(value) =
                                 block_to_primitive_expression(block)
@@ -1242,7 +1225,7 @@ fn attribute_to_tokens(
         };
         let undelegated_ident = match &node.key {
             NodeName::Punctuated(parts) => parts.last().and_then(|last| {
-                if last.to_string() == "undelegated" {
+                if last == "undelegated" {
                     Some(last)
                 } else {
                     None
@@ -1263,8 +1246,9 @@ fn attribute_to_tokens(
         let event_type = if is_custom {
             event_type
         } else if let Some(ev_name) = event_name_ident {
-            quote! {
-                #ev_name
+            let span = ev_name.span();
+            quote_spanned! {
+                span => #ev_name
             }
         } else {
             event_type
@@ -1272,8 +1256,9 @@ fn attribute_to_tokens(
 
         let event_type = if is_force_undelegated {
             let undelegated = if let Some(undelegated) = undelegated_ident {
-                quote! {
-                    #undelegated
+                let span = undelegated.span();
+                quote_spanned! {
+                    span => #undelegated
                 }
             } else {
                 quote! { undelegated }
@@ -1381,10 +1366,12 @@ fn attribute_to_tokens(
 pub(crate) fn parse_event_name(name: &str) -> (TokenStream, bool, bool) {
     let (name, is_force_undelegated) = parse_event(name);
 
-    let (event_type, is_custom) = TYPED_EVENTS
-        .binary_search(&name)
-        .map(|_| (name, false))
-        .unwrap_or((CUSTOM_EVENT, true));
+    let event_type = TYPED_EVENTS
+        .iter()
+        .find(|e| **e == name)
+        .copied()
+        .unwrap_or("Custom");
+    let is_custom = event_type == "Custom";
 
     let Ok(event_type) = event_type.parse::<TokenStream>() else {
         abort!(event_type, "couldn't parse event name");
@@ -1742,9 +1729,10 @@ pub(crate) fn event_from_attribute_node(
     let (name, name_undelegated) = parse_event(&event_name);
 
     let event_type = TYPED_EVENTS
-        .binary_search(&name)
-        .map(|_| (name))
-        .unwrap_or(CUSTOM_EVENT);
+        .iter()
+        .find(|e| **e == name)
+        .copied()
+        .unwrap_or("Custom");
 
     let Ok(event_type) = event_type.parse::<TokenStream>() else {
         abort!(attr.key, "couldn't parse event name");
@@ -1831,19 +1819,33 @@ fn is_custom_element(tag: &str) -> bool {
 fn is_self_closing(node: &NodeElement) -> bool {
     // self-closing tags
     // https://developer.mozilla.org/en-US/docs/Glossary/Empty_element
-    // Keep list alphabetized for binary search
-    [
-        "area", "base", "br", "col", "embed", "hr", "img", "input", "link",
-        "meta", "param", "source", "track", "wbr",
-    ]
-    .binary_search(&node.name().to_string().as_str())
-    .is_ok()
+    matches!(
+        node.name().to_string().as_str(),
+        "area"
+            | "base"
+            | "br"
+            | "col"
+            | "embed"
+            | "hr"
+            | "img"
+            | "input"
+            | "link"
+            | "meta"
+            | "param"
+            | "source"
+            | "track"
+            | "wbr"
+    )
 }
 
 fn camel_case_tag_name(tag_name: &str) -> String {
     let mut chars = tag_name.chars();
     let first = chars.next();
-    let underscore = if tag_name == "option" { "_" } else { "" };
+    let underscore = if tag_name == "option" || tag_name == "use" {
+        "_"
+    } else {
+        ""
+    };
     first
         .map(|f| f.to_ascii_uppercase())
         .into_iter()
@@ -1853,113 +1855,109 @@ fn camel_case_tag_name(tag_name: &str) -> String {
 }
 
 fn is_svg_element(tag: &str) -> bool {
-    // Keep list alphabetized for binary search
-    [
-        "animate",
-        "animateMotion",
-        "animateTransform",
-        "circle",
-        "clipPath",
-        "defs",
-        "desc",
-        "discard",
-        "ellipse",
-        "feBlend",
-        "feColorMatrix",
-        "feComponentTransfer",
-        "feComposite",
-        "feConvolveMatrix",
-        "feDiffuseLighting",
-        "feDisplacementMap",
-        "feDistantLight",
-        "feDropShadow",
-        "feFlood",
-        "feFuncA",
-        "feFuncB",
-        "feFuncG",
-        "feFuncR",
-        "feGaussianBlur",
-        "feImage",
-        "feMerge",
-        "feMergeNode",
-        "feMorphology",
-        "feOffset",
-        "fePointLight",
-        "feSpecularLighting",
-        "feSpotLight",
-        "feTile",
-        "feTurbulence",
-        "filter",
-        "foreignObject",
-        "g",
-        "hatch",
-        "hatchpath",
-        "image",
-        "line",
-        "linearGradient",
-        "marker",
-        "mask",
-        "metadata",
-        "mpath",
-        "path",
-        "pattern",
-        "polygon",
-        "polyline",
-        "radialGradient",
-        "rect",
-        "set",
-        "stop",
-        "svg",
-        "switch",
-        "symbol",
-        "text",
-        "textPath",
-        "tspan",
-        "use",
-        "use_",
-        "view",
-    ]
-    .binary_search(&tag)
-    .is_ok()
+    matches!(
+        tag,
+        "animate"
+            | "animateMotion"
+            | "animateTransform"
+            | "circle"
+            | "clipPath"
+            | "defs"
+            | "desc"
+            | "discard"
+            | "ellipse"
+            | "feBlend"
+            | "feColorMatrix"
+            | "feComponentTransfer"
+            | "feComposite"
+            | "feConvolveMatrix"
+            | "feDiffuseLighting"
+            | "feDisplacementMap"
+            | "feDistantLight"
+            | "feDropShadow"
+            | "feFlood"
+            | "feFuncA"
+            | "feFuncB"
+            | "feFuncG"
+            | "feFuncR"
+            | "feGaussianBlur"
+            | "feImage"
+            | "feMerge"
+            | "feMergeNode"
+            | "feMorphology"
+            | "feOffset"
+            | "fePointLight"
+            | "feSpecularLighting"
+            | "feSpotLight"
+            | "feTile"
+            | "feTurbulence"
+            | "filter"
+            | "foreignObject"
+            | "g"
+            | "hatch"
+            | "hatchpath"
+            | "image"
+            | "line"
+            | "linearGradient"
+            | "marker"
+            | "mask"
+            | "metadata"
+            | "mpath"
+            | "path"
+            | "pattern"
+            | "polygon"
+            | "polyline"
+            | "radialGradient"
+            | "rect"
+            | "set"
+            | "stop"
+            | "svg"
+            | "switch"
+            | "symbol"
+            | "text"
+            | "textPath"
+            | "tspan"
+            | "use"
+            | "use_"
+            | "view"
+    )
 }
 
 fn is_math_ml_element(tag: &str) -> bool {
-    // Keep list alphabetized for binary search
-    [
-        "annotation",
-        "maction",
-        "math",
-        "menclose",
-        "merror",
-        "mfenced",
-        "mfrac",
-        "mi",
-        "mmultiscripts",
-        "mn",
-        "mo",
-        "mover",
-        "mpadded",
-        "mphantom",
-        "mprescripts",
-        "mroot",
-        "mrow",
-        "ms",
-        "mspace",
-        "msqrt",
-        "mstyle",
-        "msub",
-        "msubsup",
-        "msup",
-        "mtable",
-        "mtd",
-        "mtext",
-        "mtr",
-        "munder",
-        "munderover",
-        "semantics",
-    ]
-    .binary_search(&tag)
-    .is_ok()
+    matches!(
+        tag,
+        "math"
+            | "mi"
+            | "mn"
+            | "mo"
+            | "ms"
+            | "mspace"
+            | "mtext"
+            | "menclose"
+            | "merror"
+            | "mfenced"
+            | "mfrac"
+            | "mpadded"
+            | "mphantom"
+            | "mroot"
+            | "mrow"
+            | "msqrt"
+            | "mstyle"
+            | "mmultiscripts"
+            | "mover"
+            | "mprescripts"
+            | "msub"
+            | "msubsup"
+            | "msup"
+            | "munder"
+            | "munderover"
+            | "mtable"
+            | "mtd"
+            | "mtr"
+            | "maction"
+            | "annotation"
+            | "semantics"
+    )
 }
 
 fn is_ambiguous_element(tag: &str) -> bool {

leptos_reactive/src/lib.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::incorrect_clone_impl_on_copy_type)]
 #![deny(missing_docs)]
 #![cfg_attr(feature = "nightly", feature(fn_traits))]
 #![cfg_attr(feature = "nightly", feature(unboxed_closures))]

leptos_reactive/src/memo.rs

@@ -179,7 +179,13 @@ where
     T: 'static,
 {
     fn clone(&self) -> Self {
-        *self
+        Self {
+            runtime: self.runtime,
+            id: self.id,
+            ty: PhantomData,
+            #[cfg(any(debug_assertions, feature = "ssr"))]
+            defined_at: self.defined_at,
+        }
     }
 }
 

leptos_reactive/src/resource.rs

@@ -734,8 +734,19 @@ where
     S: 'static,
     T: 'static,
 {
+    #[cfg_attr(
+        any(debug_assertions, feature = "ssr"),
+        instrument(level = "trace", skip_all,)
+    )]
     fn clone(&self) -> Self {
-        *self
+        Self {
+            runtime: self.runtime,
+            id: self.id,
+            source_ty: PhantomData,
+            out_ty: PhantomData,
+            #[cfg(any(debug_assertions, feature = "ssr"))]
+            defined_at: self.defined_at,
+        }
     }
 }
 

leptos_reactive/src/signal.rs

@@ -2059,11 +2059,11 @@ impl NodeId {
                         debug_warn!(
                             "[Signal::update] You’re trying to update a \
                              Signal<{}> (defined at {defined_at}) that has \
-                             already been disposed of. This is probably a \
-                             logic error in a component that creates and \
-                             disposes of scopes. If it does not cause any \
-                             issues, it is safe to ignore this warning, which \
-                             occurs only in debug mode.",
+                             already been disposed of. This is probably \
+                             either a logic error in a component that creates \
+                             and disposes of scopes. If it does cause cause \
+                             any issues, it is safe to ignore this warning, \
+                             which occurs only in debug mode.",
                             std::any::type_name::<T>()
                         );
                     }
@@ -2106,11 +2106,11 @@ impl NodeId {
                         debug_warn!(
                             "[Signal::update] You’re trying to update a \
                              Signal<{}> (defined at {defined_at}) that has \
-                             already been disposed of. This is probably a \
-                             logic error in a component that creates and \
-                             disposes of scopes. If it does not cause any \
-                             issues, it is safe to ignore this warning, which \
-                             occurs only in debug mode.",
+                             already been disposed of. This is probably \
+                             either a logic error in a component that creates \
+                             and disposes of scopes. If it does cause cause \
+                             any issues, it is safe to ignore this warning, \
+                             which occurs only in debug mode.",
                             std::any::type_name::<T>()
                         );
                     }

leptos_reactive/src/signal_wrappers_read.rs

@@ -71,7 +71,11 @@ where
 
 impl<T> Clone for Signal<T> {
     fn clone(&self) -> Self {
-        *self
+        Self {
+            inner: self.inner,
+            #[cfg(any(debug_assertions, feature = "ssr"))]
+            defined_at: self.defined_at,
+        }
     }
 }
 
@@ -432,7 +436,13 @@ where
 
 impl<T> Clone for SignalTypes<T> {
     fn clone(&self) -> Self {
-        *self
+        match self {
+            Self::ReadSignal(arg0) => Self::ReadSignal(*arg0),
+            Self::Memo(arg0) => Self::Memo(*arg0),
+            Self::DerivedSignal(arg0, arg1) => {
+                Self::DerivedSignal(*arg0, *arg1)
+            }
+        }
     }
 }
 

leptos_reactive/src/signal_wrappers_write.rs

@@ -63,7 +63,11 @@ where
 
 impl<T> Clone for SignalSetter<T> {
     fn clone(&self) -> Self {
-        *self
+        Self {
+            inner: self.inner,
+            #[cfg(any(debug_assertions, feature = "ssr"))]
+            defined_at: self.defined_at,
+        }
     }
 }
 
@@ -227,7 +231,11 @@ where
 
 impl<T> Clone for SignalSetterTypes<T> {
     fn clone(&self) -> Self {
-        *self
+        match self {
+            Self::Write(arg0) => Self::Write(*arg0),
+            Self::Mapped(cx, f) => Self::Mapped(*cx, *f),
+            Self::Default => Self::Default,
+        }
     }
 }
 

leptos_reactive/src/stored_value.rs

@@ -33,7 +33,11 @@ where
 
 impl<T> Clone for StoredValue<T> {
     fn clone(&self) -> Self {
-        *self
+        Self {
+            runtime: self.runtime,
+            id: self.id,
+            ty: self.ty,
+        }
     }
 }
 

leptos_server/Cargo.toml

@@ -10,7 +10,6 @@ readme = "../README.md"
 
 [dependencies]
 leptos_reactive = { workspace = true }
-leptos_macro = { workspace = true }
 server_fn = { workspace = true }
 lazy_static = "1"
 serde = { version = "1", features = ["derive"] }
@@ -22,11 +21,11 @@ inventory = "0.3"
 leptos = { path = "../leptos" }
 
 [features]
-csr = ["leptos_reactive/csr", "leptos_macro/csr"]
+csr = ["leptos_reactive/csr"]
 default-tls = ["server_fn/default-tls"]
-hydrate = ["leptos_reactive/hydrate", "leptos_macro/hydrate"]
+hydrate = ["leptos_reactive/hydrate"]
 rustls = ["server_fn/rustls"]
-ssr = ["leptos_reactive/ssr", "server_fn/ssr", "leptos_macro/ssr"]
+ssr = ["leptos_reactive/ssr", "server_fn/ssr"]
 nightly = ["leptos_reactive/nightly", "server_fn/nightly"]
 
 [package.metadata.cargo-all-features]

leptos_server/src/action.rs

@@ -187,7 +187,7 @@ where
     O: 'static,
 {
     fn clone(&self) -> Self {
-        *self
+        Self(self.0)
     }
 }
 

leptos_server/src/lib.rs

@@ -1,3 +1,4 @@
+#![allow(clippy::incorrect_clone_impl_on_copy_type)]
 #![deny(missing_docs)]
 #![forbid(unsafe_code)]
 

leptos_server/src/multi_action.rs

@@ -77,7 +77,7 @@ where
     O: 'static,
 {
     fn clone(&self) -> Self {
-        *self
+        Self(self.0)
     }
 }
 
@@ -178,7 +178,12 @@ where
 
 impl<I, O> Clone for Submission<I, O> {
     fn clone(&self) -> Self {
-        *self
+        Self {
+            input: self.input,
+            value: self.value,
+            pending: self.pending,
+            canceled: self.canceled,
+        }
     }
 }
 

meta/Cargo.toml

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

meta/src/title.rs

@@ -125,7 +125,6 @@ pub fn Title(
                     match document().query_selector("title") {
                         Ok(Some(title)) => title.unchecked_into(),
                         _ => {
-                            let el_ref = meta.title.el.clone();
                             let el = document().create_element("title").unwrap_throw();
                             let head = document().head().unwrap_throw();
                             head.append_child(el.unchecked_ref())
@@ -135,7 +134,6 @@ pub fn Title(
                                 let el = el.clone();
                                 move || {
                                     _ = head.remove_child(&el);
-                                    *el_ref.borrow_mut() = None;
                                 }
                             });
 

router/Cargo.toml

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

router/src/components/form.rs

@@ -1,4 +1,4 @@
-use crate::{use_navigate, use_resolved_path, NavigateOptions, ToHref, Url};
+use crate::{use_navigate, use_resolved_path, ToHref, Url};
 use leptos::{html::form, *};
 use serde::{de::DeserializeOwned, Serialize};
 use std::{error::Error, rc::Rc};
@@ -54,9 +54,6 @@ pub fn Form<A>(
     /// A [`NodeRef`] in which the `<form>` element should be stored.
     #[prop(optional)]
     node_ref: Option<NodeRef<html::Form>>,
-    /// Sets whether the page should be scrolled to the top when the form is submitted.
-    #[prop(optional)]
-    noscroll: bool,
     /// Arbitrary attributes to add to the `<form>`
     #[prop(optional, into)]
     attributes: Option<MaybeSignal<AdditionalAttributes>>,
@@ -79,7 +76,6 @@ where
         class: Option<Attribute>,
         children: Children,
         node_ref: Option<NodeRef<html::Form>>,
-        noscroll: bool,
         attributes: Option<MaybeSignal<AdditionalAttributes>>,
     ) -> HtmlElement<html::Form> {
         let action_version = version;
@@ -89,10 +85,6 @@ where
                     return;
                 }
                 let navigate = use_navigate(cx);
-                let navigate_options = NavigateOptions {
-                    scroll: !noscroll,
-                    ..Default::default()
-                };
 
                 let (form, method, action, enctype) =
                     extract_form_attributes(&ev);
@@ -175,7 +167,7 @@ where
                                                                 },
                                                                 url.search,
                                                             ),
-                                                            navigate_options,
+                                                            Default::default(),
                                                         ) {
                                                             warn!("{}", e);
                                                         }
@@ -256,7 +248,7 @@ where
                                                                 },
                                                                 url.search,
                                                             ),
-                                                            navigate_options,
+                                                            Default::default(),
                                                         ) {
                                                             warn!("{}", e);
                                                         }
@@ -275,8 +267,11 @@ where
                 else {
                     let params =
                         params.to_string().as_string().unwrap_or_default();
-                    if navigate(&format!("{action}?{params}"), navigate_options)
-                        .is_ok()
+                    if navigate(
+                        &format!("{action}?{params}"),
+                        Default::default(),
+                    )
+                    .is_ok()
                     {
                         ev.prevent_default();
                         ev.stop_propagation();
@@ -323,7 +318,6 @@ where
         class,
         children,
         node_ref,
-        noscroll,
         attributes,
     )
 }
@@ -370,9 +364,6 @@ pub fn ActionForm<I, O>(
     /// A [`NodeRef`] in which the `<form>` element should be stored.
     #[prop(optional)]
     node_ref: Option<NodeRef<html::Form>>,
-    /// Sets whether the page should be scrolled to the top when navigating.
-    #[prop(optional)]
-    noscroll: bool,
     /// Arbitrary attributes to add to the `<form>`
     #[prop(optional, into)]
     attributes: Option<MaybeSignal<AdditionalAttributes>>,
@@ -522,7 +513,6 @@ where
         .on_error(on_error)
         .method("post")
         .class(class)
-        .noscroll(noscroll)
         .children(children)
         .build();
     props.error = error;

router/src/history/params.rs

@@ -42,21 +42,19 @@ impl ParamsMap {
         self.0.remove(key)
     }
 
+    #[cfg(any(feature = "csr", feature = "hydrate", feature = "ssr"))]
     /// Converts the map to a query string.
     pub fn to_query_string(&self) -> String {
         use crate::history::url::escape;
-        let mut buf = String::new();
-        if !self.0.is_empty() {
-            buf.push('?');
-            for (k, v) in &self.0 {
-                buf.push_str(&escape(k));
-                buf.push('=');
-                buf.push_str(&escape(v));
-                buf.push('&');
-            }
-            if buf.len() > 1 {
-                buf.pop();
-            }
+        let mut buf = String::from("?");
+        for (k, v) in &self.0 {
+            buf.push_str(&escape(k));
+            buf.push('=');
+            buf.push_str(&escape(v));
+            buf.push('&');
+        }
+        if buf.len() > 1 {
+            buf.pop();
         }
         buf
     }

router/src/hooks.rs

@@ -3,82 +3,7 @@ use crate::{
     RouteContext, RouterContext,
 };
 use leptos::{create_memo, signal_prelude::*, use_context, Memo, Scope};
-use std::{borrow::Cow, rc::Rc, str::FromStr};
-
-/// Constructs a signal synchronized with a specific URL query parameter.
-///
-/// The function creates a bidirectional sync mechanism between the state encapsulated in a signal and a URL query parameter.
-/// This means that any change to the state will update the URL, and vice versa, making the function especially useful
-/// for maintaining state consistency across page reloads.
-///
-/// The `key` argument is the unique identifier for the query parameter to be synced with the state.
-/// It is important to note that only one state can be tied to a specific key at any given time.
-///
-/// The function operates with types that can be parsed from and formatted into strings, denoted by `T`.
-/// If the parsing fails for any reason, the function treats the value as `None`.
-/// The URL parameter can be cleared by setting the signal to `None`.
-///
-/// ```rust
-/// use leptos::*;
-/// use leptos_router::*;
-///
-/// #[component]
-/// pub fn SimpleQueryCounter(cx: Scope) -> impl IntoView {
-///     let (count, set_count) = create_query_signal::<i32>(cx, "count");
-///     let clear = move |_| set_count.set(None);
-///     let decrement =
-///         move |_| set_count.set(Some(count.get().unwrap_or(0) - 1));
-///     let increment =
-///         move |_| set_count.set(Some(count.get().unwrap_or(0) + 1));
-///
-///     view! { cx,
-///         <div>
-///             <button on:click=clear>"Clear"</button>
-///             <button on:click=decrement>"-1"</button>
-///             <span>"Value: " {move || count.get().unwrap_or(0)} "!"</span>
-///             <button on:click=increment>"+1"</button>
-///         </div>
-///     }
-/// }
-/// ```
-pub fn create_query_signal<T>(
-    cx: Scope,
-    key: impl Into<Cow<'static, str>>,
-) -> (Memo<Option<T>>, SignalSetter<Option<T>>)
-where
-    T: FromStr + ToString + PartialEq,
-{
-    let key = key.into();
-    let query_map = use_query_map(cx);
-    let navigate = use_navigate(cx);
-    let route = use_route(cx);
-
-    let get = create_memo(cx, {
-        let key = key.clone();
-        move |_| {
-            query_map
-                .with(|map| map.get(&key).and_then(|value| value.parse().ok()))
-        }
-    });
-
-    let set = SignalSetter::map(cx, move |value: Option<T>| {
-        let mut new_query_map = query_map.get();
-        match value {
-            Some(value) => {
-                new_query_map.insert(key.to_string(), value.to_string());
-            }
-            None => {
-                new_query_map.remove(&key);
-            }
-        }
-        let qs = new_query_map.to_query_string();
-        let path = route.path();
-        let new_url = format!("{path}{qs}");
-        let _ = navigate(&new_url, NavigateOptions::default());
-    });
-
-    (get, set)
-}
+use std::rc::Rc;
 
 /// Returns the current [RouterContext], containing information about the router's state.
 pub fn use_router(cx: Scope) -> RouterContext {

router/src/lib.rs

@@ -56,23 +56,23 @@
 //!             // our root route: the contact list is always shown
 //!             <Route
 //!               path=""
-//!               view=ContactList
+//!               view=move |cx| view! { cx,  <ContactList/> }
 //!             >
 //!               // users like /gbj or /bob
 //!               <Route
 //!                 path=":id"
-//!                 view=Contact
+//!                 view=move |cx| view! { cx,  <Contact/> }
 //!               />
 //!               // a fallback if the /:id segment is missing from the URL
 //!               <Route
 //!                 path=""
-//!                 view=move |_| view! { cx, <p class="contact">"Select a contact."</p> }
+//!                 view=move |_| view! { cx,  <p class="contact">"Select a contact."</p> }
 //!               />
 //!             </Route>
 //!             // LR will automatically use this for /about, not the /:id match above
 //!             <Route
 //!               path="about"
-//!               view=About
+//!               view=move |cx| view! { cx,  <About/> }
 //!             />
 //!           </Routes>
 //!         </main>

server_fn_macro/Cargo.toml

@@ -19,4 +19,3 @@ const_format = "0.2.30"
 
 [features]
 nightly = []
-ssr = []

server_fn_macro/src/lib.rs

@@ -217,61 +217,6 @@ pub fn server_macro_impl(
         .map(|(doc, span)| quote_spanned!(*span=> #[doc = #doc]))
         .collect::<TokenStream2>();
 
-    let inventory = if cfg!(feature = "ssr") {
-        quote! {
-            #server_fn_path::inventory::submit! {
-                #trait_obj_wrapper::from_generic_server_fn(#server_fn_path::ServerFnTraitObj::new(
-                    #struct_name::PREFIX,
-                    #struct_name::URL,
-                    #struct_name::ENCODING,
-                    <#struct_name as #server_fn_path::ServerFn<#server_ctx_path>>::call_from_bytes,
-                ))
-            }
-        }
-    } else {
-        quote! {}
-    };
-
-    let call_fn = if cfg!(feature = "ssr") {
-        quote! {
-            fn call_fn(self, cx: #server_ctx_path) -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<Self::Output, #server_fn_path::ServerFnError>>>> {
-                let #struct_name { #(#field_names),* } = self;
-                Box::pin(async move { #fn_name( #cx_fn_arg #(#field_names_2),*).await })
-            }
-        }
-    } else {
-        quote! {
-            fn call_fn_client(self, cx: #server_ctx_path) -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<Self::Output, #server_fn_path::ServerFnError>>>> {
-                let #struct_name { #(#field_names_3),* } = self;
-                Box::pin(async move { #fn_name( #cx_fn_arg #(#field_names_4),*).await })
-            }
-        }
-    };
-
-    let func = if cfg!(feature = "ssr") {
-        quote! {
-            #docs
-            #vis async fn #fn_name(#(#fn_args),*) #output_arrow #return_ty {
-                #block
-            }
-        }
-    } else {
-        quote! {
-            #docs
-            #[allow(unused_variables)]
-            #vis async fn #fn_name(#(#fn_args_2),*) #output_arrow #return_ty {
-                #server_fn_path::call_server_fn(
-                    &{
-                        let prefix = #struct_name::PREFIX.to_string();
-                        prefix + "/" + #struct_name::URL
-                    },
-                    #struct_name { #(#field_names_5),* },
-                    #encoding
-                ).await
-            }
-        }
-    };
-
     Ok(quote::quote! {
         #args_docs
         #docs
@@ -296,7 +241,15 @@ pub fn server_macro_impl(
             const ENCODING: #server_fn_path::Encoding = #encoding;
         }
 
-        #inventory
+        #[cfg(feature = "ssr")]
+        #server_fn_path::inventory::submit! {
+            #trait_obj_wrapper::from_generic_server_fn(#server_fn_path::ServerFnTraitObj::new(
+                #struct_name::PREFIX,
+                #struct_name::URL,
+                #struct_name::ENCODING,
+                <#struct_name as #server_fn_path::ServerFn<#server_ctx_path>>::call_from_bytes,
+            ))
+        }
 
         impl #server_fn_path::ServerFn<#server_ctx_path> for #struct_name {
             type Output = #output_ty;
@@ -313,10 +266,38 @@ pub fn server_macro_impl(
                 Self::ENCODING
             }
 
-            #call_fn
+            #[cfg(feature = "ssr")]
+            fn call_fn(self, cx: #server_ctx_path) -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<Self::Output, #server_fn_path::ServerFnError>>>> {
+                let #struct_name { #(#field_names),* } = self;
+                Box::pin(async move { #fn_name( #cx_fn_arg #(#field_names_2),*).await })
+            }
+
+            #[cfg(not(feature = "ssr"))]
+            fn call_fn_client(self, cx: #server_ctx_path) -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<Self::Output, #server_fn_path::ServerFnError>>>> {
+                let #struct_name { #(#field_names_3),* } = self;
+                Box::pin(async move { #fn_name( #cx_fn_arg #(#field_names_4),*).await })
+            }
         }
 
-        #func
+        #docs
+        #[cfg(feature = "ssr")]
+        #vis async fn #fn_name(#(#fn_args),*) #output_arrow #return_ty {
+            #block
+        }
+
+        #docs
+        #[cfg(not(feature = "ssr"))]
+        #[allow(unused_variables)]
+        #vis async fn #fn_name(#(#fn_args_2),*) #output_arrow #return_ty {
+            #server_fn_path::call_server_fn(
+                &{
+                    let prefix = #struct_name::PREFIX.to_string();
+                    prefix + "/" + #struct_name::URL
+                },
+                #struct_name { #(#field_names_5),* },
+                #encoding
+            ).await
+        }
     })
 }