change: change all tracing levels to trace to reduce verbosity

.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

@@ -22,6 +22,7 @@ jobs:
           [
             integrations/actix,
             integrations/axum,
+            integrations/viz,
             integrations/utils,
             leptos,
             leptos_config,
@@ -40,4 +41,4 @@ jobs:
     with:
       directory: ${{ matrix.directory }}
       cargo_make_task: "ci"
-      toolchain: nightly-2024-01-29
+      toolchain: nightly

.github/workflows/get-changed-examples-matrix.yml

@@ -26,7 +26,7 @@ jobs:
 
       - name: Get example project directories that changed
         id: changed-dirs
-        uses: tj-actions/changed-files@v41
+        uses: tj-actions/changed-files@v39
         with:
           dir_names: true
           dir_names_max_depth: "2"

.github/workflows/get-example-changed.yml

@@ -21,10 +21,10 @@ jobs:
 
       - name: Get example files that changed
         id: changed-files
-        uses: tj-actions/changed-files@v41
+        uses: tj-actions/changed-files@v39
         with:
           files: |
-            examples/**
+            examples
             !examples/cargo-make
             !examples/gtk
             !examples/Makefile.toml

.github/workflows/get-leptos-changed.yml

@@ -19,21 +19,21 @@ jobs:
 
       - name: Get source files that changed
         id: changed-source
-        uses: tj-actions/changed-files@v41
+        uses: tj-actions/changed-files@v39
         with:
           files: |
-            integrations/**
-            leptos/**
-            leptos_config/**
-            leptos_dom/**
-            leptos_hot_reload/**
-            leptos_macro/**
-            leptos_reactive/**
-            leptos_server/**
-            meta/**
-            router/**
-            server_fn/**
-            server_fn_macro/**
+            integrations
+            leptos
+            leptos_config
+            leptos_dom
+            leptos_hot_reload
+            leptos_macro
+            leptos_reactive
+            leptos_server
+            meta
+            router
+            server_fn
+            server_fn_macro
 
       - name: List source files that changed
         run: echo '${{ steps.changed-source.outputs.all_changed_files }}'

.gitignore

@@ -10,5 +10,4 @@ Cargo.lock
 .direnv
 .envrc
 
-.vscode
-vendor
+.vscode

Cargo.toml

@@ -16,6 +16,7 @@ members = [
   # integrations
   "integrations/actix",
   "integrations/axum",
+  "integrations/viz",
   "integrations/utils",
 
   # libraries
@@ -25,22 +26,22 @@ members = [
 exclude = ["benchmarks", "examples"]
 
 [workspace.package]
-version = "0.6.5"
+version = "0.5.4"
 
 [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" }
-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 = { path = "./leptos", version = "0.5.4" }
+leptos_dom = { path = "./leptos_dom", version = "0.5.4" }
+leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.5.4" }
+leptos_macro = { path = "./leptos_macro", version = "0.5.4" }
+leptos_reactive = { path = "./leptos_reactive", version = "0.5.4" }
+leptos_server = { path = "./leptos_server", version = "0.5.4" }
+server_fn = { path = "./server_fn", version = "0.5.4" }
+server_fn_macro = { path = "./server_fn_macro", version = "0.5.4" }
+server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.5.4" }
+leptos_config = { path = "./leptos_config", version = "0.5.4" }
+leptos_router = { path = "./router", version = "0.5.4" }
+leptos_meta = { path = "./meta", version = "0.5.4" }
+leptos_integration_utils = { path = "./integrations/utils", version = "0.5.4" }
 
 [profile.release]
 codegen-units = 1

README.md

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

cargo-make/check.toml

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

cargo-make/test.toml

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

examples/Makefile.toml

@@ -21,7 +21,6 @@ CARGO_MAKE_CRATE_WORKSPACE_MEMBERS = [
   "login_with_token_csr_only",
   "parent_child",
   "router",
-  "server_fns_axum",
   "session_auth_axum",
   "slots",
   "ssr_modes",
@@ -33,6 +32,7 @@ CARGO_MAKE_CRATE_WORKSPACE_MEMBERS = [
   "timer",
   "todo_app_sqlite",
   "todo_app_sqlite_axum",
+  "todo_app_sqlite_viz",
   "todomvc",
 ]
 
@@ -51,5 +51,103 @@ echo "CARGO_MAKE_CRATE_WORKSPACE_MEMBERS = $examples"
 
 [tasks.test-report]
 workspace = false
-description = "show the cargo-make configuration for web examples"
-script = { file = "./cargo-make/scripts/web-report.sh" }
+description = "report web testing technology used by examples - OPTION: [all]"
+script = '''
+set -emu
+
+BOLD="\e[1m"
+GREEN="\e[0;32m"
+ITALIC="\e[3m"
+YELLOW="\e[0;33m"
+RESET="\e[0m"
+
+echo
+echo "${YELLOW}Web Test Technology${RESET}"
+echo
+
+makefile_paths=$(find . -name Makefile.toml -not -path '*/target/*' -not -path '*/node_modules/*' |
+  sed 's%./%%' |
+  sed 's%/Makefile.toml%%' |
+  grep -v Makefile.toml |
+  sort -u)
+
+start_path=$(pwd)
+
+for path in $makefile_paths; do
+  cd $path
+
+  crate_symbols=
+
+  pw_count=$(find . -name playwright.config.ts | wc -l)
+
+  while read -r line; do
+      case $line in
+      *"cucumber"*)
+          crate_symbols=$crate_symbols"C"
+          ;;
+      *"fantoccini"*)
+          crate_symbols=$crate_symbols"D"
+          ;;
+      esac
+  done <"./Cargo.toml"
+
+  while read -r line; do
+    case $line in
+      *"cargo-make/wasm-test.toml"*)
+          crate_symbols=$crate_symbols"W"
+        ;;
+      *"cargo-make/playwright-test.toml"*)
+          crate_symbols=$crate_symbols"P"
+          crate_symbols=$crate_symbols"N"
+        ;;
+      *"cargo-make/playwright-trunk-test.toml"*)
+          crate_symbols=$crate_symbols"P"
+          crate_symbols=$crate_symbols"T"
+        ;;
+      *"cargo-make/trunk_server.toml"*)
+          crate_symbols=$crate_symbols"T"
+        ;;
+      *"cargo-make/cargo-leptos-webdriver-test.toml"*)
+          crate_symbols=$crate_symbols"L"
+        ;;
+      *"cargo-make/cargo-leptos-test.toml"*)
+          crate_symbols=$crate_symbols"L"
+          if [ $pw_count -gt 0 ]; then
+            crate_symbols=$crate_symbols"P"
+          fi
+        ;;
+    esac
+  done <"./Makefile.toml"
+
+  # Sort list of tools
+  sorted_crate_symbols=$(echo ${crate_symbols} | grep -o . | sort | tr -d "\n") 
+
+  formatted_crate_symbols=" ➤ ${BOLD}${YELLOW}${sorted_crate_symbols}${RESET}"
+  crate_line=$path
+  if [ ! -z ${1+x} ]; then
+    # Show all examples
+    if [ ! -z $crate_symbols ]; then
+      crate_line=$crate_line$formatted_crate_symbols
+    fi
+    echo $crate_line
+  elif [ ! -z $crate_symbols ]; then
+    # Filter out examples that do not run tests in `ci`
+    crate_line=$crate_line$formatted_crate_symbols
+    echo $crate_line
+  fi
+
+  cd ${start_path}
+done
+
+c="${BOLD}${YELLOW}C${RESET} = Cucumber"
+d="${BOLD}${YELLOW}D${RESET} = WebDriver"
+l="${BOLD}${YELLOW}L${RESET} = Cargo Leptos"
+n="${BOLD}${YELLOW}N${RESET} = Node"
+p="${BOLD}${YELLOW}P${RESET} = Playwright"
+t="${BOLD}${YELLOW}T${RESET} = Trunk"
+w="${BOLD}${YELLOW}W${RESET} = WASM"
+
+echo
+echo "${ITALIC}Keys:${RESET} $c, $d, $l, $n, $p, $t, $w"
+echo
+'''

examples/action-form-error-handling/Makefile.toml

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

examples/action-form-error-handling/README.md

@@ -1,68 +0,0 @@
-<picture>
-    <source srcset="https://raw.githubusercontent.com/leptos-rs/leptos/main/docs/logos/Leptos_logo_Solid_White.svg" media="(prefers-color-scheme: dark)">
-    <img src="https://raw.githubusercontent.com/leptos-rs/leptos/main/docs/logos/Leptos_logo_RGB.svg" alt="Leptos Logo">
-</picture>
-
-# Leptos Starter Template
-
-This is a template for use with the [Leptos](https://github.com/leptos-rs/leptos) web framework and the [cargo-leptos](https://github.com/akesson/cargo-leptos) tool.
-
-## Creating your template repo
-
-If you don't have `cargo-leptos` installed you can install it with
-
-`cargo install cargo-leptos`
-
-Then run
-
-`cargo leptos new --git leptos-rs/start`
-
-to generate a new project template (you will be prompted to enter a project name).
-
-`cd {projectname}`
-
-to go to your newly created project.
-
-Of course, you should explore around the project structure, but the best place to start with your application code is in `src/app.rs`.
-
-## Running your project
-
-`cargo leptos watch`  
-By default, you can access your local project at `http://localhost:3000`
-
-## Installing Additional Tools
-
-By default, `cargo-leptos` uses `nightly` Rust, `cargo-generate`, and `sass`. If you run into any trouble, you may need to install one or more of these tools.
-
-1. `rustup toolchain install nightly --allow-downgrade` - make sure you have Rust nightly
-2. `rustup target add wasm32-unknown-unknown` - add the ability to compile Rust to WebAssembly
-3. `cargo install cargo-generate` - install `cargo-generate` binary (should be installed automatically in future)
-4. `npm install -g sass` - install `dart-sass` (should be optional in future)
-
-## Executing a Server on a Remote Machine Without the Toolchain
-After running a `cargo leptos build --release` the minimum files needed are:
-
-1. The server binary located in `target/server/release`
-2. The `site` directory and all files within located in `target/site`
-
-Copy these files to your remote server. The directory structure should be:
-```text
-leptos_start
-site/
-```
-Set the following environment variables (updating for your project as needed):
-```sh
-export LEPTOS_OUTPUT_NAME="leptos_start"
-export LEPTOS_SITE_ROOT="site"
-export LEPTOS_SITE_PKG_DIR="pkg"
-export LEPTOS_SITE_ADDR="127.0.0.1:3000"
-export LEPTOS_RELOAD_PORT="3001"
-```
-Finally, run the server binary.
-
-## Notes about CSR and Trunk:
-Although it is not recommended, you can also run your project without server integration using the feature `csr` and `trunk serve`:
-
-`trunk serve --open --features csr`
-
-This may be useful for integrating external tools which require a static site, e.g. `tauri`.

examples/action-form-error-handling/src/app.rs

@@ -1,97 +0,0 @@
-use leptos::*;
-use leptos_meta::*;
-use leptos_router::*;
-
-#[component]
-pub fn App() -> impl IntoView {
-    // Provides context that manages stylesheets, titles, meta tags, etc.
-    provide_meta_context();
-
-    view! {
-        // injects a stylesheet into the document <head>
-        // id=leptos means cargo-leptos will hot-reload this stylesheet
-        <Stylesheet id="leptos" href="/pkg/leptos_start.css"/>
-
-        // sets the document title
-        <Title text="Welcome to Leptos"/>
-
-        // content for this welcome page
-        <Router>
-            <main id="app">
-                <Routes>
-                    <Route path="" view=HomePage/>
-                    <Route path="/*any" view=NotFound/>
-                </Routes>
-            </main>
-        </Router>
-    }
-}
-
-#[server]
-async fn do_something(
-    should_error: Option<String>,
-) -> Result<String, ServerFnError> {
-    if should_error.is_none() {
-        Ok(String::from("Successful submit"))
-    } else {
-        Err(ServerFnError::ServerError(String::from(
-            "You got an error!",
-        )))
-    }
-}
-
-/// Renders the home page of your application.
-#[component]
-fn HomePage() -> impl IntoView {
-    let do_something_action = Action::<DoSomething, _>::server();
-    let value = Signal::derive(move || {
-        do_something_action
-            .value()
-            .get()
-            .unwrap_or_else(|| Ok(String::new()))
-    });
-
-    Effect::new_isomorphic(move |_| {
-        logging::log!("Got value = {:?}", value.get());
-    });
-
-    view! {
-        <h1>"Test the action form!"</h1>
-        <ErrorBoundary fallback=move |error| format!("{:#?}", error
-                                                     .get()
-                                                     .into_iter()
-                                                     .next()
-                                                     .unwrap()
-                                                     .1.into_inner()
-                                                     .to_string())
-            >
-            {value}
-            <ActionForm action=do_something_action class="form">
-                <label>Should error: <input type="checkbox" name="should_error"/></label>
-                <button type="submit">Submit</button>
-            </ActionForm>
-        </ErrorBoundary>
-    }
-}
-
-/// 404 - Not Found
-#[component]
-fn NotFound() -> impl IntoView {
-    // set an HTTP status code 404
-    // this is feature gated because it can only be done during
-    // initial server-side rendering
-    // if you navigate to the 404 page subsequently, the status
-    // code will not be set because there is not a new HTTP request
-    // to the server
-    #[cfg(feature = "ssr")]
-    {
-        // this can be done inline because it's synchronous
-        // if it were async, we'd use a server function
-        let resp = expect_context::<leptos_actix::ResponseOptions>();
-        resp.set_status(actix_web::http::StatusCode::NOT_FOUND);
-    }
-
-    view! {
-        <h1>"Not Found"</h1>
-    }
-}

examples/action-form-error-handling/src/lib.rs

@@ -1,18 +0,0 @@
-pub mod app;
-use cfg_if::cfg_if;
-
-cfg_if! {
-if #[cfg(feature = "hydrate")] {
-
-  use wasm_bindgen::prelude::wasm_bindgen;
-
-    #[wasm_bindgen]
-    pub fn hydrate() {
-      use app::*;
-
-      console_error_panic_hook::set_once();
-
-      leptos::mount_to_body(App);
-    }
-}
-}

examples/action-form-error-handling/src/main.rs

@@ -1,53 +0,0 @@
-#[cfg(feature = "ssr")]
-#[actix_web::main]
-async fn main() -> std::io::Result<()> {
-    use action_form_error_handling::app::*;
-    use actix_files::Files;
-    use actix_web::*;
-    use leptos::*;
-    use leptos_actix::{generate_route_list, LeptosRoutes};
-
-    let conf = get_configuration(None).await.unwrap();
-    let addr = conf.leptos_options.site_addr;
-    // Generate the list of routes in your Leptos App
-    let routes = generate_route_list(App);
-    println!("listening on http://{}", &addr);
-
-    HttpServer::new(move || {
-        let leptos_options = &conf.leptos_options;
-        let site_root = &leptos_options.site_root;
-
-        App::new()
-            .route("/api/{tail:.*}", leptos_actix::handle_server_fns())
-            // serve JS/WASM/CSS from `pkg`
-            .service(Files::new("/pkg", format!("{site_root}/pkg")))
-            .leptos_routes(leptos_options.to_owned(), routes.to_owned(), App)
-            .app_data(web::Data::new(leptos_options.to_owned()))
-        //.wrap(middleware::Compress::default())
-    })
-    .bind(&addr)?
-    .run()
-    .await
-}
-
-#[cfg(not(any(feature = "ssr", feature = "csr")))]
-pub fn main() {
-    // no client-side main function
-    // unless we want this to work with e.g., Trunk for pure client-side testing
-    // see lib.rs for hydration function instead
-    // see optional feature `csr` instead
-}
-
-#[cfg(all(not(feature = "ssr"), feature = "csr"))]
-pub fn main() {
-    // a client-side main function is required for using `trunk serve`
-    // prefer using `cargo leptos serve` instead
-    // to run: `trunk serve --open --features csr`
-    use action_form_error_handling::app::*;
-    use leptos::*;
-    use wasm_bindgen::prelude::wasm_bindgen;
-
-    console_error_panic_hook::set_once();
-
-    leptos::mount_to_body(App);
-}

examples/action-form-error-handling/style/main.scss

@@ -1,15 +0,0 @@
-body {
-	font-family: sans-serif;
-	text-align: center;
-}
-
-#app {
-	text-align: center;
-}
-
-.form {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	gap: 0.5rem;
-}

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/cargo-make/scripts/web-report.sh

@@ -1,154 +0,0 @@
-#!/bin/bash
-
-set -emu
-
-BOLD="\e[1m"
-ITALIC="\e[3m"
-YELLOW="\e[0;33m"
-RESET="\e[0m"
-
-function web { #task: only include examples with web cargo-make configuration
-    print_header
-    print_crate_tags "$@"
-    print_footer
-}
-
-function all { #task: includes all examples
-    print_header
-    print_crate_tags "all"
-    print_footer
-}
-
-function print_header {
-    echo -e "${YELLOW}Cargo Make Web Report${RESET}"
-    echo
-    echo -e "${ITALIC}Show how crates are configured to run and test web examples with cargo-make${RESET}"
-    echo
-}
-
-function print_crate_tags {
-    local makefile_paths
-    makefile_paths=$(find_makefile_lines)
-
-    local start_path
-    start_path=$(pwd)
-
-    for path in $makefile_paths; do
-        cd "$path"
-
-        local crate_tags=
-
-        # Add cargo tags
-        while read -r line; do
-            case $line in
-            *"cucumber"*)
-                crate_tags=$crate_tags"C"
-                ;;
-            *"fantoccini"*)
-                crate_tags=$crate_tags"F"
-                ;;
-            esac
-        done <"./Cargo.toml"
-
-        #Add makefile tags
-
-        local pw_count
-        pw_count=$(find . -name playwright.config.ts | wc -l)
-
-        while read -r line; do
-            case $line in
-            *"cargo-make/wasm-test.toml"*)
-                crate_tags=$crate_tags"W"
-                ;;
-            *"cargo-make/playwright-test.toml"*)
-                crate_tags=$crate_tags"P"
-                crate_tags=$crate_tags"N"
-                ;;
-            *"cargo-make/playwright-trunk-test.toml"*)
-                crate_tags=$crate_tags"P"
-                crate_tags=$crate_tags"T"
-                ;;
-            *"cargo-make/trunk_server.toml"*)
-                crate_tags=$crate_tags"T"
-                ;;
-            *"cargo-make/cargo-leptos-webdriver-test.toml"*)
-                crate_tags=$crate_tags"L"
-                ;;
-            *"cargo-make/cargo-leptos-test.toml"*)
-                crate_tags=$crate_tags"L"
-                if [ "$pw_count" -gt 0 ]; then
-                    crate_tags=$crate_tags"P"
-                fi
-                ;;
-            *"cargo-make/cargo-leptos.toml"*)
-                crate_tags=$crate_tags"L"
-                ;;
-            esac
-        done <"./Makefile.toml"
-
-        # Sort tags
-        local sorted_crate_symbols
-        sorted_crate_symbols=$(echo "$crate_tags" | grep -o . | sort | tr -d "\n")
-
-        # Maybe print line
-        local crate_line=$path
-
-        if [ -n "$crate_tags" ]; then
-            crate_line="$crate_line ➤ ${YELLOW}$sorted_crate_symbols${RESET}"
-            echo -e "$crate_line"
-        elif [ "$#" -gt 0 ]; then
-            crate_line="${BOLD}$crate_line${RESET}"
-            echo -e "$crate_line"
-        fi
-
-        cd "$start_path"
-    done
-}
-
-function find_makefile_lines {
-    find . -name Makefile.toml -not -path '*/target/*' -not -path '*/node_modules/*' |
-        sed 's%./%%' |
-        sed 's%/Makefile.toml%%' |
-        grep -v Makefile.toml |
-        sort -u
-}
-
-function print_footer {
-    c="${BOLD}${YELLOW}C${RESET} = Cucumber Test Runner"
-    d="${BOLD}${YELLOW}F${RESET} = Fantoccini WebDriver"
-    l="${BOLD}${YELLOW}L${RESET} = Cargo Leptos"
-    n="${BOLD}${YELLOW}N${RESET} = Node"
-    p="${BOLD}${YELLOW}P${RESET} = Playwright Test"
-    t="${BOLD}${YELLOW}T${RESET} = Trunk"
-    w="${BOLD}${YELLOW}W${RESET} = WASM Test"
-
-    echo
-    echo -e "${ITALIC}Technology Keys:${RESET}\n $c\n $d\n $l\n $n\n $p\n $t\n $w"
-    echo
-}
-
-###################
-# HELP
-###################
-
-function list_help_for {
-    local task=$1
-    grep -E "^function.+ #$task" "$0" |
-        sed 's/function/ /' |
-        sed -e "s| { #$task: |~|g" |
-        column -s"~" -t |
-        sort
-}
-
-function help { #help: show task descriptions
-    echo -e "${BOLD}Usage:${RESET} ./$(basename "$0") <task> [options]"
-    echo
-    echo "Show the cargo-make configuration for web examples"
-    echo
-    echo -e "${BOLD}Tasks:${RESET}"
-    list_help_for task
-    echo
-}
-
-TIMEFORMAT="./web-report.sh completed in %3lR"
-time "${@:-all}" # Show the report by default

examples/counter/rust-toolchain.toml

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

examples/counter_isomorphic/Cargo.toml

@@ -17,6 +17,7 @@ broadcaster = "1"
 console_log = "1"
 console_error_panic_hook = "0.1"
 futures = "0.3"
+cfg-if = "1"
 lazy_static = "1"
 leptos = { path = "../../leptos" }
 leptos_actix = { path = "../../integrations/actix", optional = true }
@@ -69,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/counter_isomorphic/src/counters.rs

@@ -1,35 +1,34 @@
+use cfg_if::cfg_if;
 use leptos::*;
 use leptos_meta::*;
 use leptos_router::*;
 #[cfg(feature = "ssr")]
 use tracing::instrument;
 
-#[cfg(feature = "ssr")]
-pub mod ssr_imports {
-    pub use broadcaster::BroadcastChannel;
-    pub use once_cell::sync::OnceCell;
-    pub use std::sync::atomic::{AtomicI32, Ordering};
+cfg_if! {
+    if #[cfg(feature = "ssr")] {
+        use std::sync::atomic::{AtomicI32, Ordering};
+        use broadcaster::BroadcastChannel;
+        use once_cell::sync::OnceCell;
 
-    pub static COUNT: AtomicI32 = AtomicI32::new(0);
+        static COUNT: AtomicI32 = AtomicI32::new(0);
 
-    lazy_static::lazy_static! {
-        pub static ref COUNT_CHANNEL: BroadcastChannel<i32> = BroadcastChannel::new();
-    }
+        lazy_static::lazy_static! {
+            pub static ref COUNT_CHANNEL: BroadcastChannel<i32> = BroadcastChannel::new();
+        }
 
-    static LOG_INIT: OnceCell<()> = OnceCell::new();
-
-    pub fn init_logging() {
-        LOG_INIT.get_or_init(|| {
-            simple_logger::SimpleLogger::new().env().init().unwrap();
-        });
+        static LOG_INIT: OnceCell<()> = OnceCell::new();
+        fn init_logging() {
+            LOG_INIT.get_or_init(|| {
+                simple_logger::SimpleLogger::new().env().init().unwrap();
+            });
+        }
     }
 }
 
 #[server]
 #[cfg_attr(feature = "ssr", instrument)]
 pub async fn get_server_count() -> Result<i32, ServerFnError> {
-    use ssr_imports::*;
-
     Ok(COUNT.load(Ordering::Relaxed))
 }
 
@@ -39,8 +38,6 @@ pub async fn adjust_server_count(
     delta: i32,
     msg: String,
 ) -> Result<i32, ServerFnError> {
-    use ssr_imports::*;
-
     let new = COUNT.load(Ordering::Relaxed) + delta;
     COUNT.store(new, Ordering::Relaxed);
     _ = COUNT_CHANNEL.send(&new).await;
@@ -51,8 +48,6 @@ pub async fn adjust_server_count(
 #[server]
 #[cfg_attr(feature = "ssr", instrument)]
 pub async fn clear_server_count() -> Result<i32, ServerFnError> {
-    use ssr_imports::*;
-
     COUNT.store(0, Ordering::Relaxed);
     _ = COUNT_CHANNEL.send(&0).await;
     Ok(0)
@@ -60,7 +55,7 @@ pub async fn clear_server_count() -> Result<i32, ServerFnError> {
 #[component]
 pub fn Counters() -> impl IntoView {
     #[cfg(feature = "ssr")]
-    ssr_imports::init_logging();
+    init_logging();
 
     provide_meta_context();
     view! {
@@ -118,9 +113,9 @@ pub fn Counters() -> impl IntoView {
 // This is the typical pattern for a CRUD app
 #[component]
 pub fn Counter() -> impl IntoView {
-    let dec = create_action(|_: &()| adjust_server_count(-1, "decing".into()));
-    let inc = create_action(|_: &()| adjust_server_count(1, "incing".into()));
-    let clear = create_action(|_: &()| clear_server_count());
+    let dec = create_action(|_| adjust_server_count(-1, "decing".into()));
+    let inc = create_action(|_| adjust_server_count(1, "incing".into()));
+    let clear = create_action(|_| clear_server_count());
     let counter = create_resource(
         move || {
             (
@@ -132,6 +127,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,24 +145,15 @@ pub fn Counter() -> impl IntoView {
             <div>
                 <button on:click=move |_| clear.dispatch(())>"Clear"</button>
                 <button on:click=move |_| dec.dispatch(())>"-1"</button>
-                <span>
-                    "Value: "
-                    <Suspense>
-                        {move || counter.and_then(|count| *count)} "!"
-                    </Suspense>
-                </span>
+                <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>
     }
 }
@@ -204,7 +199,7 @@ pub fn FormCounter() -> impl IntoView {
                     <input type="hidden" name="msg" value="form value down"/>
                     <input type="submit" value="-1"/>
                 </ActionForm>
-                <span>"Value: " <Suspense>{move || value().to_string()} "!"</Suspense></span>
+                <span>"Value: " {move || value().to_string()} "!"</span>
                 <ActionForm action=adjust>
                     <input type="hidden" name="delta" value="1"/>
                     <input type="hidden" name="msg" value="form value up"/>
@@ -222,10 +217,9 @@ pub fn FormCounter() -> impl IntoView {
 #[component]
 pub fn MultiuserCounter() -> impl IntoView {
     let dec =
-        create_action(|_: &()| adjust_server_count(-1, "dec dec goose".into()));
-    let inc =
-        create_action(|_: &()| adjust_server_count(1, "inc inc moose".into()));
-    let clear = create_action(|_: &()| clear_server_count());
+        create_action(|_| adjust_server_count(-1, "dec dec goose".into()));
+    let inc = create_action(|_| adjust_server_count(1, "inc inc moose".into()));
+    let clear = create_action(|_| clear_server_count());
 
     #[cfg(not(feature = "ssr"))]
     let multiplayer_value = {

examples/counter_isomorphic/src/lib.rs

@@ -1,13 +1,21 @@
+use cfg_if::cfg_if;
 pub mod counters;
 
-#[cfg(feature = "hydrate")]
-#[wasm_bindgen::prelude::wasm_bindgen]
-pub fn hydrate() {
-    use crate::counters::*;
-    use leptos::*;
+// Needs to be in lib.rs AFAIK because wasm-bindgen needs us to be compiling a lib. I may be wrong.
+cfg_if! {
+    if #[cfg(feature = "hydrate")] {
+        use leptos::*;
+        use wasm_bindgen::prelude::wasm_bindgen;
+        use crate::counters::*;
 
-    _ = console_log::init_with_level(log::Level::Debug);
-    console_error_panic_hook::set_once();
+        #[wasm_bindgen]
+        pub fn hydrate() {
+            _ = console_log::init_with_level(log::Level::Debug);
+            console_error_panic_hook::set_once();
 
-    mount_to_body(Counters);
+            mount_to_body(|| {
+                view! { <Counters/> }
+            });
+        }
+    }
 }

examples/counter_isomorphic/src/main.rs

@@ -1,54 +1,72 @@
+use cfg_if::cfg_if;
 mod counters;
 
-use crate::counters::*;
-use actix_files::Files;
-use actix_web::*;
-use leptos::*;
-use leptos_actix::{generate_route_list, LeptosRoutes};
+// boilerplate to run in different modes
+cfg_if! {
+    // server-only stuff
+    if #[cfg(feature = "ssr")] {
+        use leptos::*;
+        use actix_files::{Files};
+        use actix_web::*;
+        use crate::counters::*;
+        use leptos_actix::{generate_route_list, LeptosRoutes};
 
-#[get("/api/events")]
-async fn counter_events() -> impl Responder {
-    use crate::counters::ssr_imports::*;
-    use futures::StreamExt;
+        #[get("/api/events")]
+        async fn counter_events() -> impl Responder {
+            use futures::StreamExt;
 
-    let stream = futures::stream::once(async {
-        crate::counters::get_server_count().await.unwrap_or(0)
-    })
-    .chain(COUNT_CHANNEL.clone())
-    .map(|value| {
-        Ok(web::Bytes::from(format!(
-            "event: message\ndata: {value}\n\n"
-        ))) as Result<web::Bytes>
-    });
-    HttpResponse::Ok()
-        .insert_header(("Content-Type", "text/event-stream"))
-        .streaming(stream)
-}
-
-#[actix_web::main]
-async fn main() -> std::io::Result<()> {
-    // Setting this to None means we'll be using cargo-leptos and its env vars.
-    // when not using cargo-leptos None must be replaced with Some("Cargo.toml")
-    let conf = get_configuration(None).await.unwrap();
-
-    let addr = conf.leptos_options.site_addr;
-    let routes = generate_route_list(Counters);
-
-    HttpServer::new(move || {
-        let leptos_options = &conf.leptos_options;
-        let site_root = &leptos_options.site_root;
-
-        App::new()
-            .service(counter_events)
-            .leptos_routes(
-                leptos_options.to_owned(),
-                routes.to_owned(),
-                Counters,
-            )
-            .service(Files::new("/", site_root))
-        //.wrap(middleware::Compress::default())
-    })
-    .bind(&addr)?
-    .run()
-    .await
+            let stream =
+                futures::stream::once(async { crate::counters::get_server_count().await.unwrap_or(0) })
+                    .chain(COUNT_CHANNEL.clone())
+                    .map(|value| {
+                        Ok(web::Bytes::from(format!(
+                            "event: message\ndata: {value}\n\n"
+                        ))) as Result<web::Bytes>
+                    });
+            HttpResponse::Ok()
+                .insert_header(("Content-Type", "text/event-stream"))
+                .streaming(stream)
+        }
+
+        #[actix_web::main]
+        async fn main() -> std::io::Result<()> {
+
+            // Explicit server function registration is no longer required
+            // on the main branch. On 0.3.0 and earlier, uncomment the lines
+            // below to register the server functions.
+            // _ = GetServerCount::register();
+            // _ = AdjustServerCount::register();
+            // _ = ClearServerCount::register();
+
+            // Setting this to None means we'll be using cargo-leptos and its env vars.
+            // when not using cargo-leptos None must be replaced with Some("Cargo.toml")
+            let conf = get_configuration(None).await.unwrap();
+
+            let addr = conf.leptos_options.site_addr;
+            let routes = generate_route_list(|| view! { <Counters/> });
+
+            HttpServer::new(move || {
+                let leptos_options = &conf.leptos_options;
+                let site_root = &leptos_options.site_root;
+
+                App::new()
+                    .service(counter_events)
+                    .route("/api/{tail:.*}", leptos_actix::handle_server_fns())
+                    .leptos_routes(leptos_options.to_owned(), routes.to_owned(), || view! { <Counters/> })
+                    .service(Files::new("/", site_root))
+                    //.wrap(middleware::Compress::default())
+            })
+            .bind(&addr)?
+            .run()
+            .await
+        }
+        }
+
+    // client-only main for Trunk
+    else {
+        pub fn main() {
+            // isomorphic counters cannot work in a Client-Side-Rendered only
+            // app as a server is required to maintain state
+        }
+    }
 }

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

@@ -7,21 +7,22 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-console_log = "1.0"
-console_error_panic_hook = "0.1"
+console_log = "1.0.0"
+console_error_panic_hook = "0.1.7"
+cfg-if = "1.0.0"
 leptos = { path = "../../leptos", features = ["nightly"] }
 leptos_axum = { path = "../../integrations/axum", optional = true }
 leptos_meta = { path = "../../meta" }
 leptos_router = { path = "../../router" }
-log = "0.4"
+log = "0.4.17"
 serde = { version = "1", features = ["derive"] }
-simple_logger = "4.0"
-axum = { version = "0.7", optional = true }
-tower = { version = "0.4", optional = true }
-tower-http = { version = "0.5", features = ["fs"], optional = true }
-tokio = { version = "1", features = ["full"], optional = true }
-http = { version = "1.0" }
-thiserror = "1.0"
+simple_logger = "4.0.0"
+axum = { version = "0.6.1", optional = true }
+tower = { version = "0.4.13", optional = true }
+tower-http = { version = "0.4", features = ["fs"], optional = true }
+tokio = { version = "1.22.0", features = ["full"], optional = true }
+http = { version = "0.2.8" }
+thiserror = "1.0.38"
 wasm-bindgen = "0.2"
 
 [features]
@@ -61,7 +62,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/errors_axum/src/error_template.rs

@@ -1,4 +1,5 @@
 use crate::errors::AppError;
+use cfg_if::cfg_if;
 use leptos::{logging::log, Errors, *};
 #[cfg(feature = "ssr")]
 use leptos_axum::ResponseOptions;
@@ -29,13 +30,12 @@ pub fn ErrorTemplate(
 
     // Only the response code for the first error is actually sent from the server
     // this may be customized by the specific application
-    #[cfg(feature = "ssr")]
-    {
+    cfg_if! { if #[cfg(feature="ssr")] {
         let response = use_context::<ResponseOptions>();
         if let Some(response) = response {
             response.set_status(errors[0].status_code());
         }
-    }
+    }}
 
     view! {
         <h1>{if errors.len() > 1 {"Errors"} else {"Error"}}</h1>

examples/errors_axum/src/fallback.rs

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

examples/errors_axum/src/lib.rs

@@ -1,21 +1,24 @@
+use cfg_if::cfg_if;
 pub mod error_template;
 pub mod errors;
-#[cfg(feature = "ssr")]
 pub mod fallback;
 pub mod landing;
 
-use wasm_bindgen::prelude::wasm_bindgen;
+// Needs to be in lib.rs AFAIK because wasm-bindgen needs us to be compiling a lib. I may be wrong.
+cfg_if! {
+    if #[cfg(feature = "hydrate")] {
+        use leptos::*;
+        use wasm_bindgen::prelude::wasm_bindgen;
+        use crate::landing::*;
 
-#[cfg(feature = "hydrate")]
-#[wasm_bindgen]
-pub fn hydrate() {
-    use crate::landing::*;
-    use leptos::*;
+        #[wasm_bindgen]
+        pub fn hydrate() {
+            _ = console_log::init_with_level(log::Level::Debug);
+            console_error_panic_hook::set_once();
 
-    _ = console_log::init_with_level(log::Level::Debug);
-    console_error_panic_hook::set_once();
-
-    leptos::mount_to_body(|| {
-        view! {  <App/> }
-    });
+            leptos::mount_to_body(|| {
+                view! {  <App/> }
+            });
+        }
+    }
 }

examples/errors_axum/src/main.rs

@@ -1,39 +1,41 @@
-#[cfg(feature = "ssr")]
-mod ssr_imports {
-    pub use axum::{
-        body::Body as AxumBody,
-        extract::{Path, State},
+use cfg_if::cfg_if;
+
+cfg_if! { if #[cfg(feature = "ssr")] {
+    use crate::fallback::file_and_error_handler;
+    use crate::landing::*;
+    use axum::body::Body as AxumBody;
+    use axum::{
+        extract::{State, Path},
         http::Request,
         response::{IntoResponse, Response},
-        routing::get,
+        routing::{get, post},
         Router,
     };
-    pub use errors_axum::{fallback::*, landing::App};
-    pub use leptos::{logging::log, *};
-    pub use leptos_axum::{generate_route_list, LeptosRoutes};
+    use errors_axum::*;
+    use leptos::{logging::log, *};
+    use leptos_axum::{generate_route_list, LeptosRoutes};
+}}
 
-    // This custom handler lets us provide Axum State via context
-    pub async fn custom_handler(
-        Path(id): Path<String>,
-        State(options): State<LeptosOptions>,
-        req: Request<AxumBody>,
-    ) -> Response {
-        let handler = leptos_axum::render_app_to_stream_with_context(
-            options.clone(),
-            move || {
-                provide_context(id.clone());
-            },
-            App,
-        );
-        handler(req).await.into_response()
-    }
+//Define a handler to test extractor with state
+#[cfg(feature = "ssr")]
+async fn custom_handler(
+    Path(id): Path<String>,
+    State(options): State<LeptosOptions>,
+    req: Request<AxumBody>,
+) -> Response {
+    let handler = leptos_axum::render_app_to_stream_with_context(
+        options.clone(),
+        move || {
+            provide_context(id.clone());
+        },
+        App,
+    );
+    handler(req).await.into_response()
 }
 
 #[cfg(feature = "ssr")]
 #[tokio::main]
 async fn main() {
-    use ssr_imports::*;
-
     simple_logger::init_with_level(log::Level::Debug)
         .expect("couldn't initialize logging");
 
@@ -50,6 +52,7 @@ async fn main() {
 
     // build our application with a route
     let app = Router::new()
+        .route("/api/*fn_name", post(leptos_axum::handle_server_fns))
         .route("/special/:id", get(custom_handler))
         .leptos_routes(&leptos_options, routes, App)
         .fallback(file_and_error_handler)
@@ -58,8 +61,8 @@ async fn main() {
     // run our app with hyper
     // `axum::Server` is a re-export of `hyper::Server`
     log!("listening on http://{}", &addr);
-    let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
-    axum::serve(listener, app.into_make_service())
+    axum::Server::bind(&addr)
+        .serve(app.into_make_service())
         .await
         .unwrap();
 }
@@ -68,5 +71,5 @@ async fn main() {
 #[cfg(not(feature = "ssr"))]
 pub fn main() {
     // This example cannot be built as a trunk standalone CSR-only app.
-    // The server is needed to demonstrate the error statuses.
+    //  The server is needed to demonstrate the error statuses.
 }

examples/fetch/rust-toolchain.toml

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

examples/hackernews/Cargo.toml

@@ -15,6 +15,7 @@ actix-files = { version = "0.6", optional = true }
 actix-web = { version = "4", optional = true, features = ["macros"] }
 console_log = "1"
 console_error_panic_hook = "0.1"
+cfg-if = "1"
 leptos = { path = "../../leptos", features = ["nightly"] }
 leptos_meta = { path = "../../meta", features = ["nightly"] }
 leptos_actix = { path = "../../integrations/actix", optional = true }
@@ -70,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/rust-toolchain.toml

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

examples/hackernews/src/lib.rs

@@ -1,3 +1,4 @@
+use cfg_if::cfg_if;
 use leptos::*;
 use leptos_meta::*;
 use leptos_router::*;
@@ -32,10 +33,16 @@ pub fn App() -> impl IntoView {
     }
 }
 
-#[cfg(feature = "hydrate")]
-#[wasm_bindgen::prelude::wasm_bindgen]
-pub fn hydrate() {
-    _ = console_log::init_with_level(log::Level::Debug);
-    console_error_panic_hook::set_once();
-    leptos::mount_to_body(App);
+// Needs to be in lib.rs AFAIK because wasm-bindgen needs us to be compiling a lib. I may be wrong.
+cfg_if! {
+    if #[cfg(feature = "hydrate")] {
+        use wasm_bindgen::prelude::wasm_bindgen;
+
+        #[wasm_bindgen]
+        pub fn hydrate() {
+            _ = console_log::init_with_level(log::Level::Debug);
+            console_error_panic_hook::set_once();
+            leptos::mount_to_body(App);
+        }
+    }
 }

examples/hackernews/src/main.rs

@@ -1,56 +1,56 @@
-// server-only stuff
-#[cfg(feature = "ssr")]
-mod ssr_imports {
-    pub use actix_files::Files;
-    pub use actix_web::*;
-    pub use hackernews::App;
-    pub use leptos_actix::{generate_route_list, LeptosRoutes};
+use cfg_if::cfg_if;
+use leptos::*;
 
-    #[get("/style.css")]
-    pub async fn css() -> impl Responder {
-        actix_files::NamedFile::open_async("./style.css").await
-    }
-    #[get("/favicon.ico")]
-    pub async fn favicon() -> impl Responder {
-        actix_files::NamedFile::open_async("./target/site//favicon.ico").await
+// boilerplate to run in different modes
+cfg_if! {
+    // server-only stuff
+    if #[cfg(feature = "ssr")] {
+        use actix_files::{Files};
+        use actix_web::*;
+        use hackernews::{App};
+        use leptos_actix::{LeptosRoutes, generate_route_list};
+
+        #[get("/style.css")]
+        async fn css() -> impl Responder {
+            actix_files::NamedFile::open_async("./style.css").await
+        }
+        #[get("/favicon.ico")]
+        async fn favicon() -> impl Responder {
+            actix_files::NamedFile::open_async("./target/site//favicon.ico").await
+        }
+
+        #[actix_web::main]
+        async fn main() -> std::io::Result<()> {
+            // Setting this to None means we'll be using cargo-leptos and its env vars.
+            let conf = get_configuration(None).await.unwrap();
+
+            let addr = conf.leptos_options.site_addr;
+            // Generate the list of routes in your Leptos App
+            let routes = generate_route_list(App);
+
+            HttpServer::new(move || {
+                let leptos_options = &conf.leptos_options;
+                let site_root = &leptos_options.site_root;
+
+                App::new()
+                    .service(css)
+                    .service(favicon)
+                    .route("/api/{tail:.*}", leptos_actix::handle_server_fns())
+                    .leptos_routes(leptos_options.to_owned(), routes.to_owned(), App)
+                    .service(Files::new("/", site_root))
+                //.wrap(middleware::Compress::default())
+            })
+            .bind(&addr)?
+            .run()
+            .await
+        }
+    } else {
+        fn main() {
+            use hackernews::{App};
+
+            _ = console_log::init_with_level(log::Level::Debug);
+            console_error_panic_hook::set_once();
+            mount_to_body(App)
+        }
     }
 }
-
-#[cfg(feature = "ssr")]
-#[actix_web::main]
-async fn main() -> std::io::Result<()> {
-    use leptos::get_configuration;
-    use ssr_imports::*;
-
-    // Setting this to None means we'll be using cargo-leptos and its env vars.
-    let conf = get_configuration(None).await.unwrap();
-
-    let addr = conf.leptos_options.site_addr;
-    // Generate the list of routes in your Leptos App
-    let routes = generate_route_list(App);
-
-    HttpServer::new(move || {
-        let leptos_options = &conf.leptos_options;
-        let site_root = &leptos_options.site_root;
-
-        App::new()
-            .service(css)
-            .service(favicon)
-            .leptos_routes(leptos_options.to_owned(), routes.to_owned(), App)
-            .service(Files::new("/", site_root))
-        //.wrap(middleware::Compress::default())
-    })
-    .bind(&addr)?
-    .run()
-    .await
-}
-
-// CSR-only setup
-#[cfg(not(feature = "ssr"))]
-fn main() {
-    use hackernews::App;
-
-    _ = console_log::init_with_level(log::Level::Debug);
-    console_error_panic_hook::set_once();
-    mount_to_body(App)
-}

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

@@ -11,23 +11,24 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-console_log = "1.0"
-console_error_panic_hook = "0.1"
+console_log = "1.0.0"
+console_error_panic_hook = "0.1.7"
+cfg-if = "1.0.0"
 leptos = { path = "../../leptos", features = ["nightly"] }
 leptos_axum = { path = "../../integrations/axum", optional = true }
 leptos_meta = { path = "../../meta", features = ["nightly"] }
 leptos_router = { path = "../../router", features = ["nightly"] }
-log = "0.4"
-simple_logger = "4.0"
-serde = { version = "1.0", features = ["derive"] }
+log = "0.4.17"
+simple_logger = "4.0.0"
+serde = { version = "1.0.148", features = ["derive"] }
 tracing = "0.1"
-gloo-net = { version = "0.4", features = ["http"] }
-reqwest = { version = "0.11", features = ["json"] }
-axum = { version = "0.7", optional = true }
-tower = { version = "0.4", optional = true }
-tower-http = { version = "0.5", features = ["fs"], optional = true }
-tokio = { version = "1", features = ["full"], optional = true }
-http = { version = "1.0", optional = true }
+gloo-net = { version = "0.2.5", features = ["http"] }
+reqwest = { version = "0.11.13", features = ["json"] }
+axum = { version = "0.6.1", optional = true }
+tower = { version = "0.4.13", optional = true }
+tower-http = { version = "0.4", features = ["fs"], optional = true }
+tokio = { version = "1.22.0", features = ["full"], optional = true }
+http = { version = "0.2.11", optional = true }
 web-sys = { version = "0.3", features = ["AbortController", "AbortSignal"] }
 wasm-bindgen = "0.2"
 
@@ -71,7 +72,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_axum/src/fallback.rs

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

examples/hackernews_axum/src/handlers.rs

@@ -1,68 +1,63 @@
-use axum::{
-    body::Body,
-    http::{Request, Response, StatusCode, Uri},
-    response::IntoResponse,
-};
-use tower::ServiceExt;
-use tower_http::services::ServeDir;
+use cfg_if::cfg_if;
 
-pub async fn file_handler(
-    uri: Uri,
-) -> Result<Response<Body>, (StatusCode, String)> {
-    let res = get_static_file(uri.clone(), "/pkg").await?;
+cfg_if! {
+if #[cfg(feature = "ssr")] {
+    use axum::{
+        body::{boxed, Body, BoxBody},
+        http::{Request, Response, StatusCode, Uri},
+    };
+    use tower::ServiceExt;
+    use tower_http::services::ServeDir;
 
-    if res.status() == StatusCode::NOT_FOUND {
-        // try with `.html`
-        // TODO: handle if the Uri has query parameters
-        match format!("{}.html", uri).parse() {
-            Ok(uri_html) => get_static_file(uri_html, "/pkg").await,
-            Err(_) => Err((
-                StatusCode::INTERNAL_SERVER_ERROR,
-                "Invalid URI".to_string(),
-            )),
+    pub async fn file_handler(uri: Uri) -> Result<Response<BoxBody>, (StatusCode, String)> {
+        let res = get_static_file(uri.clone(), "/pkg").await?;
+
+        if res.status() == StatusCode::NOT_FOUND {
+            // try with `.html`
+            // TODO: handle if the Uri has query parameters
+            match format!("{}.html", uri).parse() {
+                Ok(uri_html) => get_static_file(uri_html, "/pkg").await,
+                Err(_) => Err((StatusCode::INTERNAL_SERVER_ERROR, "Invalid URI".to_string())),
+            }
+        } else {
+            Ok(res)
         }
-    } else {
-        Ok(res)
-    }
-}
-
-pub async fn get_static_file_handler(
-    uri: Uri,
-) -> Result<Response<Body>, (StatusCode, String)> {
-    let res = get_static_file(uri.clone(), "/static").await?;
-
-    if res.status() == StatusCode::NOT_FOUND {
-        Err((StatusCode::INTERNAL_SERVER_ERROR, "Invalid URI".to_string()))
-    } else {
-        Ok(res)
-    }
-}
-
-async fn get_static_file(
-    uri: Uri,
-    base: &str,
-) -> Result<Response<Body>, (StatusCode, String)> {
-    let req = Request::builder().uri(&uri).body(Body::empty()).unwrap();
-
-    // `ServeDir` implements `tower::Service` so we can call it with `tower::ServiceExt::oneshot`
-    // When run normally, the root should be the crate root
-    if base == "/static" {
-        match ServeDir::new("./static").oneshot(req).await {
-            Ok(res) => Ok(res.into_response()),
-            Err(err) => Err((
-                StatusCode::INTERNAL_SERVER_ERROR,
-                format!("Something went wrong: {}", err),
-            )),
-        }
-    } else if base == "/pkg" {
-        match ServeDir::new("./pkg").oneshot(req).await {
-            Ok(res) => Ok(res.into_response()),
-            Err(err) => Err((
-                StatusCode::INTERNAL_SERVER_ERROR,
-                format!("Something went wrong: {}", err),
-            )),
-        }
-    } else {
-        Err((StatusCode::NOT_FOUND, "Not Found".to_string()))
+    }
+
+    pub async fn get_static_file_handler(uri: Uri) -> Result<Response<BoxBody>, (StatusCode, String)> {
+        let res = get_static_file(uri.clone(), "/static").await?;
+
+        if res.status() == StatusCode::NOT_FOUND {
+          Err((StatusCode::INTERNAL_SERVER_ERROR, "Invalid URI".to_string()))
+        } else {
+            Ok(res)
+        }
+    }
+
+    async fn get_static_file(uri: Uri, base: &str) -> Result<Response<BoxBody>, (StatusCode, String)> {
+        let req = Request::builder().uri(&uri).body(Body::empty()).unwrap();
+
+        // `ServeDir` implements `tower::Service` so we can call it with `tower::ServiceExt::oneshot`
+        // When run normally, the root should be the crate root
+        if base == "/static" {
+            match ServeDir::new("./static").oneshot(req).await {
+                Ok(res) => Ok(res.map(boxed)),
+                Err(err) => Err((
+                    StatusCode::INTERNAL_SERVER_ERROR,
+                    format!("Something went wrong: {}", err),
+                ))
+        }
+        } else if base == "/pkg" {
+            match ServeDir::new("./pkg").oneshot(req).await {
+                Ok(res) => Ok(res.map(boxed)),
+                Err(err) => Err((
+                    StatusCode::INTERNAL_SERVER_ERROR,
+                    format!("Something went wrong: {}", err),
+                )),
+        }
+    } else{
+           Err((StatusCode::NOT_FOUND, "Not Found".to_string()))
+        }
+    }
     }
 }

examples/hackernews_axum/src/lib.rs

@@ -1,11 +1,10 @@
+use cfg_if::cfg_if;
 use leptos::{component, view, IntoView};
 use leptos_meta::*;
 use leptos_router::*;
 mod api;
 pub mod error_template;
-#[cfg(feature = "ssr")]
 pub mod fallback;
-#[cfg(feature = "ssr")]
 pub mod handlers;
 mod routes;
 use routes::{nav::*, stories::*, story::*, users::*};
@@ -13,28 +12,38 @@ use routes::{nav::*, stories::*, story::*, users::*};
 #[component]
 pub fn App() -> impl IntoView {
     provide_meta_context();
-
     view! {
-        <Link rel="shortcut icon" type_="image/ico" href="/favicon.ico"/>
-        <Stylesheet id="leptos" href="/pkg/hackernews_axum.css"/>
-        <Meta name="description" content="Leptos implementation of a HackerNews demo."/>
-        <Router>
-            <Nav />
-            <main>
-                <Routes>
-                    <Route path="users/:id" view=User/>
-                    <Route path="stories/:id" view=Story/>
-                    <Route path=":stories?" view=Stories/>
-                </Routes>
-            </main>
-        </Router>
+
+        <>
+            <Link rel="shortcut icon" type_="image/ico" href="/favicon.ico"/>
+            <Stylesheet id="leptos" href="/pkg/hackernews_axum.css"/>
+            <Meta name="description" content="Leptos implementation of a HackerNews demo."/>
+            <Router>
+                <Nav />
+                <main>
+                    <Routes>
+                        <Route path="users/:id" view=User/>
+                        <Route path="stories/:id" view=Story/>
+                        <Route path=":stories?" view=Stories/>
+                    </Routes>
+                </main>
+            </Router>
+        </>
     }
 }
 
-#[cfg(feature = "hydrate")]
-#[wasm_bindgen::prelude::wasm_bindgen]
-pub fn hydrate() {
-    _ = console_log::init_with_level(log::Level::Debug);
-    console_error_panic_hook::set_once();
-    leptos::mount_to_body(App);
+// Needs to be in lib.rs AFAIK because wasm-bindgen needs us to be compiling a lib. I may be wrong.
+cfg_if! {
+    if #[cfg(feature = "hydrate")] {
+        use wasm_bindgen::prelude::wasm_bindgen;
+
+        #[wasm_bindgen]
+        pub fn hydrate() {
+            _ = console_log::init_with_level(log::Level::Debug);
+            console_error_panic_hook::set_once();
+            leptos::mount_to_body(move || {
+                view! {  <App/> }
+            });
+        }
+    }
 }

examples/hackernews_axum/src/main.rs

@@ -1,41 +1,54 @@
-#[cfg(feature = "ssr")]
-#[tokio::main]
-async fn main() {
-    use axum::{routing::get, Router};
-    use hackernews_axum::{fallback::file_and_error_handler, *};
-    use leptos::get_configuration;
+use cfg_if::cfg_if;
+use leptos::{logging::log, *};
+
+// boilerplate to run in different modes
+cfg_if! {
+if #[cfg(feature = "ssr")] {
+    use axum::{
+        Router,
+        routing::get,
+    };
     use leptos_axum::{generate_route_list, LeptosRoutes};
+    use hackernews_axum::fallback::file_and_error_handler;
 
-    let conf = get_configuration(Some("Cargo.toml")).await.unwrap();
-    let leptos_options = conf.leptos_options;
-    let addr = leptos_options.site_addr;
-    let routes = generate_route_list(App);
+    #[tokio::main]
+    async fn main() {
+        use hackernews_axum::*;
 
-    simple_logger::init_with_level(log::Level::Debug)
-        .expect("couldn't initialize logging");
+        let conf = get_configuration(Some("Cargo.toml")).await.unwrap();
+        let leptos_options = conf.leptos_options;
+        let addr = leptos_options.site_addr;
+        let routes = generate_route_list(App);
 
-    // build our application with a route
-    let app = Router::new()
+        simple_logger::init_with_level(log::Level::Debug).expect("couldn't initialize logging");
+
+        // build our application with a route
+        let app = Router::new()
         .route("/favicon.ico", get(file_and_error_handler))
-        .leptos_routes(&leptos_options, routes, App)
+        .leptos_routes(&leptos_options, routes, || view! {  <App/> } )
         .fallback(file_and_error_handler)
         .with_state(leptos_options);
 
-    // run our app with hyper
-    // `axum::Server` is a re-export of `hyper::Server`
-    println!("listening on {}", addr);
-    let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
-    axum::serve(listener, app.into_make_service())
-        .await
-        .unwrap();
+        // run our app with hyper
+        // `axum::Server` is a re-export of `hyper::Server`
+        log!("listening on {}", addr);
+        axum::Server::bind(&addr)
+            .serve(app.into_make_service())
+            .await
+            .unwrap();
+    }
 }
 
-// client-only stuff for Trunk
-#[cfg(not(feature = "ssr"))]
-pub fn main() {
-    use hackernews_axum::*;
+    // client-only stuff for Trunk
+    else {
+        use hackernews_axum::*;
 
-    _ = console_log::init_with_level(log::Level::Debug);
-    console_error_panic_hook::set_once();
-    mount_to_body(App);
+        pub fn main() {
+            _ = console_log::init_with_level(log::Level::Debug);
+            console_error_panic_hook::set_once();
+            mount_to_body(|| {
+                view! {  <App/> }
+            });
+        }
+    }
 }

examples/hackernews_islands_axum/Cargo.toml

@@ -11,8 +11,9 @@ codegen-units = 1
 lto = true
 
 [dependencies]
-console_log = "1.0"
-console_error_panic_hook = "0.1"
+console_log = "1.0.0"
+console_error_panic_hook = "0.1.7"
+cfg-if = "1.0.0"
 leptos = { path = "../../leptos", features = [
   "nightly",
   "experimental-islands",
@@ -22,20 +23,20 @@ leptos_axum = { path = "../../integrations/axum", optional = true, features = [
 ] }
 leptos_meta = { path = "../../meta", features = ["nightly"] }
 leptos_router = { path = "../../router", features = ["nightly"] }
-log = "0.4"
-simple_logger = "4.0"
-serde = { version = "1.0", features = ["derive"] }
+log = "0.4.17"
+simple_logger = "4.0.0"
+serde = { version = "1.0.148", features = ["derive"] }
 tracing = "0.1"
-gloo-net = { version = "0.4", features = ["http"] }
-reqwest = { version = "0.11", features = ["json"] }
-axum = { version = "0.7", optional = true, features = ["http2"] }
-tower = { version = "0.4", optional = true }
-tower-http = { version = "0.5", features = [
+gloo-net = { version = "0.2.5", features = ["http"] }
+reqwest = { version = "0.11.13", features = ["json"] }
+axum = { version = "0.6.1", optional = true, features = ["http2"] }
+tower = { version = "0.4.13", optional = true }
+tower-http = { version = "0.4", features = [
   "fs",
   "compression-br",
 ], optional = true }
-tokio = { version = "1", features = ["full"], optional = true }
-http = { version = "1.0", optional = true }
+tokio = { version = "1.22.0", features = ["full"], optional = true }
+http = { version = "0.2.11", optional = true }
 web-sys = { version = "0.3", features = ["AbortController", "AbortSignal"] }
 wasm-bindgen = "0.2"
 lazy_static = "1.4.0"
@@ -81,7 +82,7 @@ reload-port = 3001
 end2end-cmd = "npx playwright test"
 #  The browserlist query used for optimizing the CSS.
 browserquery = "defaults"
-# Set by cargo-leptos watch when building with that tool. Controls whether autoreload JS will be included in the head
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
 watch = false
 # The environment Leptos will run in, usually either "DEV" or "PROD"
 env = "DEV"

examples/hackernews_islands_axum/rust-toolchain.toml

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

examples/hackernews_islands_axum/src/fallback.rs

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

examples/hackernews_islands_axum/src/handlers.rs

@@ -0,0 +1,63 @@
+use cfg_if::cfg_if;
+
+cfg_if! {
+if #[cfg(feature = "ssr")] {
+    use axum::{
+        body::{boxed, Body, BoxBody},
+        http::{Request, Response, StatusCode, Uri},
+    };
+    use tower::ServiceExt;
+    use tower_http::services::ServeDir;
+
+    pub async fn file_handler(uri: Uri) -> Result<Response<BoxBody>, (StatusCode, String)> {
+        let res = get_static_file(uri.clone(), "/pkg").await?;
+
+        if res.status() == StatusCode::NOT_FOUND {
+            // try with `.html`
+            // TODO: handle if the Uri has query parameters
+            match format!("{}.html", uri).parse() {
+                Ok(uri_html) => get_static_file(uri_html, "/pkg").await,
+                Err(_) => Err((StatusCode::INTERNAL_SERVER_ERROR, "Invalid URI".to_string())),
+            }
+        } else {
+            Ok(res)
+        }
+    }
+
+    pub async fn get_static_file_handler(uri: Uri) -> Result<Response<BoxBody>, (StatusCode, String)> {
+        let res = get_static_file(uri.clone(), "/static").await?;
+
+        if res.status() == StatusCode::NOT_FOUND {
+          Err((StatusCode::INTERNAL_SERVER_ERROR, "Invalid URI".to_string()))
+        } else {
+            Ok(res)
+        }
+    }
+
+    async fn get_static_file(uri: Uri, base: &str) -> Result<Response<BoxBody>, (StatusCode, String)> {
+        let req = Request::builder().uri(&uri).body(Body::empty()).unwrap();
+
+        // `ServeDir` implements `tower::Service` so we can call it with `tower::ServiceExt::oneshot`
+        // When run normally, the root should be the crate root
+        if base == "/static" {
+            match ServeDir::new("./static").oneshot(req).await {
+                Ok(res) => Ok(res.map(boxed)),
+                Err(err) => Err((
+                    StatusCode::INTERNAL_SERVER_ERROR,
+                    format!("Something went wrong: {}", err),
+                ))
+        }
+        } else if base == "/pkg" {
+            match ServeDir::new("./pkg").oneshot(req).await {
+                Ok(res) => Ok(res.map(boxed)),
+                Err(err) => Err((
+                    StatusCode::INTERNAL_SERVER_ERROR,
+                    format!("Something went wrong: {}", err),
+                )),
+        }
+    } else{
+           Err((StatusCode::NOT_FOUND, "Not Found".to_string()))
+        }
+    }
+    }
+}

examples/hackernews_islands_axum/src/lib.rs

@@ -1,11 +1,11 @@
 #![feature(lazy_cell)]
 
+use cfg_if::cfg_if;
 use leptos::*;
 use leptos_meta::*;
 use leptos_router::*;
 mod api;
 pub mod error_template;
-#[cfg(feature = "ssr")]
 pub mod fallback;
 mod routes;
 use routes::{nav::*, stories::*, story::*, users::*};
@@ -31,10 +31,16 @@ pub fn App() -> impl IntoView {
     }
 }
 
-#[cfg(feature = "hydrate")]
-#[wasm_bindgen::prelude::wasm_bindgen]
-pub fn hydrate() {
-    #[cfg(debug_assertions)]
-    console_error_panic_hook::set_once();
-    leptos::leptos_dom::HydrationCtx::stop_hydrating();
+// Needs to be in lib.rs AFAIK because wasm-bindgen needs us to be compiling a lib. I may be wrong.
+cfg_if! {
+    if #[cfg(feature = "hydrate")] {
+        use wasm_bindgen::prelude::wasm_bindgen;
+
+        #[wasm_bindgen]
+        pub fn hydrate() {
+            #[cfg(debug_assertions)]
+            console_error_panic_hook::set_once();
+            leptos::leptos_dom::HydrationCtx::stop_hydrating();
+        }
+    }
 }

examples/hackernews_islands_axum/src/main.rs

@@ -1,11 +1,16 @@
+#[cfg(feature = "ssr")]
+mod ssr_imports {
+    pub use axum::{routing::get, Router};
+    pub use hackernews_islands::fallback::file_and_error_handler;
+    pub use leptos::*;
+    pub use leptos_axum::{generate_route_list, LeptosRoutes};
+}
+
 #[cfg(feature = "ssr")]
 #[tokio::main]
 async fn main() {
-    pub use axum::{routing::get, Router};
-    pub use hackernews_islands::fallback::file_and_error_handler;
     use hackernews_islands::*;
-    pub use leptos::get_configuration;
-    pub use leptos_axum::{generate_route_list, LeptosRoutes};
+    use ssr_imports::*;
 
     let conf = get_configuration(Some("Cargo.toml")).await.unwrap();
     let leptos_options = conf.leptos_options;
@@ -21,9 +26,9 @@ async fn main() {
 
     // run our app with hyper
     // `axum::Server` is a re-export of `hyper::Server`
-    println!("listening on {}", addr);
-    let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
-    axum::serve(listener, app.into_make_service())
+    logging::log!("listening on {}", addr);
+    axum::Server::bind(&addr)
+        .serve(app.into_make_service())
         .await
         .unwrap();
 }
@@ -35,5 +40,7 @@ pub fn main() {
     use leptos::*;
     _ = console_log::init_with_level(log::Level::Debug);
     console_error_panic_hook::set_once();
-    mount_to_body(App);
+    mount_to_body(|| {
+        view! {  <App/> }
+    });
 }

examples/hackernews_js_fetch/Cargo.toml

@@ -14,10 +14,10 @@ lto = true
 console_log = "1.0.0"
 console_error_panic_hook = "0.1.7"
 cfg-if = "1.0.0"
-leptos = { version = "0.5", features = ["nightly"] }
-leptos_axum = { version = "0.5", default-features = false, optional = true }
-leptos_meta = { version = "0.5", features = ["nightly"] }
-leptos_router = { version = "0.5", features = ["nightly"] }
+leptos = { path = "../../leptos", features = ["nightly"] }
+leptos_axum = { path = "../../integrations/axum", default-features = false, optional = true }
+leptos_meta = { path = "../../meta", features = ["nightly"] }
+leptos_router = { path = "../../router", features = ["nightly"] }
 log = "0.4.17"
 simple_logger = "4.0.0"
 serde = { version = "1.0.148", features = ["derive"] }
@@ -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/hackernews_js_fetch/README.md

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

examples/hackernews_js_fetch/src/fallback.rs

@@ -1,43 +1,39 @@
-use crate::error_template::error_template;
-use axum::{
-    body::Body,
-    extract::State,
-    http::{Request, Response, StatusCode, Uri},
-    response::{IntoResponse, Response as AxumResponse},
-};
-//use tower::ServiceExt;
-use leptos::LeptosOptions;
+use cfg_if::cfg_if;
 
-pub async fn file_and_error_handler(
-    uri: Uri,
-    State(options): State<LeptosOptions>,
-    req: Request<Body>,
-) -> AxumResponse {
-    let root = options.site_root.clone();
-    let res = get_static_file(uri.clone(), &root).await.unwrap();
+cfg_if! {
+if #[cfg(feature = "ssr")] {
+    use axum::{
+        body::{Body, BoxBody},
+        extract::State,
+        response::IntoResponse,
+        http::{Request, Response, StatusCode, Uri},
+    };
+    use axum::response::Response as AxumResponse;
+    //use tower::ServiceExt;
+    use leptos::{LeptosOptions};
+    use crate::error_template::error_template;
 
-    if res.status() == StatusCode::OK {
-        res.into_response()
-    } else {
-        let handler =
-            leptos_axum::render_app_to_stream(options.to_owned(), || {
-                error_template(None)
-            });
-        handler(req).await.into_response()
+    pub async fn file_and_error_handler(uri: Uri, State(options): State<LeptosOptions>, req: Request<Body>) -> AxumResponse {
+        let root = options.site_root.clone();
+        let res = get_static_file(uri.clone(), &root).await.unwrap();
+
+        if res.status() == StatusCode::OK {
+            res.into_response()
+        } else{
+            let handler = leptos_axum::render_app_to_stream(options.to_owned(), || error_template(None));
+            handler(req).await.into_response()
+        }
     }
-}
 
-async fn get_static_file(
-    uri: Uri,
-    root: &str,
-) -> Result<Response<Body>, (StatusCode, String)> {
-    let req = Request::builder()
-        .uri(uri.clone())
-        .body(Body::empty())
-        .unwrap();
-    // `ServeDir` implements `tower::Service` so we can call it with `tower::ServiceExt::oneshot`
-    // This path is relative to the cargo root
-    _ = req;
-    _ = root;
-    todo!()
+    async fn get_static_file(uri: Uri, root: &str) -> Result<Response<BoxBody>, (StatusCode, String)> {
+        let req = Request::builder().uri(uri.clone()).body(Body::empty()).unwrap();
+        // `ServeDir` implements `tower::Service` so we can call it with `tower::ServiceExt::oneshot`
+        // This path is relative to the cargo root
+        _ = req;
+        _ = root;
+        todo!()
+    }
+
+
+}
 }

examples/hackernews_js_fetch/src/lib.rs

@@ -1,9 +1,9 @@
+use cfg_if::cfg_if;
 use leptos::{component, view, IntoView};
 use leptos_meta::*;
 use leptos_router::*;
 mod api;
 pub mod error_template;
-#[cfg(feature = "ssr")]
 pub mod fallback;
 mod routes;
 use routes::{nav::*, stories::*, story::*, users::*};
@@ -29,22 +29,25 @@ pub fn App() -> impl IntoView {
     }
 }
 
-#[cfg(feature = "hydrate")]
-#[wasm_bindgen]
-pub fn hydrate() {
-    _ = console_log::init_with_level(log::Level::Debug);
-    console_error_panic_hook::set_once();
-    leptos::mount_to_body(App);
-}
+cfg_if! {
+    if #[cfg(feature = "hydrate")] {
+        #[wasm_bindgen]
+        pub fn hydrate() {
+            _ = console_log::init_with_level(log::Level::Debug);
+            console_error_panic_hook::set_once();
+            leptos::mount_to_body(move || {
+                view! { <App/> }
+            });
+        }
+    } else if #[cfg(feature = "ssr")] {
 
-#[cfg(feature = "ssr")]
-mod ssr_imports {
-    use crate::App;
-    use axum::{routing::post, Router};
-    use leptos::*;
+    use axum::{
+        Router,
+        routing::post
+    };
     use leptos_axum::{generate_route_list, LeptosRoutes};
+    use leptos::*;
     use log::{info, Level};
-    use wasm_bindgen::prelude::wasm_bindgen;
 
     #[wasm_bindgen]
     pub struct Handler(axum_js_fetch::App);
@@ -52,20 +55,17 @@ mod ssr_imports {
     #[wasm_bindgen]
     impl Handler {
         pub async fn new() -> Self {
-            _ = console_log::init_with_level(Level::Debug);
+            console_log::init_with_level(Level::Debug);
             console_error_panic_hook::set_once();
 
-            let leptos_options = LeptosOptions::builder()
-                .output_name("client")
-                .site_pkg_dir("pkg")
-                .build();
+            let leptos_options = LeptosOptions::builder().output_name("client").site_pkg_dir("pkg").build();
             let routes = generate_route_list(App);
 
             // build our application with a route
             let app: axum::Router<(), axum::body::Body> = Router::new()
-                .leptos_routes(&leptos_options, routes, || view! { <App/> })
-                .route("/api/*fn_name", post(leptos_axum::handle_server_fns))
-                .with_state(leptos_options);
+            .leptos_routes(&leptos_options, routes, || view! { <App/> } )
+            .route("/api/*fn_name", post(leptos_axum::handle_server_fns))
+            .with_state(leptos_options);
 
             info!("creating handler instance");
 
@@ -77,3 +77,4 @@ mod ssr_imports {
         }
     }
 }
+}

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

@@ -14,7 +14,7 @@ leptos_router = { path = "../../../router", features = ["csr"] }
 log = "0.4"
 console_error_panic_hook = "0.1"
 console_log = "1"
-gloo-net = "0.5"
-gloo-storage = "0.3"
+gloo-net = "0.2"
+gloo-storage = "0.2"
 serde = "1.0"
 thiserror = "1.0"

examples/login_with_token_csr_only/client/src/api.rs

@@ -1,5 +1,5 @@
 use api_boundary::*;
-use gloo_net::http::{Request, RequestBuilder, Response};
+use gloo_net::http::{Request, Response};
 use serde::de::DeserializeOwned;
 use thiserror::Error;
 
@@ -41,7 +41,7 @@ impl AuthorizedApi {
     fn auth_header_value(&self) -> String {
         format!("Bearer {}", self.token.token)
     }
-    async fn send<T>(&self, req: RequestBuilder) -> Result<T>
+    async fn send<T>(&self, req: Request) -> Result<T>
     where
         T: DeserializeOwned,
     {

examples/login_with_token_csr_only/server/Cargo.toml

@@ -5,18 +5,14 @@ edition = "2021"
 publish = false
 
 [dependencies]
-api-boundary = "=0.0.0"
-
 anyhow = "1.0"
-axum = "0.7"
-axum-extra = { version = "0.9.2", features = ["typed-header"] }
+api-boundary = "*"
+axum = { version = "0.6", features = ["headers"] }
 env_logger = "0.10"
 log = "0.4"
 mailparse = "0.14"
 pwhash = "1.0"
 thiserror = "1.0"
-tokio = { version = "1.35", features = ["macros", "rt-multi-thread"] }
-tower-http = { version = "0.5", features = ["cors"] }
-uuid = { version = "1.6", features = ["v4"] }
-parking_lot = "0.12.1"
-headers = "0.4.0"
+tokio = { version = "1.25", features = ["macros", "rt-multi-thread"] }
+tower-http = { version = "0.4", features = ["cors"] }
+uuid = { version = "1.3", features = ["v4"] }

examples/login_with_token_csr_only/server/src/application.rs

@@ -1,36 +1,38 @@
 use mailparse::addrparse;
 use pwhash::bcrypt;
-use std::{collections::HashMap, str::FromStr};
+use std::{collections::HashMap, str::FromStr, sync::RwLock};
 use thiserror::Error;
 use uuid::Uuid;
 
 #[derive(Default)]
 pub struct AppState {
-    users: HashMap<EmailAddress, Password>,
-    tokens: HashMap<Uuid, EmailAddress>,
+    users: RwLock<HashMap<EmailAddress, Password>>,
+    tokens: RwLock<HashMap<Uuid, EmailAddress>>,
 }
 
 impl AppState {
     pub fn create_user(
-        &mut self,
+        &self,
         credentials: Credentials,
     ) -> Result<(), CreateUserError> {
         let Credentials { email, password } = credentials;
-        let user_exists = self.users.get(&email).is_some();
+        let user_exists = self.users.read().unwrap().get(&email).is_some();
         if user_exists {
             return Err(CreateUserError::UserExists);
         }
-        self.users.insert(email, password);
+        self.users.write().unwrap().insert(email, password);
         Ok(())
     }
 
     pub fn login(
-        &mut self,
+        &self,
         email: EmailAddress,
         password: &str,
     ) -> Result<Uuid, LoginError> {
         let valid_credentials = self
             .users
+            .read()
+            .unwrap()
             .get(&email)
             .map(|hashed_password| hashed_password.verify(password))
             .unwrap_or(false);
@@ -38,16 +40,16 @@ impl AppState {
             Err(LoginError::InvalidEmailOrPassword)
         } else {
             let token = Uuid::new_v4();
-            self.tokens.insert(token, email);
+            self.tokens.write().unwrap().insert(token, email);
             Ok(token)
         }
     }
 
-    pub fn logout(&mut self, token: &str) -> Result<(), LogoutError> {
+    pub fn logout(&self, token: &str) -> Result<(), LogoutError> {
         let token = token
             .parse::<Uuid>()
             .map_err(|_| LogoutError::NotLoggedIn)?;
-        self.tokens.remove(&token);
+        self.tokens.write().unwrap().remove(&token);
         Ok(())
     }
 
@@ -60,6 +62,8 @@ impl AppState {
             .map_err(|_| AuthError::NotAuthorized)
             .and_then(|token| {
                 self.tokens
+                    .read()
+                    .unwrap()
                     .get(&token)
                     .cloned()
                     .map(|email| CurrentUser { email, token })

examples/login_with_token_csr_only/server/src/main.rs

@@ -1,16 +1,13 @@
 use api_boundary as json;
 use axum::{
-    extract::State,
+    extract::{State, TypedHeader},
+    headers::{authorization::Bearer, Authorization},
     http::Method,
     response::Json,
     routing::{get, post},
     Router,
 };
-use axum_extra::TypedHeader;
-use headers::{authorization::Bearer, Authorization};
-use parking_lot::RwLock;
-use std::{env, net::SocketAddr, sync::Arc};
-use tokio::net::TcpListener;
+use std::{env, sync::Arc};
 use tower_http::cors::{Any, CorsLayer};
 
 mod adapters;
@@ -35,7 +32,7 @@ async fn main() -> anyhow::Result<()> {
     }
     env_logger::init();
 
-    let shared_state = Arc::new(RwLock::new(AppState::default()));
+    let shared_state = Arc::new(AppState::default());
 
     let cors_layer = CorsLayer::new()
         .allow_methods([Method::GET, Method::POST])
@@ -49,10 +46,11 @@ async fn main() -> anyhow::Result<()> {
         .route_layer(cors_layer)
         .with_state(shared_state);
 
-    let addr = "0.0.0.0:3000".parse::<SocketAddr>()?;
-    log::info!("Start listening on http://{addr}");
-    let listener = TcpListener::bind(addr).await?;
-    axum::serve(listener, app.into_make_service()).await?;
+    let addr = "0.0.0.0:3000".parse().unwrap();
+    log::info!("Listen on {addr}");
+    axum::Server::bind(&addr)
+        .serve(app.into_make_service())
+        .await?;
     Ok(())
 }
 
@@ -75,43 +73,40 @@ enum Error {
 }
 
 async fn create_user(
-    State(state): State<Arc<RwLock<AppState>>>,
+    State(state): State<Arc<AppState>>,
     Json(credentials): Json<json::Credentials>,
 ) -> Result<()> {
     let credentials = Credentials::try_from(credentials)?;
-    state.write().create_user(credentials)?;
+    state.create_user(credentials)?;
     Ok(Json(()))
 }
 
 async fn login(
-    State(state): State<Arc<RwLock<AppState>>>,
+    State(state): State<Arc<AppState>>,
     Json(credentials): Json<json::Credentials>,
 ) -> Result<json::ApiToken> {
     let json::Credentials { email, password } = credentials;
     log::debug!("{email} tries to login");
     let email = email.parse().map_err(|_|
-        // Here we don't want to leak detailed info.
-        LoginError::InvalidEmailOrPassword)?;
-    let token = state
-        .write()
-        .login(email, &password)
-        .map(|s| s.to_string())?;
+          // Here we don't want to leak detailed info.
+          LoginError::InvalidEmailOrPassword)?;
+    let token = state.login(email, &password).map(|s| s.to_string())?;
     Ok(Json(json::ApiToken { token }))
 }
 
 async fn logout(
-    State(state): State<Arc<RwLock<AppState>>>,
+    State(state): State<Arc<AppState>>,
     TypedHeader(auth): TypedHeader<Authorization<Bearer>>,
 ) -> Result<()> {
-    state.write().logout(auth.token())?;
+    state.logout(auth.token())?;
     Ok(Json(()))
 }
 
 async fn get_user_info(
-    State(state): State<Arc<RwLock<AppState>>>,
+    State(state): State<Arc<AppState>>,
     TypedHeader(auth): TypedHeader<Authorization<Bearer>>,
 ) -> Result<json::UserInfo> {
-    let user = state.read().authorize_user(auth.token())?;
+    let user = state.authorize_user(auth.token())?;
     let CurrentUser { email, .. } = user;
     Ok(Json(json::UserInfo {
         email: email.into_string(),

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/e2e/tests/router.spec.ts

@@ -5,10 +5,6 @@ test.describe("Test Router example", () => {
     await page.goto("/");
   });
 
-  test("Starts on correct home page", async({ page }) => {  
-       await expect(page.getByText("Select a contact.")).toBeVisible();
-  });
-
   const links = [
     { label: "Bill Smith", url: "/0" },
     { label: "Tim Jones", url: "/1" },

examples/router/rust-toolchain.toml

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

examples/server_fns_axum/Cargo.toml

@@ -1,102 +0,0 @@
-[package]
-name = "server_fns_axum"
-version = "0.1.0"
-edition = "2021"
-
-[lib]
-crate-type = ["cdylib", "rlib"]
-
-[dependencies]
-console_log = "1.0"
-console_error_panic_hook = "0.1"
-futures = "0.3"
-http = "1.0"
-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"] }
-log = "0.4"
-simple_logger = "4.0"
-serde = { version = "1", features = ["derive"] }
-axum = { version = "0.7", optional = true }
-tower = { version = "0.4", optional = true }
-tower-http = { version = "0.5", features = ["fs", "tracing", "trace"], optional = true }
-tokio = { version = "1", features = ["full"], optional = true }
-thiserror = "1.0"
-wasm-bindgen = "0.2"
-serde_toml = "0.0.1"
-toml = "0.8.8"
-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"]
-ssr = [
-	"dep:axum",
-	"dep:tower",
-	"dep:tower-http",
-	"dep:tokio",
-	"leptos/ssr",
-	"leptos_meta/ssr",
-	"leptos_router/ssr",
-	"dep:leptos_axum",
-	"dep:notify",
-	"dep:dashmap",
-	"dep:once_cell",
-	"dep:async-broadcast",
-]
-
-[package.metadata.cargo-all-features]
-denylist = ["axum", "tower", "tower-http", "tokio", "leptos_axum"]
-skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]
-
-[package.metadata.leptos]
-# The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name
-output-name = "server_fns_axum"
-# The site root folder is where cargo-leptos generate all output. WARNING: all content of this folder will be erased on a rebuild. Use it in your server setup.
-site-root = "target/site"
-# The site-root relative folder where all compiled output (JS, WASM and CSS) is written
-# Defaults to pkg
-site-pkg-dir = "pkg"
-# [Optional] The source CSS file. If it ends with .sass or .scss then it will be compiled by dart-sass into CSS. The CSS is optimized by Lightning CSS before being written to <site-root>/<site-pkg>/app.css
-style-file = "./style.css"
-# [Optional] Files in the asset-dir will be copied to the site-root directory
-assets-dir = "public"
-# The IP and port (ex: 127.0.0.1:3000) where the server serves the content. Use it in your server setup.
-site-addr = "127.0.0.1:3000"
-# The port to use for automatic reload monitoring
-reload-port = 3001
-# [Optional] Command to use when running end2end tests. It will run in the end2end dir.
-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
-watch = false
-# The environment Leptos will run in, usually either "DEV" or "PROD"
-env = "DEV"
-# The features to use when compiling the bin target
-#
-# Optional. Can be over-ridden with the command line parameter --bin-features
-bin-features = ["ssr"]
-
-# If the --no-default-features flag should be used when compiling the bin target
-#
-# Optional. Defaults to false.
-bin-default-features = false
-
-# The features to use when compiling the lib target
-#
-# Optional. Can be over-ridden with the command line parameter --lib-features
-lib-features = ["hydrate"]
-
-# If the --no-default-features flag should be used when compiling the lib target
-#
-# Optional. Defaults to false.
-lib-default-features = false

examples/server_fns_axum/README.md

@@ -1,19 +0,0 @@
-# Leptos Todo App Sqlite with Axum
-
-This example creates a basic todo app with an Axum backend that uses Leptos' server functions to call sqlx from the client and seamlessly run it on the server.
-
-## Getting Started
-
-See the [Examples README](../README.md) for setup and run instructions.
-
-## E2E Testing
-
-See the [E2E README](./e2e/README.md) for more information about the testing strategy.
-
-## Rendering
-
-See the [SSR Notes](../SSR_NOTES.md) for more information about Server Side Rendering.
-
-## Quick Start
-
-Run `cargo leptos watch` to run this example.

examples/server_fns_axum/rust-toolchain.toml

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

examples/server_fns_axum/src/app.rs

@@ -1,852 +0,0 @@
-use futures::StreamExt;
-use http::Method;
-use leptos::{html::Input, *};
-use leptos_meta::{provide_meta_context, Link, Meta, Stylesheet};
-use leptos_router::{ActionForm, Route, Router, Routes};
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
-use server_fn::{
-    client::{browser::BrowserClient, Client},
-    codec::{
-        Encoding, FromReq, FromRes, GetUrl, IntoReq, IntoRes, MultipartData,
-        MultipartFormData, Rkyv, SerdeLite, StreamingText, TextStream,
-    },
-    request::{browser::BrowserRequest, ClientReq, Req},
-    response::{browser::BrowserResponse, ClientRes, Res},
-};
-use std::future::Future;
-#[cfg(feature = "ssr")]
-use std::sync::{
-    atomic::{AtomicU8, Ordering},
-    Mutex,
-};
-use strum::{Display, EnumString};
-use wasm_bindgen::JsCast;
-use web_sys::{FormData, HtmlFormElement, SubmitEvent};
-
-#[component]
-pub fn TodoApp() -> impl IntoView {
-    provide_meta_context();
-
-    view! {
-        <Meta name="color-scheme" content="dark light"/>
-        <Link rel="shortcut icon" type_="image/ico" href="/favicon.ico"/>
-        <Stylesheet id="leptos" href="/pkg/server_fns_axum.css"/>
-        <Router>
-            <header>
-                <h1>"Server Function Demo"</h1>
-            </header>
-            <main>
-                <Routes>
-                    <Route path="" view=HomePage/>
-                </Routes>
-            </main>
-        </Router>
-    }
-}
-
-#[component]
-pub fn HomePage() -> impl IntoView {
-    view! {
-        <h2>"Some Simple Server Functions"</h2>
-        <SpawnLocal/>
-        <WithAnAction/>
-        <WithActionForm/>
-        <h2>"Custom Error Types"</h2>
-        <CustomErrorTypes/>
-        <h2>"Alternative Encodings"</h2>
-        <ServerFnArgumentExample/>
-        <RkyvExample/>
-        <FileUpload/>
-        <FileUploadWithProgress/>
-        <FileWatcher/>
-        <CustomEncoding/>
-        <CustomClientExample/>
-    }
-}
-
-/// A server function is really just an API call to your server. But it provides a plain async
-/// function as a wrapper around that. This means you can call it like any other async code, just
-/// by spawning a task with `spawn_local`.
-///
-/// In reality, you usually want to use a resource to load data from the server or an action to
-/// mutate data on the server. But a simple `spawn_local` can make it more obvious what's going on.
-#[component]
-pub fn SpawnLocal() -> impl IntoView {
-    /// A basic server function can be called like any other async function.
-    ///
-    /// You can define a server function at any scope. This one, for example, is only available
-    /// inside the SpawnLocal component. **However**, note that all server functions are publicly
-    /// available API endpoints: This scoping means you can only call this server function
-    /// from inside this component, but it is still available at its URL to any caller, from within
-    /// your app or elsewhere.
-    #[server]
-    pub async fn shouting_text(input: String) -> Result<String, ServerFnError> {
-        // insert a simulated wait
-        tokio::time::sleep(std::time::Duration::from_millis(250)).await;
-        Ok(input.to_ascii_uppercase())
-    }
-
-    let input_ref = NodeRef::<Input>::new();
-    let (shout_result, set_shout_result) =
-        create_signal("Click me".to_string());
-
-    view! {
-        <h3>Using <code>spawn_local</code></h3>
-        <p>
-            "You can call a server function by using "<code>"spawn_local"</code> " in an event listener. "
-            "Clicking this button should alert with the uppercase version of the input."
-        </p>
-        <input node_ref=input_ref placeholder="Type something here."/>
-        <button
-            on:click=move |_| {
-                let value = input_ref.get().unwrap().value();
-                spawn_local(async move {
-                    let uppercase_text = shouting_text(value).await.unwrap_or_else(|e| e.to_string());
-                    set_shout_result(uppercase_text);
-                });
-            }
-        >
-            {shout_result}
-        </button>
-    }
-}
-
-/// Pretend this is a database and we're storing some rows in memory!
-/// This exists only on the server.
-#[cfg(feature = "ssr")]
-static ROWS: Mutex<Vec<String>> = Mutex::new(Vec::new());
-
-/// Imagine this server function mutates some state on the server, like a database row.
-/// Every third time, it will return an error.
-///
-/// This kind of mutation is often best handled by an Action.
-/// Remember, if you're loading data, use a resource; if you're running an occasional action,
-/// use an action.
-#[server]
-pub async fn add_row(text: String) -> Result<usize, ServerFnError> {
-    static N: AtomicU8 = AtomicU8::new(0);
-
-    // insert a simulated wait
-    tokio::time::sleep(std::time::Duration::from_millis(250)).await;
-
-    let nth_run = N.fetch_add(1, Ordering::Relaxed);
-    // this will print on the server, like any server function
-    println!("Adding {text:?} to the database!");
-    if nth_run % 3 == 2 {
-        Err(ServerFnError::new("Oh no! Couldn't add to database!"))
-    } else {
-        let mut rows = ROWS.lock().unwrap();
-        rows.push(text);
-        Ok(rows.len())
-    }
-}
-
-/// Simply returns the number of rows.
-#[server]
-pub async fn get_rows() -> Result<usize, ServerFnError> {
-    // insert a simulated wait
-    tokio::time::sleep(std::time::Duration::from_millis(250)).await;
-
-    Ok(ROWS.lock().unwrap().len())
-}
-
-/// An action abstracts over the process of spawning a future and setting a signal when it
-/// resolves. Its .input() signal holds the most recent argument while it's still pending,
-/// and its .value() signal holds the most recent result. Its .version() signal can be fed
-/// into a resource, telling it to refetch whenever the action has successfully resolved.
-///
-/// This makes actions useful for mutations, i.e., some server function that invalidates
-/// loaded previously loaded from another server function.
-#[component]
-pub fn WithAnAction() -> impl IntoView {
-    let input_ref = NodeRef::<Input>::new();
-
-    // a server action can be created by using the server function's type name as a generic
-    // the type name defaults to the PascalCased function name
-    let action = create_server_action::<AddRow>();
-
-    // this resource will hold the total number of rows
-    // passing it action.version() means it will refetch whenever the action resolves successfully
-    let row_count = create_resource(action.version(), |_| get_rows());
-
-    view! {
-        <h3>Using <code>create_action</code></h3>
-        <p>
-            "Some server functions are conceptually \"mutations,\", which change something on the server. "
-            "These often work well as actions."
-        </p>
-        <input node_ref=input_ref placeholder="Type something here."/>
-        <button
-            on:click=move |_| {
-                let text = input_ref.get().unwrap().value();
-                action.dispatch(text.into());
-                // note: technically, this `action` takes `AddRow` (the server fn type) as its
-                // argument
-                //
-                // however, for any one-argument server functions, `From<_>` is implemented between
-                // the server function type and the type of this single argument
-            }
-        >
-            Submit
-        </button>
-        <p>You submitted: {move || format!("{:?}", action.input().get())}</p>
-        <p>The result was: {move || format!("{:?}", action.value().get())}</p>
-        <Transition>
-            <p>Total rows: {row_count}</p>
-        </Transition>
-    }
-}
-
-/// An <ActionForm/> lets you do the same thing as dispatching an action, but automates the
-/// creation of the dispatched argument struct using a <form>. This means it also gracefully
-/// degrades well when JS/WASM are not available.
-///
-/// Try turning off WASM in your browser. The form still works, and successfully displays the error
-/// message if the server function returns an error. Otherwise, it loads the new resource data.
-#[component]
-pub fn WithActionForm() -> impl IntoView {
-    let action = create_server_action::<AddRow>();
-    let row_count = create_resource(action.version(), |_| get_rows());
-
-    view! {
-        <h3>Using <code>"<ActionForm/>"</code></h3>
-        <p>
-            <code>"<ActionForm/>"</code> "lets you use an HTML " <code>"<form>"</code>
-            "to call a server function in a way that gracefully degrades."
-        </p>
-        <ActionForm action>
-            <input
-                // the `name` of the input corresponds to the argument name
-                name="text"
-                placeholder="Type something here."
-            />
-            <button> Submit </button>
-        </ActionForm>
-        <p>You submitted: {move || format!("{:?}", action.input().get())}</p>
-        <p>The result was: {move || format!("{:?}", action.value().get())}</p>
-        <Transition>archive underaligned: need alignment 4 but have alignment 1
-            <p>Total rows: {row_count}</p>
-        </Transition>
-    }
-}
-
-/// The plain `#[server]` macro gives sensible defaults for the settings needed to create a server
-/// function, but those settings can also be customized. For example, you can set a specific unique
-/// path rather than the hashed path, or you can choose a different combination of input and output
-/// encodings.
-///
-/// Arguments to the server macro can be specified as named key-value pairs, like `name = value`.
-#[server(
-    // this server function will be exposed at /api2/custom_path
-    prefix = "/api2",
-    endpoint = "custom_path",
-    // it will take its arguments as a URL-encoded GET request (useful for caching)
-    input = GetUrl,
-    // it will return its output using SerdeLite
-    // (this needs to be enabled with the `serde-lite` feature on the `server_fn` crate
-    output = SerdeLite,
-)]
-// You can use the `#[middleware]` macro to add appropriate middleware
-// In this case, any `tower::Layer` that takes services of `Request<Body>` will work
-#[middleware(crate::middleware::LoggingLayer)]
-pub async fn length_of_input(input: String) -> Result<usize, ServerFnError> {
-    println!("2. Running server function.");
-    // insert a simulated wait
-    tokio::time::sleep(std::time::Duration::from_millis(250)).await;
-    Ok(input.len())
-}
-
-#[component]
-pub fn ServerFnArgumentExample() -> impl IntoView {
-    let input_ref = NodeRef::<Input>::new();
-    let (result, set_result) = create_signal(0);
-
-    view! {
-        <h3>Custom arguments to the <code>#[server]</code> " macro"</h3>
-        <p>
-            This example shows how to specify additional behavior including
-            <ul>
-                <li>Specific server function <strong>paths</strong></li>
-                <li>Mixing and matching input and output <strong>encodings</strong></li>
-                <li>Adding custom <strong>middleware</strong> on a per-server-fn basis</li>
-            </ul>
-        </p>
-        <input node_ref=input_ref placeholder="Type something here."/>
-        <button
-            on:click=move |_| {
-                let value = input_ref.get().unwrap().value();
-                spawn_local(async move {
-                    let length = length_of_input(value).await.unwrap_or(0);
-                    set_result(length);
-                });
-            }
-        >
-            Click to see length
-        </button>
-        <p>Length is {result}</p>
-    }
-}
-
-/// `server_fn` supports a wide variety of input and output encodings, each of which can be
-/// referred to as a PascalCased struct name
-/// - Toml
-/// - Cbor
-/// - Rkyv
-/// - etc.
-#[server(
-    input = Rkyv,
-    output = Rkyv
-)]
-pub async fn rkyv_example(input: String) -> Result<String, ServerFnError> {
-    // insert a simulated wait
-    tokio::time::sleep(std::time::Duration::from_millis(250)).await;
-    Ok(input.to_ascii_uppercase())
-}
-
-#[component]
-pub fn RkyvExample() -> impl IntoView {
-    let input_ref = NodeRef::<Input>::new();
-    let (input, set_input) = create_signal(String::new());
-    let rkyv_result = create_resource(input, rkyv_example);
-
-    view! {
-        <h3>Using <code>rkyv</code> encoding</h3>
-        <p>
-        </p>
-        <input node_ref=input_ref placeholder="Type something here."/>
-        <button
-            on:click=move |_| {
-                let value = input_ref.get().unwrap().value();
-                set_input(value);
-            }
-        >
-            Click to capitalize
-        </button>
-        <p>{input}</p>
-        <Transition>
-            {rkyv_result}
-        </Transition>
-    }
-}
-
-#[component]
-pub fn FileUpload() -> impl IntoView {
-    /// A simple file upload function, which does just returns the length of the file.
-    ///
-    /// On the server, this uses the `multer` crate, which provides a streaming API.
-    #[server(
-        input = MultipartFormData,
-    )]
-    pub async fn file_length(
-        data: MultipartData,
-    ) -> Result<usize, ServerFnError> {
-        // `.into_inner()` returns the inner `multer` stream
-        // it is `None` if we call this on the client, but always `Some(_)` on the server, so is safe to
-        // unwrap
-        let mut data = data.into_inner().unwrap();
-
-        // this will just measure the total number of bytes uploaded
-        let mut count = 0;
-        while let Ok(Some(mut field)) = data.next_field().await {
-            println!("\n[NEXT FIELD]\n");
-            let name = field.name().unwrap_or_default().to_string();
-            println!("  [NAME] {name}");
-            while let Ok(Some(chunk)) = field.chunk().await {
-                let len = chunk.len();
-                count += len;
-                println!("      [CHUNK] {len}");
-                // in a real server function, you'd do something like saving the file here
-            }
-        }
-
-        Ok(count)
-    }
-
-    let upload_action = create_action(|data: &FormData| {
-        let data = data.clone();
-        // `MultipartData` implements `From<FormData>`
-        file_length(data.into())
-    });
-
-    view! {
-        <h3>File Upload</h3>
-        <p>Uploading files is fairly easy using multipart form data.</p>
-        <form 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();
-            upload_action.dispatch(form_data);
-        }>
-            <input type="file" name="file_to_upload"/>
-            <input type="submit"/>
-        </form>
-        <p>
-            {move || if upload_action.input().get().is_none() && upload_action.value().get().is_none() {
-                "Upload a file.".to_string()
-            } else if upload_action.pending().get() {
-                "Uploading...".to_string()
-            } else if let Some(Ok(value)) = upload_action.value().get() {
-                value.to_string()
-            } else {
-                format!("{:?}", upload_action.value().get())
-            }}
-        </p>
-    }
-}
-
-/// 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)]
-    pub async fn watched_files() -> Result<TextStream, ServerFnError> {
-        use notify::{
-            Config, Error, Event, RecommendedWatcher, RecursiveMode, Watcher,
-        };
-        use std::path::Path;
-
-        let (tx, rx) = futures::channel::mpsc::unbounded();
-
-        let mut watcher = RecommendedWatcher::new(
-            move |res: Result<Event, Error>| {
-                if let Ok(ev) = res {
-                    if let Some(path) = ev.paths.last() {
-                        let filename = path
-                            .file_name()
-                            .unwrap()
-                            .to_str()
-                            .unwrap()
-                            .to_string();
-                        _ = tx.unbounded_send(filename); //res);
-                    }
-                }
-            },
-            Config::default(),
-        )?;
-        watcher
-            .watch(Path::new("./watched_files"), RecursiveMode::Recursive)?;
-        std::mem::forget(watcher);
-
-        Ok(TextStream::from(rx))
-    }
-
-    let (files, set_files) = create_signal(Vec::new());
-
-    create_effect(move |_| {
-        spawn_local(async move {
-            while let Some(res) =
-                watched_files().await.unwrap().into_inner().next().await
-            {
-                if let Ok(filename) = res {
-                    set_files.update(|n| n.push(filename));
-                }
-            }
-        });
-    });
-
-    view! {
-        <h3>Watching files and returning a streaming response</h3>
-        <p>Files changed since you loaded the page:</p>
-        <ul>
-            {move || files.get().into_iter().map(|file| view! { <li><code>{file}</code></li> }).collect::<Vec<_>>()}
-        </ul>
-        <p><em>Add or remove some text files in the <code>watched_files</code> directory and see the list of changes here.</em></p>
-    }
-}
-
-/// The `ServerFnError` type is generic over a custom error type, which defaults to `NoCustomError`
-/// for backwards compatibility and to support the most common use case.
-///
-/// A custom error type should implement `FromStr` and `Display`, which allows it to be converted
-/// into and from a string easily to be sent over the network. It does *not* need to implement
-/// `Serialize` and `Deserialize`, although these can be used to generate the `FromStr`/`Display`
-/// implementations if you'd like. However, it's much lighter weight to use something like `strum`
-/// simply to generate those trait implementations.
-#[server]
-pub async fn ascii_uppercase(
-    text: String,
-) -> Result<String, ServerFnError<InvalidArgument>> {
-    if text.len() < 5 {
-        Err(InvalidArgument::TooShort.into())
-    } else if text.len() > 15 {
-        Err(InvalidArgument::TooLong.into())
-    } else if text.is_ascii() {
-        Ok(text.to_ascii_uppercase())
-    } else {
-        Err(InvalidArgument::NotAscii.into())
-    }
-}
-
-// The EnumString and Display derive macros are provided by strum
-#[derive(Debug, Clone, EnumString, Display)]
-pub enum InvalidArgument {
-    TooShort,
-    TooLong,
-    NotAscii,
-}
-
-#[component]
-pub fn CustomErrorTypes() -> impl IntoView {
-    let input_ref = NodeRef::<Input>::new();
-    let (result, set_result) = create_signal(None);
-
-    view! {
-        <h3>Using custom error types</h3>
-        <p>
-            "Server functions can use a custom error type that is preserved across the network boundary."
-        </p>
-        <p>
-            "Try typing a message that is between 5 and 15 characters of ASCII text below. Then try breaking \
-            the rules!"
-        </p>
-        <input node_ref=input_ref placeholder="Type something here."/>
-        <button
-            on:click=move |_| {
-                let value = input_ref.get().unwrap().value();
-                spawn_local(async move {
-                    let data = ascii_uppercase(value).await;
-                    set_result(Some(data));
-                });
-            }
-        >
-            "Submit"
-        </button>
-        <p>
-            {move || format!("{:?}", result.get())}
-        </p>
-    }
-}
-
-/// Server function encodings are just types that implement a few traits.
-/// This means that you can implement your own encodings, by implementing those traits!
-///
-/// Here, we'll create a custom encoding that serializes and deserializes the server fn
-/// using TOML. Why would you ever want to do this? I don't know, but you can!
-pub struct Toml;
-
-/// A newtype wrapper around server fn data that will be TOML-encoded.
-///
-/// This is needed because of Rust rules around implementing foreign traits for foreign types.
-/// It will be fed into the `custom = ` argument to the server fn below.
-#[derive(Serialize, Deserialize)]
-pub struct TomlEncoded<T>(T);
-
-impl Encoding for Toml {
-    const CONTENT_TYPE: &'static str = "application/toml";
-    const METHOD: Method = Method::POST;
-}
-
-impl<T, Request, Err> IntoReq<Toml, Request, Err> for TomlEncoded<T>
-where
-    Request: ClientReq<Err>,
-    T: Serialize,
-{
-    fn into_req(
-        self,
-        path: &str,
-        accepts: &str,
-    ) -> Result<Request, ServerFnError<Err>> {
-        let data = toml::to_string(&self.0)
-            .map_err(|e| ServerFnError::Serialization(e.to_string()))?;
-        Request::try_new_post(path, Toml::CONTENT_TYPE, accepts, data)
-    }
-}
-
-impl<T, Request, Err> FromReq<Toml, Request, Err> for TomlEncoded<T>
-where
-    Request: Req<Err> + Send,
-    T: DeserializeOwned,
-{
-    async fn from_req(req: Request) -> Result<Self, ServerFnError<Err>> {
-        let string_data = req.try_into_string().await?;
-        toml::from_str::<T>(&string_data)
-            .map(TomlEncoded)
-            .map_err(|e| ServerFnError::Args(e.to_string()))
-    }
-}
-
-impl<T, Response, Err> IntoRes<Toml, Response, Err> for TomlEncoded<T>
-where
-    Response: Res<Err>,
-    T: Serialize + Send,
-{
-    async fn into_res(self) -> Result<Response, ServerFnError<Err>> {
-        let data = toml::to_string(&self.0)
-            .map_err(|e| ServerFnError::Serialization(e.to_string()))?;
-        Response::try_from_string(Toml::CONTENT_TYPE, data)
-    }
-}
-
-impl<T, Response, Err> FromRes<Toml, Response, Err> for TomlEncoded<T>
-where
-    Response: ClientRes<Err> + Send,
-    T: DeserializeOwned,
-{
-    async fn from_res(res: Response) -> Result<Self, ServerFnError<Err>> {
-        let data = res.try_into_string().await?;
-        toml::from_str(&data)
-            .map(TomlEncoded)
-            .map_err(|e| ServerFnError::Deserialization(e.to_string()))
-    }
-}
-
-#[derive(Serialize, Deserialize)]
-pub struct WhyNotResult {
-    original: String,
-    modified: String,
-}
-
-#[server(
-    input = Toml,
-    output = Toml,
-    custom = TomlEncoded
-)]
-pub async fn why_not(
-    original: String,
-    addition: String,
-) -> Result<TomlEncoded<WhyNotResult>, ServerFnError> {
-    // insert a simulated wait
-    tokio::time::sleep(std::time::Duration::from_millis(250)).await;
-    Ok(TomlEncoded(WhyNotResult {
-        modified: format!("{original}{addition}"),
-        original,
-    }))
-}
-
-#[component]
-pub fn CustomEncoding() -> impl IntoView {
-    let input_ref = NodeRef::<Input>::new();
-    let (result, set_result) = create_signal("foo".to_string());
-
-    view! {
-        <h3>Custom encodings</h3>
-        <p>
-            "This example creates a custom encoding that sends server fn data using TOML. Why? Well... why not?"
-        </p>
-        <input node_ref=input_ref placeholder="Type something here."/>
-        <button
-            on:click=move |_| {
-                let value = input_ref.get().unwrap().value();
-                spawn_local(async move {
-                let new_value = why_not(value, ", but in TOML!!!".to_string()).await.unwrap();
-                    set_result(new_value.0.modified);
-                });
-            }
-        >
-            Submit
-        </button>
-        <p>{result}</p>
-    }
-}
-
-/// Middleware lets you modify the request/response on the server.
-///
-/// On the client, you might also want to modify the request. For example, you may need to add a
-/// custom header for authentication on every request. You can do this by creating a "custom
-/// client."
-#[component]
-pub fn CustomClientExample() -> impl IntoView {
-    // Define a type for our client.
-    pub struct CustomClient;
-
-    // Implement the `Client` trait for it.
-    impl<CustErr> Client<CustErr> for CustomClient {
-        // BrowserRequest and BrowserResponse are the defaults used by other server functions.
-        // They are wrappers for the underlying Web Fetch API types.
-        type Request = BrowserRequest;
-        type Response = BrowserResponse;
-
-        // Our custom `send()` implementation does all the work.
-        fn send(
-            req: Self::Request,
-        ) -> impl Future<Output = Result<Self::Response, ServerFnError<CustErr>>>
-               + Send {
-            // BrowserRequest derefs to the underlying Request type from gloo-net,
-            // so we can get access to the headers here
-            let headers = req.headers();
-            // modify the headers by appending one
-            headers.append("X-Custom-Header", "foobar");
-            // delegate back out to BrowserClient to send the modified request
-            BrowserClient::send(req)
-        }
-    }
-
-    // Specify our custom client with `client = `
-    #[server(client = CustomClient)]
-    pub async fn fn_with_custom_client() -> Result<(), ServerFnError> {
-        use http::header::HeaderMap;
-        use leptos_axum::extract;
-
-        let headers: HeaderMap = extract().await?;
-        let custom_header = headers.get("X-Custom-Header");
-        println!("X-Custom-Header = {custom_header:?}");
-        Ok(())
-    }
-
-    view! {
-        <h3>Custom clients</h3>
-        <p>You can define a custom server function client to do something like adding a header to every request.</p>
-        <p>Check the network request in your browser devtools to see how this client adds a custom header.</p>
-        <button on:click=|_| spawn_local(async { fn_with_custom_client().await.unwrap() })>Click me</button>
-    }
-}

examples/server_fns_axum/src/fallback.rs

@@ -1,50 +0,0 @@
-use crate::{error_template::ErrorTemplate, errors::TodoAppError};
-use axum::{
-    body::Body,
-    extract::State,
-    http::{Request, Response, StatusCode, Uri},
-    response::{IntoResponse, Response as AxumResponse},
-};
-use leptos::{view, Errors, LeptosOptions};
-use tower::ServiceExt;
-use tower_http::services::ServeDir;
-
-pub async fn file_and_error_handler(
-    uri: Uri,
-    State(options): State<LeptosOptions>,
-    req: Request<Body>,
-) -> AxumResponse {
-    let root = options.site_root.clone();
-    let res = get_static_file(uri.clone(), &root).await.unwrap();
-
-    if res.status() == StatusCode::OK {
-        res.into_response()
-    } else {
-        let mut errors = Errors::default();
-        errors.insert_with_default_key(TodoAppError::NotFound);
-        let handler = leptos_axum::render_app_to_stream(
-            options.to_owned(),
-            move || view! {<ErrorTemplate outside_errors=errors.clone()/>},
-        );
-        handler(req).await.into_response()
-    }
-}
-
-async fn get_static_file(
-    uri: Uri,
-    root: &str,
-) -> Result<Response<Body>, (StatusCode, String)> {
-    let req = Request::builder()
-        .uri(uri.clone())
-        .body(Body::empty())
-        .unwrap();
-    // `ServeDir` implements `tower::Service` so we can call it with `tower::ServiceExt::oneshot`
-    // This path is relative to the cargo root
-    match ServeDir::new(root).oneshot(req).await {
-        Ok(res) => Ok(res.into_response()),
-        Err(err) => Err((
-            StatusCode::INTERNAL_SERVER_ERROR,
-            format!("Something went wrong: {err}"),
-        )),
-    }
-}

examples/server_fns_axum/src/lib.rs

@@ -1,17 +0,0 @@
-pub mod app;
-pub mod error_template;
-pub mod errors;
-#[cfg(feature = "ssr")]
-pub mod fallback;
-#[cfg(feature = "ssr")]
-pub mod middleware;
-
-#[wasm_bindgen::prelude::wasm_bindgen]
-pub fn hydrate() {
-    use crate::app::TodoApp;
-
-    _ = console_log::init_with_level(log::Level::Error);
-    console_error_panic_hook::set_once();
-
-    leptos::mount_to_body(TodoApp);
-}

examples/server_fns_axum/src/main.rs

@@ -1,31 +0,0 @@
-use crate::{app::*, fallback::file_and_error_handler};
-use axum::Router;
-use leptos::{get_configuration, logging};
-use leptos_axum::{generate_route_list, LeptosRoutes};
-use server_fns_axum::*;
-
-#[tokio::main]
-async fn main() {
-    simple_logger::init_with_level(log::Level::Error)
-        .expect("couldn't initialize logging");
-
-    // Setting this to None means we'll be using cargo-leptos and its env vars
-    let conf = get_configuration(None).await.unwrap();
-    let leptos_options = conf.leptos_options;
-    let addr = leptos_options.site_addr;
-    let routes = generate_route_list(TodoApp);
-
-    // build our application with a route
-    let app = Router::new()
-        .leptos_routes(&leptos_options, routes, TodoApp)
-        .fallback(file_and_error_handler)
-        .with_state(leptos_options);
-
-    // run our app with hyper
-    // `axum::Server` is a re-export of `hyper::Server`
-    let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
-    logging::log!("listening on http://{}", &addr);
-    axum::serve(listener, app.into_make_service())
-        .await
-        .unwrap();
-}

examples/server_fns_axum/src/middleware.rs

@@ -1,72 +0,0 @@
-use axum::body::Body;
-use http::Request;
-use pin_project_lite::pin_project;
-use std::{
-    future::Future,
-    pin::Pin,
-    task::{Context, Poll},
-};
-use tower::{Layer, Service};
-
-pub struct LoggingLayer;
-
-impl<S> Layer<S> for LoggingLayer {
-    type Service = LoggingService<S>;
-
-    fn layer(&self, inner: S) -> Self::Service {
-        LoggingService { inner }
-    }
-}
-
-pub struct LoggingService<T> {
-    inner: T,
-}
-
-impl<T> Service<Request<Body>> for LoggingService<T>
-where
-    T: Service<Request<Body>>,
-{
-    type Response = T::Response;
-    type Error = T::Error;
-    type Future = LoggingServiceFuture<T::Future>;
-
-    fn poll_ready(
-        &mut self,
-        cx: &mut Context<'_>,
-    ) -> Poll<Result<(), Self::Error>> {
-        self.inner.poll_ready(cx)
-    }
-
-    fn call(&mut self, req: Request<Body>) -> Self::Future {
-        println!("1. Running my middleware!");
-
-        LoggingServiceFuture {
-            inner: self.inner.call(req),
-        }
-    }
-}
-
-pin_project! {
-    pub struct LoggingServiceFuture<T> {
-        #[pin]
-        inner: T,
-    }
-}
-
-impl<T> Future for LoggingServiceFuture<T>
-where
-    T: Future,
-{
-    type Output = T::Output;
-
-    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let this = self.project();
-        match this.inner.poll(cx) {
-            Poll::Pending => Poll::Pending,
-            Poll::Ready(output) => {
-                println!("3. Running my middleware!");
-                Poll::Ready(output)
-            }
-        }
-    }
-}

examples/session_auth_axum/Cargo.toml

@@ -7,40 +7,40 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-anyhow = "1.0"
-console_log = "1.0"
-rand = { version = "0.8", features = ["min_const_gen"], optional = true }
-console_error_panic_hook = "0.1"
-futures = "0.3"
+anyhow = "1.0.66"
+console_log = "1.0.0"
+rand = { version = "0.8.5", features = ["min_const_gen"], optional = true }
+console_error_panic_hook = "0.1.7"
+futures = "0.3.25"
+cfg-if = "1.0.0"
 leptos = { path = "../../leptos", features = ["nightly"] }
 leptos_meta = { path = "../../meta", features = ["nightly"] }
 leptos_axum = { path = "../../integrations/axum", optional = true }
 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"] }
-tower = { version = "0.4", optional = true }
-tower-http = { version = "0.5", features = ["fs"], optional = true }
-tokio = { version = "1", features = ["full"], optional = true }
-http = { version = "1.0" }
+log = "0.4.17"
+simple_logger = "4.0.0"
+serde = { version = "1.0.148", features = ["derive"] }
+axum = { version = "0.6.1", optional = true, features=["macros"] }
+tower = { version = "0.4.13", optional = true }
+tower-http = { version = "0.4", features = ["fs"], optional = true }
+tokio = { version = "1.22.0", features = ["full"], optional = true }
+http = { version = "0.2.11" }
 sqlx = { version = "0.7.2", features = [
 	"runtime-tokio-rustls",
 	"sqlite",
 ], optional = true }
-thiserror = "1.0"
+thiserror = "1.0.38"
 wasm-bindgen = "0.2"
-axum_session_auth = { version = "0.10", features = [
+axum_session_auth = { version = "0.9.0", features = [
 	"sqlite-rustls",
 ], optional = true }
-axum_session = { version = "0.10", features = [
+axum_session = { version = "0.9.0", features = [
 	"sqlite-rustls",
 ], optional = true }
-bcrypt = { version = "0.15", optional = true }
-async-trait = { version = "0.1", optional = true }
+bcrypt = { version = "0.14", optional = true }
+async-trait = { version = "0.1.64", optional = true }
 
 [features]
-default = ["ssr"]
 hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
 ssr = [
 	"dep:axum",
@@ -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/flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1681202837,
+        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1685573264,
-        "narHash": "sha256-Zffu01pONhs/pqH07cjlF10NnMDLok8ix5Uk4rhOnZQ=",
+        "lastModified": 1672580127,
+        "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "380be19fbd2d9079f677978361792cb25e8a3635",
+        "rev": "0874168639713f547c05947c76124f78441ea46c",
         "type": "github"
       },
       "original": {
@@ -67,11 +67,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1703902408,
-        "narHash": "sha256-qXdWvu+tlgNjeoz8yQMRKSom6QyRROfgpmeOhwbujqw=",
+        "lastModified": 1681525152,
+        "narHash": "sha256-KzI+ILcmU03iFWtB+ysPqtNmp8TP8v1BBReTuPP8MJY=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "319f57cd2c34348c55970a4bf2b35afe82088681",
+        "rev": "b6f8d87208336d7cb85003b2e439fc707c38f92a",
         "type": "github"
       },
       "original": {

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

@@ -1,7 +1,17 @@
+use cfg_if::cfg_if;
 use leptos::*;
 use serde::{Deserialize, Serialize};
 use std::collections::HashSet;
 
+cfg_if! {
+if #[cfg(feature = "ssr")] {
+    use sqlx::SqlitePool;
+    use axum_session_auth::{SessionSqlitePool, Authentication, HasPermission};
+    use bcrypt::{hash, verify, DEFAULT_COST};
+    use crate::todo::{pool, auth};
+    pub type AuthSession = axum_session_auth::AuthSession<User, i64, SessionSqlitePool, SqlitePool>;
+}}
+
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct User {
     pub id: i64,
@@ -23,35 +33,19 @@ impl Default for User {
     }
 }
 
-#[cfg(feature = "ssr")]
-pub mod ssr {
-    pub use super::User;
-    pub use axum_session_auth::{
-        Authentication, HasPermission, SessionSqlitePool,
-    };
-    pub use sqlx::SqlitePool;
-    pub use std::collections::HashSet;
-    pub type AuthSession = axum_session_auth::AuthSession<
-        User,
-        i64,
-        SessionSqlitePool,
-        SqlitePool,
-    >;
-    pub use crate::todo::ssr::{auth, pool};
-    pub use async_trait::async_trait;
-    pub use bcrypt::{hash, verify, DEFAULT_COST};
+cfg_if! {
+if #[cfg(feature = "ssr")] {
+    use async_trait::async_trait;
 
     impl User {
         pub async fn get(id: i64, pool: &SqlitePool) -> Option<Self> {
-            let sqluser = sqlx::query_as::<_, SqlUser>(
-                "SELECT * FROM users WHERE id = ?",
-            )
-            .bind(id)
-            .fetch_one(pool)
-            .await
-            .ok()?;
+            let sqluser = sqlx::query_as::<_, SqlUser>("SELECT * FROM users WHERE id = ?")
+                .bind(id)
+                .fetch_one(pool)
+                .await
+                .ok()?;
 
-            //lets just get all the tokens the user can use, we will only use the full permissions if modifying them.
+            //lets just get all the tokens the user can use, we will only use the full permissions if modifing them.
             let sql_user_perms = sqlx::query_as::<_, SqlPermissionTokens>(
                 "SELECT token FROM user_permissions WHERE user_id = ?;",
             )
@@ -63,19 +57,14 @@ pub mod ssr {
             Some(sqluser.into_user(Some(sql_user_perms)))
         }
 
-        pub async fn get_from_username(
-            name: String,
-            pool: &SqlitePool,
-        ) -> Option<Self> {
-            let sqluser = sqlx::query_as::<_, SqlUser>(
-                "SELECT * FROM users WHERE username = ?",
-            )
-            .bind(name)
-            .fetch_one(pool)
-            .await
-            .ok()?;
+        pub async fn get_from_username(name: String, pool: &SqlitePool) -> Option<Self> {
+            let sqluser = sqlx::query_as::<_, SqlUser>("SELECT * FROM users WHERE username = ?")
+                .bind(name)
+                .fetch_one(pool)
+                .await
+                .ok()?;
 
-            //lets just get all the tokens the user can use, we will only use the full permissions if modifying them.
+            //lets just get all the tokens the user can use, we will only use the full permissions if modifing them.
             let sql_user_perms = sqlx::query_as::<_, SqlPermissionTokens>(
                 "SELECT token FROM user_permissions WHERE user_id = ?;",
             )
@@ -95,10 +84,7 @@ pub mod ssr {
 
     #[async_trait]
     impl Authentication<User, i64, SqlitePool> for User {
-        async fn load_user(
-            userid: i64,
-            pool: Option<&SqlitePool>,
-        ) -> Result<User, anyhow::Error> {
+        async fn load_user(userid: i64, pool: Option<&SqlitePool>) -> Result<User, anyhow::Error> {
             let pool = pool.unwrap();
 
             User::get(userid, pool)
@@ -134,10 +120,7 @@ pub mod ssr {
     }
 
     impl SqlUser {
-        pub fn into_user(
-            self,
-            sql_user_perms: Option<Vec<SqlPermissionTokens>>,
-        ) -> User {
+        pub fn into_user(self, sql_user_perms: Option<Vec<SqlPermissionTokens>>) -> User {
             User {
                 id: self.id,
                 username: self.username,
@@ -154,16 +137,15 @@ pub mod ssr {
         }
     }
 }
+}
 
-#[server]
+#[server(Foo, "/api")]
 pub async fn foo() -> Result<String, ServerFnError> {
     Ok(String::from("Bar!"))
 }
 
-#[server]
+#[server(GetUser, "/api")]
 pub async fn get_user() -> Result<Option<User>, ServerFnError> {
-    use crate::todo::ssr::auth;
-
     let auth = auth()?;
 
     Ok(auth.current_user)
@@ -175,14 +157,14 @@ pub async fn login(
     password: String,
     remember: Option<String>,
 ) -> Result<(), ServerFnError> {
-    use self::ssr::*;
-
     let pool = pool()?;
     let auth = auth()?;
 
     let user: User = User::get_from_username(username, &pool)
         .await
-        .ok_or_else(|| ServerFnError::new("User does not exist."))?;
+        .ok_or_else(|| {
+            ServerFnError::ServerError("User does not exist.".into())
+        })?;
 
     match verify(password, &user.password)? {
         true => {
@@ -204,8 +186,6 @@ pub async fn signup(
     password_confirmation: String,
     remember: Option<String>,
 ) -> Result<(), ServerFnError> {
-    use self::ssr::*;
-
     let pool = pool()?;
     let auth = auth()?;
 
@@ -227,7 +207,9 @@ pub async fn signup(
         User::get_from_username(username, &pool)
             .await
             .ok_or_else(|| {
-                ServerFnError::new("Signup failed: User does not exist.")
+                ServerFnError::ServerError(
+                    "Signup failed: User does not exist.".into(),
+                )
             })?;
 
     auth.login_user(user.id);
@@ -240,8 +222,6 @@ pub async fn signup(
 
 #[server(Logout, "/api")]
 pub async fn logout() -> Result<(), ServerFnError> {
-    use self::ssr::*;
-
     let auth = auth()?;
 
     auth.logout_user();

examples/session_auth_axum/src/error_template.rs

@@ -1,4 +1,5 @@
 use crate::errors::TodoAppError;
+use cfg_if::cfg_if;
 use leptos::{Errors, *};
 #[cfg(feature = "ssr")]
 use leptos_axum::ResponseOptions;
@@ -28,12 +29,13 @@ pub fn ErrorTemplate(
 
     // Only the response code for the first error is actually sent from the server
     // this may be customized by the specific application
-    #[cfg(feature = "ssr")]
-    {
+    cfg_if! {
+      if #[cfg(feature="ssr")]{
         let response = use_context::<ResponseOptions>();
-        if let Some(response) = response {
-            response.set_status(errors[0].status_code());
+        if let Some(response) = response{
+          response.set_status(errors[0].status_code());
         }
+      }
     }
 
     view! {

examples/session_auth_axum/src/fallback.rs

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

examples/session_auth_axum/src/lib.rs

@@ -1,18 +1,27 @@
+use cfg_if::cfg_if;
+
 pub mod auth;
 pub mod error_template;
 pub mod errors;
-#[cfg(feature = "ssr")]
 pub mod fallback;
-#[cfg(feature = "ssr")]
 pub mod state;
 pub mod todo;
 
-#[cfg(feature = "hydrate")]
-#[wasm_bindgen::prelude::wasm_bindgen]
-pub fn hydrate() {
-    use crate::todo::*;
-    _ = console_log::init_with_level(log::Level::Debug);
-    console_error_panic_hook::set_once();
+// Needs to be in lib.rs AFAIK because wasm-bindgen needs us to be compiling a lib. I may be wrong.
+cfg_if! {
+    if #[cfg(feature = "hydrate")] {
+        use wasm_bindgen::prelude::wasm_bindgen;
+        use crate::todo::*;
+        use leptos::view;
 
-    leptos::mount_to_body(TodoApp);
+        #[wasm_bindgen]
+        pub fn hydrate() {
+            _ = console_log::init_with_level(log::Level::Debug);
+            console_error_panic_hook::set_once();
+
+            leptos::mount_to_body(|| {
+                view! { <TodoApp/> }
+            });
+        }
+    }
 }

examples/session_auth_axum/src/main.rs

@@ -1,131 +1,117 @@
-use axum::{
-    body::Body as AxumBody,
-    extract::{Path, State},
-    http::Request,
-    response::{IntoResponse, Response},
-    routing::get,
-    Router,
-};
-use axum_session::{SessionConfig, SessionLayer, SessionStore};
-use axum_session_auth::{AuthConfig, AuthSessionLayer, SessionSqlitePool};
-use leptos::{get_configuration, logging::log, provide_context};
-use leptos_axum::{
-    generate_route_list, handle_server_fns_with_context, LeptosRoutes,
-};
-use session_auth_axum::{
-    auth::{ssr::AuthSession, User},
-    fallback::file_and_error_handler,
-    state::AppState,
-    todo::*,
-};
-use sqlx::{sqlite::SqlitePoolOptions, SqlitePool};
+use cfg_if::cfg_if;
 
-async fn server_fn_handler(
-    State(app_state): State<AppState>,
-    auth_session: AuthSession,
-    path: Path<String>,
-    request: Request<AxumBody>,
-) -> impl IntoResponse {
-    log!("{:?}", path);
+// boilerplate to run in different modes
+cfg_if! {
+if #[cfg(feature = "ssr")] {
+    use axum::{
+        response::{Response, IntoResponse},
+        routing::get,
+        extract::{Path, State, RawQuery},
+        http::{Request, header::HeaderMap},
+        body::Body as AxumBody,
+        Router,
+    };
+    use session_auth_axum::todo::*;
+    use session_auth_axum::auth::*;
+    use session_auth_axum::state::AppState;
+    use session_auth_axum::fallback::file_and_error_handler;
+    use leptos_axum::{generate_route_list, LeptosRoutes, handle_server_fns_with_context};
+    use leptos::{logging::log, provide_context, get_configuration};
+    use sqlx::{SqlitePool, sqlite::SqlitePoolOptions};
+    use axum_session::{SessionConfig, SessionLayer, SessionStore};
+    use axum_session_auth::{AuthSessionLayer, AuthConfig, SessionSqlitePool};
 
-    handle_server_fns_with_context(
-        move || {
+    async fn server_fn_handler(State(app_state): State<AppState>, auth_session: AuthSession, path: Path<String>, headers: HeaderMap, raw_query: RawQuery,
+    request: Request<AxumBody>) -> impl IntoResponse {
+
+        log!("{:?}", path);
+
+        handle_server_fns_with_context(path, headers, raw_query, move || {
             provide_context(auth_session.clone());
             provide_context(app_state.pool.clone());
-        },
-        request,
-    )
-    .await
-}
-
-async fn leptos_routes_handler(
-    auth_session: AuthSession,
-    State(app_state): State<AppState>,
-    req: Request<AxumBody>,
-) -> Response {
-    let handler = leptos_axum::render_route_with_context(
-        app_state.leptos_options.clone(),
-        app_state.routes.clone(),
-        move || {
-            provide_context(auth_session.clone());
-            provide_context(app_state.pool.clone());
-        },
-        TodoApp,
-    );
-    handler(req).await.into_response()
-}
-
-#[tokio::main]
-async fn main() {
-    simple_logger::init_with_level(log::Level::Info)
-        .expect("couldn't initialize logging");
-
-    let pool = SqlitePoolOptions::new()
-        .connect("sqlite:Todos.db")
-        .await
-        .expect("Could not make pool.");
-
-    // Auth section
-    let session_config =
-        SessionConfig::default().with_table_name("axum_sessions");
-    let auth_config = AuthConfig::<i64>::default();
-    let session_store = SessionStore::<SessionSqlitePool>::new(
-        Some(pool.clone().into()),
-        session_config,
-    )
-    .await
-    .unwrap();
-
-    if let Err(e) = sqlx::migrate!().run(&pool).await {
-        eprintln!("{e:?}");
+        }, request).await
     }
 
-    // Explicit server function registration is no longer required
-    // on the main branch. On 0.3.0 and earlier, uncomment the lines
-    // below to register the server functions.
-    // _ = GetTodos::register();
-    // _ = AddTodo::register();
-    // _ = DeleteTodo::register();
-    // _ = Login::register();
-    // _ = Logout::register();
-    // _ = Signup::register();
-    // _ = GetUser::register();
-    // _ = Foo::register();
+    async fn leptos_routes_handler(auth_session: AuthSession, State(app_state): State<AppState>, req: Request<AxumBody>) -> Response{
+            let handler = leptos_axum::render_route_with_context(app_state.leptos_options.clone(),
+            app_state.routes.clone(),
+            move || {
+                provide_context(auth_session.clone());
+                provide_context(app_state.pool.clone());
+            },
+            TodoApp
+        );
+        handler(req).await.into_response()
+    }
 
-    // Setting this to None means we'll be using cargo-leptos and its env vars
-    let conf = get_configuration(None).await.unwrap();
-    let leptos_options = conf.leptos_options;
-    let addr = leptos_options.site_addr;
-    let routes = generate_route_list(TodoApp);
+    #[tokio::main]
+    async fn main() {
+        simple_logger::init_with_level(log::Level::Info).expect("couldn't initialize logging");
 
-    let app_state = AppState {
-        leptos_options,
-        pool: pool.clone(),
-        routes: routes.clone(),
-    };
+        let pool = SqlitePoolOptions::new()
+            .connect("sqlite:Todos.db")
+            .await
+            .expect("Could not make pool.");
 
-    // build our application with a route
-    let app = Router::new()
-        .route(
-            "/api/*fn_name",
-            get(server_fn_handler).post(server_fn_handler),
-        )
-        .leptos_routes_with_handler(routes, get(leptos_routes_handler))
+        // Auth section
+        let session_config = SessionConfig::default().with_table_name("axum_sessions");
+        let auth_config = AuthConfig::<i64>::default();
+        let session_store = SessionStore::<SessionSqlitePool>::new(Some(pool.clone().into()), session_config).await.unwrap();
+
+        sqlx::migrate!()
+            .run(&pool)
+            .await
+            .expect("could not run SQLx migrations");
+
+        // Explicit server function registration is no longer required
+        // on the main branch. On 0.3.0 and earlier, uncomment the lines
+        // below to register the server functions.
+        // _ = GetTodos::register();
+        // _ = AddTodo::register();
+        // _ = DeleteTodo::register();
+        // _ = Login::register();
+        // _ = Logout::register();
+        // _ = Signup::register();
+        // _ = GetUser::register();
+        // _ = Foo::register();
+
+        // Setting this to None means we'll be using cargo-leptos and its env vars
+        let conf = get_configuration(None).await.unwrap();
+        let leptos_options = conf.leptos_options;
+        let addr = leptos_options.site_addr;
+        let routes = generate_route_list(TodoApp);
+
+        let app_state = AppState{
+            leptos_options,
+            pool: pool.clone(),
+            routes: routes.clone(),
+        };
+
+        // build our application with a route
+        let app = Router::new()
+        .route("/api/*fn_name", get(server_fn_handler).post(server_fn_handler))
+        .leptos_routes_with_handler(routes, get(leptos_routes_handler) )
         .fallback(file_and_error_handler)
-        .layer(
-            AuthSessionLayer::<User, i64, SessionSqlitePool, SqlitePool>::new(
-                Some(pool.clone()),
-            )
-            .with_config(auth_config),
-        )
+        .layer(AuthSessionLayer::<User, i64, SessionSqlitePool, SqlitePool>::new(Some(pool.clone()))
+        .with_config(auth_config))
         .layer(SessionLayer::new(session_store))
         .with_state(app_state);
 
-    // run our app with hyper
-    // `axum::Server` is a re-export of `hyper::Server`
-    log!("listening on http://{}", &addr);
-    let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
-    axum::serve(listener, app.into_make_service())
-        .await
-        .unwrap();
+        // run our app with hyper
+        // `axum::Server` is a re-export of `hyper::Server`
+        log!("listening on http://{}", &addr);
+        axum::Server::bind(&addr)
+            .serve(app.into_make_service())
+            .await
+            .unwrap();
+    }
+}
+
+    // client-only stuff for Trunk
+    else {
+        pub fn main() {
+            // This example cannot be built as a trunk standalone CSR-only app.
+            // Only the server may directly connect to the database.
+        }
+    }
 }

examples/session_auth_axum/src/state.rs

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

examples/session_auth_axum/src/todo.rs

@@ -1,4 +1,5 @@
 use crate::{auth::*, error_template::ErrorTemplate};
+use cfg_if::cfg_if;
 use leptos::*;
 use leptos_meta::*;
 use leptos_router::*;
@@ -13,41 +14,40 @@ pub struct Todo {
     completed: bool,
 }
 
-#[cfg(feature = "ssr")]
-pub mod ssr {
-    use super::Todo;
-    use crate::auth::{ssr::AuthSession, User};
-    use leptos::*;
-    use sqlx::SqlitePool;
+cfg_if! {
+    if #[cfg(feature = "ssr")] {
 
-    pub fn pool() -> Result<SqlitePool, ServerFnError> {
-        use_context::<SqlitePool>()
-            .ok_or_else(|| ServerFnError::ServerError("Pool missing.".into()))
-    }
+        use sqlx::SqlitePool;
+        use futures::future::join_all;
 
-    pub fn auth() -> Result<AuthSession, ServerFnError> {
-        use_context::<AuthSession>().ok_or_else(|| {
-            ServerFnError::ServerError("Auth session missing.".into())
-        })
-    }
+        pub fn pool() -> Result<SqlitePool, ServerFnError> {
+           use_context::<SqlitePool>()
+                .ok_or_else(|| ServerFnError::ServerError("Pool missing.".into()))
+        }
 
-    #[derive(sqlx::FromRow, Clone)]
-    pub struct SqlTodo {
-        id: u32,
-        user_id: i64,
-        title: String,
-        created_at: String,
-        completed: bool,
-    }
+        pub fn auth() -> Result<AuthSession, ServerFnError> {
+            use_context::<AuthSession>()
+                .ok_or_else(|| ServerFnError::ServerError("Auth session missing.".into()))
+        }
 
-    impl SqlTodo {
-        pub async fn into_todo(self, pool: &SqlitePool) -> Todo {
-            Todo {
-                id: self.id,
-                user: User::get(self.user_id, pool).await,
-                title: self.title,
-                created_at: self.created_at,
-                completed: self.completed,
+        #[derive(sqlx::FromRow, Clone)]
+        pub struct SqlTodo {
+            id: u32,
+            user_id: i64,
+            title: String,
+            created_at: String,
+            completed: bool,
+        }
+
+        impl SqlTodo {
+            pub async fn into_todo(self, pool: &SqlitePool) -> Todo {
+                Todo {
+                    id: self.id,
+                    user: User::get(self.user_id, pool).await,
+                    title: self.title,
+                    created_at: self.created_at,
+                    completed: self.completed,
+                }
             }
         }
     }
@@ -55,9 +55,6 @@ pub mod ssr {
 
 #[server(GetTodos, "/api")]
 pub async fn get_todos() -> Result<Vec<Todo>, ServerFnError> {
-    use self::ssr::{pool, SqlTodo};
-    use futures::future::join_all;
-
     let pool = pool()?;
 
     Ok(join_all(
@@ -72,8 +69,6 @@ pub async fn get_todos() -> Result<Vec<Todo>, ServerFnError> {
 
 #[server(AddTodo, "/api")]
 pub async fn add_todo(title: String) -> Result<(), ServerFnError> {
-    use self::ssr::*;
-
     let user = get_user().await?;
     let pool = pool()?;
 
@@ -98,8 +93,6 @@ pub async fn add_todo(title: String) -> Result<(), ServerFnError> {
 // The struct name and path prefix arguments are optional.
 #[server]
 pub async fn delete_todo(id: u16) -> Result<(), ServerFnError> {
-    use self::ssr::*;
-
     let pool = pool()?;
 
     Ok(sqlx::query("DELETE FROM todos WHERE id = $1")

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

@@ -1,111 +0,0 @@
-[package]
-name = "sso_auth_axum"
-version = "0.1.0"
-edition = "2021"
-
-[lib]
-crate-type = ["cdylib", "rlib"]
-
-[dependencies]
-oauth2 = { version = "4.4.2", optional = true }
-anyhow = "1.0.66"
-console_log = "1.0.0"
-rand = { version = "0.8.5", features = ["min_const_gen"], optional = true }
-console_error_panic_hook = "0.1.7"
-futures = "0.3.25"
-leptos = { path = "../../leptos" }
-leptos_meta = { path = "../../meta" }
-leptos_axum = { path = "../../integrations/axum", optional = true }
-leptos_router = { path = "../../router" }
-log = "0.4.17"
-simple_logger = "4.0.0"
-serde = { version = "1.0.148", features = ["derive"] }
-serde_json = { version = "1.0.108", optional = true }
-axum = { version = "0.7", optional = true, features = ["macros"] }
-tower = { version = "0.4", optional = true }
-tower-http = { version = "0.5", features = ["fs"], optional = true }
-tokio = { version = "1.22.0", features = ["full"], optional = true }
-http = { version = "1" }
-sqlx = { version = "0.7", features = [
-	"runtime-tokio-rustls",
-	"sqlite",
-], optional = true }
-thiserror = "1.0.38"
-wasm-bindgen = "0.2"
-axum_session_auth = { version = "0.12", features = [
-	"sqlite-rustls",
-], optional = true }
-axum_session = { version = "0.12", features = [
-	"sqlite-rustls",
-], optional = true }
-async-trait = { version = "0.1.64", optional = true }
-reqwest = { version = "0.11", optional = true, features = ["json"] }
-
-[features]
-hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
-ssr = [
-	"dep:serde_json",
-	"dep:axum",
-	"dep:tower",
-	"dep:tower-http",
-	"dep:tokio",
-	"dep:reqwest",
-	"dep:oauth2",
-	"dep:axum_session_auth",
-	"dep:axum_session",
-	"dep:async-trait",
-	"dep:sqlx",
-	"dep:rand",
-	"leptos/ssr",
-	"leptos_meta/ssr",
-	"leptos_router/ssr",
-	"dep:leptos_axum",
-]
-
-[package.metadata.cargo-all-features]
-denylist = ["axum", "tower", "tower-http", "tokio", "sqlx", "leptos_axum"]
-skip_feature_sets = [["csr", "ssr"], ["csr", "hydrate"], ["ssr", "hydrate"]]
-
-[package.metadata.leptos]
-# The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name
-output-name = "sso_auth_axum"
-# The site root folder is where cargo-leptos generate all output. WARNING: all content of this folder will be erased on a rebuild. Use it in your server setup.
-site-root = "target/site"
-# The site-root relative folder where all compiled output (JS, WASM and CSS) is written
-# Defaults to pkg
-site-pkg-dir = "pkg"
-# [Optional] The source CSS file. If it ends with .sass or .scss then it will be compiled by dart-sass into CSS. The CSS is optimized by Lightning CSS before being written to <site-root>/<site-pkg>/app.css
-style-file = "./style.css"
-# [Optional] Files in the asset-dir will be copied to the site-root directory
-assets-dir = "public"
-# The IP and port (ex: 127.0.0.1:3000) where the server serves the content. Use it in your server setup.
-site-addr = "127.0.0.1:3000"
-# The port to use for automatic reload monitoring
-reload-port = 3001
-# [Optional] Command to use when running end2end tests. It will run in the end2end dir.
-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
-watch = false
-# The environment Leptos will run in, usually either "DEV" or "PROD"
-env = "DEV"
-# The features to use when compiling the bin target
-#
-# Optional. Can be over-ridden with the command line parameter --bin-features
-bin-features = ["ssr"]
-
-# If the --no-default-features flag should be used when compiling the bin target
-#
-# Optional. Defaults to false.
-bin-default-features = false
-
-# The features to use when compiling the lib target
-#
-# Optional. Can be over-ridden with the command line parameter --lib-features
-lib-features = ["hydrate"]
-
-# If the --no-default-features flag should be used when compiling the lib target
-#
-# Optional. Defaults to false.
-lib-default-features = false

examples/sso_auth_axum/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 Greg Johnston
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

examples/sso_auth_axum/Makefile.toml

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

examples/sso_auth_axum/README.md

@@ -1,83 +0,0 @@
-# Leptos SSO Authenticated Email Display App with Axum
-
-## Overview
-This project demonstrates various methods of implementing Single Sign-On (SSO) authorization using OAuth, specifically with the OAuth2 library. The primary focus is on the Authorization Code Grant flow.
-
-### Process Flow
-1. **Initiating Sign-In:** When a user clicks the 'Sign In With {THIRD PARTY SERVICE}' button, the request is sent to a server function. This function retrieves an authorization URL from the third-party service.
-
-2. **CSRF Token Handling:** During the URL fetch, a CSRF_TOKEN is generated and confirmed by the service to mitigate Cross-Site Request Forgery attacks. Learn more about CSRF [here](https://en.wikipedia.org/wiki/Cross-site_request_forgery). This token is stored on our server.
-
-3. **User Redirection:** Post-login, users are redirected to our server with a URL formatted as follows:  
-`http://your-redirect-uri.com/callback?code=AUTHORIZATION_CODE&state=CSRF_TOKEN`
-Note: Additional parameters like Scope and Client_ID may be included by the service.
-
-4. **Token Acquisition:** The 'code' parameter in the URL is not the actual service token. Instead, it's used to fetch the token. We verify the CSRF_TOKEN in the URL against our server's stored token for security.
-
-5. **Access Token Usage:** With a valid CSRF_TOKEN, we use the AUTHORIZATION_CODE in an HTTP Request to the third-party service. The response typically includes:
-- An `access token`
-- An `expires_in` value (time in seconds until token expiration)
-- A `refresh token` (used to renew the access token)
-
-6. **Email Retrieval and Display:** The access token allows us to retrieve the user's email. This email is then displayed in our Email Display App.
-
-7. **Session Management:** The `expires_in` value is sent to the client. The client uses this to set a timeout, ensuring that if the session is still active (the window hasn't been closed), it automatically triggers a token refresh when required.
-
-
-
-## Client Side Rendering
-This example cannot be built as a trunk standalone CSR-only app. Only the server may directly connect to the database.
-
-## Server Side Rendering with cargo-leptos
-cargo-leptos is now the easiest and most featureful way to build server side rendered apps with hydration. It provides automatic recompilation of client and server code, wasm optimisation, CSS minification, and more! Check out more about it [here](https://github.com/akesson/cargo-leptos)
-
-## Env Vars
-Commands that run the program, cargo leptos watch, cargo leptos serve, cargo run etc... All need the following Environment variables
-G_AUTH_CLIENT_ID : This is the client ID given to you by google.
-G_AUTH_SECRET : This is the secret given to you by google.
-NGROK : this is the ngrok endpoint you get when you run ngrok http 3000
-
-## Ngrok Google Set Up
-After running your app, run
-```bash
-ngrok http 3000
-```
-Then use google api's and services, go to credentials, create credentials, add your app name, and use the ngrok url as the origin
-and use the ngrok url with /g_auth as the redirect url. That will look like this `https://362b-24-34-20-189.ngrok-free.app/g_auth`
-Save you client ID and secret given to you by google. Use them as Envars when you run the program as below
-```bash
-REDIRECT_URL={ngrok_redirect_url} G_AUTH_CLIENT_ID={google_credential_client_id} G_AUTH_SECRET={google_credential_secret} {your command here...}
-```
-
-1. Install cargo-leptos
-```bash
-cargo install --locked cargo-leptos
-``` 
-2. Build the site in watch mode, recompiling on file changes
-```bash
-cargo leptos watch
-```
-
-Open browser on [http://localhost:3000/](http://localhost:3000/)
-
-3. When ready to deploy, run
-```bash
-cargo leptos build --release
-```
-
-## Server Side Rendering without cargo-leptos
-To run it as a server side app with hydration, you'll need to have wasm-pack installed.
-
-0. Edit the `[package.metadata.leptos]` section and set `site-root` to `"."`. You'll also want to change the path of the `<StyleSheet / >` component in the root component to point towards the CSS file in the root. This tells leptos that the WASM/JS files generated by wasm-pack are available at `./pkg` and that the CSS files are no longer processed by cargo-leptos. Building to alternative folders is not supported at this time. You'll also want to edit the call to `get_configuration()` to pass in `Some(Cargo.toml)`, so that Leptos will read the settings instead of cargo-leptos. If you do so, your file/folder names cannot include dashes.
-1. Install wasm-pack
-```bash
-cargo install wasm-pack
-```
-2. Build the Webassembly used to hydrate the HTML from the server
-```bash
-wasm-pack build --target=web --debug --no-default-features --features=hydrate
-```
-3. Run the server to serve the Webassembly, JS, and HTML 
-```bash
-cargo run --no-default-features --features=ssr
-```

examples/sso_auth_axum/flake.lock

@@ -1,116 +0,0 @@
-{
-  "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1672580127,
-        "narHash": "sha256-3lW3xZslREhJogoOkjeZtlBtvFMyxHku7I/9IVehhT8=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0874168639713f547c05947c76124f78441ea46c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-22.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
-        "rust-overlay": "rust-overlay"
-      }
-    },
-    "rust-overlay": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1681525152,
-        "narHash": "sha256-KzI+ILcmU03iFWtB+ysPqtNmp8TP8v1BBReTuPP8MJY=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "b6f8d87208336d7cb85003b2e439fc707c38f92a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

examples/sso_auth_axum/flake.nix

@@ -1,37 +0,0 @@
-{
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.05";
-  inputs.rust-overlay.url = "github:oxalica/rust-overlay";
-  inputs.rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
-  inputs.flake-utils.url = "github:numtide/flake-utils";
-
-  outputs = { self, nixpkgs, rust-overlay, flake-utils }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        pkgs = import nixpkgs {
-          inherit system;
-          overlays = [ (import rust-overlay) ];
-        };
-      in
-        with pkgs; rec {
-          devShells.default = mkShell {
-
-            shellHook = ''
-              export PKG_CONFIG_PATH="${pkgs.openssl.dev}/lib/pkgconfig";
-            '';
-
-            nativeBuildInputs = [
-              pkg-config
-            ];
-            buildInputs = [
-              trunk
-              sqlite
-              sass
-              openssl
-              (rust-bin.nightly.latest.default.override {
-                extensions = [ "rust-src" ];
-                targets = [ "wasm32-unknown-unknown" ];
-              })
-            ];
-          };
-        });
-}

examples/sso_auth_axum/migrations/20231217000000_create_tables.sql

@@ -1,26 +0,0 @@
-PRAGMA foreign_keys = ON;
-
-CREATE TABLE IF NOT EXISTS users (
-  id         INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  email      TEXT NOT NULL UNIQUE,
-  created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-);
-
-CREATE TABLE IF NOT EXISTS user_permissions (
-    user_id  INTEGER NOT NULL,
-    token    TEXT NOT NULL
-);
-
-CREATE TABLE IF NOT EXISTS csrf_tokens (
-    csrf_token TEXT NOT NULL PRIMARY KEY UNIQUE
-);
-
-CREATE TABLE IF NOT EXISTS google_tokens (
-  id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-  user_id INTEGER NOT NULL UNIQUE,
-  access_secret TEXT NOT NULL,
-  refresh_secret TEXT NOT NULL,
-  created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-  FOREIGN KEY (user_id) REFERENCES users(id) CONFLICT REPLACE
-);
-