fix: hydration ID mismatch with nested Suspense

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

@@ -31,10 +31,10 @@ jobs:
           dir_names: true
           dir_names_max_depth: "2"
           files: |
-            examples/**
-            !examples/cargo-make/**
-            !examples/gtk/**
-            !examples/hackernews_js_fetch/**
+            examples
+            !examples/cargo-make
+            !examples/gtk
+            !examples/hackernews_js_fetch
             !examples/Makefile.toml
             !examples/*.md
           json: true

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

@@ -25,8 +25,8 @@ jobs:
         with:
           files: |
             examples/**
-            !examples/cargo-make/**
-            !examples/gtk/**
+            !examples/cargo-make
+            !examples/gtk
             !examples/Makefile.toml
             !examples/*.md
 

.github/workflows/run-cargo-make-task.yml

@@ -55,9 +55,9 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 18
 
-      - uses: pnpm/action-setup@v3
+      - uses: pnpm/action-setup@v2
         name: Install pnpm
         id: pnpm-install
         with:

Cargo.toml

@@ -25,7 +25,7 @@ members = [
 exclude = ["benchmarks", "examples"]
 
 [workspace.package]
-version = "0.6.6"
+version = "0.6.5"
 
 [workspace.dependencies]
 leptos = { path = "./leptos", version = "0.6.5" }

examples/Makefile.toml

@@ -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 [web|all|help]"
-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/README.md

@@ -16,7 +16,7 @@ You can also run any of the examples using [`cargo-make`](https://github.com/sag
 
 Follow these steps to get any example up and running.
 
-1. `cd` to the example you want to run
+1. `cd` to the example root directory
 2. Run `cargo make ci` to setup and test the example
 3. Run `cargo make start` to run the example
 4. Open the client URL in the console output (<http://127.0.0.1:8080> or <http://127.0.0.1:3000> by default)

examples/cargo-make/scripts/web-report.sh

@@ -1,169 +0,0 @@
-#!/bin/bash
-
-set -emu
-
-BOLD="\e[1m"
-ITALIC="\e[3m"
-YELLOW="\e[1;33m"
-RED="\e[1;36m"
-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"
-                ;;
-            *"package.metadata.leptos"*)
-                crate_tags=$crate_tags"M"
-                ;;
-            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")
-
-        # Find leptos projects that are not configured to build with cargo-leptos
-        sorted_crate_symbols=${sorted_crate_symbols//"LM"/"L"}
-
-        # Maybe print line
-        local crate_line=$path
-
-        if [ -n "$crate_tags" ]; then
-            local color=$YELLOW
-            case $sorted_crate_symbols in
-            *"M"*)
-                color=$RED
-                ;;
-            esac
-
-            crate_line="$crate_line ➤ ${color}$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"
-    m="${BOLD}${RED}M${RESET} = Cargo Leptos Metadata Only (${ITALIC}ci is not configured to build with cargo-leptos${RESET})"
-    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}Report Keys:${RESET}\n $c\n $d\n $l\n $m\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_isomorphic/src/counters.rs

@@ -141,12 +141,9 @@ 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>
+                <Suspense fallback=move |_| view!{ <span>"Value: "</span>}>
+                  <span>"Value: " { counter.get().map(|count| count.unwrap_or(0)).unwrap_or(0);} "!"</span>
+                </Suspense>
                 <button on:click=move |_| inc.dispatch(())>"+1"</button>
             </div>
             <Suspense>
@@ -204,7 +201,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"/>

examples/hackernews_islands_axum/Makefile.toml

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

examples/session_auth_axum/Cargo.toml

@@ -30,10 +30,10 @@ sqlx = { version = "0.7.2", features = [
 ], optional = true }
 thiserror = "1.0"
 wasm-bindgen = "0.2"
-axum_session_auth = { version = "0.12.1", features = [
+axum_session_auth = { version = "0.10", features = [
 	"sqlite-rustls",
 ], optional = true }
-axum_session = { version = "0.12.4", features = [
+axum_session = { version = "0.10", features = [
 	"sqlite-rustls",
 ], optional = true }
 bcrypt = { version = "0.15", optional = true }

examples/session_auth_axum/src/main.rs

@@ -70,7 +70,7 @@ async fn main() {
         SessionConfig::default().with_table_name("axum_sessions");
     let auth_config = AuthConfig::<i64>::default();
     let session_store = SessionStore::<SessionSqlitePool>::new(
-        Some(SessionSqlitePool::from(pool.clone())),
+        Some(pool.clone().into()),
         session_config,
     )
     .await

examples/suspense_tests/src/app.rs

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

examples/tailwind_axum/Cargo.toml

@@ -44,7 +44,7 @@ skip_feature_sets = [["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 = "leptos_tailwind"
+output-name = "tailwind_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

examples/tailwind_axum/package-lock.json

@@ -9,6 +9,7 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
+        "preline": "^1.8.0",
         "tailwindcss": "^3.3.2"
       }
     },
@@ -103,6 +104,15 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@popperjs/core": {
+      "version": "2.11.8",
+      "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+      "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
     "node_modules/any-promise": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
@@ -689,6 +699,14 @@
       "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
       "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
     },
+    "node_modules/preline": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/preline/-/preline-1.8.0.tgz",
+      "integrity": "sha512-guttn86Fc/+AbvN9oKcr2z3zU7DL3Q5dl7nhcR4nTi5F02LXQc7WIYwgIXMR97kymCs52feiju6glXO3dUIpvA==",
+      "dependencies": {
+        "@popperjs/core": "^2.11.2"
+      }
+    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",

examples/tailwind_axum/src/app.rs

@@ -7,7 +7,8 @@ pub fn App() -> impl IntoView {
     provide_meta_context();
 
     view! {
-        <Stylesheet id="leptos" href="/pkg/leptos_tailwind.css"/>
+
+        <Stylesheet id="leptos" href="/pkg/tailwind_axum.css"/>
         <Link rel="shortcut icon" type_="image/ico" href="/favicon.ico"/>
         <Router>
             <Routes>

examples/tailwind_csr/src/app.rs

@@ -8,7 +8,7 @@ pub fn App() -> impl IntoView {
 
     view! {
 
-        <Stylesheet id="leptos" href="/style/output.css"/>
+        <Stylesheet id="leptos" href="/pkg/tailwind.css"/>
         <Link rel="shortcut icon" type_="image/ico" href="/favicon.ico"/>
         <Router>
             <Routes>

integrations/utils/src/lib.rs

@@ -2,7 +2,6 @@ use futures::{Stream, StreamExt};
 use leptos::{nonce::use_nonce, use_context, RuntimeId};
 use leptos_config::LeptosOptions;
 use leptos_meta::MetaContext;
-use std::borrow::Cow;
 
 extern crate tracing;
 
@@ -56,9 +55,7 @@ pub fn html_parts_separated(
     options: &LeptosOptions,
     meta: Option<&MetaContext>,
 ) -> (String, &'static str) {
-    let pkg_path = option_env!("CDN_PKG_PATH")
-        .map(Cow::from)
-        .unwrap_or_else(|| format!("/{}", options.site_pkg_dir).into());
+    let pkg_path = &options.site_pkg_dir;
     let output_name = &options.output_name;
     let nonce = use_nonce();
     let nonce = nonce
@@ -110,8 +107,8 @@ pub fn html_parts_separated(
                     <meta charset="utf-8"/>
                     <meta name="viewport" content="width=device-width, initial-scale=1"/>
                     {head}
-                    <link rel="modulepreload" href="{pkg_path}/{output_name}.js"{nonce}>
-                    <link rel="preload" href="{pkg_path}/{wasm_output_name}.wasm" as="fetch" type="application/wasm" crossorigin=""{nonce}>
+                    <link rel="modulepreload" href="/{pkg_path}/{output_name}.js"{nonce}>
+                    <link rel="preload" href="/{pkg_path}/{wasm_output_name}.wasm" as="fetch" type="application/wasm" crossorigin=""{nonce}>
                     <script type="module"{nonce}>
                         function idle(c) {{
                             if ("requestIdleCallback" in window) {{
@@ -121,9 +118,9 @@ pub fn html_parts_separated(
                             }}
                         }}
                         idle(() => {{
-                            import('{pkg_path}/{output_name}.js')
+                            import('/{pkg_path}/{output_name}.js')
                                 .then(mod => {{
-                                    mod.default('{pkg_path}/{wasm_output_name}.wasm').then({import_callback});
+                                    mod.default('/{pkg_path}/{wasm_output_name}.wasm').then({import_callback});
                                 }})
                         }});
                     </script>

leptos/Cargo.toml

@@ -15,7 +15,6 @@ leptos_macro = { workspace = true }
 leptos_reactive = { workspace = true }
 leptos_server = { workspace = true }
 leptos_config = { workspace = true }
-leptos-spin-macro = { version="0.1", optional = true}
 tracing = "0.1"
 typed-builder = "0.18"
 typed-builder-macro = "0.18"
@@ -67,10 +66,7 @@ miniserde = ["leptos_reactive/miniserde"]
 rkyv = ["leptos_reactive/rkyv"]
 tracing = ["leptos_macro/tracing"]
 nonce = ["leptos_dom/nonce"]
-spin = [
-  "leptos_reactive/spin",
-  "leptos-spin-macro"
-]
+spin = ["leptos_reactive/spin"]
 experimental-islands = [
   "leptos_dom/experimental-islands",
   "leptos_macro/experimental-islands",

leptos/src/lib.rs

@@ -179,14 +179,7 @@ pub mod error {
 pub use leptos_macro::template;
 #[cfg(not(all(target_arch = "wasm32", feature = "template_macro")))]
 pub use leptos_macro::view as template;
-pub use leptos_macro::{component, island, slice, slot, view, Params};
-cfg_if::cfg_if!(
-    if #[cfg(feature="spin")] {
-        pub use leptos_spin_macro::server;
-    } else {
-        pub use leptos_macro::server;
-    }
-);
+pub use leptos_macro::{component, island, server, slice, slot, view, Params};
 pub use leptos_reactive::*;
 pub use leptos_server::{
     self, create_action, create_multi_action, create_server_action,

leptos/src/suspense_component.rs

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

leptos/src/transition.rs

@@ -155,9 +155,7 @@ fn is_first_run(
     first_run: RwSignal<bool>,
     suspense_context: &SuspenseContext,
 ) -> bool {
-    if cfg!(feature = "csr")
-        || (cfg!(feature = "hydrate") && !HydrationCtx::is_hydrating())
-    {
+    if cfg!(feature = "csr") {
         false
     } else {
         match (

leptos_config/Cargo.toml

@@ -9,7 +9,7 @@ description = "Configuration for the Leptos web framework."
 readme = "../README.md"
 
 [dependencies]
-config = { version = "0.14", default-features = false, features = ["toml"] }
+config = { version = "0.13.3", default-features = false, features = ["toml"] }
 regex = "1.7.0"
 serde = { version = "1.0.151", features = ["derive"] }
 thiserror = "1.0.38"

leptos_reactive/src/lib.rs

@@ -125,7 +125,7 @@ use runtime::*;
 pub use runtime::{
     as_child_of_current_owner, batch, create_runtime, current_runtime,
     on_cleanup, run_as_child, set_current_runtime,
-    spawn_local_with_current_owner, spawn_local_with_owner, try_batch,
+    spawn_local_with_current_owner, spawn_local_with_owner,
     try_spawn_local_with_current_owner, try_spawn_local_with_owner,
     try_with_owner, untrack, untrack_with_diagnostics, with_current_owner,
     with_owner, Owner, RuntimeId, ScopedFuture,
@@ -143,8 +143,7 @@ pub use suspense::{GlobalSuspenseContext, SuspenseContext};
 pub use trigger::*;
 pub use watch::*;
 
-#[doc(hidden)]
-pub fn console_warn(s: &str) {
+pub(crate) fn console_warn(s: &str) {
     cfg_if::cfg_if! {
         if #[cfg(all(target_arch = "wasm32", any(feature = "csr", feature = "hydrate")))] {
             web_sys::console::warn_1(&wasm_bindgen::JsValue::from_str(s));

leptos_reactive/src/runtime.rs

@@ -1397,30 +1397,12 @@ impl Drop for SetObserverOnDrop {
 ///
 /// # Panics
 /// Panics if the runtime has already been disposed.
-///
-/// To avoid panicking under any circumstances, use [`try_batch`].
 #[cfg_attr(
     any(debug_assertions, features = "ssr"),
     instrument(level = "trace", skip_all,)
 )]
 #[inline(always)]
 pub fn batch<T>(f: impl FnOnce() -> T) -> T {
-    try_batch(f).expect(
-        "tried to run a batched update in a runtime that has been disposed",
-    )
-}
-
-/// Attempts to batch any reactive updates, preventing effects from running until the whole
-/// function has run. This allows you to prevent rerunning effects if multiple
-/// signal updates might cause the same effect to run.
-///
-/// Unlike [`batch`], this will not panic if the runtime has been disposed.
-#[cfg_attr(
-    any(debug_assertions, features = "ssr"),
-    instrument(level = "trace", skip_all,)
-)]
-#[inline(always)]
-pub fn try_batch<T>(f: impl FnOnce() -> T) -> Result<T, ReactiveSystemError> {
     with_runtime(move |runtime| {
         let batching = SetBatchingOnDrop(runtime.batching.get());
         runtime.batching.set(true);
@@ -1433,6 +1415,7 @@ pub fn try_batch<T>(f: impl FnOnce() -> T) -> Result<T, ReactiveSystemError> {
         runtime.run_effects();
         val
     })
+    .expect("tried to run a batched update in a runtime that has been disposed")
 }
 
 struct SetBatchingOnDrop(bool);

leptos_server/src/action.rs

@@ -1,10 +1,7 @@
 //use crate::{ServerFn, ServerFnError};
-#[cfg(debug_assertions)]
-use leptos_reactive::console_warn;
 use leptos_reactive::{
-    create_rw_signal, is_suppressing_resource_load, signal_prelude::*,
-    spawn_local, store_value, try_batch, use_context, ReadSignal, RwSignal,
-    StoredValue,
+    batch, create_rw_signal, is_suppressing_resource_load, signal_prelude::*,
+    spawn_local, store_value, use_context, ReadSignal, RwSignal, StoredValue,
 };
 use server_fn::{error::ServerFnUrlError, ServerFn, ServerFnError};
 use std::{cell::Cell, future::Future, pin::Pin, rc::Rc};
@@ -96,18 +93,8 @@ where
         any(debug_assertions, feature = "ssr"),
         tracing::instrument(level = "trace", skip_all,)
     )]
-    #[track_caller]
     pub fn dispatch(&self, input: I) {
-        #[cfg(debug_assertions)]
-        let loc = std::panic::Location::caller();
-
-        self.0.with_value(|a| {
-            a.dispatch(
-                input,
-                #[cfg(debug_assertions)]
-                loc,
-            )
-        })
+        self.0.with_value(|a| a.dispatch(input))
     }
 
     /// Create an [Action].
@@ -379,11 +366,7 @@ where
         any(debug_assertions, feature = "ssr"),
         tracing::instrument(level = "trace", skip_all,)
     )]
-    pub fn dispatch(
-        &self,
-        input: I,
-        #[cfg(debug_assertions)] loc: &'static std::panic::Location<'static>,
-    ) {
+    pub fn dispatch(&self, input: I) {
         if !is_suppressing_resource_load() {
             let fut = (self.action_fn)(&input);
             self.input.set(Some(input));
@@ -396,7 +379,7 @@ where
             pending_dispatches.set(pending_dispatches.get().saturating_sub(1));
             spawn_local(async move {
                 let new_value = fut.await;
-                let res = try_batch(move || {
+                batch(move || {
                     value.set(Some(new_value));
                     input.set(None);
                     version.update(|n| *n += 1);
@@ -406,18 +389,6 @@ where
                         pending.set(false);
                     }
                 });
-
-                if res.is_err() {
-                    #[cfg(debug_assertions)]
-                    console_warn(&format!(
-                        "At {loc}, you are dispatching an action in a runtime \
-                         that has already been disposed. This may be because \
-                         you are calling `.dispatch()` in the body of a \
-                         component, during initial server-side rendering. If \
-                         that's the case, you should probably be using \
-                         `create_resource` instead of `create_action`."
-                    ));
-                }
             })
         }
     }

meta/Cargo.toml

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

meta/src/lib.rs

@@ -16,9 +16,6 @@
 //!
 //! #[component]
 //! fn MyApp() -> impl IntoView {
-//!     // Provides a [`MetaContext`], if there is not already one provided.
-//!     provide_meta_context();
-//!
 //!     let (name, set_name) = create_signal("Alice".to_string());
 //!
 //!     view! {

router/Cargo.toml

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

router/src/components/form.rs

@@ -1,6 +1,6 @@
 use crate::{
-    hooks::has_router, resolve_redirect_url, use_navigate, use_resolved_path,
-    NavigateOptions, ToHref, Url,
+    hooks::has_router, use_navigate, use_resolved_path, NavigateOptions,
+    ToHref, Url,
 };
 use leptos::{
     html::form,
@@ -447,10 +447,8 @@ where
 {
     let has_router = has_router();
     if !has_router {
-        _ = server_fn::redirect::set_redirect_hook(|loc: &str| {
-            if let Some(url) = resolve_redirect_url(loc) {
-                _ = window().location().set_href(&url.href());
-            }
+        _ = server_fn::redirect::set_redirect_hook(|path: &str| {
+            _ = window().location().set_href(path);
         });
     }
     let action_url = if let Some(url) = action.url() {
@@ -480,10 +478,6 @@ where
                     action.dispatch(new_input);
                 }
                 Err(err) => {
-                    error!(
-                        "Error converting form field into server function \
-                         arguments: {err:?}"
-                    );
                     batch(move || {
                         value.set(Some(Err(ServerFnError::Serialization(
                             err.to_string(),
@@ -547,10 +541,8 @@ where
 {
     let has_router = has_router();
     if !has_router {
-        _ = server_fn::redirect::set_redirect_hook(|loc: &str| {
-            if let Some(url) = resolve_redirect_url(loc) {
-                _ = window().location().set_href(&url.href());
-            }
+        _ = server_fn::redirect::set_redirect_hook(|path: &str| {
+            _ = window().location().set_href(path);
         });
     }
     let action_url = if let Some(url) = action.url() {

router/src/components/router.rs

@@ -1,7 +1,7 @@
 use crate::{
-    create_location, matching::resolve_path, resolve_redirect_url,
-    scroll_to_el, use_location, use_navigate, Branch, History, Location,
-    LocationChange, RouteContext, RouterIntegrationContext, State,
+    create_location, matching::resolve_path, scroll_to_el, use_location,
+    use_navigate, Branch, History, Location, LocationChange, RouteContext,
+    RouterIntegrationContext, State,
 };
 #[cfg(not(feature = "ssr"))]
 use crate::{unescape, Url};
@@ -24,7 +24,6 @@ use std::{
 use thiserror::Error;
 #[cfg(not(feature = "ssr"))]
 use wasm_bindgen::JsCast;
-use wasm_bindgen::UnwrapThrowExt;
 
 static GLOBAL_ROUTERS_COUNT: AtomicUsize = AtomicUsize::new(0);
 
@@ -57,24 +56,15 @@ pub fn Router(
     // set server function redirect hook
     let navigate = use_navigate();
     let navigate = SendWrapper::new(navigate);
-    let router_hook = Box::new(move |loc: &str| {
-        let Some(url) = resolve_redirect_url(loc) else {
-            return; // resolve_redirect_url() already logs an error
-        };
-        let current_origin =
-            leptos_dom::helpers::location().origin().unwrap_throw();
-        if url.origin() == current_origin {
+    let router_hook = Box::new(move |path: &str| {
+        let path = path.to_string();
+        // delay by a tick here, so that the Action updates *before* the redirect
+        request_animation_frame({
             let navigate = navigate.clone();
-            // delay by a tick here, so that the Action updates *before* the redirect
-            request_animation_frame(move || {
-                navigate(&url.pathname(), Default::default());
-            });
-            // Use set_href() if the conditions for client-side navigation were not satisfied
-        } else if let Err(e) =
-            leptos_dom::helpers::location().set_href(&url.href())
-        {
-            leptos::logging::error!("Failed to redirect: {e:#?}");
-        }
+            move || {
+                navigate(&path, Default::default());
+            }
+        });
     }) as RedirectHook;
     _ = server_fn::redirect::set_redirect_hook(router_hook);
 

router/src/hooks.rs

@@ -3,8 +3,8 @@ use crate::{
     RouterContext,
 };
 use leptos::{
-    create_memo, request_animation_frame, signal_prelude::*, use_context,
-    window, Memo, Oco,
+    create_memo, request_animation_frame, signal_prelude::*, use_context, Memo,
+    Oco,
 };
 use std::{rc::Rc, str::FromStr};
 
@@ -216,28 +216,3 @@ pub(crate) fn use_is_back_navigation() -> ReadSignal<bool> {
     let router = use_router();
     router.inner.is_back.read_only()
 }
-
-/// Resolves a redirect location to an (absolute) URL.
-pub(crate) fn resolve_redirect_url(loc: &str) -> Option<web_sys::Url> {
-    let origin = match window().location().origin() {
-        Ok(origin) => origin,
-        Err(e) => {
-            leptos::logging::error!("Failed to get origin: {:#?}", e);
-            return None;
-        }
-    };
-
-    // TODO: Use server function's URL as base instead.
-    let base = origin;
-
-    match web_sys::Url::new_with_base(loc, &base) {
-        Ok(url) => Some(url),
-        Err(e) => {
-            leptos::logging::error!(
-                "Invalid redirect location: {}",
-                e.as_string().unwrap_or_default(),
-            );
-            None
-        }
-    }
-}

server_fn/Cargo.toml

@@ -27,9 +27,7 @@ once_cell = "1"
 actix-web = { version = "4", optional = true }
 
 # axum
-axum = { version = "0.7", optional = true, default-features = false, features = [
-  "multipart",
-] }
+axum = { version = "0.7", optional = true, default-features = false, features = ["multipart"] }
 tower = { version = "0.4", optional = true }
 tower-layer = { version = "0.3", optional = true }
 
@@ -75,6 +73,8 @@ url = "2"
 
 [features]
 default = ["json", "cbor"]
+form-redirects = []
+actix = ["ssr", "dep:actix-web", "dep:send_wrapper"]
 axum-no-default = [
   "ssr",
   "dep:axum",
@@ -83,9 +83,10 @@ axum-no-default = [
   "dep:tower",
   "dep:tower-layer",
 ]
-form-redirects = []
-actix = ["ssr", "dep:actix-web", "dep:send_wrapper"]
-axum = ["axum/default", "axum-no-default"]
+axum = [
+  "axum/default",
+  "axum-no-default",
+]
 browser = [
   "dep:gloo-net",
   "dep:js-sys",
@@ -111,21 +112,7 @@ all-features = true
 
 # disables some feature combos for testing in CI
 [package.metadata.cargo-all-features]
-denylist = [
-  "rustls",
-  "default-tls",
-  "form-redirects",
-  "gloo-net",
-  "js-sys",
-  "wasm-bindgen",
-  "web-sys",
-  "tower",
-  "tower-layer",
-  "send_wrapper",
-  "ciborium",
-  "hyper",
-  "inventory",
-]
+denylist = ["rustls", "default-tls", "form-redirects"]
 skip_feature_sets = [
   [
     "actix",
@@ -143,48 +130,4 @@ skip_feature_sets = [
     "browser",
     "reqwest",
   ],
-  [
-    "default-tls",
-    "rustls",
-  ],
-  [
-    "browser",
-    "ssr",
-  ],
-  [
-    "axum-no-default",
-    "actix",
-  ],
-  [
-    "axum-no-default",
-    "browser",
-  ],
-  [
-    "rkyv",
-    "json",
-  ],
-  [
-    "rkyv",
-    "cbor",
-  ],
-  [
-    "rkyv",
-    "url",
-  ],
-  [
-    "rkyv",
-    "serde-lite",
-  ],
-  [
-    "url",
-    "json",
-  ],
-  [
-    "url",
-    "cbor",
-  ],
-  [
-    "url",
-    "serde-lite",
-  ],
 ]

server_fn/src/redirect.rs

@@ -25,9 +25,9 @@ pub fn set_redirect_hook(
     REDIRECT_HOOK.set(Box::new(hook))
 }
 
-/// Calls the hook that has been set by [`set_redirect_hook`] to redirect to `loc`.
-pub fn call_redirect_hook(loc: &str) {
+/// Calls the hook that has been set by [`set_redirect_hook`] to redirect to `path`.
+pub fn call_redirect_hook(path: &str) {
     if let Some(hook) = REDIRECT_HOOK.get() {
-        hook(loc)
+        hook(path)
     }
 }

server_fn_macro/src/lib.rs

@@ -434,7 +434,7 @@ pub fn server_macro_impl(
         quote! {
             #server_fn_path::request::BrowserMockReq
         }
-    } else if cfg!(feature = "axum") {
+    } else if cfg!(feature = "axum-no-default") {
         quote! {
             #server_fn_path::axum_export::http::Request<#server_fn_path::axum_export::body::Body>
         }
@@ -458,7 +458,7 @@ pub fn server_macro_impl(
         quote! {
             #server_fn_path::response::BrowserMockRes
         }
-    } else if cfg!(feature = "axum") {
+    } else if cfg!(feature = "axum-no-default") {
         quote! {
             #server_fn_path::axum_export::http::Response<#server_fn_path::axum_export::body::Body>
         }
@@ -638,7 +638,7 @@ fn err_type(return_ty: &Type) -> Result<Option<&GenericArgument>> {
                 {
                     if let Some(segment) = pat.path.segments.last() {
                         if segment.ident == "ServerFnError" {
-                            let args = &segment.arguments;
+                            let args = &pat.path.segments[0].arguments;
                             match args {
                                 // Result<T, ServerFnError>
                                 PathArguments::None => return Ok(None),