chore(nightly): update proc-macro span file name method name

.github/ISSUE_TEMPLATE/bug_report.md

@@ -29,15 +29,11 @@ Steps to reproduce the behavior:
 3. Scroll down to '....'
 4. See error
 
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Next Steps**
-
-- [ ] I will make a PR
-- [ ] I would like to make a PR, but need help getting started
-- [ ] I want someone else to take the time to fix this
-- [ ] This is a low priority for me and is just shared for your information
-
 **Additional context**
 Add any other context about the problem here.

.github/dependabot.yml

@@ -1,19 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-  # Grouping all dependencies in one PR weekly
-  - package-ecosystem: cargo
-    directory: "/"
-    schedule:
-      interval: weekly
-      day: monday
-    open-pull-requests-limit: 1
-    allow:
-      - dependency-type: "all"
-    groups:
-      rust-dependencies:
-        patterns:
-          - "*"

.github/workflows/autofix.yml

@@ -21,20 +21,34 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with: {toolchain: "nightly-2025-04-16", components: "rustfmt, clippy", target: "wasm32-unknown-unknown", rustflags: ""}
+        with: {toolchain: nightly, components: "rustfmt, clippy", target: "wasm32-unknown-unknown", rustflags: ""}
       - name: Install Glib
         run: |
           sudo apt-get update
           sudo apt-get install -y libglib2.0-dev
-      - name: Install cargo-all-features
-        run: cargo install --git https://github.com/sabify/cargo-all-features --branch arbitrary-command-support
       - name: Install jq
         run: sudo apt-get install jq
-      - name: Format the workspace
-        run: cargo fmt --all
-      - name: Clippy the workspace
-        run: cargo all-features clippy --allow-dirty --fix --lib --no-deps
-      - uses: autofix-ci/action@v1.3.2
+      - run: |
+          echo "Formatting the workspace"
+          cargo fmt --all
+
+          echo "Running Clippy against each member's features (default features included)"
+          for member in $(cargo metadata --no-deps --format-version 1 | jq -r '.packages[] | .name'); do
+              echo "Working on member $member":
+              echo -e "\tdefault-features/no-features:"
+              # this will also run on members with no features or default features
+              cargo clippy --allow-dirty --fix --lib --package "$member"
+
+              features=$(cargo metadata --no-deps --format-version 1 | jq -r ".packages[] | select(.name == \"$member\") | .features | keys[]")
+              for feature in $features; do
+                  if [ "$feature" = "default" ]; then
+                    continue
+                  fi
+                  echo -e "\tfeature $feature"
+                  cargo clippy --allow-dirty --fix --lib --package "$member" --features "$feature"
+              done
+          done
+      - uses: autofix-ci/action@v1.3.1
         if: ${{ always() }}
         with:
           fail-fast: false

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

@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        toolchain: [stable, nightly-2025-04-16]
+        toolchain: [stable, nightly-2025-03-05]
         erased_mode: [true, false]
     steps:
       - name: Free Disk Space
@@ -72,14 +72,6 @@ jobs:
         run: cargo binstall cargo-nextest --no-confirm
       - name: Install cargo-all-features
         run: cargo install --git https://github.com/sabify/cargo-all-features --branch arbitrary-command-support
-      # Part of direct-minimal-versions check
-      - name: Install cargo-hack
-        if: contains(matrix.toolchain, 'nightly')
-        uses: taiki-e/install-action@cargo-hack
-      # Part of direct-minimal-versions check
-      - name: Install cargo-minimal-versions
-        if: contains(matrix.toolchain, 'nightly')
-        uses: taiki-e/install-action@cargo-minimal-versions
       - name: Install Trunk
         if: contains(inputs.directory, 'examples')
         run: cargo binstall trunk --no-confirm
@@ -168,16 +160,6 @@ jobs:
         run: |
           cd '${{ inputs.directory }}'
           cargo make --no-workspace --profile=github-actions ci
