v0.8.6

Merge pull request #4186 from leptos-rs/4184
A few pieces of lazy island clean-up
2025-12-27 15:44:42 -05:00 · 2025-07-27 08:59:22 -04:00 · 2025-07-27 08:50:22 -04:00 · 2025-07-27 08:50:08 -04:00 · 2025-07-27 08:34:59 -04:00 · 2025-07-27 08:30:51 -04:00
30 changed files with 5374 additions and 110 deletions
--- a/.github/workflows/autofix.yml
+++ b/.github/workflows/autofix.yml
@@ -17,17 +17,10 @@ env:
 jobs:
  autofix:
    runs-on: ubuntu-latest
-    timeout-minutes: 30
    steps:
      - uses: actions/checkout@v4
      - uses: actions-rust-lang/setup-rust-toolchain@v1
-        with:
-          {
-            toolchain: "nightly-2025-07-16",
-            components: "rustfmt, clippy",
-            target: "wasm32-unknown-unknown",
-            rustflags: "",
-          }
+        with: {toolchain: "nightly-2025-07-16", components: "rustfmt, clippy", target: "wasm32-unknown-unknown", rustflags: ""}
      - name: Install Glib
        run: |
          sudo apt-get update
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1788,7 +1788,7 @@ checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388"

 [[package]]
 name = "leptos"
