fix: hydration ID mismatch with nested Suspense

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"
-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/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_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/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>
     }
 }

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_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`."
-                    ));
-                }
             })
         }
     }

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