-          # check the direct-minimal-versions on release
-          if [[ "${{ github.ref_name }}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
-            cargo make --no-workspace --profile=github-actions check-minimal-versions
-          fi
-      # Check if the counter_isomorphic can be built with leptos_debuginfo cfg flag in release mode
-      - name: ${{ inputs.cargo_make_task }} with --cfg=leptos_debuginfo
-        if: contains(inputs.directory, 'counter_isomorphic')
-        run: |
-          cd '${{ inputs.directory }}'
-          RUSTFLAGS="$RUSTFLAGS --cfg leptos_debuginfo" cargo leptos build --release
       - name: Clean up ${{ inputs.directory }}
         if: always()
         run: |

Cargo.toml

@@ -40,131 +40,41 @@ members = [
 exclude = ["benchmarks", "examples", "projects"]
 
 [workspace.package]
-version = "0.8.2"
+version = "0.8.0-rc1"
 edition = "2021"
-rust-version = "1.80"
+rust-version = "1.76"
 
 [workspace.dependencies]
-# members
 throw_error = { path = "./any_error/", version = "0.3.0" }
-any_spawner = { path = "./any_spawner/", version = "0.3.0" }
+any_spawner = { path = "./any_spawner/", version = "0.3.0-rc1" }
 const_str_slice_concat = { path = "./const_str_slice_concat", version = "0.1" }
 either_of = { path = "./either_of/", version = "0.1.5" }
 hydration_context = { path = "./hydration_context", version = "0.3.0" }
-leptos = { path = "./leptos", version = "0.8.2" }
-leptos_config = { path = "./leptos_config", version = "0.8.2" }
-leptos_dom = { path = "./leptos_dom", version = "0.8.2" }
-leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.8.2" }
-leptos_integration_utils = { path = "./integrations/utils", version = "0.8.2" }
-leptos_macro = { path = "./leptos_macro", version = "0.8.2" }
-leptos_router = { path = "./router", version = "0.8.2" }
-leptos_router_macro = { path = "./router_macro", version = "0.8.2" }
-leptos_server = { path = "./leptos_server", version = "0.8.2" }
-leptos_meta = { path = "./meta", version = "0.8.2" }
+itertools = "0.14.0"
+leptos = { path = "./leptos", version = "0.8.0-rc1" }
+leptos_config = { path = "./leptos_config", version = "0.8.0-rc1" }
+leptos_dom = { path = "./leptos_dom", version = "0.8.0-rc1" }
+leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.8.0-rc1" }
+leptos_integration_utils = { path = "./integrations/utils", version = "0.8.0-rc1" }
+leptos_macro = { path = "./leptos_macro", version = "0.8.0-rc1" }
+leptos_router = { path = "./router", version = "0.8.0-rc1" }
+leptos_router_macro = { path = "./router_macro", version = "0.8.0-rc1" }
+leptos_server = { path = "./leptos_server", version = "0.8.0-rc1" }
+leptos_meta = { path = "./meta", version = "0.8.0-rc1" }
 next_tuple = { path = "./next_tuple", version = "0.1.0" }
 oco_ref = { path = "./oco", version = "0.2.0" }
 or_poisoned = { path = "./or_poisoned", version = "0.1.0" }
-reactive_graph = { path = "./reactive_graph", version = "0.2.0" }
-reactive_stores = { path = "./reactive_stores", version = "0.2.0" }
-reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.2.0" }
-server_fn = { path = "./server_fn", version = "0.8.2" }
-server_fn_macro = { path = "./server_fn_macro", version = "0.8.2" }
-server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.8.2" }
-tachys = { path = "./tachys", version = "0.2.0" }
-
-# members deps
-itertools = { default-features = false, version = "0.14.0" }
-convert_case = { default-features = false, version = "0.8.0" }
-serde_json = { default-features = false, version = "1.0.140" }
-trybuild = { default-features = false, version = "1.0.105" }
-typed-builder = { default-features = false, version = "0.21.0" }
-thiserror = { default-features = false, version = "2.0.12" }
-wasm-bindgen = { default-features = false, version = "0.2.100" }
-indexmap = { default-features = false, version = "2.9.0" }
-rstml = { default-features = false, version = "0.12.1" }
-rustc_version = { default-features = false, version = "0.4.1" }
-guardian = { default-features = false, version = "1.3.0" }
-rustc-hash = { default-features = false, version = "2.1.1" }
-actix-web = { default-features = false, version = "4.11.0" }
-tracing = { default-features = false, version = "0.1.41" }
-slotmap = { default-features = false, version = "1.0.7" }
-futures = { default-features = false, version = "0.3.31" }
-dashmap = { default-features = false, version = "6.1.0" }
-pin-project-lite = { default-features = false, version = "0.2.16" }
-send_wrapper = { default-features = false, version = "0.6.0" }
-tokio-test = { default-features = false, version = "0.4.4" }
-html-escape = { default-features = false, version = "0.2.13" }
-proc-macro-error2 = { default-features = false, version = "2.0.1" }
-const_format = { default-features = false, version = "0.2.34" }
-gloo-net = { default-features = false, version = "0.6.0" }
-url = { default-features = false, version = "2.5.4" }
-tokio = { default-features = false, version = "1.45.1" }
-base64 = { default-features = false, version = "0.22.1" }
-cfg-if = { default-features = false, version = "1.0.0" }
-wasm-bindgen-futures = { default-features = false, version = "0.4.50" }
-tower = { default-features = false, version = "0.5.2" }
-proc-macro2 = { default-features = false, version = "1.0.95" }
-serde = { default-features = false, version = "1.0.219" }
-parking_lot = { default-features = false, version = "0.12.4" }
-axum = { default-features = false, version = "0.8.4" }
-serde_qs = { default-features = false, version = "0.15.0" }
-syn = { default-features = false, version = "2.0.101" }
-xxhash-rust = { default-features = false, version = "0.8.15" }
-paste = { default-features = false, version = "1.0.15" }
-quote = { default-features = false, version = "1.0.40" }
-web-sys = { default-features = false, version = "0.3.77" }
-js-sys = { default-features = false, version = "0.3.77" }
-rand = { default-features = false, version = "0.9.1" }
-serde-lite = { default-features = false, version = "0.5.0" }
-tokio-tungstenite = { default-features = false, version = "0.26.2" }
-serial_test = { default-features = false, version = "3.2.0" }
-erased = { default-features = false, version = "0.1.2" }
-glib = { default-features = false, version = "0.20.10" }
-async-trait = { default-features = false, version = "0.1.88" }
-typed-builder-macro = { default-features = false, version = "0.21.0" }
-linear-map = { default-features = false, version = "1.2.0" }
-anyhow = { default-features = false, version = "1.0.98" }
-walkdir = { default-features = false, version = "2.5.0" }
-actix-ws = { default-features = false, version = "0.3.0" }
-tower-http = { default-features = false, version = "0.6.4" }
-prettyplease = { default-features = false, version = "0.2.33" }
-inventory = { default-features = false, version = "0.3.20" }
-config = { default-features = false, version = "0.15.11" }
-camino = { default-features = false, version = "1.1.9" }
-ciborium = { default-features = false, version = "0.2.2" }
-multer = { default-features = false, version = "3.1.0" }
-leptos-spin-macro = { default-features = false, version = "0.2.0" }
-sledgehammer_utils = { default-features = false, version = "0.3.1" }
-sledgehammer_bindgen = { default-features = false, version = "0.6.0" }
-wasm-streams = { default-features = false, version = "0.4.2" }
-rkyv = { default-features = false, version = "0.8.10" }
-temp-env = { default-features = false, version = "0.3.6" }
-uuid = { default-features = false, version = "1.17.0" }
-bytes = { default-features = false, version = "1.10.1" }
-http = { default-features = false, version = "1.3.1" }
-regex = { default-features = false, version = "1.11.1" }
-drain_filter_polyfill = { default-features = false, version = "0.1.3" }
-tempfile = { default-features = false, version = "3.20.0" }
-futures-lite = { default-features = false, version = "2.6.0" }
-log = { default-features = false, version = "0.4.27" }
-percent-encoding = { default-features = false, version = "2.3.1" }
-async-executor = { default-features = false, version = "1.13.2" }
-const-str = { default-features = false, version = "0.6.2" }
-http-body-util = { default-features = false, version = "0.1.3" }
-hyper = { default-features = false, version = "1.6.0" }
-postcard = { default-features = false, version = "1.1.1" }
-rmp-serde = { default-features = false, version = "1.3.0" }
-reqwest = { default-features = false, version = "0.12.18" }
-tower-layer = { default-features = false, version = "0.3.3" }
-attribute-derive = { default-features = false, version = "0.10.3" }
-insta = { default-features = false, version = "1.43.1" }
-codee = { default-features = false, version = "0.3.0" }
-actix-http = { default-features = false, version = "3.11.0" }
-wasm-bindgen-test = { default-features = false, version = "0.3.50" }
-rustversion = { default-features = false, version = "1.0.21" }
-getrandom = { default-features = false, version = "0.3.3" }
-actix-files = { default-features = false, version = "0.6.6" }
-async-lock = { default-features = false, version = "3.4.0" }
+reactive_graph = { path = "./reactive_graph", version = "0.2.0-rc1" }
+reactive_stores = { path = "./reactive_stores", version = "0.2.0-rc1" }
+reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.2.0-rc1" }
+rustversion = "1"
+serde_json = "1.0.0"
+server_fn = { path = "./server_fn", version = "0.8.0-rc1" }
+server_fn_macro = { path = "./server_fn_macro", version = "0.8.0-rc1" }
+server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.8.0-rc1" }
+tachys = { path = "./tachys", version = "0.2.0-rc1" }
+trybuild = "1"
+wasm-bindgen = { version = "0.2.100" }
 
 [profile.release]
 codegen-units = 1

any_error/Cargo.toml

@@ -10,4 +10,4 @@ rust-version.workspace = true
 edition.workspace = true
 
 [dependencies]
-pin-project-lite = { workspace = true, default-features = true }
+pin-project-lite = "0.2.15"

any_spawner/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "any_spawner"
-version = "0.3.0"
+version = "0.3.0-rc1"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
@@ -9,25 +9,25 @@ description = "Spawn asynchronous tasks in an executor-independent way."
 edition.workspace = true
 
 [dependencies]
-async-executor = { optional = true , workspace = true, default-features = true }
-futures = { workspace = true, default-features = true }
-glib = { optional = true , workspace = true, default-features = true }
-thiserror = { workspace = true , default-features = true }
-tokio = { optional = true, default-features = false, features = [
+async-executor = { version = "1.13.1", optional = true }
+futures = "0.3.31"
+glib = { version = "0.20.6", optional = true }
+thiserror = "2.0"
+tokio = { version = "1.41", optional = true, default-features = false, features = [
   "rt",
-] , workspace = true }
-tracing = { optional = true , workspace = true, default-features = true }
-wasm-bindgen-futures = { optional = true , workspace = true, default-features = true }
+] }
+tracing = { version = "0.1.41", optional = true }
+wasm-bindgen-futures = { version = "0.4.50", optional = true }
 
 [dev-dependencies]
-futures-lite = { default-features = false , workspace = true }
-tokio = { default-features = false, features = [
+futures-lite = { version = "2.6.0", default-features = false }
+tokio = { version = "1.41", default-features = false, features = [
   "rt",
   "macros",
   "time",
-] , workspace = true }
-wasm-bindgen-test = { workspace = true, default-features = true }
-serial_test = { workspace = true, default-features = true }
+] }
+wasm-bindgen-test = { version = "0.3.50" }
+serial_test = "3.2.0"
 
 [features]
 async-executor = ["dep:async-executor"]

any_spawner/src/lib.rs

@@ -472,8 +472,9 @@ fn handle_uninitialized_spawn(_fut: PinnedFuture<()>) {
     #[cfg(all(debug_assertions, not(feature = "tracing")))]
     {
         panic!(
-            "At {caller}, tried to spawn a Future with Executor::spawn() \
-             before a global executor was initialized."
+            "At {}, tried to spawn a Future with Executor::spawn() before a \
+             global executor was initialized.",
+            caller
         );
     }
     // In release builds (without tracing), call the specific no-op function.
@@ -502,8 +503,9 @@ fn handle_uninitialized_spawn_local(_fut: PinnedLocalFuture<()>) {
     #[cfg(all(debug_assertions, not(feature = "tracing")))]
     {
         panic!(
-            "At {caller}, tried to spawn a Future with \
-             Executor::spawn_local() before a global executor was initialized."
+            "At {}, tried to spawn a Future with Executor::spawn_local() \
+             before a global executor was initialized.",
+            caller
         );
     }
     // In release builds (without tracing), call the specific no-op function (which usually panics).

cargo-make/check-minimal-versions.toml

@@ -1,14 +0,0 @@
-[tasks.check-minimal-versions]
-condition = { channels = ["nightly"] }
-command = "cargo"
-args = [
-  "all-features",
-  "minimal-versions",
-  "check",
-  "--ignore-private",
-  "--detach-path-deps",
-  "--direct",
-]
-install_script = '''
-cargo install --git https://github.com/sabify/cargo-all-features --branch arbitrary-command-support
-'''

cargo-make/main.toml

@@ -1,8 +1,4 @@
-extend = [
-  { path = "./lint.toml" },
-  { path = "./test.toml" },
-  { path = "./check-minimal-versions.toml" },
-]
+extend = [{ path = "./lint.toml" }, { path = "./test.toml" }]
 
 [env]
 RUSTFLAGS = ""

const_str_slice_concat/src/lib.rs

@@ -31,7 +31,7 @@ pub const fn const_concat(
         let mut i = 0;
 
         // have it iterate over bytes manually, because, again,
-        // no mutable references in const fns
+        // no mutable refernces in const fns
         while i < x.len() {
             buffer[position] = x[i];
             position += 1;
@@ -59,7 +59,7 @@ pub const fn const_concat_with_prefix(
         let mut i = 0;
 
         // have it iterate over bytes manually, because, again,
-        // no mutable references in const fns
+        // no mutable refernces in const fns
         while i < x.len() {
             buffer[position] = x[i];
             position += 1;
@@ -116,7 +116,7 @@ pub const fn const_concat_with_separator(
         let mut i = 0;
 
         // have it iterate over bytes manually, because, again,
-        // no mutable references in const fns
+        // no mutable refernces in const fns
         while i < x.len() {
             buffer[position] = x[i];
             position += 1;

either_of/Cargo.toml

@@ -10,8 +10,8 @@ rust-version.workspace = true
 edition.workspace = true
 
 [dependencies]
-pin-project-lite = { workspace = true, default-features = true }
-paste = { workspace = true, default-features = true }
+pin-project-lite = "0.2.16"
+paste = "1.0.15"
 
 [features]
 default = ["no_std"]

examples/counter_isomorphic/Cargo.toml

@@ -23,6 +23,7 @@ leptos = { path = "../../leptos" }
 leptos_actix = { path = "../../integrations/actix", optional = true }
 leptos_router = { path = "../../router" }
 log = "0.4.22"
+once_cell = "1.19"
 gloo-net = { version = "0.6.0" }
 wasm-bindgen = "0.2.93"
 serde = { version = "1.0", features = ["derive"] }

examples/fetch/src/main.rs

@@ -7,7 +7,7 @@ pub fn main() {
 
     fmt()
         .with_writer(
-            // To avoid trace events in the browser from showing their
+            // To avoide trace events in the browser from showing their
             // JS backtrace, which is very annoying, in my opinion
             MakeConsoleWriter::default()
                 .map_trace_level_to(tracing::Level::DEBUG),

examples/hackernews/src/routes/story.rs

@@ -6,7 +6,7 @@ use leptos_router::{components::A, hooks::use_params_map};
 #[component]
 pub fn Story() -> impl IntoView {
     let params = use_params_map();
-    let story = Resource::new_blocking(
+    let story = Resource::new(
         move || params.read().get("id").unwrap_or_default(),
         move |id| async move {
             if id.is_empty() {

examples/hackernews_axum/src/main.rs

@@ -1,7 +1,7 @@
 #[cfg(feature = "ssr")]
 #[tokio::main]
 async fn main() {
-    use axum::{routing::get, Router};
+    use axum::Router;
     use hackernews_axum::{shell, App};
     use leptos::config::get_configuration;
     use leptos_axum::{generate_route_list, LeptosRoutes};
@@ -13,15 +13,6 @@ async fn main() {
 
     // build our application with a route
     let app = Router::new()
-        .route(
-            "/favicon.ico",
-            get(|| async {
-                (
-                    [("content-type", "image/x-icon")],
-                    include_bytes!("../public/favicon.ico"),
-                )
-            }),
-        )
         .leptos_routes(&leptos_options, routes, {
             let leptos_options = leptos_options.clone();
             move || shell(leptos_options.clone())

examples/hackernews_axum/src/routes/story.rs

@@ -6,7 +6,7 @@ use leptos_router::{components::A, hooks::use_params_map};
 #[component]
 pub fn Story() -> impl IntoView {
     let params = use_params_map();
-    let story = Resource::new_blocking(
+    let story = Resource::new(
         move || params.read().get("id").unwrap_or_default(),
         move |id| async move {
             if id.is_empty() {

examples/hackernews_islands_axum/src/fallback.rs

@@ -26,17 +26,12 @@ pub async fn file_and_error_handler(
         .map(|h| h.to_str().unwrap_or("none"))
         .unwrap_or("none")
         .to_string();
-    let static_result = get_static_file(uri.clone(), accept_encoding).await;
+    let res = get_static_file(uri.clone(), accept_encoding).await.unwrap();
 
-    match static_result {
-        Ok(res) => {
-            if res.status() == StatusCode::OK {
-                res.into_response()
-            } else {
-                (StatusCode::NOT_FOUND, "Not found.").into_response()
-            }
-        }
-        Err(e) => e.into_response(),
+    if res.status() == StatusCode::OK {
+        res.into_response()
+    } else {
+        (StatusCode::NOT_FOUND, "Not found.").into_response()
     }
 }
 

examples/hackernews_islands_axum/src/main.rs

@@ -1,7 +1,6 @@
 #[cfg(feature = "ssr")]
 #[tokio::main]
 async fn main() {
-    use axum::routing::get;
     pub use axum::Router;
     use hackernews_islands::*;
     pub use leptos::config::get_configuration;
@@ -26,7 +25,6 @@ async fn main() {
 
     // build our application with a route
     let app = Router::new()
-        .route("/favicon.ico", get(fallback::file_and_error_handler))
         .leptos_routes(&leptos_options, routes, {
             let leptos_options = leptos_options.clone();
             move || shell(leptos_options.clone())

examples/hackernews_islands_axum/src/routes/stories.rs

@@ -47,7 +47,7 @@ pub fn Stories() -> impl IntoView {
     let stories = Resource::new(
         move || (page(), story_type()),
         move |(page, story_type)| async move {
-            fetch_stories(story_type, page).await.ok()
+            fetch_stories(category(&story_type), page).await.ok()
         },
     );
     let (pending, set_pending) = signal(false);

examples/hackernews_islands_axum/src/routes/story.rs

@@ -13,7 +13,7 @@ pub async fn fetch_story(
 #[component]
 pub fn Story() -> impl IntoView {
     let params = use_params_map();
-    let story = Resource::new_blocking(
+    let story = Resource::new(
         move || params.read().get("id").unwrap_or_default(),
         move |id| async move {
             if id.is_empty() {

examples/hackernews_js_fetch/src/routes/story.rs

@@ -7,7 +7,7 @@ use send_wrapper::SendWrapper;
 #[component]
 pub fn Story() -> impl IntoView {
     let params = use_params_map();
-    let story = Resource::new_blocking(
+    let story = Resource::new(
         move || params.read().get("id").unwrap_or_default(),
         move |id| {
             SendWrapper::new(async move {

examples/islands_router/Cargo.toml

@@ -10,11 +10,7 @@ crate-type = ["cdylib", "rlib"]
 console_error_panic_hook = "0.1.7"
 futures = "0.3.30"
 http = "1.1"
-leptos = { path = "../../leptos", features = [
-  "tracing",
-  "islands",
-  "islands-router",
-] }
+leptos = { path = "../../leptos", features = ["tracing", "islands"] }
 leptos_router = { path = "../../router" }
 server_fn = { path = "../../server_fn", features = ["serde-lite"] }
 leptos_axum = { path = "../../integrations/axum", features = [

examples/regression/Cargo.toml

@@ -1,90 +0,0 @@
-[package]
-name = "regression"
-version = "0.1.0"
-edition = "2021"
-
-[lib]
-crate-type = ["cdylib", "rlib"]
-
-[dependencies]
-axum = { version = "0.8.1", optional = true }
-console_error_panic_hook = "0.1.7"
-console_log = "1.0"
-leptos = { path = "../../leptos", features = ["tracing"] }
-leptos_meta = { path = "../../meta" }
-leptos_axum = { path = "../../integrations/axum", optional = true }
-leptos_router = { path = "../../router" }
-serde = { version = "1.0", features = ["derive"] }
-thiserror = "1.0"
-tokio = { version = "1.39", features = [ "rt-multi-thread", "macros", "time" ], optional = true }
-wasm-bindgen = "0.2.92"
-
-[features]
-hydrate = [
-  "leptos/hydrate",
-]
-ssr = [
-  "dep:axum",
-  "dep:tokio",
-  "leptos/ssr",
-  "leptos_meta/ssr",
-  "dep:leptos_axum",
-  "leptos_router/ssr",
-]
-
-[profile.release]
-panic = "abort"
-
-[profile.wasm-release]
-inherits = "release"
-opt-level = 'z'
-lto = true
-codegen-units = 1
-panic = "abort"
-
-[package.metadata.cargo-all-features]
-denylist = ["axum", "tower", "tower-http", "tokio", "sqlx", "leptos_axum"]
-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 = "regression"
-# 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"
-# 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.
-#   [Windows] for non-WSL use "npx.cmd playwright test"
-#   This binary name can be checked in Powershell with Get-Command npx
-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/regression/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2025 Leptos
-
-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/regression/Makefile.toml

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

examples/regression/README.md

@@ -1,8 +0,0 @@
-# Regression Tests
-
-This example functions as a catch-all for all current and future regression
-test cases that typically happens at integration.
-
-## Quick Start
-
-Run `cargo leptos watch` to run this example.

examples/regression/e2e/Cargo.toml

@@ -1,18 +0,0 @@
-[package]
-name = "regression_e2e"
-version = "0.1.0"
-edition = "2021"
-
-[dev-dependencies]
-anyhow = "1.0"
-async-trait = "0.1.81"
-cucumber = "0.21.1"
-fantoccini = "0.21.1"
-pretty_assertions = "1.4"
-serde_json = "1.0"
-tokio = { version = "1.39", features = ["macros", "rt-multi-thread", "time"] }
-url = "2.5"
-
-[[test]]
-name = "app_suite"
-harness = false    # Allow Cucumber to print output instead of libtest

examples/regression/e2e/Makefile.toml

@@ -1,20 +0,0 @@
-extend = { path = "../../cargo-make/main.toml" }
-
-[tasks.test]
-env = { RUN_AUTOMATICALLY = false }
-condition = { env_true = ["RUN_AUTOMATICALLY"] }
-
-[tasks.ci]
-
-[tasks.test-ui]
-command = "cargo"
-args = [
-  "test",
-  "--test",
-  "app_suite",
-  "--",
-  "--retry",
-  "2",
-  "--fail-fast",
-  "${@}",
-]

examples/regression/e2e/README.md

@@ -1,34 +0,0 @@
-# E2E Testing
-
-This example demonstrates e2e testing with Rust using executable requirements.
-
-## Testing Stack
-
-|    |      Role      |  Description |
-|---|---|---|
-| [Cucumber](https://github.com/cucumber-rs/cucumber/tree/main) | Test Runner | Run [Gherkin](https://cucumber.io/docs/gherkin/reference/) specifications as Rust tests |
-| [Fantoccini](https://github.com/jonhoo/fantoccini/tree/main) | Browser Client | Interact with web pages through WebDriver |
-| [Cargo Leptos](https://github.com/leptos-rs/cargo-leptos) | Build Tool |  Compile example and start the server and end-2-end tests |
-| [chromedriver](https://chromedriver.chromium.org/downloads) | WebDriver | Provide WebDriver for Chrome |
-
-## Testing Organization
-
-Testing is organized around what a user can do and see/not see. Test scenarios are grouped by the **user action** and the **object** of that action. This makes it easier to locate and reason about requirements.
-
-Here is a brief overview of how things fit together.
-
-```bash
-features
-└── {action}_{object}.feature   # Specify test scenarios
-tests
-├── fixtures
-│   ├── action.rs               # Perform a user action (click, type, etc.)
-│   ├── check.rs                # Assert what a user can see/not see
-│   ├── find.rs                 # Query page elements
-│   ├── mod.rs
-│   └── world
-│       ├── action_steps.rs     # Map Gherkin steps to user actions
-│       ├── check_steps.rs      # Map Gherkin steps to user expectations
-│       └── mod.rs
-└── app_suite.rs                # Test main
-```

examples/regression/e2e/features/pr_4091.feature

@@ -1,26 +0,0 @@
-@check_pr_4091
-Feature: Regression from pull request 4091
-
-    Scenario: Signal for testing should work
-        Given I see the app
-        And I can access regression test 4091
-        When I select the link test1
-        Then I see the result is the string Test1
-
-    Scenario: The result returns to empty due to on_cleanup
-        Given I see the app
-        And I can access regression test 4091
-        When I select the following links
-            | test1     |
-            | 4091 Home |
-        Then I see the result is empty
-
-    Scenario: The result does not accumulate due to on_cleanup
-        Given I see the app
-        And I can access regression test 4091
-        When I select the following links
-            | test1     |
-            | 4091 Home |
-            | test1     |
-            | 4091 Home |
-        Then I see the result is empty

examples/regression/e2e/tests/app_suite.rs

@@ -1,30 +0,0 @@
-mod fixtures;
-
-use anyhow::Result;
-use cucumber::World;
-use fixtures::world::AppWorld;
-use std::{ffi::OsStr, fs::read_dir};
-
-#[tokio::main]
-async fn main() -> Result<()> {
-    // Normally the below is done, but it's now gotten to the point of
-    // having a sufficient number of tests where the resource contention
-    // of the concurrently running browsers will cause failures on CI.
-    // AppWorld::cucumber()
-    //     .fail_on_skipped()
-    //     .run_and_exit("./features")
-    //     .await;
-
-    // Mitigate the issue by manually stepping through each feature,
-    // rather than letting cucumber glob them and dispatch all at once.
-    for entry in read_dir("./features")? {
-        let path = entry?.path();
-        if path.extension() == Some(OsStr::new("feature")) {
-            AppWorld::cucumber()
-                .fail_on_skipped()
-                .run_and_exit(path)
-                .await;
-        }
-    }
-    Ok(())
-}

examples/regression/e2e/tests/fixtures/action.rs

@@ -1,17 +0,0 @@
-use super::{find, world::HOST};
-use anyhow::Result;
-use fantoccini::Client;
-use std::result::Result::Ok;
-
-pub async fn goto_path(client: &Client, path: &str) -> Result<()> {
-    let url = format!("{}{}", HOST, path);
-    client.goto(&url).await?;
-
-    Ok(())
-}
-
-pub async fn click_link(client: &Client, text: &str) -> Result<()> {
-    let link = find::link_with_text(&client, &text).await?;
-    link.click().await?;
-    Ok(())
-}

examples/regression/e2e/tests/fixtures/check.rs

@@ -1,13 +0,0 @@
-use crate::fixtures::find;
-use anyhow::{Ok, Result};
-use fantoccini::Client;
-use pretty_assertions::assert_eq;
-
-pub async fn result_text_is(
-    client: &Client,
-    expected_text: &str,
-) -> Result<()> {
-    let actual = find::text_at_id(client, "result").await?;
-    assert_eq!(&actual, expected_text);
-    Ok(())
-}

examples/regression/e2e/tests/fixtures/find.rs

@@ -1,21 +0,0 @@
-use anyhow::{Ok, Result};
-use fantoccini::{elements::Element, Client, Locator};
-
-pub async fn text_at_id(client: &Client, id: &str) -> Result<String> {
-    let element = client
-        .wait()
-        .for_element(Locator::Id(id))
-        .await
-        .expect(format!("no such element with id `{}`", id).as_str());
-    let text = element.text().await?;
-    Ok(text)
-}
-
-pub async fn link_with_text(client: &Client, text: &str) -> Result<Element> {
-    let link = client
-        .wait()
-        .for_element(Locator::LinkText(text))
-        .await
-        .expect(format!("Link not found by `{}`", text).as_str());
-    Ok(link)
-}

examples/regression/e2e/tests/fixtures/mod.rs

@@ -1,4 +0,0 @@
-pub mod action;
-pub mod check;
-pub mod find;
-pub mod world;

examples/regression/e2e/tests/fixtures/world/action_steps.rs

@@ -1,47 +0,0 @@
-use crate::fixtures::{action, world::AppWorld};
-use anyhow::{Ok, Result};
-use cucumber::{gherkin::Step, given, when};
-
-#[given("I see the app")]
-#[when("I open the app")]
-async fn i_open_the_app(world: &mut AppWorld) -> Result<()> {
-    let client = &world.client;
-    action::goto_path(client, "").await?;
-
-    Ok(())
-}
-
-#[given(regex = "^I can access regression test (.*)$")]
-#[when(regex = "^I select the link (.*)$")]
-async fn i_select_the_link(world: &mut AppWorld, text: String) -> Result<()> {
-    let client = &world.client;
-    action::click_link(client, &text).await?;
-
-    Ok(())
-}
-
-#[given(expr = "I select the following links")]
-#[when(expr = "I select the following links")]
-async fn i_select_the_following_links(
-    world: &mut AppWorld,
-    step: &Step,
-) -> Result<()> {
-    let client = &world.client;
-
-    if let Some(table) = step.table.as_ref() {
-        for row in table.rows.iter() {
-            action::click_link(client, &row[0]).await?;
-        }
-    }
-
-    Ok(())
-}
-
-#[given(regex = "^I (refresh|reload) the (browser|page)$")]
-#[when(regex = "^I (refresh|reload) the (browser|page)$")]
-async fn i_refresh_the_browser(world: &mut AppWorld) -> Result<()> {
-    let client = &world.client;
-    client.refresh().await?;
-
-    Ok(())
-}

examples/regression/e2e/tests/fixtures/world/check_steps.rs

@@ -1,22 +0,0 @@
-use crate::fixtures::{check, world::AppWorld};
-use anyhow::{Ok, Result};
-use cucumber::then;
-
-#[then(regex = r"^I see the result is empty$")]
-async fn i_see_the_result_is_empty(
-    world: &mut AppWorld,
-) -> Result<()> {
-    let client = &world.client;
-    check::result_text_is(client, "").await?;
-    Ok(())
-}
-
-#[then(regex = r"^I see the result is the string (.*)$")]
-async fn i_see_the_result_is_the_string(
-    world: &mut AppWorld,
-    text: String,
-) -> Result<()> {
-    let client = &world.client;
-    check::result_text_is(client, &text).await?;
-    Ok(())
-}

examples/regression/e2e/tests/fixtures/world/mod.rs

@@ -1,39 +0,0 @@
-pub mod action_steps;
-pub mod check_steps;
-
-use anyhow::Result;
-use cucumber::World;
-use fantoccini::{
-    error::NewSessionError, wd::Capabilities, Client, ClientBuilder,
-};
-
-pub const HOST: &str = "http://127.0.0.1:3000";
-
-#[derive(Debug, World)]
-#[world(init = Self::new)]
-pub struct AppWorld {
-    pub client: Client,
-}
-
-impl AppWorld {
-    async fn new() -> Result<Self, anyhow::Error> {
-        let webdriver_client = build_client().await?;
-
-        Ok(Self {
-            client: webdriver_client,
-        })
-    }
-}
-
-async fn build_client() -> Result<Client, NewSessionError> {
-    let mut cap = Capabilities::new();
-    let arg = serde_json::from_str("{\"args\": [\"-headless\"]}").unwrap();
-    cap.insert("goog:chromeOptions".to_string(), arg);
-
-    let client = ClientBuilder::native()
-        .capabilities(cap)
-        .connect("http://localhost:4444")
-        .await?;
-
-    Ok(client)
-}

examples/regression/src/app.rs

@@ -1,61 +0,0 @@
-use crate::pr_4091::Routes4091;
-use leptos::prelude::*;
-use leptos_meta::{MetaTags, *};
-use leptos_router::{
-    components::{Route, Router, Routes},
-    path,
-};
-
-pub fn shell(options: LeptosOptions) -> impl IntoView {
-    view! {
-        <!DOCTYPE html>
-        <html lang="en">
-            <head>
-                <meta charset="utf-8"/>
-                <meta name="viewport" content="width=device-width, initial-scale=1"/>
-                <AutoReload options=options.clone()/>
-                <HydrationScripts options/>
-                <MetaTags/>
-            </head>
-            <body>
-                <App/>
-            </body>
-        </html>
-    }
-}
-
-#[component]
-pub fn App() -> impl IntoView {
-    provide_meta_context();
-    let fallback = || view! { "Page not found." }.into_view();
-    view! {
-        <Stylesheet id="leptos" href="/pkg/regression.css"/>
-        <Router>
-            <main>
-                <Routes fallback>
-                    <Route path=path!("") view=HomePage/>
-                    <Routes4091/>
-                </Routes>
-            </main>
-        </Router>
-    }
-}
-
-#[server]
-async fn server_call() -> Result<(), ServerFnError> {
-    tokio::time::sleep(std::time::Duration::from_millis(1)).await;
-    Ok(())
-}
-
-#[component]
-fn HomePage() -> impl IntoView {
-    view! {
-        <Title text="Regression Tests"/>
-        <h1>"Listing of regression tests"</h1>
-        <nav>
-            <ul>
-                <li><a href="/4091/">"4091"</a></li>
-            </ul>
-        </nav>
-    }
-}

examples/regression/src/lib.rs

@@ -1,10 +0,0 @@
-pub mod app;
-mod pr_4091;
-
-#[cfg(feature = "hydrate")]
-#[wasm_bindgen::prelude::wasm_bindgen]
-pub fn hydrate() {
-    use app::*;
-    console_error_panic_hook::set_once();
-    leptos::mount::hydrate_body(App);
-}

examples/regression/src/main.rs

@@ -1,37 +0,0 @@
-#[cfg(feature = "ssr")]
-#[tokio::main]
-async fn main() {
-    use axum::Router;
-    use leptos::prelude::*;
-    use leptos_axum::{generate_route_list, LeptosRoutes};
-    use regression::app::{shell, App};
-
-    let conf = get_configuration(None).unwrap();
-    let addr = conf.leptos_options.site_addr;
-    let leptos_options = conf.leptos_options;
-    // Generate the list of routes in your Leptos App
-    let routes = generate_route_list(App);
-
-    let app = Router::new()
-        .leptos_routes(&leptos_options, routes, {
-            let leptos_options = leptos_options.clone();
-            move || shell(leptos_options.clone())
-        })
-        .fallback(leptos_axum::file_and_error_handler(shell))
-        .with_state(leptos_options);
-
-    // run our app with hyper
-    // `axum::Server` is a re-export of `hyper::Server`
-    println!("listening on http://{}", &addr);
-    let listener = tokio::net::TcpListener::bind(&addr).await.unwrap();
-    axum::serve(listener, app.into_make_service())
-        .await
-        .unwrap();
-}
-
-#[cfg(not(feature = "ssr"))]
-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
-}

examples/regression/src/pr_4091.rs

@@ -1,67 +0,0 @@
-use leptos::{context::Provider, prelude::*};
-use leptos_router::{
-    components::{ParentRoute, Route, A},
-    nested_router::Outlet,
-    path,
-};
-
-// FIXME This should be a set rather than a naive vec for push and pop, as
-// it may be possible for unexpected token be popped/pushed on multi-level
-// navigation.  For basic naive tests it should be Fine(TM).
-#[derive(Clone)]
-struct Expectations(Vec<&'static str>);
-
-#[component]
-pub fn Routes4091() -> impl leptos_router::MatchNestedRoutes + Clone {
-    view! {
-        <ParentRoute path=path!("4091") view=Container>
-            <Route path=path!("") view=Root/>
-            <Route path=path!("test1") view=Test1/>
-        </ParentRoute>
-    }
-    .into_inner()
-}
-
-#[component]
-fn Container() -> impl IntoView {
-    let rw_signal = RwSignal::new(Expectations(Vec::new()));
-    provide_context(rw_signal);
-
-    view! {
-        <nav>
-            <ul>
-                <li><A href="./">"4091 Home"</A></li>
-                <li><A href="test1">"test1"</A></li>
-            </ul>
-        </nav>
-        <div id="result">{move || {
-            rw_signal.with(|ex| ex.0.iter().fold(String::new(), |a, b| a + b + " "))
-        }}</div>
-        <Provider value=rw_signal>
-            <Outlet/>
-        </Provider>
-    }
-}
-
-#[component]
-fn Root() -> impl IntoView {
-    view! {
-        <div>"This is Root"</div>
-    }
-}
-
-#[component]
-fn Test1() -> impl IntoView {
-    let signal = expect_context::<RwSignal<Expectations>>();
-
-    on_cleanup(move || {
-        signal.update(|ex| {
-            ex.0.pop();
-        });
-    });
-
-    view! {
-        {move || signal.update(|ex| ex.0.push("Test1"))}
-        <div>"This is Test1"</div>
-    }
-}

examples/regression/style/main.scss

@@ -1,3 +0,0 @@
-body {
-    font-family: sans-serif;
-}

examples/server_fns_axum/Cargo.toml

@@ -38,6 +38,7 @@ strum = { version = "0.27.1", features = ["strum_macros", "derive"] }
 notify = { version = "8.0", optional = true }
 pin-project-lite = "0.2.14"
 dashmap = { version = "6.0", optional = true }
+once_cell = { version = "1.19", optional = true }
 async-broadcast = { version = "0.7.1", optional = true }
 bytecheck = "0.8.0"
 rkyv = { version = "0.8.8" }
@@ -53,6 +54,7 @@ ssr = [
   "dep:leptos_axum",
   "dep:notify",
   "dep:dashmap",
+  "dep:once_cell",
   "dep:async-broadcast",
 ]
 

examples/server_fns_axum/src/app.rs

@@ -424,7 +424,7 @@ pub fn FileUploadWithProgress() -> impl IntoView {
         use async_broadcast::{broadcast, Receiver, Sender};
         use dashmap::DashMap;
         use futures::Stream;
-        use std::sync::LazyLock;
+        use once_cell::sync::Lazy;
 
         struct File {
             total: usize,
@@ -432,8 +432,7 @@ pub fn FileUploadWithProgress() -> impl IntoView {
             rx: Receiver<usize>,
         }
 
-        static FILES: LazyLock<DashMap<String, File>> =
-            LazyLock::new(DashMap::new);
+        static FILES: Lazy<DashMap<String, File>> = Lazy::new(DashMap::new);
 
         pub async fn add_chunk(filename: &str, len: usize) {
             println!("[{filename}]\tadding {len}");
@@ -946,7 +945,9 @@ pub fn CustomClientExample() -> impl IntoView {
                             Item = Result<server_fn::Bytes, server_fn::Bytes>,
                         > + Send
                         + 'static,
-                    impl Sink<server_fn::Bytes> + Send + 'static,
+                    impl Sink<Result<server_fn::Bytes, server_fn::Bytes>>
+                        + Send
+                        + 'static,
                 ),
                 E,
             >,

examples/stores/README.md

@@ -1,6 +1,6 @@
-# Stores Example
+# Leptos Counter Example
 
-This example shows how to use reactive stores, by building a client-side rendered TODO application.
+This example creates a simple counter in a client side rendered app with Rust and WASM!
 
 ## Getting Started
 

examples/suspense_tests/e2e/features/check_instrumented_issue_3719.feature

@@ -52,7 +52,7 @@ Feature: Using instrumented counters to test regression from #3502.
             | list_items         | 1 |
             | get_item           | 1 |
             | inspect_item_root  | 0 |
-            | inspect_item_field | 3 |
+            | inspect_item_field | 4 |
 
     Scenario: Follow paths ordinarily down to a target
         Given I select the following links

examples/suspense_tests/src/instrumented.rs

@@ -477,8 +477,6 @@ fn ItemInspect() -> impl IntoView {
         move || params.get().map(|p| p.path),
         move |p| async move {
             // leptos::logging::log!("res_inspect: res_overview.await");
-            // Note: this resource is untracked here, though `params` changing
-            // will nonetheless results in the "expected" tracked updates.
             let overview = res_overview.await;
             // leptos::logging::log!("res_inspect: resolved res_overview.await");
             // let result =
@@ -563,7 +561,7 @@ fn ShowCounters() -> impl IntoView {
     //
     // However, upon `Reset Counters`, the mode from which the reset
     // was issued will result in the rendering be reflected as such, so
-    // if the initial state was SSR, resetting under CSR will result in
+    // if the intial state was SSR, resetting under CSR will result in
     // the CSR counters be rendered after.  However for the intents and
     // purpose for the testing only the CSR is cared for.
     //

examples/tailwind_actix/Cargo.toml

@@ -57,7 +57,7 @@ site-pkg-dir = "pkg"
 # The tailwind input file.
 #
 # Optional, Activates the tailwind build
-tailwind-input-file = "input.css"
+tailwind-input-file = "style/tailwind.css"
 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"

examples/tailwind_actix/tailwind.config.js

@@ -0,0 +1,13 @@
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+  content: {
+    files: ["*.html", "./src/**/*.rs"],
+    transform: {
+      rs: (content) => content.replace(/(?:^|\s)class:/g, ' '),
+    },
+  },
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+}

examples/tailwind_csr/index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <link data-trunk rel="rust" data-wasm-opt="z" />
     <link data-trunk rel="icon" type="image/ico" href="/public/favicon.ico" />
-    <link data-trunk rel="tailwind-css" href="input.css" />
+    <link data-trunk rel="tailwind-css" href="/style/tailwind.css" />
     <title>Leptos • Counter with Tailwind</title>
   </head>
 

examples/tailwind_csr/input.css

@@ -1 +0,0 @@
-@import "tailwindcss";

examples/tailwind_csr/style/tailwind.css

@@ -0,0 +1,3 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;

examples/tailwind_csr/tailwind.config.js

@@ -0,0 +1,13 @@
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+  content: {
+    files: ["*.html", "./src/**/*.rs"],
+    transform: {
+      rs: (content) => content.replace(/(?:^|\s)class:/g, ' '),
+    },
+  },
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+}

examples/websocket/Cargo.toml

@@ -1,74 +0,0 @@
-[package]
-name = "websocket"
-version = "0.1.0"
-edition = "2021"
-
-[lib]
-crate-type = ["cdylib", "rlib"]
-
-[dependencies]
-console_log = "1.0"
-console_error_panic_hook = "0.1.7"
-futures = "0.3.30"
-leptos = { path = "../../leptos", features = ["tracing"] }
-leptos_axum = { path = "../../integrations/axum", optional = true }
-log = "0.4.22"
-simple_logger = "5.0"
-serde = { version = "1.0", features = ["derive"] }
-axum = { version = "0.8.1", optional = true }
-tokio = { version = "1.39", features = ["full"], optional = true }
-thiserror = "2.0"
-wasm-bindgen = "0.2.100"
-
-[features]
-hydrate = ["leptos/hydrate"]
-ssr = ["dep:axum", "dep:tokio", "leptos/ssr", "dep:leptos_axum"]
-
-[package.metadata.cargo-all-features]
-denylist = ["axum", "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 = "websocket"
-# 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/websocket/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/websocket/Makefile.toml

@@ -1,12 +0,0 @@
-extend = [
-  { path = "../cargo-make/main.toml" },
-  { path = "../cargo-make/cargo-leptos-webdriver-test.toml" },
-]
-
-[env]
-CLIENT_PROCESS_NAME = "websocket"
-
-[tasks.test-ui]
-cwd = "./e2e"
-command = "cargo"
-args = ["make", "test-ui", "${@}"]

examples/websocket/README.md

@@ -1,19 +0,0 @@
-# Leptos WebSocket
-
-This example creates a basic WebSocket echo app.
-
-## 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/websocket/e2e/Cargo.toml

@@ -1,18 +0,0 @@
-[package]
-name = "websocket_e2e"
-version = "0.1.0"
-edition = "2021"
-
-[dev-dependencies]
-anyhow = "1.0"
-async-trait = "0.1.81"
-cucumber = "0.21.1"
-fantoccini = "0.21.1"
-pretty_assertions = "1.4"
-serde_json = "1.0"
-tokio = { version = "1.39", features = ["macros", "rt-multi-thread", "time"] }
-url = "2.5"
-
-[[test]]
-name = "app_suite"
-harness = false    # Allow Cucumber to print output instead of libtest

examples/websocket/e2e/Makefile.toml

@@ -1,20 +0,0 @@
-extend = { path = "../../cargo-make/main.toml" }
-
-[tasks.test]
-env = { RUN_AUTOMATICALLY = false }
-condition = { env_true = ["RUN_AUTOMATICALLY"] }
-
-[tasks.ci]
-
-[tasks.test-ui]
-command = "cargo"
-args = [
-  "test",
-  "--test",
-  "app_suite",
-  "--",
-  "--retry",
-  "2",
-  "--fail-fast",
-  "${@}",
-]

examples/websocket/e2e/README.md

@@ -1,34 +0,0 @@
-# E2E Testing
-
-This example demonstrates e2e testing with Rust using executable requirements.
-
-## Testing Stack
-
-|    |      Role      |  Description |
-|---|---|---|
-| [Cucumber](https://github.com/cucumber-rs/cucumber/tree/main) | Test Runner | Run [Gherkin](https://cucumber.io/docs/gherkin/reference/) specifications as Rust tests |
-| [Fantoccini](https://github.com/jonhoo/fantoccini/tree/main) | Browser Client | Interact with web pages through WebDriver |
-| [Cargo Leptos ](https://github.com/leptos-rs/cargo-leptos) | Build Tool |  Compile example and start the server and end-2-end tests |
-| [chromedriver](https://chromedriver.chromium.org/downloads) | WebDriver | Provide WebDriver for Chrome
-
-## Testing Organization
-
-Testing is organized around what a user can do and see/not see. Test scenarios are grouped by the **user action** and the **object** of that action. This makes it easier to locate and reason about requirements.
-
-Here is a brief overview of how things fit together.
-
-```bash
-features
-└── {action}_{object}.feature   # Specify test scenarios
-tests
-├── fixtures
-│   ├── action.rs               # Perform a user action (click, type, etc.)
-│   ├── check.rs                # Assert what a user can see/not see
-│   ├── find.rs                 # Query page elements
-│   ├── mod.rs
-│   └── world
-│       ├── action_steps.rs     # Map Gherkin steps to user actions
-│       ├── check_steps.rs      # Map Gherkin steps to user expectations
-│       └── mod.rs
-└── app_suite.rs                # Test main 
-```

examples/websocket/e2e/features/echo_client_error.feature

@@ -1,10 +0,0 @@
-@echo_client_error
-Feature: Echo Client Error
-
-    Background:
-        Given I see the app
-
-    @echo_client_error-see-fifth-input-error
-    Scenario: Should see the client error
-        Given I add a text as abcde
-        Then I see the label of the input is Error(ServerFnErrorWrapper(Registration("Error generated from client")))

examples/websocket/e2e/features/echo_server_error.feature

@@ -1,10 +0,0 @@
-@echo_server_error
-Feature: Echo Server Error
-
-    Background:
-        Given I see the app
-
-    @echo_server_error-see-third-input-error
-    Scenario: Should see the server error
-        Given I add a text as abc
-        Then I see the label of the input is Error(ServerFnErrorWrapper(Registration("Error generated from server")))

examples/websocket/e2e/features/echo_text.feature

@@ -1,17 +0,0 @@
-@echo_text
-Feature: Echo Text
-
-    Background:
-        Given I see the app
-
-    @echo_text-see-first-input
-    Scenario: Should see the label
-        Given I add a text as a
-        Then I see the label of the input is A
-
-    @add_text-see-second-input
-    Scenario: Should see the label
-        Given I add a text as ab
-        Then I see the label of the input is AB
-
-

examples/websocket/e2e/features/open_app.feature

@@ -1,7 +0,0 @@
-@open_app
-Feature: Open App
-
-  @open_app-title
-  Scenario: Should see the home page title
-    When I open the app
-    Then I see the page title is Simple Echo WebSocket Communication

examples/websocket/e2e/tests/app_suite.rs

@@ -1,14 +0,0 @@
-mod fixtures;
-
-use anyhow::Result;
-use cucumber::World;
-use fixtures::world::AppWorld;
-
-#[tokio::main]
-async fn main() -> Result<()> {
-    AppWorld::cucumber()
-        .fail_on_skipped()
-        .run_and_exit("./features")
-        .await;
-    Ok(())
-}

examples/websocket/e2e/tests/fixtures/action.rs

@@ -1,18 +0,0 @@
-use super::{find, world::HOST};
-use anyhow::Result;
-use fantoccini::Client;
-use std::result::Result::Ok;
-
-pub async fn goto_path(client: &Client, path: &str) -> Result<()> {
-    let url = format!("{}{}", HOST, path);
-    client.goto(&url).await?;
-
-    Ok(())
-}
-
-pub async fn fill_input(client: &Client, text: &str) -> Result<()> {
-    let textbox = find::input(client).await;
-    textbox.send_keys(text).await?;
-
-    Ok(())
-}

examples/websocket/e2e/tests/fixtures/check.rs

@@ -1,22 +0,0 @@
-use anyhow::{Ok, Result};
-use fantoccini::{Client, Locator};
-use pretty_assertions::assert_eq;
-
-pub async fn text_on_element(
-    client: &Client,
-    selector: &str,
-    expected_text: &str,
-) -> Result<()> {
-    let element = client
-        .wait()
-        .for_element(Locator::Css(selector))
-        .await
-        .unwrap_or_else(|_| {
-            panic!("Element not found by Css selector `{}`", selector)
-        });
-
-    let actual = element.text().await?;
-    assert_eq!(&actual, expected_text);
-
-    Ok(())
-}

examples/websocket/e2e/tests/fixtures/find.rs

@@ -1,11 +0,0 @@
-use fantoccini::{elements::Element, Client, Locator};
-
-pub async fn input(client: &Client) -> Element {
-    let textbox = client
-        .wait()
-        .for_element(Locator::Css("input"))
-        .await
-        .expect("websocket textbox not found");
-
-    textbox
-}

examples/websocket/e2e/tests/fixtures/mod.rs

@@ -1,4 +0,0 @@
-pub mod action;
-pub mod check;
-pub mod find;
-pub mod world;

examples/websocket/e2e/tests/fixtures/world/action_steps.rs

@@ -1,20 +0,0 @@
-use crate::fixtures::{action, world::AppWorld};
-use anyhow::{Ok, Result};
-use cucumber::{given, when};
-
-#[given("I see the app")]
-#[when("I open the app")]
-async fn i_open_the_app(world: &mut AppWorld) -> Result<()> {
-    let client = &world.client;
-    action::goto_path(client, "").await?;
-
-    Ok(())
-}
-
-#[given(regex = "^I add a text as (.*)$")]
-async fn i_add_a_text(world: &mut AppWorld, text: String) -> Result<()> {
-    let client = &world.client;
-    action::fill_input(client, text.as_str()).await?;
-
-    Ok(())
-}

examples/websocket/e2e/tests/fixtures/world/check_steps.rs

@@ -1,28 +0,0 @@
-use crate::fixtures::{check, world::AppWorld};
-use anyhow::{Ok, Result};
-use cucumber::then;
-use std::time::Duration;
-use tokio::time::sleep;
-
-#[then(regex = "^I see the page title is (.*)$")]
-async fn i_see_the_page_title_is(
-    world: &mut AppWorld,
-    text: String,
-) -> Result<()> {
-    let client = &world.client;
-    check::text_on_element(client, "h1", &text).await?;
-
-    Ok(())
-}
-
-#[then(regex = "^I see the label of the input is (.*)$")]
-async fn i_see_the_label_of_the_input_is(
-    world: &mut AppWorld,
-    text: String,
-) -> Result<()> {
-    sleep(Duration::from_millis(500)).await;
-    let client = &world.client;
-    check::text_on_element(client, "p", &text).await?;
-
-    Ok(())
-}

examples/websocket/e2e/tests/fixtures/world/mod.rs

@@ -1,39 +0,0 @@
-pub mod action_steps;
-pub mod check_steps;
-
-use anyhow::Result;
-use cucumber::World;
-use fantoccini::{
-    error::NewSessionError, wd::Capabilities, Client, ClientBuilder,
-};
-
-pub const HOST: &str = "http://127.0.0.1:3000";
-
-#[derive(Debug, World)]
-#[world(init = Self::new)]
-pub struct AppWorld {
-    pub client: Client,
-}
-
-impl AppWorld {
-    async fn new() -> Result<Self, anyhow::Error> {
-        let webdriver_client = build_client().await?;
-
-        Ok(Self {
-            client: webdriver_client,
-        })
-    }
-}
-
-async fn build_client() -> Result<Client, NewSessionError> {
-    let mut cap = Capabilities::new();
-    let arg = serde_json::from_str("{\"args\": [\"-headless\"]}").unwrap();
-    cap.insert("goog:chromeOptions".to_string(), arg);
-
-    let client = ClientBuilder::native()
-        .capabilities(cap)
-        .connect("http://localhost:4444")
-        .await?;
-
-    Ok(client)
-}

examples/websocket/src/lib.rs

@@ -1,9 +0,0 @@
-pub mod websocket;
-
-#[cfg(feature = "hydrate")]
-#[wasm_bindgen::prelude::wasm_bindgen]
-pub fn hydrate() {
-    use crate::websocket::App;
-    console_error_panic_hook::set_once();
-    leptos::mount::hydrate_body(App);
-}

examples/websocket/src/main.rs

@@ -1,44 +0,0 @@
-#[cfg(feature = "ssr")]
-#[tokio::main]
-async fn main() {
-    use axum::Router;
-    use leptos::prelude::*;
-    use leptos_axum::{generate_route_list, LeptosRoutes};
-    use websocket::websocket::{shell, App};
-
-    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).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()
-        .leptos_routes(&leptos_options, routes, {
-            let leptos_options = leptos_options.clone();
-            move || shell(leptos_options.clone())
-        })
-        .fallback(leptos_axum::file_and_error_handler(shell))
-        .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();
-    println!("listening on http://{}", &addr);
-    axum::serve(listener, app.into_make_service())
-        .await
-        .unwrap();
-}
-
-#[cfg(not(feature = "ssr"))]
-pub fn main() {
-    use leptos::mount::mount_to_body;
-    use websocket::websocket::App;
-
-    _ = console_log::init_with_level(log::Level::Debug);
-    console_error_panic_hook::set_once();
-    mount_to_body(App);
-}

examples/websocket/src/websocket.rs

@@ -1,123 +0,0 @@
-use leptos::{prelude::*, task::spawn_local};
-use server_fn::{codec::JsonEncoding, BoxedStream, ServerFnError, Websocket};
-
-pub fn shell(options: LeptosOptions) -> impl IntoView {
-    view! {
-        <!DOCTYPE html>
-        <html lang="en">
-            <head>
-                <meta charset="utf-8" />
-                <meta name="viewport" content="width=device-width, initial-scale=1" />
-                <AutoReload options=options.clone() />
-                <HydrationScripts options />
-                <link rel="shortcut icon" type="image/ico" href="/favicon.ico" />
-            </head>
-            <body>
-                <App />
-            </body>
-        </html>
-    }
-}
-
-// The websocket protocol can be used on any server function that accepts and returns a [`BoxedStream`]
-// with items that can be encoded by the input and output encoding generics.
-//
-// In this case, the input and output encodings are [`Json`] and [`Json`], respectively which requires
-// the items to implement [`Serialize`] and [`Deserialize`].
-#[server(protocol = Websocket<JsonEncoding, JsonEncoding>)]
-async fn echo_websocket(
-    input: BoxedStream<String, ServerFnError>,
-) -> Result<BoxedStream<String, ServerFnError>, ServerFnError> {
-    use futures::{channel::mpsc, SinkExt, StreamExt};
-    let mut input = input; // FIXME :-) server fn fields should pass mut through to destructure
-
-    // create a channel of outgoing websocket messages
-    // we'll return rx, so sending a message to tx will send a message to the client via the websocket
-    let (mut tx, rx) = mpsc::channel(1);
-
-    // spawn a task to listen to the input stream of messages coming in over the websocket
-    tokio::spawn(async move {
-        let mut x = 0;
-        while let Some(msg) = input.next().await {
-            // do some work on each message, and then send our responses
-            x += 1;
-            println!("In server: {} {:?}", x, msg);
-            if x % 3 == 0 {
-                let _ = tx
-                    .send(Err(ServerFnError::Registration(
-                        "Error generated from server".to_string(),
-                    )))
-                    .await;
-            } else {
-                let _ = tx.send(msg.map(|msg| msg.to_ascii_uppercase())).await;
-            }
-        }
-    });
-
-    Ok(rx.into())
-}
-
-#[component]
-pub fn App() -> impl IntoView {
-    use futures::{channel::mpsc, StreamExt};
-    let (mut tx, rx) = mpsc::channel(1);
-    let latest = RwSignal::new(Ok("".into()));
-
-    // we'll only listen for websocket messages on the client
-    if cfg!(feature = "hydrate") {
-        spawn_local(async move {
-            match echo_websocket(rx.into()).await {
-                Ok(mut messages) => {
-                    while let Some(msg) = messages.next().await {
-                        leptos::logging::log!("{:?}", msg);
-                        latest.set(msg);
-                    }
-                }
-                Err(e) => leptos::logging::warn!("{e}"),
-            }
-        });
-    }
-
-    let mut x = 0;
-    view! {
-        <h1>Simple Echo WebSocket Communication</h1>
-        <input
-            type="text"
-            on:input:target=move |ev| {
-                x += 1;
-                let msg = ev.target().value();
-                leptos::logging::log!("In client: {} {:?}", x, msg);
-                if x % 5 == 0 {
-                    let _ = tx
-                        .try_send(
-                            Err(
-                                ServerFnError::Registration(
-                                    "Error generated from client".to_string(),
-                                ),
-                            ),
-                        );
-                } else {
-                    let _ = tx.try_send(Ok(msg));
-                }
-            }
-        />
-        <div>
-            <ErrorBoundary fallback=|errors| {
-                view! {
-                    <p>
-                        {move || {
-                            errors
-                                .get()
-                                .into_iter()
-                                .map(|(_, e)| format!("{e:?}"))
-                                .collect::<Vec<String>>()
-                                .join(" ")
-                        }}
-                    </p>
-                }
-            }>
-                <p>{latest}</p>
-            </ErrorBoundary>
-        </div>
-    }
-}

hydration_context/Cargo.toml

@@ -12,11 +12,12 @@ edition.workspace = true
 [dependencies]
 throw_error = { workspace = true }
 or_poisoned = { workspace = true }
-futures = { workspace = true, default-features = true }
-serde = { features = ["derive"] , workspace = true, default-features = true }
-wasm-bindgen = { workspace = true, optional = true , default-features = true }
-js-sys = { optional = true , workspace = true, default-features = true }
-pin-project-lite = { workspace = true, default-features = true }
+futures = "0.3.31"
+serde = { version = "1.0", features = ["derive"] }
+wasm-bindgen = { version = "0.2.100", optional = true }
+js-sys = { version = "0.3.74", optional = true }
+once_cell = "1.20"
+pin-project-lite = "0.2.15"
 
 [features]
 browser = ["dep:wasm-bindgen", "dep:js-sys"]

hydration_context/src/hydrate.rs

@@ -7,12 +7,10 @@ use super::{SerializedDataId, SharedContext};
 use crate::{PinnedFuture, PinnedStream};
 use core::fmt::Debug;
 use js_sys::Array;
+use once_cell::sync::Lazy;
 use std::{
     fmt::Display,
-    sync::{
-        atomic::{AtomicBool, AtomicUsize, Ordering},
-        LazyLock,
-    },
+    sync::atomic::{AtomicBool, AtomicUsize, Ordering},
 };
 use throw_error::{Error, ErrorId};
 use wasm_bindgen::{prelude::wasm_bindgen, JsCast};
@@ -81,8 +79,8 @@ pub struct HydrateSharedContext {
     id: AtomicUsize,
     is_hydrating: AtomicBool,
     during_hydration: AtomicBool,
-    errors: LazyLock<Vec<(SerializedDataId, ErrorId, Error)>>,
-    incomplete: LazyLock<Vec<SerializedDataId>>,
+    errors: Lazy<Vec<(SerializedDataId, ErrorId, Error)>>,
+    incomplete: Lazy<Vec<SerializedDataId>>,
 }
 
 impl HydrateSharedContext {
@@ -92,8 +90,8 @@ impl HydrateSharedContext {
             id: AtomicUsize::new(0),
             is_hydrating: AtomicBool::new(true),
             during_hydration: AtomicBool::new(true),
-            errors: LazyLock::new(serialized_errors),
-            incomplete: LazyLock::new(incomplete_chunks),
+            errors: Lazy::new(serialized_errors),
+            incomplete: Lazy::new(incomplete_chunks),
         }
     }
 
@@ -106,8 +104,8 @@ impl HydrateSharedContext {
             id: AtomicUsize::new(0),
             is_hydrating: AtomicBool::new(false),
             during_hydration: AtomicBool::new(true),
-            errors: LazyLock::new(serialized_errors),
-            incomplete: LazyLock::new(incomplete_chunks),
+            errors: Lazy::new(serialized_errors),
+            incomplete: Lazy::new(incomplete_chunks),
         }
     }
 }

integrations/actix/Cargo.toml

@@ -9,10 +9,10 @@ rust-version.workspace = true
 edition.workspace = true
 
 [dependencies]
-actix-http = { workspace = true, default-features = true }
-actix-files = { workspace = true, default-features = true }
-actix-web = { workspace = true, default-features = true }
-futures = { workspace = true, default-features = true }
+actix-http = "3.9"
+actix-files = "0.6"
+actix-web = "4.9"
+futures = "0.3.31"
 any_spawner = { workspace = true, features = ["tokio"] }
 hydration_context = { workspace = true }
 leptos = { workspace = true, features = ["nonce", "ssr"] }
@@ -22,12 +22,13 @@ leptos_meta = { workspace = true, features = ["nonce"] }
 leptos_router = { workspace = true, features = ["ssr"] }
 server_fn = { workspace = true, features = ["actix"] }
 tachys = { workspace = true }
-serde_json = { workspace = true , default-features = true }
-parking_lot = { workspace = true, default-features = true }
-tracing = { optional = true , workspace = true, default-features = true }
-tokio = { features = ["rt", "fs"] , workspace = true, default-features = true }
-send_wrapper = { workspace = true, default-features = true }
-dashmap = { workspace = true, default-features = true }
+serde_json = { workspace = true }
+parking_lot = "0.12.3"
+tracing = { version = "0.1", optional = true }
+tokio = { version = "1.43", features = ["rt", "fs"] }
+send_wrapper = "0.6.0"
+dashmap = "6"
+once_cell = "1"
 
 [package.metadata.docs.rs]
 rustdoc-args = ["--generate-link-to-definition"]

integrations/actix/src/lib.rs

@@ -38,6 +38,7 @@ use leptos_router::{
     static_routes::{RegenerationFn, ResolvedStaticPath},
     ExpandOptionals, Method, PathSegment, RouteList, RouteListing, SsrMode,
 };
+use once_cell::sync::Lazy;
 use parking_lot::RwLock;
 use send_wrapper::SendWrapper;
 use server_fn::{
@@ -50,7 +51,7 @@ use std::{
     future::Future,
     ops::{Deref, DerefMut},
     path::Path,
-    sync::{Arc, LazyLock},
+    sync::Arc,
 };
 
 /// This struct lets you define headers and override the status of the Response from an Element or a Server Function
@@ -1209,8 +1210,8 @@ impl StaticRouteGenerator {
     }
 }
 
-static STATIC_HEADERS: LazyLock<DashMap<String, ResponseOptions>> =
-    LazyLock::new(DashMap::new);
+static STATIC_HEADERS: Lazy<DashMap<String, ResponseOptions>> =
+    Lazy::new(DashMap::new);
 
 fn was_404(owner: &Owner) -> bool {
     let resp = owner.with(|| expect_context::<ResponseOptions>());
@@ -1229,7 +1230,7 @@ fn static_path(options: &LeptosOptions, path: &str) -> String {
     // If the path ends with a trailing slash, we generate the path
     // as a directory with a index.html file inside.
     if path != "/" && path.ends_with("/") {
-        static_file_path(options, &format!("{path}index"))
+        static_file_path(options, &format!("{}index", path))
     } else {
         static_file_path(options, path)
     }

integrations/axum/Cargo.toml

@@ -4,18 +4,18 @@ authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Axum integrations for the Leptos web framework."
-version = "0.8.2"
+version = "0.8.0-rc1"
 rust-version.workspace = true
 edition.workspace = true
 
 [dependencies]
 any_spawner = { workspace = true, features = ["tokio"] }
 hydration_context = { workspace = true }
-axum = { default-features = false, features = [
+axum = { version = "0.8.1", default-features = false, features = [
   "matched-path",
-] , workspace = true }
-dashmap = { workspace = true, default-features = true }
-futures = { workspace = true, default-features = true }
+] }
+dashmap = "6"
+futures = "0.3.31"
 leptos = { workspace = true, features = ["nonce", "ssr"] }
 server_fn = { workspace = true, features = ["axum-no-default"] }
 leptos_macro = { workspace = true, features = ["axum"] }
@@ -23,15 +23,16 @@ leptos_meta = { workspace = true, features = ["ssr", "nonce"] }
 leptos_router = { workspace = true, features = ["ssr"] }
 leptos_integration_utils = { workspace = true }
 tachys = { workspace = true }
-parking_lot = { workspace = true, default-features = true }
-tokio = { default-features = false , workspace = true }
-tower = { features = ["util"] , workspace = true, default-features = true }
-tower-http = { workspace = true, default-features = true }
-tracing = { optional = true , workspace = true, default-features = true }
+once_cell = "1"
+parking_lot = "0.12.3"
+tokio = { version = "1.43", default-features = false }
+tower = { version = "0.5.1", features = ["util"] }
+tower-http = "0.6.2"
+tracing = { version = "0.1.41", optional = true }
 
 [dev-dependencies]
-axum = { workspace = true, default-features = true }
-tokio = { features = ["net", "rt-multi-thread"] , workspace = true, default-features = true }
+axum = "0.8.1"
+tokio = { version = "1.43", features = ["net", "rt-multi-thread"] }
 
 [features]
 wasm = []

integrations/axum/src/lib.rs

@@ -69,12 +69,12 @@ use leptos_router::{
     static_routes::RegenerationFn, ExpandOptionals, PathSegment, RouteList,
     RouteListing, SsrMode,
 };
+#[cfg(feature = "default")]
+use once_cell::sync::Lazy;
 use parking_lot::RwLock;
 use server_fn::{error::ServerFnErrorErr, redirect::REDIRECT_HEADER};
 #[cfg(feature = "default")]
 use std::path::Path;
-#[cfg(feature = "default")]
-use std::sync::LazyLock;
 use std::{collections::HashSet, fmt::Debug, io, pin::Pin, sync::Arc};
 #[cfg(feature = "default")]
 use tower::util::ServiceExt;
@@ -590,7 +590,7 @@ where
 /// Returns an Axum [Handler](axum::handler::Handler) that listens for a `GET` request and tries
 /// to route it using [leptos_router], serving an HTML stream of your application.
 ///
-/// This version allows us to pass Axum State/Extension/Extractor or other info from Axum or network
+/// This version allows us to pass Axum State/Extension/Extractor or other infro from Axum or network
 /// layers above Leptos itself. To use it, you'll need to write your own handler function that provides
 /// the data to leptos in a closure. An example is below
 /// ```
@@ -796,7 +796,7 @@ where
 /// This stream will pause at each `<Suspense/>` node and wait for it to resolve before
 /// sending down its HTML. The app will become interactive once it has fully loaded.
 ///
-/// This version allows us to pass Axum State/Extension/Extractor or other info from Axum or network
+/// This version allows us to pass Axum State/Extension/Extractor or other infro from Axum or network
 /// layers above Leptos itself. To use it, you'll need to write your own handler function that provides
 /// the data to leptos in a closure. An example is below
 /// ```
@@ -879,8 +879,7 @@ where
     }
 }
 
-/// Can be used in conjunction with a custom [file_and_error_handler_with_context] to process an Axum [Request](axum::extract::Request) into an Axum [Response](axum::response::Response)
-pub fn handle_response_inner<IV>(
+fn handle_response_inner<IV>(
     additional_context: impl Fn() + 'static + Clone + Send,
     app_fn: impl FnOnce() -> IV + Send + 'static,
     req: Request<Body>,
@@ -1023,7 +1022,7 @@ where
 /// to route it using [leptos_router], asynchronously rendering an HTML page after all
 /// `async` resources have loaded.
 ///
-/// This version allows us to pass Axum State/Extension/Extractor or other info from Axum or network
+/// This version allows us to pass Axum State/Extension/Extractor or other infro from Axum or network
 /// layers above Leptos itself. To use it, you'll need to write your own handler function that provides
 /// the data to leptos in a closure. An example is below
 /// ```
@@ -1090,7 +1089,7 @@ where
 /// to route it using [leptos_router], asynchronously rendering an HTML page after all
 /// `async` resources have loaded.
 ///
-/// This version allows us to pass Axum State/Extension/Extractor or other info from Axum or network
+/// This version allows us to pass Axum State/Extension/Extractor or other infro from Axum or network
 /// layers above Leptos itself. To use it, you'll need to write your own handler function that provides
 /// the data to leptos in a closure. An example is below
 /// ```
@@ -1522,8 +1521,8 @@ impl StaticRouteGenerator {
 }
 
 #[cfg(feature = "default")]
-static STATIC_HEADERS: LazyLock<DashMap<String, ResponseOptions>> =
-    LazyLock::new(DashMap::new);
+static STATIC_HEADERS: Lazy<DashMap<String, ResponseOptions>> =
+    Lazy::new(DashMap::new);
 
 #[cfg(feature = "default")]
 fn was_404(owner: &Owner) -> bool {
@@ -1544,7 +1543,7 @@ fn static_path(options: &LeptosOptions, path: &str) -> String {
     // If the path ends with a trailing slash, we generate the path
     // as a directory with a index.html file inside.
     if path != "/" && path.ends_with("/") {
-        static_file_path(options, &format!("{path}index"))
+        static_file_path(options, &format!("{}index", path))
     } else {
         static_file_path(options, path)
     }

integrations/utils/Cargo.toml

@@ -9,7 +9,7 @@ rust-version.workspace = true
 edition.workspace = true
 
 [dependencies]
-futures = { workspace = true, default-features = true }
+futures = "0.3.31"
 hydration_context = { workspace = true }
 leptos = { workspace = true, features = ["nonce"] }
 leptos_meta = { workspace = true, features = ["ssr"] }

leptos/Cargo.toml

@@ -15,8 +15,8 @@ any_spawner = { workspace = true, features = [
   "wasm-bindgen",
   "futures-executor",
 ] }
-base64 = { optional = true, workspace = true, default-features = true }
-cfg-if = { workspace = true, default-features = true }
+base64 = { version = "0.22.1", optional = true }
+cfg-if = "1.0"
 hydration_context = { workspace = true }
 either_of = { workspace = true }
 leptos_dom = { workspace = true }
@@ -24,38 +24,38 @@ leptos_hot_reload = { workspace = true }
 leptos_macro = { workspace = true }
 leptos_server = { workspace = true, features = ["tachys"] }
 leptos_config = { workspace = true }
-leptos-spin-macro = { optional = true , workspace = true, default-features = true }
+leptos-spin-macro = { version = "0.2.0", optional = true }
 oco_ref = { workspace = true }
 or_poisoned = { workspace = true }
-paste = { workspace = true, default-features = true }
-rand = { optional = true , workspace = true, default-features = true }
-# NOTE: While not used directly, `getrandom`'s `wasm_js` feature is needed when `rand` is used on WASM to
+paste = "1.0"
+rand = { version = "0.8.5", optional = true }
+# NOTE: While not used directly, `getrandom`'s `js` feature is needed when `rand` is used on WASM to
 #       avoid a compilation error
-getrandom = { optional = true , workspace = true, default-features = true }
+getrandom = { version = "0.2", optional = true }
 reactive_graph = { workspace = true, features = ["serde"] }
-rustc-hash = { workspace = true, default-features = true }
+rustc-hash = "2.0"
 tachys = { workspace = true, features = [
   "reactive_graph",
   "reactive_stores",
   "oco",
 ] }
-thiserror = { workspace = true, default-features = true }
-tracing = { optional = true, workspace = true, default-features = true }
-typed-builder = { workspace = true, default-features = true }
-typed-builder-macro = { workspace = true, default-features = true }
-serde = { workspace = true, default-features = true }
-serde_json = { optional = true, workspace = true, default-features = true }
+thiserror = "2.0"
+tracing = { version = "0.1.41", optional = true }
+typed-builder = "0.20.0"
+typed-builder-macro = "0.20.0"
+serde = "1.0"
+serde_json = { version = "1.0", optional = true }
 server_fn = { workspace = true, features = ["form-redirects", "browser"] }
-web-sys = { features = [
+web-sys = { version = "0.3.72", features = [
   "ShadowRoot",
   "ShadowRootInit",
   "ShadowRootMode",
-], workspace = true, default-features = true }
-wasm-bindgen = { workspace = true, default-features = true }
-serde_qs = { workspace = true, default-features = true }
-slotmap = { workspace = true, default-features = true }
-futures = { workspace = true, default-features = true }
-send_wrapper = { workspace = true, default-features = true }
+] }
+wasm-bindgen = { workspace = true }
+serde_qs = "0.13.0"
+slotmap = "1.0"
+futures = "0.3.31"
+send_wrapper = "0.6.0"
 
 [features]
 hydration = [
@@ -64,13 +64,13 @@ hydration = [
   "hydration_context/browser",
   "leptos_dom/hydration",
 ]
-csr = ["leptos_macro/csr", "reactive_graph/effects", "getrandom?/wasm_js"]
+csr = ["leptos_macro/csr", "reactive_graph/effects", "getrandom?/js"]
 hydrate = [
   "leptos_macro/hydrate",
   "hydration",
   "tachys/hydrate",
   "reactive_graph/effects",
-  "getrandom?/wasm_js",
+  "getrandom?/js",
 ]
 default-tls = ["server_fn/default-tls"]
 rustls = ["server_fn/rustls"]
@@ -99,21 +99,15 @@ trace-component-props = [
   "leptos_dom/trace-component-props",
 ]
 delegation = ["tachys/delegation"]
-islands-router = ["tachys/mark_branches"]
-
-[dev-dependencies]
-tokio = { features = ["rt-multi-thread", "macros"] , workspace = true, default-features = true }
-tokio-test = { workspace = true, default-features = true }
-any_spawner = { workspace = true, features = ["futures-executor", "tokio"] }
 
 [build-dependencies]
-rustc_version = { workspace = true, default-features = true }
+rustc_version = "0.4.1"
 
 # Having an erasure feature rather than normal --cfg erase_components for the proc macro crate is a workaround for this rust issue:
 # https://github.com/rust-lang/cargo/issues/4423
 # TLDR proc macros will ignore RUSTFLAGS when --target is specified on the cargo command.
 # This works around the issue by the non proc-macro crate which does see RUSTFLAGS enabling the replacement feature on the proc-macro crate, which wouldn't.
-# This is automatic as long as the leptos crate is depended upon,
+# This is automatic as long as the leptos crate is depended upon, 
 # downstream usage should never manually enable this feature.
 [target.'cfg(erase_components)'.dependencies]
 leptos_macro = { workspace = true, features = ["__internal_erase_components"] }

leptos/build.rs

@@ -1,15 +1,8 @@
 use rustc_version::{version_meta, Channel};
 
 fn main() {
-    let target = std::env::var("TARGET").unwrap_or_default();
-
     // Set cfg flags depending on release channel
     if matches!(version_meta().unwrap().channel, Channel::Nightly) {
         println!("cargo:rustc-cfg=rustc_nightly");
     }
-    // Set cfg flag for getrandom wasm_js
-    if target == "wasm32-unknown-unknown" {
-        // Set a custom cfg flag for wasm builds
-        println!("cargo:rustc-cfg=getrandom_backend=\"wasm_js\"");
-    }
 }

leptos/src/children.rs

@@ -47,7 +47,7 @@ type BoxedChildrenFn = Box<dyn Fn() -> AnyView + Send>;
 ///
 /// Different component types take different types for their `children` prop, some of which cannot
 /// be directly constructed. Using `ToChildren` allows the component user to pass children without
-/// explicitly constructing the correct type.
+/// explicity constructing the correct type.
 ///
 /// ## Examples
 ///

leptos/src/error_boundary.rs

@@ -1,21 +1,20 @@
 use crate::{children::TypedChildren, IntoView};
-use futures::{channel::oneshot, future::join_all};
 use hydration_context::{SerializedDataId, SharedContext};
 use leptos_macro::component;
 use reactive_graph::{
     computed::ArcMemo,
     effect::RenderEffect,
-    owner::{provide_context, ArcStoredValue, Owner},
+    owner::{provide_context, Owner},
     signal::ArcRwSignal,
-    traits::{Get, Update, With, WithUntracked, WriteValue},
+    traits::{Get, Update, With, WithUntracked},
 };
 use rustc_hash::FxHashMap;
-use std::{collections::VecDeque, fmt::Debug, mem, sync::Arc};
+use std::{fmt::Debug, sync::Arc};
 use tachys::{
     html::attribute::{any_attribute::AnyAttribute, Attribute},
     hydration::Cursor,
     reactive_graph::OwnedView,
-    ssr::{StreamBuilder, StreamChunk},
+    ssr::StreamBuilder,
     view::{
         add_attr::AddAnyAttr, Mountable, Position, PositionState, Render,
         RenderHtml,
@@ -97,12 +96,10 @@ where
     let hook = hook as Arc<dyn ErrorHook>;
 
     let _guard = throw_error::set_error_hook(Arc::clone(&hook));
-    let suspended_children = ErrorBoundarySuspendedChildren::default();
 
     let owner = Owner::new();
     let children = owner.with(|| {
         provide_context(Arc::clone(&hook));
-        provide_context(suspended_children.clone());
         children.into_inner()()
     });
 
@@ -114,15 +111,11 @@ where
             children,
             errors,
             fallback,
-            suspended_children,
         },
         owner,
     )
 }
 
-pub(crate) type ErrorBoundarySuspendedChildren =
-    ArcStoredValue<Vec<oneshot::Receiver<()>>>;
-
 struct ErrorBoundaryView<Chil, FalFn> {
     hook: Arc<dyn ErrorHook>,
     boundary_id: SerializedDataId,
@@ -130,7 +123,6 @@ struct ErrorBoundaryView<Chil, FalFn> {
     children: Chil,
     fallback: FalFn,
     errors: ArcRwSignal<Errors>,
-    suspended_children: ErrorBoundarySuspendedChildren,
 }
 
 struct ErrorBoundaryViewState<Chil, Fal> {
@@ -265,7 +257,6 @@ where
             children,
             fallback,
             errors,
-            suspended_children,
         } = self;
         ErrorBoundaryView {
             hook,
@@ -274,7 +265,6 @@ where
             children: children.add_any_attr(attr.into_cloneable_owned()),
             fallback,
             errors,
-            suspended_children,
         }
     }
 }
@@ -302,7 +292,6 @@ where
             children,
             fallback,
             errors,
-            suspended_children,
             ..
         } = self;
         ErrorBoundaryView {
@@ -312,7 +301,6 @@ where
             children: children.resolve().await,
             fallback,
             errors,
-            suspended_children,
         }
     }
 
@@ -361,8 +349,7 @@ where
     ) where
         Self: Sized,
     {
-        let _hook = throw_error::set_error_hook(Arc::clone(&self.hook));
-
+        let _hook = throw_error::set_error_hook(self.hook);
         // first, attempt to serialize the children to HTML, then check for errors
         let mut new_buf = StreamBuilder::new(buf.clone_id());
         let mut new_pos = *position;
@@ -374,76 +361,20 @@ where
             extra_attrs.clone(),
         );
 
-        let suspense_children =
-            mem::take(&mut *self.suspended_children.write_value());
-
-        // not waiting for any suspended children: just render
-        if suspense_children.is_empty() {
-            // any thrown errors would've been caught here
-            if self.errors.with_untracked(|map| map.is_empty()) {
-                buf.append(new_buf);
-            } else {
-                // otherwise, serialize the fallback instead
-                let mut fallback = String::with_capacity(Fal::MIN_LENGTH);
-                (self.fallback)(self.errors).to_html_with_buf(
-                    &mut fallback,
-                    position,
-                    escape,
-                    mark_branches,
-                    extra_attrs,
-                );
-                buf.push_sync(&fallback);
-            }
+        // any thrown errors would've been caught here
+        if self.errors.with_untracked(|map| map.is_empty()) {
+            buf.append(new_buf);
         } else {
-            let mut position = *position;
-            // if we're waiting for suspended children, we'll first wait for them to load
-            // in this implementation, an ErrorBoundary that *contains* Suspense essentially acts
-            // like a Suspense: it will wait for (all top-level) child Suspense to load before rendering anything
-            let mut view_buf = StreamBuilder::new(new_buf.clone_id());
-            view_buf.next_id();
-            let hook = Arc::clone(&self.hook);
-            view_buf.push_async(async move {
-                let _hook = throw_error::set_error_hook(Arc::clone(&hook));
-                let _ = join_all(suspense_children).await;
-
-                let mut my_chunks = VecDeque::new();
-                for chunk in new_buf.take_chunks() {
-                    match chunk {
-                        StreamChunk::Sync(data) => {
-                            my_chunks.push_back(StreamChunk::Sync(data))
-                        }
-                        StreamChunk::Async { chunks } => {
-                            let chunks = chunks.await;
-                            my_chunks.extend(chunks);
-                        }
-                        StreamChunk::OutOfOrder { chunks } => {
-                            let chunks = chunks.await;
-                            my_chunks.push_back(StreamChunk::OutOfOrder {
-                                chunks: Box::pin(async move { chunks }),
-                            });
-                        }
-                    }
-                }
-
-                if self.errors.with_untracked(|map| map.is_empty()) {
-                    // if no errors, just go ahead with the stream
-                    my_chunks
-                } else {
-                    // otherwise, serialize the fallback instead
-                    let mut fallback = String::with_capacity(Fal::MIN_LENGTH);
-                    (self.fallback)(self.errors).to_html_with_buf(
-                        &mut fallback,
-                        &mut position,
-                        escape,
-                        mark_branches,
-                        extra_attrs,
-                    );
-                    my_chunks.clear();
-                    my_chunks.push_back(StreamChunk::Sync(fallback));
-                    my_chunks
-                }
-            });
-            buf.append(view_buf);
+            // otherwise, serialize the fallback instead
+            let mut fallback = String::with_capacity(Fal::MIN_LENGTH);
+            (self.fallback)(self.errors).to_html_with_buf(
+                &mut fallback,
+                position,
+                escape,
+                mark_branches,
+                extra_attrs,
+            );
+            buf.push_sync(&fallback);
         }
     }
 

leptos/src/form.rs

@@ -111,39 +111,28 @@ where
 
     let on_submit = {
         move |ev: SubmitEvent| {
-            // request_animation_frame here schedules this event handler to run slightly later
-            // this means that this `submit` handler will run *after* any other `submit` handlers
-            // that have been added by the user. this is useful because it means that the user can
-            // add an `on:submit` handler and call `ev.prevent_default()` to prevent the form submission
-            //
-            // without this delay, this handler will always run before the user's handler (which was added
-            // later), which means the user can't prevent the form submission in the same way
-            //
-            // see https://github.com/leptos-rs/leptos/issues/3872
-            request_animation_frame(move || {
-                if ev.default_prevented() {
-                    return;
-                }
+            if ev.default_prevented() {
+                return;
+            }
 
-                ev.prevent_default();
+            ev.prevent_default();
 
-                match ServFn::from_event(&ev) {
-                    Ok(new_input) => {
-                        action.dispatch(new_input);
-                    }
-                    Err(err) => {
-                        crate::logging::error!(
-                            "Error converting form field into server function \
-                             arguments: {err:?}"
-                        );
-                        value.set(Some(Err(ServerFnErrorErr::Serialization(
-                            err.to_string(),
-                        )
-                        .into_app_error())));
-                        version.update(|n| *n += 1);
-                    }
+            match ServFn::from_event(&ev) {
+                Ok(new_input) => {
+                    action.dispatch(new_input);
                 }
-            });
+                Err(err) => {
+                    crate::logging::error!(
+                        "Error converting form field into server function \
+                         arguments: {err:?}"
+                    );
+                    value.set(Some(Err(ServerFnErrorErr::Serialization(
+                        err.to_string(),
+                    )
+                    .into_app_error())));
+                    version.update(|n| *n += 1);
+                }
+            }
         }
     };
 
@@ -266,7 +255,7 @@ where
     ) -> Result<Self, serde_qs::Error>;
 }
 
-/// Errors that can arise when converting from an HTML event or form into a Rust data type.
+/// Errors that can arise when coverting from an HTML event or form into a Rust data type.
 #[derive(Error, Debug)]
 pub enum FromFormDataError {
     /// Could not find a `<form>` connected to the event.

leptos/src/hydration/island_script.js

@@ -1,5 +1,5 @@
 ((root, pkg_path, output_name, wasm_output_name) => {
-	let MOST_RECENT_CHILDREN_CB = [];
+	let MOST_RECENT_CHILDREN_CB;
 
 	function idle(c) {
 		if ("requestIdleCallback" in window) {
@@ -22,18 +22,12 @@
 						traverse(child, children);
 					}
 				} else {
-					if (tag === 'leptos-children') {
-						MOST_RECENT_CHILDREN_CB.push(node.$$on_hydrate);
-						for(const child of node.children) {
-							traverse(child);
-						};
-						// un-set the "most recent children"
-						MOST_RECENT_CHILDREN_CB.pop();
-					} else {
-						for(const child of node.children) {
-							traverse(child);
-						};
+					if(tag === 'leptos-children') {
+						MOST_RECENT_CHILDREN_CB = node.$$on_hydrate;
 					}
+					for(const child of node.children) {
+						traverse(child);
+					};
 				}
 			}
 		}
@@ -43,9 +37,8 @@
 	function hydrateIsland(el, id, mod) {
 		const islandFn = mod[id];
 		if (islandFn) {
-			const children_cb = MOST_RECENT_CHILDREN_CB[MOST_RECENT_CHILDREN_CB.length-1];
-			if (children_cb) {
-				children_cb();
+			if (MOST_RECENT_CHILDREN_CB) {
+				MOST_RECENT_CHILDREN_CB();
 			}
 			islandFn(el);
 		} else {
@@ -55,7 +48,7 @@
 	idle(() => {
 		import(`${root}/${pkg_path}/${output_name}.js`)
 			.then(mod => {
-				mod.default({module_or_path: `${root}/${pkg_path}/${wasm_output_name}.wasm`}).then(() => {
+				mod.default(`${root}/${pkg_path}/${wasm_output_name}.wasm`).then(() => {
 					mod.hydrate();
 					hydrateIslands(document.body, mod);
 				});

leptos/src/hydration/islands_routing.js

@@ -17,10 +17,6 @@ window.addEventListener("popstate", async (ev) => {
 });
 
 window.addEventListener("submit", async (ev) => {
-	if (ev.defaultPrevented) {
-		return;
-	}
-		
 	const req = submitToReq(ev);
 	if(!req) {
 		return;
@@ -198,15 +194,6 @@ function diffRange(oldDocument, oldRoot, newDocument, newRoot, oldEnd, newEnd) {
 		else if (oldNode.nodeType === Node.TEXT_NODE) {
 			oldNode.textContent = newNode.textContent;
 		}
-		// islands should not be diffed on the client, because we do not want to overwrite client-side state 
-		// but their children should be diffed still, because they could contain new server content
-		else if (oldNode.nodeType === Node.ELEMENT_NODE && oldNode.tagName === "LEPTOS-ISLAND") {
-			// TODO: diff the leptos-children 
-
-			// skip over leptos-island otherwise
-			oldDocWalker.nextSibling();
-			newDocWalker.nextSibling();
-		}
 		// if it's an element, replace if it's a different tag, or update attributes
 		else if (oldNode.nodeType === Node.ELEMENT_NODE) {
 			diffElement(oldNode, newNode);

leptos/src/hydration/mod.rs

@@ -83,10 +83,6 @@ pub fn HydrationScripts(
                     }
                 }
             }
-        } else {
-            leptos::logging::error!(
-                "File hashing is active but no hash file was found"
-            );
         }
     } else if std::option_env!("LEPTOS_OUTPUT_NAME").is_none() {
         wasm_file_name.push_str("_bg");
@@ -111,19 +107,21 @@ pub fn HydrationScripts(
         .unwrap_or_default();
 
     let root = root.unwrap_or_default();
-    view! {
-        <link rel="modulepreload" href=format!("{root}/{pkg_path}/{js_file_name}.js") nonce=nonce.clone()/>
-        <link
-            rel="preload"
-            href=format!("{root}/{pkg_path}/{wasm_file_name}.wasm")
-            r#as="fetch"
-            r#type="application/wasm"
-            crossorigin=nonce.clone().unwrap_or_default()
-        />
-        <script type="module" nonce=nonce>
-            {format!("{script}({root:?}, {pkg_path:?}, {js_file_name:?}, {wasm_file_name:?});{islands_router}")}
-        </script>
-    }
+    use_context::<IslandsRouterNavigation>().is_none().then(|| {
+        view! {
+            <link rel="modulepreload" href=format!("{root}/{pkg_path}/{js_file_name}.js") nonce=nonce.clone()/>
+            <link
+                rel="preload"
+                href=format!("{root}/{pkg_path}/{wasm_file_name}.wasm")
+                r#as="fetch"
+                r#type="application/wasm"
+                crossorigin=nonce.clone().unwrap_or_default()
+            />
+            <script type="module" nonce=nonce>
+                {format!("{script}({root:?}, {pkg_path:?}, {js_file_name:?}, {wasm_file_name:?});{islands_router}")}
+            </script>
+        }
+    })
 }
 
 /// If this is provided via context, it means that you are using the islands router and

leptos/src/hydration/reload_script.js

@@ -7,7 +7,7 @@ ws.onmessage = (ev) => {
 		let found = false;
 		document.querySelectorAll("link").forEach((link) => {
 			if (link.getAttribute('href').includes(msg.css)) {
-				let newHref = '/' + msg.css + '?version=' + Date.now();
+				let newHref = '/' + msg.css + '?version=' + new Date().getMilliseconds();
 				link.setAttribute('href', newHref);
 				found = true;
 			}

leptos/src/lib.rs

@@ -162,7 +162,6 @@ pub mod prelude {
         pub use crate::{
             callback::*, children::*, component::*, control_flow::*, error::*,
             form::*, hydration::*, into_view::*, mount::*, suspense::*,
-            text_prop::*,
         };
         pub use leptos_config::*;
         pub use leptos_dom::helpers::*;

leptos/src/nonce.rs

@@ -4,7 +4,7 @@ use base64::{
     engine::{self, general_purpose},
     Engine,
 };
-use rand::{rng, RngCore};
+use rand::{thread_rng, RngCore};
 use std::{fmt::Display, ops::Deref, sync::Arc};
 use tachys::html::attribute::AttributeValue;
 
@@ -171,9 +171,9 @@ const NONCE_ENGINE: engine::GeneralPurpose =
 impl Nonce {
     /// Generates a new nonce from 16 bytes (128 bits) of random data.
     pub fn new() -> Self {
-        let mut rng = rng();
+        let mut thread_rng = thread_rng();
         let mut bytes = [0; 16];
-        rng.fill_bytes(&mut bytes);
+        thread_rng.fill_bytes(&mut bytes);
         Nonce(NONCE_ENGINE.encode(bytes).into())
     }
 }