-version = "0.8.5"
+version = "0.8.6"
 dependencies = [
 "any_spawner",
 "base64",
@@ -1952,7 +1952,7 @@ dependencies = [

 [[package]]
 name = "leptos_macro"
-version = "0.8.5"
+version = "0.8.6"
 dependencies = [
 "attribute-derive",
 "cfg-if",
@@ -1972,7 +1972,7 @@ dependencies = [
 "rustc_version",
 "serde",
 "server_fn",
- "server_fn_macro 0.8.5",
+ "server_fn_macro 0.8.6",
 "syn 2.0.104",
 "tracing",
 "trybuild",
@@ -2799,9 +2799,9 @@ dependencies = [

 [[package]]
 name = "redox_syscall"
-version = "0.5.14"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3a5d9f0aba1dbcec1cc47f0ff94a4b778fe55bca98a6dfa92e4e094e57b1c4"
+checksum = "7e8af0dde094006011e6a740d4879319439489813bd0bcdc7d821beaeeff48ec"
 dependencies = [
 "bitflags",
 ]
@@ -3345,7 +3345,7 @@ dependencies = [

 [[package]]
 name = "server_fn_macro"
-version = "0.8.5"
+version = "0.8.6"
 dependencies = [
 "const_format",
 "convert_case 0.8.0",
@@ -3360,7 +3360,7 @@ dependencies = [
 name = "server_fn_macro_default"
 version = "0.8.5"
 dependencies = [
- "server_fn_macro 0.8.5",
+ "server_fn_macro 0.8.6",
 "syn 2.0.104",
 ]

@@ -4339,15 +4339,16 @@ dependencies = [

 [[package]]
 name = "wasm_split_helpers"
-version = "0.1.0"
+version = "0.1.2"
 dependencies = [
 "async-once-cell",
+ "or_poisoned",
 "wasm_split_macros",
 ]

 [[package]]
 name = "wasm_split_macros"
-version = "0.1.0"
+version = "0.1.2"
 dependencies = [
 "base16",
 "digest",
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,7 +40,6 @@ members = [
 exclude = ["benchmarks", "examples", "projects"]

 [workspace.package]
-version = "0.8.5"
 edition = "2021"
 rust-version = "1.88"

@@ -51,12 +50,12 @@ any_spawner = { path = "./any_spawner/", version = "0.3.0" }
 const_str_slice_concat = { path = "./const_str_slice_concat", version = "0.1" }
 either_of = { path = "./either_of/", version = "0.1.6" }
 hydration_context = { path = "./hydration_context", version = "0.3.0" }
-leptos = { path = "./leptos", version = "0.8.5" }
+leptos = { path = "./leptos", version = "0.8.6" }
 leptos_config = { path = "./leptos_config", version = "0.8.5" }
 leptos_dom = { path = "./leptos_dom", version = "0.8.5" }
 leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.8.5" }
 leptos_integration_utils = { path = "./integrations/utils", version = "0.8.5" }
-leptos_macro = { path = "./leptos_macro", version = "0.8.5" }
+leptos_macro = { path = "./leptos_macro", version = "0.8.6" }
 leptos_router = { path = "./router", version = "0.8.5" }
 leptos_router_macro = { path = "./router_macro", version = "0.8.5" }
 leptos_server = { path = "./leptos_server", version = "0.8.5" }
@@ -68,11 +67,11 @@ reactive_graph = { path = "./reactive_graph", version = "0.2.5" }
 reactive_stores = { path = "./reactive_stores", version = "0.2.5" }
 reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.2.5" }
 server_fn = { path = "./server_fn", version = "0.8.5" }
-server_fn_macro = { path = "./server_fn_macro", version = "0.8.5" }
+server_fn_macro = { path = "./server_fn_macro", version = "0.8.6" }
 server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.8.5" }
 tachys = { path = "./tachys", version = "0.2.6" }
-wasm_split_helpers = { path = "./wasm_split", version = "0.1.0" }
-wasm_split_macros = { path = "./wasm_split_macros", version = "0.1.0" }
+wasm_split_helpers = { path = "./wasm_split", version = "0.1.2" }
+wasm_split_macros = { path = "./wasm_split_macros", version = "0.1.2" }

 # members deps
 async-once-cell = { default-features = false, version = "0.5.3" }
--- a/examples/lazy_routes/src/app.rs
+++ b/examples/lazy_routes/src/app.rs
@@ -305,7 +305,10 @@ impl LazyRoute for ViewD {
    }
 }

+// Server functions can be made lazy by combining the two macros,
+// with `#[server]` coming first, then `#[lazy]`
 #[server]
+#[lazy]
 async fn d_data() -> Result<Vec<i32>, ServerFnError> {
    tokio::time::sleep(std::time::Duration::from_millis(250)).await;
    Ok(vec![1, 1, 2, 3, 5, 8, 13])
--- a/integrations/actix/Cargo.toml
+++ b/integrations/actix/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Actix integrations for the Leptos web framework."
-version = { workspace = true }
+version = "0.8.5"
 rust-version.workspace = true
 edition.workspace = true

@@ -22,10 +22,10 @@ leptos_meta = { workspace = true, features = ["nonce"] }
 leptos_router = { workspace = true, features = ["ssr"] }
 server_fn = { workspace = true, features = ["actix-no-default"] }
 tachys = { workspace = true }
-serde_json = { workspace = true , default-features = 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 }
+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 }

--- a/integrations/axum/Cargo.toml
+++ b/integrations/axum/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Axum integrations for the Leptos web framework."
-version = { workspace = true }
+version = "0.8.5"
 rust-version.workspace = true
 edition.workspace = true

--- a/integrations/utils/Cargo.toml
+++ b/integrations/utils/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Utilities to help build server integrations for the Leptos web framework."
-version = { workspace = true }
+version = "0.8.5"
 rust-version.workspace = true
 edition.workspace = true

--- a/leptos/Cargo.toml
+++ b/leptos/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leptos"
-version = { workspace = true }
+version = "0.8.6"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
--- a/leptos/src/lib.rs
+++ b/leptos/src/lib.rs
@@ -348,6 +348,7 @@ pub use web_sys;

 #[doc(hidden)]
 pub mod __reexports {
+    pub use send_wrapper;
    pub use wasm_bindgen_futures;
 }

--- a/leptos_config/Cargo.toml
+++ b/leptos_config/Cargo.toml
@@ -5,7 +5,7 @@ license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Configuration for the Leptos web framework."
 readme = "../README.md"
-version = { workspace = true }
+version = "0.8.5"
 rust-version.workspace = true
 edition.workspace = true

@@ -13,16 +13,24 @@ edition.workspace = true
 config = { default-features = false, features = [
  "toml",
  "convert-case",
-] , workspace = true }
+], workspace = true }
 regex = { workspace = true, default-features = true }
-serde = { features = ["derive", "rc"] , workspace = true, default-features = true }
-thiserror = { workspace = true , default-features = true }
-typed-builder = { workspace = true , default-features = true }
+serde = { features = [
+  "derive",
+  "rc",
+], workspace = true, default-features = true }
+thiserror = { workspace = true, default-features = true }
+typed-builder = { workspace = true, default-features = true }

 [dev-dependencies]
-tokio = { features = ["rt", "macros"] , workspace = true, default-features = true }
+tokio = { features = [
+  "rt",
+  "macros",
+], workspace = true, default-features = true }
 tempfile = { workspace = true, default-features = true }
-temp-env = { features = ["async_closure"] , workspace = true, default-features = true }
+temp-env = { features = [
+  "async_closure",
+], workspace = true, default-features = true }

 [package.metadata.docs.rs]
 rustdoc-args = ["--generate-link-to-definition"]
--- a/leptos_dom/Cargo.toml
+++ b/leptos_dom/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leptos_dom"
-version = { workspace = true }
+version = "0.8.5"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
@@ -14,10 +14,10 @@ reactive_graph = { workspace = true }
 or_poisoned = { workspace = true }
 js-sys = { workspace = true, default-features = true }
 send_wrapper = { workspace = true, default-features = true }
-tracing = { optional = true , workspace = true, default-features = true }
-wasm-bindgen = { workspace = true , default-features = true }
-serde_json = { optional = true , workspace = true, default-features = true }
-serde = { optional = true , workspace = true, default-features = true }
+tracing = { optional = true, workspace = true, default-features = true }
+wasm-bindgen = { workspace = true, default-features = true }
+serde_json = { optional = true, workspace = true, default-features = true }
+serde = { optional = true, workspace = true, default-features = true }

 [dev-dependencies]
 leptos = { path = "../leptos" }
--- a/leptos_hot_reload/Cargo.toml
+++ b/leptos_hot_reload/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leptos_hot_reload"
-version = { workspace = true }
+version = "0.8.5"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
@@ -11,17 +11,20 @@ edition.workspace = true

 [dependencies]
 anyhow = { workspace = true, default-features = true }
-serde = { features = ["derive"] , workspace = true, default-features = true }
+serde = { features = ["derive"], workspace = true, default-features = true }
 syn = { features = [
  "full",
  "parsing",
  "extra-traits",
  "visit",
  "printing",
-] , workspace = true, default-features = true }
+], workspace = true, default-features = true }
 quote = { workspace = true, default-features = true }
 rstml = { workspace = true, default-features = true }
-proc-macro2 = { features = ["span-locations", "nightly"] , workspace = true, default-features = true }
+proc-macro2 = { features = [
+  "span-locations",
+  "nightly",
+], workspace = true, default-features = true }
 parking_lot = { workspace = true, default-features = true }
 walkdir = { workspace = true, default-features = true }
 camino = { workspace = true, default-features = true }
--- a/leptos_macro/Cargo.toml
+++ b/leptos_macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leptos_macro"
-version = { workspace = true }
+version = "0.8.6"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
@@ -13,26 +13,28 @@ edition.workspace = true
 proc-macro = true

 [dependencies]
-attribute-derive = { features = ["syn-full"] , workspace = true, default-features = true }
+attribute-derive = { features = [
+  "syn-full",
+], workspace = true, default-features = true }
 cfg-if = { workspace = true, default-features = true }
 html-escape = { workspace = true, default-features = true }
-itertools = { workspace = true , default-features = true }
+itertools = { workspace = true, default-features = true }
 prettyplease = { workspace = true, default-features = true }
-proc-macro-error2 = { default-features = false , workspace = true }
+proc-macro-error2 = { default-features = false, workspace = true }
 proc-macro2 = { workspace = true, default-features = true }
 quote = { workspace = true, default-features = true }
-syn = { features = ["full"] , workspace = true, default-features = true }
+syn = { features = ["full"], workspace = true, default-features = true }
 rstml = { workspace = true, default-features = true }
 leptos_hot_reload = { workspace = true }
 server_fn_macro = { workspace = true }
-convert_case = { workspace = true , default-features = true }
-uuid = { features = ["v4"] , workspace = true, default-features = true }
-tracing = { optional = true , workspace = true, default-features = true }
+convert_case = { workspace = true, default-features = true }
+uuid = { features = ["v4"], workspace = true, default-features = true }
+tracing = { optional = true, workspace = true, default-features = true }

 [dev-dependencies]
 log = { workspace = true, default-features = true }
 typed-builder = { workspace = true, default-features = true }
-trybuild = { workspace = true , default-features = true }
+trybuild = { workspace = true, default-features = true }
 leptos = { path = "../leptos" }
 leptos_router = { path = "../router", features = ["ssr"] }
 server_fn = { path = "../server_fn", features = ["cbor"] }
--- a/leptos_macro/src/component.rs
+++ b/leptos_macro/src/component.rs
@@ -548,7 +548,7 @@ impl ToTokens for Model {
                quote! {
                    #[::leptos::prelude::lazy]
                    #[allow(non_snake_case)]
-                    async fn #outer_name (el: ::leptos::web_sys::HtmlElement) {
+                    fn #outer_name (el: ::leptos::web_sys::HtmlElement) {
                        #hydrate_fn_inner
                    }

--- a/leptos_macro/src/lazy.rs
+++ b/leptos_macro/src/lazy.rs
@@ -48,7 +48,10 @@ pub fn lazy_impl(args: proc_macro::TokenStream, s: TokenStream) -> TokenStream {
    let is_wasm = cfg!(feature = "csr") || cfg!(feature = "hydrate");
    if is_wasm {
        quote! {
-            #[::leptos::wasm_split_helpers::wasm_split(#unique_name)]
+            #[::leptos::wasm_split_helpers::wasm_split(
+                #unique_name,
+                ::leptos::__reexports::send_wrapper
+            )]
            #fun
        }
    } else {
--- a/leptos_server/Cargo.toml
+++ b/leptos_server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leptos_server"
-version = { workspace = true }
+version = "0.8.5"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
@@ -11,11 +11,11 @@ edition.workspace = true

 [dependencies]
 base64 = { workspace = true, default-features = true }
-codee = { features = ["json_serde"] , workspace = true, default-features = true }
+codee = { features = ["json_serde"], workspace = true, default-features = true }
 hydration_context = { workspace = true }
 reactive_graph = { workspace = true, features = ["hydration"] }
 server_fn = { workspace = true }
-tracing = { optional = true , workspace = true, default-features = true }
+tracing = { optional = true, workspace = true, default-features = true }
 futures = { workspace = true, default-features = true }

 any_spawner = { workspace = true }
@@ -25,9 +25,9 @@ send_wrapper = { workspace = true, default-features = true }

 # serialization formats
 serde = { workspace = true, default-features = true }
-js-sys = { optional = true , workspace = true, default-features = true }
-wasm-bindgen = { workspace = true, optional = true , default-features = true }
-serde_json = { workspace = true , default-features = true }
+js-sys = { optional = true, workspace = true, default-features = true }
+wasm-bindgen = { workspace = true, optional = true, default-features = true }
+serde_json = { workspace = true, default-features = true }

 [features]
 ssr = []
--- a/meta/Cargo.toml
+++ b/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leptos_meta"
-version = { workspace = true }
+version = "0.8.5"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
--- a/router/Cargo.toml
+++ b/router/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leptos_router"
-version = { workspace = true }
+version = "0.8.5"
 authors = ["Greg Johnston", "Ben Wishovich"]
 license = "MIT"
 readme = "../README.md"
--- a/router_macro/Cargo.toml
+++ b/router_macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leptos_router_macro"
-version = { workspace = true }
+version = "0.8.5"
 authors = ["Greg Johnston", "Ben Wishovich"]
 license = "MIT"
 readme = "../README.md"
--- a/scripts/bump.sh
+++ b/scripts/bump.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+
+set -e
+
+LAST_TAG=$(git describe --tags --abbrev=0 --match "v*")
+
+# Get package name and manifest_path for all members
+PACKAGES=$(cargo metadata --no-deps --format-version=1 | jq -r '.packages[] | "\(.name):::\(.manifest_path)"')
+
+for PKG in $PACKAGES; do
+    NAME="${PKG%%:::*}"
+    MANIFEST_PATH="${PKG##*:::}"
+    DIR=$(dirname "$MANIFEST_PATH")
+
+    # Check if any file in the package directory changed since the last tag
+    if git diff --quiet "$LAST_TAG"..HEAD -- "$DIR"; then
+        continue
+    fi
+
+    echo "Changes detected in $NAME ($DIR)"
+    PS3="Select version bump for $NAME: "
+    select BUMP in patch minor major; do
+        if [[ "$BUMP" == "patch" || "$BUMP" == "minor" || "$BUMP" == "major" ]]; then
+            break
+        else
+            echo "Invalid option"
+        fi
+    done
+
+    if cargo set-version --help >/dev/null 2>&1; then
+        cargo set-version --bump "$BUMP" --package "$NAME"
+    else
+        echo "Please install cargo-edit first."
+        exit 1
+    fi
+
+    echo "$NAME bumped to $BUMP"
+done
--- a/server_fn/Cargo.toml
+++ b/server_fn/Cargo.toml
@@ -5,7 +5,7 @@ license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "RPC for any web framework."
 readme = "../README.md"
-version = { workspace = true }
+version = "0.8.5"
 rust-version.workspace = true
 edition.workspace = true

--- a/server_fn/server_fn_macro_default/Cargo.toml
+++ b/server_fn/server_fn_macro_default/Cargo.toml
@@ -4,7 +4,7 @@ authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "The default implementation of the server_fn macro without a context"
-version = { workspace = true }
+version = "0.8.5"
 edition.workspace = true

 [lib]
--- a/server_fn_macro/Cargo.toml
+++ b/server_fn_macro/Cargo.toml
@@ -5,16 +5,22 @@ license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "RPC for any web framework."
 readme = "../README.md"
-version = { workspace = true }
+version = "0.8.6"
 edition.workspace = true

 [dependencies]
 quote = { workspace = true, default-features = true }
-syn = { features = ["full", "parsing", "extra-traits"] , workspace = true, default-features = true }
+syn = { features = [
+  "full",
+  "parsing",
+  "extra-traits",
+], workspace = true, default-features = true }
 proc-macro2 = { workspace = true, default-features = true }
-xxhash-rust = { features = ["const_xxh64"] , workspace = true, default-features = true }
+xxhash-rust = { features = [
+  "const_xxh64",
+], workspace = true, default-features = true }
 const_format = { workspace = true, default-features = true }
-convert_case = { workspace = true , default-features = true }
+convert_case = { workspace = true, default-features = true }


 [build-dependencies]
--- a/server_fn_macro/src/lib.rs
+++ b/server_fn_macro/src/lib.rs
@@ -1525,7 +1525,10 @@ impl Parse for ServerFnBody {
                    true
                }
            } else {
-                true
+                // in ssr mode, remove the "lazy" macro
+                // the lazy macro doesn't do anything on the server anyway, but it can cause confusion for rust-analyzer
+                // when the lazy macro is applied to both the function and the dummy
+                !(cfg!(feature = "ssr") && matches!(attr.meta.path().segments.last(), Some(PathSegment { ident, .. }) if ident == "lazy") )
            }
        });

--- a/wasm_split/Cargo.toml
+++ b/wasm_split/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasm_split_helpers"
-version = "0.1.0"
+version = "0.1.2"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "README.md"
@@ -14,3 +14,4 @@ async-once-cell = { default-features = true, workspace = true, features = [
 	"std",
 ] }
 wasm_split_macros.workspace = true
+or_poisoned.workspace = true
--- a/wasm_split/src/lib.rs
+++ b/wasm_split/src/lib.rs
@@ -1,9 +1,8 @@
 use std::{
-    cell::Cell,
    ffi::c_void,
    future::Future,
    pin::Pin,
-    rc::Rc,
+    sync::{Arc, Mutex},
    task::{Context, Poll, Waker},
 };

@@ -12,18 +11,19 @@ pub type LoadFn = unsafe extern "C" fn(LoadCallbackFn, *const c_void) -> ();

 type Lazy = async_once_cell::Lazy<Option<()>, SplitLoaderFuture>;

+use or_poisoned::OrPoisoned;
 pub use wasm_split_macros::wasm_split;

 pub struct LazySplitLoader {
-    lazy: Pin<Rc<Lazy>>,
+    lazy: Pin<Arc<Lazy>>,
 }

 impl LazySplitLoader {
    pub fn new(load: LoadFn) -> Self {
        Self {
-            lazy: Rc::pin(Lazy::new(SplitLoaderFuture::new(SplitLoader::new(
-                load,
-            )))),
+            lazy: Arc::pin(Lazy::new(SplitLoaderFuture::new(
+                SplitLoader::new(load),
+            ))),
        }
    }
 }
@@ -42,36 +42,33 @@ enum SplitLoaderState {
 }

 struct SplitLoader {
-    state: Cell<SplitLoaderState>,
-    waker: Cell<Option<Waker>>,
+    state: Mutex<SplitLoaderState>,
+    waker: Mutex<Option<Waker>>,
 }

 impl SplitLoader {
-    fn new(load: LoadFn) -> Rc<Self> {
-        Rc::new(SplitLoader {
-            state: Cell::new(SplitLoaderState::Deferred(load)),
-            waker: Cell::new(None),
+    fn new(load: LoadFn) -> Arc<Self> {
+        Arc::new(SplitLoader {
+            state: Mutex::new(SplitLoaderState::Deferred(load)),
+            waker: Mutex::new(None),
        })
    }

    fn complete(&self, value: bool) {
-        self.state.set(SplitLoaderState::Completed(if value {
-            Some(())
-        } else {
-            None
-        }));
-        if let Some(waker) = self.waker.take() {
+        *self.state.lock().or_poisoned() =
+            SplitLoaderState::Completed(if value { Some(()) } else { None });
+        if let Some(waker) = self.waker.lock().or_poisoned().take() {
            waker.wake();
        }
    }
 }

 struct SplitLoaderFuture {
-    loader: Rc<SplitLoader>,
+    loader: Arc<SplitLoader>,
 }

 impl SplitLoaderFuture {
-    fn new(loader: Rc<SplitLoader>) -> Self {
+    fn new(loader: Arc<SplitLoader>) -> Self {
        SplitLoaderFuture { loader }
    }
 }
@@ -80,21 +77,24 @@ impl Future for SplitLoaderFuture {
    type Output = Option<()>;

    fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<()>> {
-        match self.loader.state.get() {
+        let mut loader = self.loader.state.lock().or_poisoned();
+        match *loader {
            SplitLoaderState::Deferred(load) => {
-                self.loader.state.set(SplitLoaderState::Pending);
-                self.loader.waker.set(Some(cx.waker().clone()));
+                *loader = SplitLoaderState::Pending;
+                *self.loader.waker.lock().or_poisoned() =
+                    Some(cx.waker().clone());
                unsafe {
                    load(
                        load_callback,
-                        Rc::<SplitLoader>::into_raw(self.loader.clone())
+                        Arc::<SplitLoader>::into_raw(self.loader.clone())
                            as *const c_void,
                    )
                };
                Poll::Pending
            }
            SplitLoaderState::Pending => {
-                self.loader.waker.set(Some(cx.waker().clone()));
+                *self.loader.waker.lock().or_poisoned() =
+                    Some(cx.waker().clone());
                Poll::Pending
            }
            SplitLoaderState::Completed(value) => Poll::Ready(value),
@@ -103,5 +103,5 @@ impl Future for SplitLoaderFuture {
 }

 unsafe extern "C" fn load_callback(loader: *const c_void, success: bool) {
-    unsafe { Rc::from_raw(loader as *const SplitLoader) }.complete(success);
+    unsafe { Arc::from_raw(loader as *const SplitLoader) }.complete(success);
 }
--- a/wasm_split_macros/Cargo.toml
+++ b/wasm_split_macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "wasm_split_macros"
-version = "0.1.0"
+version = "0.1.2"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "README.md"
--- a/wasm_split_macros/src/lib.rs
+++ b/wasm_split_macros/src/lib.rs
@@ -1,11 +1,40 @@
 use digest::Digest;
 use proc_macro::TokenStream;
 use quote::{format_ident, quote};
-use syn::{parse_macro_input, Ident, ItemFn, ReturnType, Signature};
+use syn::{
+    parse,
+    parse::{Parse, ParseStream},
+    parse_macro_input,
+    token::Comma,
+    Ident, ItemFn, Path, Result, ReturnType, Signature,
+};
+
+struct WasmSplitArgs {
+    module_ident: Ident,
+    _comma: Option<Comma>,
+    send_wrapper_path: Option<Path>,
+}
+
+impl Parse for WasmSplitArgs {
+    fn parse(input: ParseStream) -> Result<Self> {
+        let module_ident = input.parse()?;
+        let _comma = input.parse().ok();
+        let send_wrapper_path = input.parse().ok();
+        Ok(Self {
+            module_ident,
+            _comma,
+            send_wrapper_path,
+        })
+    }
+}

 #[proc_macro_attribute]
 pub fn wasm_split(args: TokenStream, input: TokenStream) -> TokenStream {
-    let module_ident = parse_macro_input!(args as Ident);
+    let WasmSplitArgs {
+        module_ident,
+        send_wrapper_path,
+        ..
+    } = parse_macro_input!(args);
    let item_fn = parse_macro_input!(input as ItemFn);

    let name = &item_fn.sig.ident;
@@ -45,9 +74,9 @@ pub fn wasm_split(args: TokenStream, input: TokenStream) -> TokenStream {
            ReturnType::Default => quote! { () },
            ReturnType::Type(_, ty) => quote! { #ty },
        };
-        let async_output = syn::parse::<ReturnType>(
+        let async_output = parse::<ReturnType>(
            quote! {
-                -> std::pin::Pin<Box<dyn std::future::Future<Output = #ty>>>
+                -> std::pin::Pin<Box<dyn std::future::Future<Output = #ty> + Send + Sync>>
            }
            .into(),
        )
@@ -83,10 +112,18 @@ pub fn wasm_split(args: TokenStream, input: TokenStream) -> TokenStream {
    let stmts = &item_fn.block.stmts;

    let body = if was_async {
-        quote! {
-            Box::pin(async move {
-                #(#stmts)*
-            })
+        if let Some(send_wrapper_path) = send_wrapper_path {
+            quote! {
+                Box::pin(#send_wrapper_path::SendWrapper::new(async move {
+                    #(#stmts)*
+                }))
+            }
+        } else {
+            quote! {
+                Box::pin(async move {
+                    #(#stmts)*
+                })
+            }
        }
    } else {
        quote! { #(#stmts)* }
@@ -99,7 +136,7 @@ pub fn wasm_split(args: TokenStream, input: TokenStream) -> TokenStream {
            static #split_loader_ident: ::leptos::wasm_split_helpers::LazySplitLoader = ::leptos::wasm_split_helpers::LazySplitLoader::new(#load_module_ident);
        }

-        #[link(wasm_import_module = "/pkg/__wasm_split.js")]
+        #[link(wasm_import_module = "/pkg/__wasm_split.______________________.js")]
        extern "C" {
            #[no_mangle]
            fn #load_module_ident (callback: unsafe extern "C" fn(*const ::std::ffi::c_void, bool), data: *const ::std::ffi::c_void) -> ();
--- a/~/.build/rust-analyzer/metadata/sysroot/Cargo.lock
+++ b/~/.build/rust-analyzer/metadata/sysroot/Cargo.lock
@@ -0,0 +1,503 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "addr2line"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+dependencies = [
+ "compiler_builtins",
+ "gimli",
+ "rustc-std-workspace-alloc",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+dependencies = [
+ "compiler_builtins",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "alloc"
+version = "0.0.0"
+dependencies = [
+ "compiler_builtins",
+ "core",
+]
+
+[[package]]
+name = "alloctests"
+version = "0.0.0"
+dependencies = [
+ "rand",
+ "rand_xorshift",
+]
+
+[[package]]
+name = "cc"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aeb932158bd710538c73702db6945cb68a8fb08c519e6e12706b94263b36db8"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+dependencies = [
+ "compiler_builtins",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "compiler_builtins"
+version = "0.1.158"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "164cdc689e4c6d69417f77a5f48be240c291e84fbef0b1281755dc754b19c809"
+dependencies = [
+ "cc",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "core"
+version = "0.0.0"
+
+[[package]]
+name = "coretests"
+version = "0.0.0"
+dependencies = [
+ "rand",
+ "rand_xorshift",
+]
+
+[[package]]
+name = "dlmalloc"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cff88b751e7a276c4ab0e222c3f355190adc6dde9ce39c851db39da34990df7"
+dependencies = [
+ "cfg-if",
+ "compiler_builtins",
+ "libc",
+ "rustc-std-workspace-core",
+ "windows-sys",
+]
+
+[[package]]
+name = "fortanix-sgx-abi"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57cafc2274c10fab234f176b25903ce17e690fca7597090d50880e047a0389c5"
+dependencies = [
+ "compiler_builtins",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "getopts"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
+dependencies = [
+ "rustc-std-workspace-core",
+ "rustc-std-workspace-std",
+ "unicode-width",
+]
+
+[[package]]
+name = "gimli"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+dependencies = [
+ "compiler_builtins",
+ "rustc-std-workspace-alloc",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3"
+dependencies = [
+ "compiler_builtins",
+ "rustc-std-workspace-alloc",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e"
+dependencies = [
+ "compiler_builtins",
+ "rustc-std-workspace-alloc",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.172"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
+dependencies = [
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+dependencies = [
+ "compiler_builtins",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
+dependencies = [
+ "adler2",
+ "compiler_builtins",
+ "rustc-std-workspace-alloc",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "object"
+version = "0.36.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+dependencies = [
+ "compiler_builtins",
+ "memchr",
+ "rustc-std-workspace-alloc",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "panic_abort"
+version = "0.0.0"
+dependencies = [
+ "alloc",
+ "cfg-if",
+ "compiler_builtins",
+ "core",
+ "libc",
+]
+
+[[package]]
+name = "panic_unwind"
+version = "0.0.0"
+dependencies = [
+ "alloc",
+ "cfg-if",
+ "compiler_builtins",
+ "core",
+ "libc",
+ "unwind",
+]
+
+[[package]]
+name = "proc_macro"
+version = "0.0.0"
+dependencies = [
+ "core",
+ "rustc-literal-escaper",
+ "std",
+]
+
+[[package]]
+name = "profiler_builtins"
+version = "0.0.0"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
+dependencies = [
+ "compiler_builtins",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "r-efi-alloc"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e43c53ff1a01d423d1cb762fd991de07d32965ff0ca2e4f80444ac7804198203"
+dependencies = [
+ "compiler_builtins",
+ "r-efi",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "rand"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+
+[[package]]
+name = "rand_xorshift"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+dependencies = [
+ "compiler_builtins",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "rustc-literal-escaper"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0041b6238913c41fe704213a4a9329e2f685a156d1781998128b4149c230ad04"
+dependencies = [
+ "rustc-std-workspace-std",
+]
+
+[[package]]
+name = "rustc-std-workspace-alloc"
+version = "1.99.0"
+dependencies = [
+ "alloc",
+]
+
+[[package]]
+name = "rustc-std-workspace-core"
+version = "1.99.0"
+dependencies = [
+ "core",
+]
+
+[[package]]
+name = "rustc-std-workspace-std"
+version = "1.99.0"
+dependencies = [
+ "std",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "std"
+version = "0.0.0"
+dependencies = [
+ "addr2line",
+ "alloc",
+ "cfg-if",
+ "compiler_builtins",
+ "core",
+ "dlmalloc",
+ "fortanix-sgx-abi",
+ "hashbrown",
+ "hermit-abi",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "panic_abort",
+ "panic_unwind",
+ "r-efi",
+ "r-efi-alloc",
+ "rand",
+ "rand_xorshift",
+ "rustc-demangle",
+ "std_detect",
+ "unwind",
+ "wasi",
+ "windows-targets 0.0.0",
+]
+
+[[package]]
+name = "std_detect"
+version = "0.1.5"
+dependencies = [
+ "cfg-if",
+ "compiler_builtins",
+ "libc",
+ "rustc-std-workspace-alloc",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "sysroot"
+version = "0.0.0"
+dependencies = [
+ "proc_macro",
+ "profiler_builtins",
+ "std",
+ "test",
+]
+
+[[package]]
+name = "test"
+version = "0.0.0"
+dependencies = [
+ "core",
+ "getopts",
+ "libc",
+ "std",
+]
+
+[[package]]
+name = "unicode-width"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+dependencies = [
+ "compiler_builtins",
+ "rustc-std-workspace-core",
+ "rustc-std-workspace-std",
+]
+
+[[package]]
+name = "unwind"
+version = "0.0.0"
+dependencies = [
+ "cfg-if",
+ "compiler_builtins",
+ "core",
+ "libc",
+ "unwinding",
+]
+
+[[package]]
+name = "unwinding"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8393f2782b6060a807337ff353780c1ca15206f9ba2424df18cb6e733bd7b345"
+dependencies = [
+ "compiler_builtins",
+ "gimli",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+dependencies = [
+ "compiler_builtins",
+ "rustc-std-workspace-alloc",
+ "rustc-std-workspace-core",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.0.0"
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
--- a/~/.build/rust-analyzer/metadata/workspace/Cargo.lock
+++ b/~/.build/rust-analyzer/metadata/workspace/Cargo.lock
Author	SHA1	Message	Date
Greg Johnston	30b917cfc3	v0.8.6	2025-07-27 08:59:22 -04:00
Greg Johnston	6cd731cbb1	Merge pull request #4186 from leptos-rs/4184 A few pieces of lazy island clean-up	2025-07-27 08:50:22 -04:00
Greg Johnston	f1b6b79e27	Enhancing members’ versioning (#4172 ) * fix: decouple versioning for members * feat: handy script to bump changed member crates from the last released tag	2025-07-27 08:50:08 -04:00
Greg Johnston	623ee08f82	chore: this does not need to be async	2025-07-27 08:34:59 -04:00
Greg Johnston	877849a5dd	chore: new wasm_split version	2025-07-27 08:30:51 -04:00
Greg Johnston	fb59da90c2	fix: support file hashing when using lazy loading (#4182 )	2025-07-26 15:46:31 -04:00
Greg Johnston	d33f5c9e77	feat: allow lazy server functions (#4169 )	2025-07-24 07:30:05 -04:00
dependabot[bot]	deb8e96eb0	chore(deps): bump redox_syscall in the rust-dependencies group (#4171 ) Bumps the rust-dependencies group with 1 update: redox_syscall. Updates `redox_syscall` from 0.5.14 to 0.5.15 --- updated-dependencies: - dependency-name: redox_syscall dependency-version: 0.5.15 dependency-type: indirect update-type: version-update:semver-patch dependency-group: rust-dependencies ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2025-07-22 12:33:31 -04:00
Greg Johnston	181e4d0566	chore: bump wasm-split version numbers (#4170 )	2025-07-22 12:31:46 -04:00
Saber Haj Rabiee	525379a9b3	fix(CI): remove autofix CI timeout (#4173 )	2025-07-22 12:31:04 -04:00
Saber Haj Rabiee	783a233167	feat: handy script to bump changed member crates from the last released tag	2025-07-21 22:44:40 -07:00
Saber Haj Rabiee	8079956d1b	fix: decouple versioning for members	2025-07-21 22:43:58 -07:00