Merge remote-tracking branch 'origin' into 4385

fix: patching keyed store fields (closes #3957)

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

@@ -24,7 +24,7 @@ jobs:
           fetch-depth: 0
       - name: Get example files that changed
         id: changed-files
-        uses: tj-actions/changed-files@v46
+        uses: tj-actions/changed-files@v47
         with:
           files: |
             examples/**

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

@@ -18,7 +18,7 @@ jobs:
           fetch-depth: 0
       - name: Get source files that changed
         id: changed-source
-        uses: tj-actions/changed-files@v46
+        uses: tj-actions/changed-files@v47
         with:
           files_ignore: |
             .*/**/*

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

@@ -88,7 +88,7 @@ jobs:
         run: trunk --version
       - name: Install Node.js
         if: contains(inputs.directory, 'examples')
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: 20
       - uses: pnpm/action-setup@v4

Cargo.lock

@@ -44,9 +44,9 @@ dependencies = [
 
 [[package]]
 name = "actix-http"
-version = "3.11.1"
+version = "3.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44cceded2fb55f3c4b67068fa64962e2ca59614edc5b03167de9ff82ae803da0"
+checksum = "7926860314cbe2fb5d1f13731e387ab43bd32bca224e82e6e2db85de0a3dba49"
 dependencies = [
  "actix-codec",
  "actix-rt",
@@ -224,9 +224,9 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.24.2"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
 dependencies = [
  "gimli",
 ]
@@ -270,7 +270,7 @@ dependencies = [
  "futures-lite",
  "glib",
  "serial_test",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tracing",
  "wasm-bindgen-futures",
@@ -279,9 +279,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.99"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 
 [[package]]
 name = "async-executor"
@@ -370,9 +370,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "attribute-derive"
-version = "0.10.3"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0053e96dd3bec5b4879c23a138d6ef26f2cb936c9cdc96274ac2b9ed44b5bb54"
+checksum = "05832cdddc8f2650cc2cc187cc2e952b8c133a48eb055f35211f61ee81502d77"
 dependencies = [
  "attribute-derive-macro",
  "derive-where",
@@ -384,9 +384,9 @@ dependencies = [
 
 [[package]]
 name = "attribute-derive-macro"
-version = "0.10.3"
+version = "0.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "463b53ad0fd5b460af4b1915fe045ff4d946d025fb6c4dc3337752eaa980f71b"
+checksum = "0a7cdbbd4bd005c5d3e2e9c885e6fa575db4f4a3572335b974d8db853b6beb61"
 dependencies = [
  "collection_literals",
  "interpolator",
@@ -406,9 +406,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "axum"
-version = "0.8.4"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5"
+checksum = "8a18ed336352031311f4e0b4dd2ff392d4fbb370777c9d18d7fc9d7359f73871"
 dependencies = [
  "axum-core",
  "base64",
@@ -427,15 +427,14 @@ dependencies = [
  "multer",
  "percent-encoding",
  "pin-project-lite",
- "rustversion",
- "serde",
+ "serde_core",
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
  "sha1",
  "sync_wrapper",
  "tokio",
- "tokio-tungstenite 0.26.2",
+ "tokio-tungstenite",
  "tower",
  "tower-layer",
  "tower-service",
@@ -444,9 +443,9 @@ dependencies = [
 
 [[package]]
 name = "axum-core"
-version = "0.5.2"
+version = "0.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6"
+checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22"
 dependencies = [
  "bytes",
  "futures-core",
@@ -455,7 +454,6 @@ dependencies = [
  "http-body-util",
  "mime",
  "pin-project-lite",
- "rustversion",
  "sync_wrapper",
  "tower-layer",
  "tower-service",
@@ -464,9 +462,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.75"
+version = "0.3.76"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
+checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6"
 dependencies = [
  "addr2line",
  "cfg-if",
@@ -474,7 +472,7 @@ dependencies = [
  "miniz_oxide",
  "object",
  "rustc-demangle",
- "windows-targets 0.52.6",
+ "windows-link 0.2.0",
 ]
 
 [[package]]
@@ -533,9 +531,9 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "bytecheck"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50690fb3370fb9fe3550372746084c46f2ac8c9685c583d2be10eefd89d3d1a3"
+checksum = "0caa33a2c0edca0419d15ac723dff03f1956f7978329b1e3b5fdaaaed9d3ca8b"
 dependencies = [
  "bytecheck_derive",
  "ptr_meta",
@@ -545,9 +543,9 @@ dependencies = [
 
 [[package]]
 name = "bytecheck_derive"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efb7846e0cb180355c2dec69e721edafa36919850f1a9f52ffba4ebc0393cb71"
+checksum = "89385e82b5d1821d2219e0b095efa2cc1f246cbf99080f3be46a1a85c0d392d9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -577,15 +575,15 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1de8bc0aa9e9385ceb3bf0c152e3a9b9544f6c4a912c8ae504e80c1f0368603"
+checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609"
 
 [[package]]
 name = "cc"
-version = "1.2.38"
+version = "1.2.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80f41ae168f955c12fb8960b057d70d0ca153fb83182b57d86380443527be7e9"
+checksum = "e1d05d92f4b1fd76aad469d46cdd858ca761576082cd37df81416691e50199fb"
 dependencies = [
  "find-msvc-tools",
  "jobserver",
@@ -648,7 +646,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1"
 dependencies = [
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -664,15 +662,15 @@ dependencies = [
  "serde-lite",
  "serde-wasm-bindgen",
  "serde_json",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "collection_literals"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b3f65b8fb8e88ba339f7d23a390fe1b0896217da05e2a66c584c9b29a91df8"
+checksum = "2550f75b8cfac212855f6b1885455df8eaee8fe8e246b647d69146142e016084"
 
 [[package]]
 name = "concurrent-queue"
@@ -716,9 +714,9 @@ checksum = "451d0640545a0553814b4c646eb549343561618838e9b42495f466131fe3ad49"
 
 [[package]]
 name = "const_format"
-version = "0.2.34"
+version = "0.2.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd"
+checksum = "7faa7469a93a566e9ccc1c73fe783b4a65c274c5ace346038dca9c39fe0030ad"
 dependencies = [
  "const_format_proc_macros",
 ]
@@ -851,9 +849,9 @@ checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
 
 [[package]]
 name = "deranged"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d630bccd429a5bb5a64b5e94f693bfc48c9f8566418fda4c494cc94f911f87cc"
+checksum = "a41953f86f8a05768a6cda24def994fd2f424b04ec5c719cf89989779f199071"
 dependencies = [
  "powerfmt",
 ]
@@ -903,12 +901,14 @@ dependencies = [
 [[package]]
 name = "dioxus-cli-config"
 version = "0.7.0-rc.0"
-source = "git+https://github.com/dioxuslabs/dioxus#eef4db67b1164934eb29b7ac4d4bcd693bba25a5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8cec511d8a05ed60071bb0088f07ec40325faf27a608fa19d65befdd842b57f"
 
 [[package]]
 name = "dioxus-core"
 version = "0.7.0-rc.0"
-source = "git+https://github.com/dioxuslabs/dioxus#eef4db67b1164934eb29b7ac4d4bcd693bba25a5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07b55eccaa5c4f35f1755ea18a5716fe8ecba60ff1f25c52be6ceda2e6a52eb6"
 dependencies = [
  "const_format",
  "dioxus-core-types",
@@ -929,12 +929,14 @@ dependencies = [
 [[package]]
 name = "dioxus-core-types"
 version = "0.7.0-rc.0"
-source = "git+https://github.com/dioxuslabs/dioxus#eef4db67b1164934eb29b7ac4d4bcd693bba25a5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0ef2a94b4ceb8f7a39f56a539d07e82b0358a49a0b95028ad48635975df29d7"
 
 [[package]]
 name = "dioxus-devtools"
 version = "0.7.0-rc.0"
-source = "git+https://github.com/dioxuslabs/dioxus#eef4db67b1164934eb29b7ac4d4bcd693bba25a5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60af4e129968ab1713471ed0b29c3eefa4e8e09252429487d7a581e93c7ecfe5"
 dependencies = [
  "dioxus-cli-config",
  "dioxus-core",
@@ -943,7 +945,7 @@ dependencies = [
  "serde",
  "serde_json",
  "subsecond",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tracing",
  "tungstenite 0.27.0",
  "warnings",
@@ -952,7 +954,8 @@ dependencies = [
 [[package]]
 name = "dioxus-devtools-types"
 version = "0.7.0-rc.0"
-source = "git+https://github.com/dioxuslabs/dioxus#eef4db67b1164934eb29b7ac4d4bcd693bba25a5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64274704b6a8d018112473cdce0b3db1dcccfa79bde445223592fe4e396ff5ef"
 dependencies = [
  "dioxus-core",
  "serde",
@@ -962,7 +965,8 @@ dependencies = [
 [[package]]
 name = "dioxus-signals"
 version = "0.7.0-rc.0"
-source = "git+https://github.com/dioxuslabs/dioxus#eef4db67b1164934eb29b7ac4d4bcd693bba25a5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1d0e70a8da969c0404f5ef8cf6f47042bea55608b582079f3ea3d9fff46125c"
 dependencies = [
  "dioxus-core",
  "futures-channel",
@@ -1083,15 +1087,15 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.2"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ced73b1dacfc750a6db6c0a0c3a3853c8b41997e2e2c563dc90804ae6867959"
+checksum = "0399f9d26e5191ce32c498bebd31e7a3ceabc2745f0ac54af3f335126c3f24b3"
 
 [[package]]
 name = "flate2"
-version = "1.1.2"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
+checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1239,7 +1243,8 @@ dependencies = [
 [[package]]
 name = "generational-box"
 version = "0.7.0-rc.0"
-source = "git+https://github.com/dioxuslabs/dioxus#eef4db67b1164934eb29b7ac4d4bcd693bba25a5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb058e0358ff765e719ab3e61629c5090fedb6a6ccf66479de21440a33d7f084"
 dependencies = [
  "parking_lot",
  "tracing",
@@ -1284,9 +1289,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.31.1"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
 
 [[package]]
 name = "gio-sys"
@@ -1648,7 +1653,7 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.6.0",
+ "socket2 0.5.10",
  "tokio",
  "tower-service",
  "tracing",
@@ -1873,7 +1878,7 @@ checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388"
 
 [[package]]
 name = "leptos"
-version = "0.8.9"
+version = "0.8.10"
 dependencies = [
  "any_spawner",
  "base64",
@@ -1905,7 +1910,7 @@ dependencies = [
  "slotmap",
  "subsecond",
  "tachys",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "throw_error",
  "tokio",
  "tokio-test",
@@ -1987,14 +1992,14 @@ dependencies = [
  "serde",
  "temp-env",
  "tempfile",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "typed-builder",
 ]
 
 [[package]]
 name = "leptos_dom"
-version = "0.8.6"
+version = "0.8.7"
 dependencies = [
  "js-sys",
  "leptos",
@@ -2027,7 +2032,7 @@ dependencies = [
 
 [[package]]
 name = "leptos_integration_utils"
-version = "0.8.5"
+version = "0.8.6"
 dependencies = [
  "futures",
  "hydration_context",
@@ -2040,7 +2045,7 @@ dependencies = [
 
 [[package]]
 name = "leptos_macro"
-version = "0.8.8"
+version = "0.8.9"
 dependencies = [
  "attribute-derive",
  "cfg-if",
@@ -2084,7 +2089,7 @@ dependencies = [
 
 [[package]]
 name = "leptos_router"
-version = "0.8.7"
+version = "0.8.8"
 dependencies = [
  "any_spawner",
  "either_of",
@@ -2099,7 +2104,7 @@ dependencies = [
  "rustc_version",
  "send_wrapper",
  "tachys",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tracing",
  "url",
  "wasm-bindgen",
@@ -2142,18 +2147,18 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.175"
+version = "0.2.176"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174"
 
 [[package]]
 name = "libloading"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
+checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
 dependencies = [
  "cfg-if",
- "windows-targets 0.53.3",
+ "windows-link 0.2.0",
 ]
 
 [[package]]
@@ -2193,11 +2198,10 @@ checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487"
 
 [[package]]
 name = "lock_api"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
 dependencies = [
- "autocfg",
  "scopeguard",
 ]
 
@@ -2250,9 +2254,9 @@ checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3"
 
 [[package]]
 name = "memchr"
-version = "2.7.5"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
 name = "memfd"
@@ -2290,9 +2294,9 @@ dependencies = [
 
 [[package]]
 name = "mini-internal"
-version = "0.1.42"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6c74ab4f1a0c0ab045260ee4727b23c00cc17e5eff5095262d08eef8c3c8d49"
+checksum = "560f32b6891d8d9bade8942c45a27694f16d789d3b4b8e6b7135a5240de0a8af"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2311,9 +2315,9 @@ dependencies = [
 
 [[package]]
 name = "miniserde"
-version = "0.1.42"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08ec68bf2ad170a53a6efa92c3df7187968d6e475fe7a935725868154074ca0f"
+checksum = "ac79f4123c070de643a7a93b9339abf18c30005c622bf4b1c29c2c0960f52d39"
 dependencies = [
  "itoa",
  "mini-internal",
@@ -2327,6 +2331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
 dependencies = [
  "adler2",
+ "simd-adler32",
 ]
 
 [[package]]
@@ -2360,18 +2365,18 @@ dependencies = [
 
 [[package]]
 name = "munge"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7feb0b48aa0a25f9fe0899482c6e1379ee7a11b24a53073eacdecb9adb6dc60"
+checksum = "5e17401f259eba956ca16491461b6e8f72913a0a114e39736ce404410f915a0c"
 dependencies = [
  "munge_macro",
 ]
 
 [[package]]
 name = "munge_macro"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2e3795a5d2da581a8b252fec6022eee01aea10161a4d1bf237d4cbe47f7e988"
+checksum = "4568f25ccbd45ab5d5603dc34318c1ec56b117531781260002151b8530a9f931"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2426,9 +2431,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.7"
+version = "0.37.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
 dependencies = [
  "memchr",
 ]
@@ -2439,7 +2444,7 @@ version = "0.2.1"
 dependencies = [
  "serde",
  "serde_json",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -2504,9 +2509,9 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -2514,15 +2519,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.11"
+version = "0.9.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets 0.52.6",
+ "windows-link 0.2.0",
 ]
 
 [[package]]
@@ -2718,18 +2723,18 @@ dependencies = [
 
 [[package]]
 name = "ptr_meta"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe9e76f66d3f9606f44e45598d155cb13ecf09f4a28199e48daf8c8fc937ea90"
+checksum = "0b9a0cf95a1196af61d4f1cbdab967179516d9a4a4312af1f31948f8f6224a79"
 dependencies = [
  "ptr_meta_derive",
 ]
 
 [[package]]
 name = "ptr_meta_derive"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca414edb151b4c8d125c12566ab0d74dc9cdba36fb80eb7b848c15f495fd32d1"
+checksum = "7347867d0a7e1208d93b46767be83e2b8f978c3dad35f775ac8d8847551d6fe1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2749,8 +2754,8 @@ dependencies = [
  "quinn-udp",
  "rustc-hash 2.1.1",
  "rustls",
- "socket2 0.6.0",
- "thiserror 2.0.16",
+ "socket2 0.5.10",
+ "thiserror 2.0.17",
  "tokio",
  "tracing",
  "web-time",
@@ -2771,7 +2776,7 @@ dependencies = [
  "rustls",
  "rustls-pki-types",
  "slab",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tinyvec",
  "tracing",
  "web-time",
@@ -2786,16 +2791,16 @@ dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
- "socket2 0.6.0",
+ "socket2 0.5.10",
  "tracing",
  "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
 dependencies = [
  "proc-macro2",
 ]
@@ -2830,9 +2835,9 @@ checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 
 [[package]]
 name = "rancor"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf5f7161924b9d1cea0e4cabc97c372cea92b5f927fc13c6bca67157a0ad947"
+checksum = "a063ea72381527c2a0561da9c80000ef822bdd7c3241b1cc1b12100e3df081ee"
 dependencies = [
  "ptr_meta",
 ]
@@ -2868,7 +2873,7 @@ dependencies = [
 
 [[package]]
 name = "reactive_graph"
-version = "0.2.7"
+version = "0.2.8"
 dependencies = [
  "any_spawner",
  "async-lock",
@@ -2884,7 +2889,7 @@ dependencies = [
  "serde",
  "slotmap",
  "subsecond",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "tokio",
  "tokio-test",
  "tracing",
@@ -2893,7 +2898,7 @@ dependencies = [
 
 [[package]]
 name = "reactive_stores"
-version = "0.2.5"
+version = "0.3.0"
 dependencies = [
  "any_spawner",
  "dashmap",
@@ -2923,18 +2928,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.17"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
  "bitflags",
 ]
 
 [[package]]
 name = "regex"
-version = "1.11.2"
+version = "1.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
+checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2944,9 +2949,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
+checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -2967,9 +2972,9 @@ checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
 
 [[package]]
 name = "rend"
-version = "0.5.2"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a35e8a6bf28cd121053a66aa2e6a2e3eaffad4a60012179f0e864aa5ffeff215"
+checksum = "cadadef317c2f20755a64d7fdc48f9e7178ee6b0e1f7fce33fa60f1d68a276e6"
 dependencies = [
  "bytecheck",
 ]
@@ -3035,9 +3040,9 @@ dependencies = [
 
 [[package]]
 name = "rkyv"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19f5c3e5da784cd8c69d32cdc84673f3204536ca56e1fa01be31a74b92c932ac"
+checksum = "35a640b26f007713818e9a9b65d34da1cf58538207b052916a83d80e43f3ffa4"
 dependencies = [
  "bytecheck",
  "bytes",
@@ -3054,9 +3059,9 @@ dependencies = [
 
 [[package]]
 name = "rkyv_derive"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4270433626cffc9c4c1d3707dd681f2a2718d3d7b09ad754bec137acecda8d22"
+checksum = "bd83f5f173ff41e00337d97f6572e416d022ef8a19f371817259ae960324c482"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3097,7 +3102,7 @@ dependencies = [
  "quote",
  "syn 2.0.106",
  "syn_derive",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -3166,9 +3171,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.6"
+version = "0.103.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8572f3c2cb9934231157b45499fc41e1f58c589fdfb81a844ba873265e80f8eb"
+checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -3358,7 +3363,7 @@ checksum = "f3faaf9e727533a19351a43cc5a8de957372163c7d35cc48c90b75cdda13c352"
 dependencies = [
  "percent-encoding",
  "serde",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -3450,10 +3455,10 @@ dependencies = [
  "serde_json",
  "serde_qs",
  "server_fn_macro_default",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "throw_error",
  "tokio",
- "tokio-tungstenite 0.27.0",
+ "tokio-tungstenite",
  "tower",
  "tower-layer",
  "trybuild",
@@ -3537,6 +3542,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
 [[package]]
 name = "simdutf8"
 version = "0.1.5"
@@ -3638,7 +3649,8 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 [[package]]
 name = "subsecond"
 version = "0.7.0-rc.0"
-source = "git+https://github.com/dioxuslabs/dioxus#eef4db67b1164934eb29b7ac4d4bcd693bba25a5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b14ed4d86ab065ffbfdb994fd3e44daf5244b02cb643bd52949d74b703f36605"
 dependencies = [
  "js-sys",
  "libc",
@@ -3647,7 +3659,7 @@ dependencies = [
  "memmap2",
  "serde",
  "subsecond-types",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -3656,7 +3668,8 @@ dependencies = [
 [[package]]
 name = "subsecond-types"
 version = "0.7.0-rc.0"
-source = "git+https://github.com/dioxuslabs/dioxus#eef4db67b1164934eb29b7ac4d4bcd693bba25a5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "275920a8a5634e47e12253971db85946798795bbe4d9dfc1debf23533d823983"
 dependencies = [
  "serde",
 ]
@@ -3735,7 +3748,7 @@ dependencies = [
 
 [[package]]
 name = "tachys"
-version = "0.2.8"
+version = "0.2.9"
 dependencies = [
  "any_spawner",
  "async-trait",
@@ -3796,9 +3809,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.22.0"
+version = "3.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84fa4d11fadde498443cca10fd3ac23c951f0dc59e080e9f4b93d4df4e4eea53"
+checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
 dependencies = [
  "fastrand",
  "getrandom 0.3.3",
@@ -3827,11 +3840,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.16"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
 dependencies = [
- "thiserror-impl 2.0.16",
+ "thiserror-impl 2.0.17",
 ]
 
 [[package]]
@@ -3847,9 +3860,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.16"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3860,6 +3873,7 @@ dependencies = [
 name = "throw_error"
 version = "0.3.0"
 dependencies = [
+ "anyhow",
  "pin-project-lite",
 ]
 
@@ -3962,9 +3976,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.3"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f63835928ca123f1bef57abbcd23bb2ba0ac9ae1235f1e65bda0d06e7786bd"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
  "rustls",
  "tokio",
@@ -3996,27 +4010,15 @@ dependencies = [
 
 [[package]]
 name = "tokio-tungstenite"
-version = "0.26.2"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084"
-dependencies = [
- "futures-util",
- "log",
- "tokio",
- "tungstenite 0.26.2",
-]
-
-[[package]]
-name = "tokio-tungstenite"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "489a59b6730eda1b0171fcfda8b121f4bee2b35cba8645ca35c5f7ba3eb736c1"
+checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857"
 dependencies = [
  "futures-util",
  "log",
  "rustls",
  "tokio",
- "tungstenite 0.27.0",
+ "tungstenite 0.28.0",
 ]
 
 [[package]]
@@ -4226,23 +4228,6 @@ dependencies = [
  "toml 0.9.7",
 ]
 
-[[package]]
-name = "tungstenite"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13"
-dependencies = [
- "bytes",
- "data-encoding",
- "http 1.3.1",
- "httparse",
- "log",
- "rand",
- "sha1",
- "thiserror 2.0.16",
- "utf-8",
-]
-
 [[package]]
 name = "tungstenite"
 version = "0.27.0"
@@ -4256,7 +4241,24 @@ dependencies = [
  "log",
  "rand",
  "sha1",
- "thiserror 2.0.16",
+ "thiserror 2.0.17",
+ "utf-8",
+]
+
+[[package]]
+name = "tungstenite"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442"
+dependencies = [
+ "bytes",
+ "data-encoding",
+ "http 1.3.1",
+ "httparse",
+ "log",
+ "rand",
+ "sha1",
+ "thiserror 2.0.17",
  "utf-8",
 ]
 
@@ -4282,9 +4284,9 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 
 [[package]]
 name = "unicase"
@@ -4891,9 +4893,9 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
 
 [[package]]
 name = "zerotrie"

Cargo.toml

@@ -50,26 +50,26 @@ 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.9" }
+leptos = { path = "./leptos", version = "0.8.10" }
 leptos_config = { path = "./leptos_config", version = "0.8.7" }
-leptos_dom = { path = "./leptos_dom", version = "0.8.6" }
+leptos_dom = { path = "./leptos_dom", version = "0.8.7" }
 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.8" }
-leptos_router = { path = "./router", version = "0.8.7" }
+leptos_integration_utils = { path = "./integrations/utils", version = "0.8.6" }
+leptos_macro = { path = "./leptos_macro", version = "0.8.9" }
+leptos_router = { path = "./router", version = "0.8.8" }
 leptos_router_macro = { path = "./router_macro", version = "0.8.5" }
 leptos_server = { path = "./leptos_server", version = "0.8.5" }
 leptos_meta = { path = "./meta", version = "0.8.5" }
 next_tuple = { path = "./next_tuple", version = "0.1.0" }
 oco_ref = { path = "./oco", version = "0.2.1" }
 or_poisoned = { path = "./or_poisoned", version = "0.1.0" }
-reactive_graph = { path = "./reactive_graph", version = "0.2.7" }
-reactive_stores = { path = "./reactive_stores", version = "0.2.5" }
+reactive_graph = { path = "./reactive_graph", version = "0.2.8" }
+reactive_stores = { path = "./reactive_stores", version = "0.3.0" }
 reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.2.6" }
 server_fn = { path = "./server_fn", version = "0.8.7" }
 server_fn_macro = { path = "./server_fn_macro", version = "0.8.7" }
 server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.8.5" }
-tachys = { path = "./tachys", version = "0.2.8" }
+tachys = { path = "./tachys", version = "0.2.9" }
 wasm_split_helpers = { path = "./wasm_split", version = "0.1.2" }
 wasm_split_macros = { path = "./wasm_split_macros", version = "0.1.3" }
 
@@ -80,7 +80,7 @@ convert_case = { default-features = false, version = "0.8.0" }
 serde_json = { default-features = false, version = "1.0.143" }
 trybuild = { default-features = false, version = "1.0.110" }
 typed-builder = { default-features = false, version = "0.21.2" }
-thiserror = { default-features = false, version = "2.0.16" }
+thiserror = { default-features = false, version = "2.0.17" }
 wasm-bindgen = { default-features = false, version = "0.2.100" }
 indexmap = { default-features = false, version = "2.11.0" }
 rstml = { default-features = false, version = "0.12.1" }
@@ -97,7 +97,7 @@ 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" }
+const_format = { default-features = false, version = "0.2.35" }
 gloo-net = { default-features = false, version = "0.6.0" }
 url = { default-features = false, version = "2.5.4" }
 tokio = { default-features = false, version = "1.47.1" }
@@ -107,46 +107,46 @@ 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.101" }
 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" }
+parking_lot = { default-features = false, version = "0.12.5" }
+axum = { default-features = false, version = "0.8.6" }
 serde_qs = { default-features = false, version = "0.15.0" }
 syn = { default-features = false, version = "2.0.106" }
 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" }
+quote = { default-features = false, version = "1.0.41" }
 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.27.0" }
+tokio-tungstenite = { default-features = false, version = "0.28.0" }
 serial_test = { default-features = false, version = "3.2.0" }
 erased = { default-features = false, version = "0.1.2" }
 glib = { default-features = false, version = "0.20.12" }
 async-trait = { default-features = false, version = "0.1.89" }
 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.99" }
+anyhow = { default-features = false, version = "1.0.100" }
 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.37" }
 inventory = { default-features = false, version = "0.3.21" }
 config = { default-features = false, version = "0.15.14" }
-camino = { default-features = false, version = "1.1.11" }
+camino = { default-features = false, version = "1.2.1" }
 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.11" }
+rkyv = { default-features = false, version = "0.8.12" }
 temp-env = { default-features = false, version = "0.3.6" }
 uuid = { default-features = false, version = "1.18.0" }
 bytes = { default-features = false, version = "1.10.1" }
 http = { default-features = false, version = "1.3.1" }
-regex = { default-features = false, version = "1.11.2" }
+regex = { default-features = false, version = "1.11.3" }
 drain_filter_polyfill = { default-features = false, version = "0.1.3" }
-tempfile = { default-features = false, version = "3.21.0" }
+tempfile = { default-features = false, version = "3.23.0" }
 futures-lite = { default-features = false, version = "2.6.1" }
 log = { default-features = false, version = "0.4.27" }
 percent-encoding = { default-features = false, version = "2.3.2" }
@@ -158,10 +158,10 @@ postcard = { default-features = false, version = "1.1.3" }
 rmp-serde = { default-features = false, version = "1.3.0" }
 reqwest = { default-features = false, version = "0.12.23" }
 tower-layer = { default-features = false, version = "0.3.3" }
-attribute-derive = { default-features = false, version = "0.10.3" }
+attribute-derive = { default-features = false, version = "0.10.5" }
 insta = { default-features = false, version = "1.43.1" }
 codee = { default-features = false, version = "0.3.0" }
-actix-http = { default-features = false, version = "3.11.1" }
+actix-http = { default-features = false, version = "3.11.2" }
 wasm-bindgen-test = { default-features = false, version = "0.3.50" }
 rustversion = { default-features = false, version = "1.0.22" }
 getrandom = { default-features = false, version = "0.3.3" }
@@ -170,9 +170,9 @@ async-lock = { default-features = false, version = "3.4.1" }
 base16 = { default-features = false, version = "0.2.1" }
 digest = { default-features = false, version = "0.10.7" }
 sha2 = { default-features = false, version = "0.10.8" }
-subsecond = { default-features = false, git = "https://github.com/dioxuslabs/dioxus" }
-dioxus-cli-config = { default-features = false, git = "https://github.com/dioxuslabs/dioxus" }
-dioxus-devtools = { default-features = false, git = "https://github.com/dioxuslabs/dioxus" }
+subsecond = { default-features = false, version = "0.7.0-rc.0" }
+dioxus-cli-config = { default-features = false, version = "0.7.0-rc.0" }
+dioxus-devtools = { default-features = false, version = "0.7.0-rc.0" }
 
 [profile.release]
 codegen-units = 1

README.md

@@ -95,7 +95,7 @@ Here are some resources for learning more about Leptos:
 [`cargo-leptos`](https://github.com/leptos-rs/cargo-leptos) is a build tool that's designed to make it easy to build apps that run on both the client and the server, with seamless integration. The best way to get started with a real Leptos project right now is to use `cargo-leptos` and our starter templates for [Actix](https://github.com/leptos-rs/start) or [Axum](https://github.com/leptos-rs/start-axum).
 
 ```bash
-cargo install cargo-leptos
+cargo install cargo-leptos --locked
 cargo leptos new --git https://github.com/leptos-rs/start-axum
 cd [your project name]
 cargo leptos watch

any_error/Cargo.toml

@@ -11,3 +11,6 @@ edition.workspace = true
 
 [dependencies]
 pin-project-lite = { workspace = true, default-features = true }
+
+[dev-dependencies]
+anyhow.workspace = true

any_error/src/lib.rs

@@ -45,10 +45,10 @@ impl fmt::Display for Error {
 
 impl<T> From<T> for Error
 where
-    T: error::Error + Send + Sync + 'static,
+    T: Into<Box<dyn error::Error + Send + Sync + 'static>>,
 {
     fn from(value: T) -> Self {
-        Error(Arc::new(value))
+        Error(Arc::from(value.into()))
     }
 }
 
@@ -158,3 +158,32 @@ where
         this.inner.poll(cx)
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::error::Error as StdError;
+
+    #[derive(Debug)]
+    struct MyError;
+
+    impl Display for MyError {
+        fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+            write!(f, "MyError")
+        }
+    }
+
+    impl StdError for MyError {}
+
+    #[test]
+    fn test_from() {
+        let e = MyError;
+        let _le = Error::from(e);
+
+        let e = "some error".to_string();
+        let _le = Error::from(e);
+
+        let e = anyhow::anyhow!("anyhow error");
+        let _le = Error::from(e);
+    }
+}

examples/regression/e2e/features/issue_4251.feature

@@ -0,0 +1,13 @@
+@check_issue_4251
+Feature: Check that issue 4251 does not reappear
+
+	Scenario: Clicking a link to the same page you’re currently on should not add the page to the history stack.
+		Given I see the app
+		And I can access regression test 4324
+		When I select the link This page
+		And I select the link This page
+		And I select the link This page
+		Then I see the result is the string Issue4324
+		When I press the back button
+		And I select the link 4324
+		Then I see the result is the string Issue4324

examples/regression/e2e/features/issue_4324.feature

@@ -0,0 +1,11 @@
+@check_issue_4324
+Feature: Check that issue 4324 does not reappear
+
+	Scenario: Navigating to the same page after clicking "Back" should set the URL correctly
+		Given I see the app
+		And I can access regression test 4324
+		Then I see the path is /4324/
+		When I press the back button
+		Then I see the path is /
+		When I select the link 4324
+		Then I see the path is /4324/

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

@@ -43,3 +43,13 @@ pub async fn element_value_is(
     assert_eq!(value.as_deref(), Some(expected));
     Ok(())
 }
+
+pub async fn path_is(client: &Client, expected_path: &str) -> Result<()> {
+    let url = client
+        .current_url()
+        .await
+        .expect("could not access current URL");
+    let path = url.path();
+    assert_eq!(expected_path, path);
+    Ok(())
+}

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

@@ -45,3 +45,12 @@ async fn i_refresh_the_browser(world: &mut AppWorld) -> Result<()> {
 
     Ok(())
 }
+
+#[given(regex = "^I press the back button$")]
+#[when(regex = "^I press the back button$")]
+async fn i_go_back(world: &mut AppWorld) -> Result<()> {
+    let client = &world.client;
+    client.back().await?;
+
+    Ok(())
+}

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

@@ -43,3 +43,10 @@ async fn i_see_the_value(
     check::element_value_is(client, &id, &value).await?;
     Ok(())
 }
+
+#[then(regex = r"^I see the path is (.*)$")]
+async fn i_see_the_path(world: &mut AppWorld, path: String) -> Result<()> {
+    let client = &world.client;
+    check::path_is(client, &path).await?;
+    Ok(())
+}

examples/regression/src/app.rs

@@ -1,7 +1,7 @@
 use crate::{
     issue_4005::Routes4005, issue_4088::Routes4088, issue_4217::Routes4217,
-    issue_4285::Routes4285, issue_4296::Routes4296, pr_4015::Routes4015,
-    pr_4091::Routes4091,
+    issue_4285::Routes4285, issue_4296::Routes4296, issue_4324::Routes4324,
+    pr_4015::Routes4015, pr_4091::Routes4091,
 };
 use leptos::prelude::*;
 use leptos_meta::{MetaTags, *};
@@ -47,6 +47,7 @@ pub fn App() -> impl IntoView {
                     <Routes4005/>
                     <Routes4285/>
                     <Routes4296/>
+                    <Routes4324/>
                 </Routes>
             </main>
         </Router>
@@ -73,6 +74,7 @@ fn HomePage() -> impl IntoView {
                 <li><a href="/4005/">"4005"</a></li>
                 <li><a href="/4285/">"4285"</a></li>
                 <li><a href="/4296/">"4296"</a></li>
+                <li><a href="/4324/">"4324"</a></li>
             </ul>
         </nav>
     }

examples/regression/src/issue_4324.rs

@@ -0,0 +1,21 @@
+use leptos::prelude::*;
+#[allow(unused_imports)]
+use leptos_router::{
+    components::Route, path, Lazy, MatchNestedRoutes, NavigateOptions,
+};
+
+#[component]
+pub fn Routes4324() -> impl MatchNestedRoutes + Clone {
+    view! {
+        <Route path=path!("4324") view=Issue4324/>
+    }
+    .into_inner()
+}
+
+#[component]
+pub fn Issue4324() -> impl IntoView {
+    view! {
+        <a href="/4324/">"This page"</a>
+        <p id="result">"Issue4324"</p>
+    }
+}

examples/regression/src/lib.rs

@@ -4,6 +4,7 @@ mod issue_4088;
 mod issue_4217;
 mod issue_4285;
 mod issue_4296;
+mod issue_4324;
 mod pr_4015;
 mod pr_4091;
 

examples/tailwind_csr/Trunk.toml

@@ -0,0 +1,3 @@
+[tools]
+tailwindcss = "4.1.13"
+

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 = "0.8.5"
+version = "0.8.6"
 rust-version.workspace = true
 edition.workspace = true
 

integrations/utils/src/lib.rs

@@ -68,7 +68,8 @@ pub trait ExtendResponse: Sized {
                 let nonce =
                     use_nonce().map(|n| n.to_string()).unwrap_or_default();
                 if let Some(manifest) = use_context::<WasmSplitManifest>() {
-                    let (pkg_path, manifest) = &*manifest.0.read_value();
+                    let (pkg_path, manifest, wasm_split_file) =
+                        &*manifest.0.read_value();
                     let prefetches = prefetches.0.read_value();
 
                     let all_prefetches = prefetches.iter().flat_map(|key| {
@@ -90,7 +91,7 @@ pub trait ExtendResponse: Sized {
                         .to_html();
                     }
                     _ = view! {
-                        <Link rel="modulepreload" href=format!("{pkg_path}/__wasm_split.js") crossorigin=nonce/>
+                        <Link rel="modulepreload" href=format!("{pkg_path}/{wasm_split_file}") crossorigin=nonce/>
                     }
                     .to_html();
                 }

leptos/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos"
-version = "0.8.9"
+version = "0.8.10"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"

leptos/src/hydration/mod.rs

@@ -65,16 +65,56 @@ pub fn HydrationScripts(
     if let Some(splits) = SPLIT_MANIFEST.get_or_init(|| {
         let root = root.clone().unwrap_or_default();
 
+        let (wasm_split_js, wasm_split_manifest) = if options.hash_files {
+            let hash_path = std::env::current_exe()
+                .map(|path| {
+                    path.parent().map(|p| p.to_path_buf()).unwrap_or_default()
+                })
+                .unwrap_or_default()
+                .join(options.hash_file.as_ref());
+            let hashes = std::fs::read_to_string(&hash_path)
+                .expect("failed to read hash file");
+
+            let mut split =
+                "__wasm_split.______________________.js".to_string();
+            let mut manifest = "__wasm_split_manifest.json".to_string();
+            for line in hashes.lines() {
+                let line = line.trim();
+                if !line.is_empty() {
+                    if let Some((file, hash)) = line.split_once(':') {
+                        if file == "manifest" {
+                            manifest.clear();
+                            manifest.push_str("__wasm_split_manifest.");
+                            manifest.push_str(hash.trim());
+                            manifest.push_str(".json");
+                        }
+                        if file == "split" {
+                            split.clear();
+                            split.push_str("__wasm_split.");
+                            split.push_str(hash.trim());
+                            split.push_str(".js");
+                        }
+                    }
+                }
+            }
+            (split, manifest)
+        } else {
+            (
+                "__wasm_split.______________________.js".to_string(),
+                "__wasm_split_manifest.json".to_string(),
+            )
+        };
+
         let site_dir = &options.site_root;
         let pkg_dir = &options.site_pkg_dir;
         let path = PathBuf::from(site_dir.to_string());
-        let path = path
-            .join(pkg_dir.to_string())
-            .join("__wasm_split_manifest.json");
+        let path = path.join(pkg_dir.to_string()).join(wasm_split_manifest);
         let file = std::fs::read_to_string(path).ok()?;
+
         let manifest = WasmSplitManifest(ArcStoredValue::new((
             format!("{root}/{pkg_dir}"),
             serde_json::from_str(&file).expect("could not read manifest file"),
+            wasm_split_js,
         )));
 
         Some(manifest)

leptos/src/lib.rs

@@ -311,7 +311,9 @@ pub mod subsecond;
 
 /// Utilities for simple isomorphic logging to the console or terminal.
 pub mod logging {
-    pub use leptos_dom::{debug_warn, error, log, warn};
+    pub use leptos_dom::{
+        debug_error, debug_log, debug_warn, error, log, warn,
+    };
 }
 
 /// Utilities for working with asynchronous tasks.
@@ -395,7 +397,8 @@ pub fn prefetch_lazy_fn_on_server(id: &'static str) {
 #[derive(Clone, Debug, Default)]
 pub struct WasmSplitManifest(
     pub  reactive_graph::owner::ArcStoredValue<(
-        String,
-        std::collections::HashMap<String, Vec<String>>,
+        String,                                         // the pkg root
+        std::collections::HashMap<String, Vec<String>>, // preloads
+        String, // the name of the __wasm_split.js file
     )>,
 );

leptos_dom/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_dom"
-version = "0.8.6"
+version = "0.8.7"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"

leptos_macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_macro"
-version = "0.8.8"
+version = "0.8.9"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"

leptos_macro/src/view/mod.rs

@@ -25,9 +25,8 @@ use std::{
 use syn::{
     punctuated::Pair::{End, Punctuated},
     spanned::Spanned,
-    Expr,
-    Expr::Tuple,
-    ExprArray, ExprLit, ExprRange, Lit, LitStr, RangeLimits, Stmt,
+    Expr::{self, Tuple},
+    ExprArray, ExprLit, ExprPath, ExprRange, Lit, LitStr, RangeLimits, Stmt,
 };
 
 #[derive(Clone, Copy, PartialEq, Eq)]
@@ -1679,7 +1678,7 @@ fn attribute_value(
 }
 
 // Keep list alphabetized for binary search
-const TYPED_EVENTS: [&str; 126] = [
+const TYPED_EVENTS: [&str; 127] = [
     "DOMContentLoaded",
     "abort",
     "afterprint",
@@ -1775,6 +1774,7 @@ const TYPED_EVENTS: [&str; 126] = [
     "reset",
     "resize",
     "scroll",
+    "scrollend",
     "securitypolicyviolation",
     "seeked",
     "seeking",
@@ -1871,6 +1871,28 @@ pub(crate) fn ident_from_tag_name(tag_name: &NodeName) -> Ident {
     }
 }
 
+pub(crate) fn full_path_from_tag_name(tag_name: &NodeName) -> Option<ExprPath> {
+    match tag_name {
+        NodeName::Path(path) => Some(path.clone()),
+        NodeName::Block(_) => {
+            let span = tag_name.span();
+            proc_macro_error2::emit_error!(
+                span,
+                "blocks not allowed in tag-name position"
+            );
+            None
+        }
+        _ => {
+            let span = tag_name.span();
+            proc_macro_error2::emit_error!(
+                span,
+                "punctuated names not allowed in slots"
+            );
+            None
+        }
+    }
+}
+
 pub(crate) fn directive_call_from_attribute_node(
     attr: &KeyedAttribute,
     directive_name: &str,

leptos_macro/src/view/slot_helper.rs

@@ -1,6 +1,6 @@
 use super::{
     component_builder::maybe_optimised_component_children,
-    convert_to_snake_case, ident_from_tag_name,
+    convert_to_snake_case, full_path_from_tag_name,
 };
 use crate::view::{fragment_to_tokens, utils::filter_prefixed_attrs, TagType};
 use proc_macro2::{Ident, TokenStream, TokenTree};
@@ -24,7 +24,7 @@ pub(crate) fn slot_to_tokens(
         node.name().to_string()
     });
 
-    let component_name = ident_from_tag_name(node.name());
+    let component_path = full_path_from_tag_name(node.name());
 
     let Some(parent_slots) = parent_slots else {
         proc_macro_error2::emit_error!(
@@ -190,7 +190,7 @@ pub(crate) fn slot_to_tokens(
 
     let slot = quote_spanned! {node.span()=>
         {
-            let slot = #component_name::builder()
+            let slot = #component_path::builder()
                 #(#props)*
                 #(#slots)*
                 #children

reactive_graph/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reactive_graph"
-version = "0.2.7"
+version = "0.2.8"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"

reactive_graph/src/effect/immediate.rs

@@ -65,6 +65,7 @@ impl Dispose for ImmediateEffect {
 
 impl ImmediateEffect {
     /// Creates a new effect which runs immediately, then again as soon as any tracked signal changes.
+    /// (Unless [batch] is used.)
     ///
     /// NOTE: this requires a `Fn` function because it might recurse.
     /// Use [Self::new_mut] to pass a `FnMut` function, it'll panic on recursion.
@@ -82,6 +83,7 @@ impl ImmediateEffect {
         Self { inner: Some(inner) }
     }
     /// Creates a new effect which runs immediately, then again as soon as any tracked signal changes.
+    /// (Unless [batch] is used.)
     ///
     /// # Panics
     /// Panics on recursion or if triggered in parallel. Also see [Self::new]
@@ -93,8 +95,10 @@ impl ImmediateEffect {
         Self::new(move || fun.try_lock().expect(MSG)())
     }
     /// Creates a new effect which runs immediately, then again as soon as any tracked signal changes.
+    /// (Unless [batch] is used.)
     ///
     /// NOTE: this requires a `Fn` function because it might recurse.
+    /// Use [Self::new_mut_scoped] to pass a `FnMut` function, it'll panic on recursion.
     /// NOTE: this effect is automatically cleaned up when the current owner is cleared or disposed.
     #[track_caller]
     pub fn new_scoped(fun: impl Fn() + Send + Sync + 'static) {
@@ -102,6 +106,19 @@ impl ImmediateEffect {
 
         on_cleanup(move || effect.dispose());
     }
+    /// Creates a new effect which runs immediately, then again as soon as any tracked signal changes.
+    /// (Unless [batch] is used.)
+    ///
+    /// NOTE: this effect is automatically cleaned up when the current owner is cleared or disposed.
+    ///
+    /// # Panics
+    /// Panics on recursion or if triggered in parallel. Also see [Self::new_scoped]
+    #[track_caller]
+    pub fn new_mut_scoped(fun: impl FnMut() + Send + Sync + 'static) {
+        let effect = Self::new_mut(fun);
+
+        on_cleanup(move || effect.dispose());
+    }
 
     /// Creates a new effect which runs immediately, then again as soon as any tracked signal changes.
     ///
@@ -130,6 +147,41 @@ impl DefinedAt for ImmediateEffect {
     }
 }
 
+/// Defers any [ImmediateEffect]s from running until the end of the function.
+///
+/// NOTE: this affects only [ImmediateEffect]s, not other effects.
+///
+/// NOTE: this is rarely needed, but it is useful for example when multiple signals
+/// need to be updated atomically (for example a double-bound signal tree).
+pub fn batch<T>(f: impl FnOnce() -> T) -> T {
+    struct ExecuteOnDrop;
+    impl Drop for ExecuteOnDrop {
+        fn drop(&mut self) {
+            let effects = {
+                let mut batch = inner::BATCH.write().or_poisoned();
+                batch.take().unwrap().into_inner().expect("lock poisoned")
+            };
+            // TODO: Should we skip the effects if it's panicking?
+            for effect in effects {
+                effect.update_if_necessary();
+            }
+        }
+    }
+    let mut execute_on_drop = None;
+    {
+        let mut batch = inner::BATCH.write().or_poisoned();
+        if batch.is_none() {
+            execute_on_drop = Some(ExecuteOnDrop);
+        } else {
+            // Nested batching has no effect.
+        }
+        *batch = Some(batch.take().unwrap_or_default());
+    }
+    let ret = f();
+    drop(execute_on_drop);
+    ret
+}
+
 mod inner {
     use crate::{
         graph::{
@@ -140,6 +192,7 @@ mod inner {
         owner::Owner,
         traits::DefinedAt,
     };
+    use indexmap::IndexSet;
     use or_poisoned::OrPoisoned;
     use std::{
         panic::Location,
@@ -147,6 +200,11 @@ mod inner {
         thread::{self, ThreadId},
     };
 
+    /// Only the [super::batch] function ever writes to the outer RwLock.
+    /// While the effects will write to the inner one.
+    pub(super) static BATCH: RwLock<Option<RwLock<IndexSet<AnySubscriber>>>> =
+        RwLock::new(None);
+
     /// Handles subscription logic for effects.
     ///
     /// To handle parallelism and recursion we assign ordered (1..) ids to each run.
@@ -202,6 +260,8 @@ mod inner {
             fun: impl Fn() + Send + Sync + 'static,
         ) -> Arc<RwLock<EffectInner>> {
             let owner = Owner::new();
+            #[cfg(any(debug_assertions, leptos_debuginfo))]
+            let defined_at = Location::caller();
 
             Arc::new_cyclic(|weak| {
                 let any_subscriber = AnySubscriber(
@@ -211,7 +271,7 @@ mod inner {
 
                 RwLock::new(EffectInner {
                     #[cfg(any(debug_assertions, leptos_debuginfo))]
-                    defined_at: Location::caller(),
+                    defined_at,
                     owner,
                     state: ReactiveNodeState::Dirty,
                     run_count_start: 0,
@@ -260,6 +320,17 @@ mod inner {
                 ReactiveNodeState::Dirty => true,
             };
 
+            {
+                if let Some(batch) = &*BATCH.read().or_poisoned() {
+                    let mut batch = batch.write().or_poisoned();
+                    let subscriber =
+                        self.read().or_poisoned().any_subscriber.clone();
+
+                    batch.insert(subscriber);
+                    return needs_update;
+                }
+            }
+
             if needs_update {
                 let mut guard = self.write().or_poisoned();
 

reactive_graph/src/owner.rs

@@ -209,6 +209,25 @@ impl Owner {
         this
     }
 
+    /// Returns the parent of this `Owner`, if any.
+    ///
+    /// None when:
+    /// - This is a root owner
+    /// - The parent has been dropped
+    pub fn parent(&self) -> Option<Owner> {
+        self.inner
+            .read()
+            .or_poisoned()
+            .parent
+            .as_ref()
+            .and_then(|p| p.upgrade())
+            .map(|inner| Owner {
+                inner,
+                #[cfg(feature = "hydration")]
+                shared_context: self.shared_context.clone(),
+            })
+    }
+
     /// Creates a new `Owner` that is the child of the current `Owner`, if any.
     pub fn child(&self) -> Self {
         let parent = Some(Arc::downgrade(&self.inner));

reactive_graph/src/wrappers.rs

@@ -1542,7 +1542,6 @@ pub mod read {
 
     impl<T, S> ReadUntracked for MaybeProp<T, S>
     where
-        T: Clone,
         S: Storage<Option<T>> + Storage<SignalTypes<Option<T>, S>>,
     {
         type Value = ReadGuard<Option<T>, SignalReadGuard<Option<T>, S>>;

reactive_graph/tests/effect_immediate.rs

@@ -225,3 +225,38 @@ fn threaded_chaos_effect() {
     let values: Vec<_> = signals.iter().map(|s| s.get_untracked()).collect();
     println!("FINAL: {values:?}");
 }
+
+#[cfg(feature = "effects")]
+#[test]
+fn test_batch() {
+    use imports::*;
+    use reactive_graph::{effect::batch, owner::StoredValue};
+
+    let owner = Owner::new();
+    owner.set();
+
+    let a = RwSignal::new(0);
+    let b = RwSignal::new(0);
+
+    let values = StoredValue::new(Vec::new());
+
+    ImmediateEffect::new_scoped(move || {
+        println!("{} = {}", a.get(), b.get());
+        values.write_value().push((a.get(), b.get()));
+    });
+
+    a.set(1);
+    b.set(1);
+
+    batch(move || {
+        a.set(2);
+        b.set(2);
+
+        batch(move || {
+            a.set(3);
+            b.set(3);
+        });
+    });
+
+    assert_eq!(values.get_value(), vec![(0, 0), (1, 0), (1, 1), (3, 3)]);
+}

reactive_stores/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reactive_stores"
-version = "0.2.5"
+version = "0.3.0"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"

reactive_stores/src/arc_field.rs

@@ -30,6 +30,8 @@ where
     defined_at: &'static Location<'static>,
     path: Arc<dyn Fn() -> StorePath + Send + Sync>,
     get_trigger: Arc<dyn Fn(StorePath) -> StoreFieldTrigger + Send + Sync>,
+    get_trigger_unkeyed:
+        Arc<dyn Fn(StorePath) -> StoreFieldTrigger + Send + Sync>,
     read: Arc<dyn Fn() -> Option<StoreFieldReader<T>> + Send + Sync>,
     pub(crate) write:
         Arc<dyn Fn() -> Option<StoreFieldWriter<T>> + Send + Sync>,
@@ -103,6 +105,10 @@ impl<T> StoreField for ArcField<T> {
         (self.get_trigger)(path)
     }
 
+    fn get_trigger_unkeyed(&self, path: StorePath) -> StoreFieldTrigger {
+        (self.get_trigger_unkeyed)(path)
+    }
+
     fn path(&self) -> impl IntoIterator<Item = StorePathSegment> {
         (self.path)()
     }
@@ -132,6 +138,9 @@ where
             defined_at: Location::caller(),
             path: Arc::new(move || value.path().into_iter().collect()),
             get_trigger: Arc::new(move |path| value.get_trigger(path)),
+            get_trigger_unkeyed: Arc::new(move |path| {
+                value.get_trigger_unkeyed(path)
+            }),
             read: Arc::new(move || value.reader().map(StoreFieldReader::new)),
             write: Arc::new(move || value.writer().map(StoreFieldWriter::new)),
             keys: Arc::new(move || value.keys()),
@@ -158,6 +167,10 @@ where
                 let value = value.clone();
                 move |path| value.get_trigger(path)
             }),
+            get_trigger_unkeyed: Arc::new({
+                let value = value.clone();
+                move |path| value.get_trigger_unkeyed(path)
+            }),
             read: Arc::new({
                 let value = value.clone();
                 move || value.reader().map(StoreFieldReader::new)
@@ -202,6 +215,10 @@ where
                 let value = value.clone();
                 move |path| value.get_trigger(path)
             }),
+            get_trigger_unkeyed: Arc::new({
+                let value = value.clone();
+                move |path| value.get_trigger_unkeyed(path)
+            }),
             read: Arc::new({
                 let value = value.clone();
                 move || value.reader().map(StoreFieldReader::new)
@@ -245,6 +262,10 @@ where
                 let value = value.clone();
                 move |path| value.get_trigger(path)
             }),
+            get_trigger_unkeyed: Arc::new({
+                let value = value.clone();
+                move |path| value.get_trigger_unkeyed(path)
+            }),
             read: Arc::new({
                 let value = value.clone();
                 move || value.reader().map(StoreFieldReader::new)
@@ -289,6 +310,10 @@ where
                 let value = value.clone();
                 move |path| value.get_trigger(path)
             }),
+            get_trigger_unkeyed: Arc::new({
+                let value = value.clone();
+                move |path| value.get_trigger_unkeyed(path)
+            }),
             read: Arc::new({
                 let value = value.clone();
                 move || value.reader().map(StoreFieldReader::new)
@@ -337,6 +362,10 @@ where
                 let value = value.clone();
                 move |path| value.get_trigger(path)
             }),
+            get_trigger_unkeyed: Arc::new({
+                let value = value.clone();
+                move |path| value.get_trigger_unkeyed(path)
+            }),
             read: Arc::new({
                 let value = value.clone();
                 move || value.reader().map(StoreFieldReader::new)
@@ -368,6 +397,7 @@ impl<T> Clone for ArcField<T> {
             defined_at: self.defined_at,
             path: self.path.clone(),
             get_trigger: Arc::clone(&self.get_trigger),
+            get_trigger_unkeyed: Arc::clone(&self.get_trigger_unkeyed),
             read: Arc::clone(&self.read),
             write: Arc::clone(&self.write),
             keys: Arc::clone(&self.keys),

reactive_stores/src/deref.rs

@@ -68,6 +68,11 @@ where
     fn get_trigger(&self, path: StorePath) -> StoreFieldTrigger {
         self.inner.get_trigger(path)
     }
+
+    fn get_trigger_unkeyed(&self, path: StorePath) -> StoreFieldTrigger {
+        self.inner.get_trigger_unkeyed(path)
+    }
+
     fn path(&self) -> impl IntoIterator<Item = StorePathSegment> {
         self.inner.path()
     }

reactive_stores/src/field.rs

@@ -59,6 +59,13 @@ where
             .unwrap_or_default()
     }
 
+    fn get_trigger_unkeyed(&self, path: StorePath) -> StoreFieldTrigger {
+        self.inner
+            .try_get_value()
+            .map(|inner| inner.get_trigger_unkeyed(path))
+            .unwrap_or_default()
+    }
+
     fn path(&self) -> impl IntoIterator<Item = StorePathSegment> {
         self.inner
             .try_get_value()

reactive_stores/src/iter.rs

@@ -84,6 +84,10 @@ where
         self.inner.get_trigger(path)
     }
 
+    fn get_trigger_unkeyed(&self, path: StorePath) -> StoreFieldTrigger {
+        self.inner.get_trigger_unkeyed(path)
+    }
+
     fn reader(&self) -> Option<Self::Reader> {
         let inner = self.inner.reader()?;
         let index = self.index;
@@ -109,6 +113,23 @@ where
     fn keys(&self) -> Option<KeyMap> {
         self.inner.keys()
     }
+
+    fn track_field(&self) {
+        let mut full_path = self.path().into_iter().collect::<StorePath>();
+        let trigger = self.get_trigger(self.path().into_iter().collect());
+        trigger.this.track();
+        trigger.children.track();
+
+        // tracks `this` for all ancestors: i.e., it will track any change that is made
+        // directly to one of its ancestors, but not a change made to a *child* of an ancestor
+        // (which would end up with every subfield tracking its own siblings, because they are
+        // children of its parent)
+        while !full_path.is_empty() {
+            full_path.pop();
+            let inner = self.get_trigger(full_path.clone());
+            inner.this.track();
+        }
+    }
 }
 
 impl<Inner, Prev> DefinedAt for AtIndex<Inner, Prev>

reactive_stores/src/keyed.rs

@@ -110,6 +110,10 @@ where
         self.inner.get_trigger(path)
     }
 
+    fn get_trigger_unkeyed(&self, path: StorePath) -> StoreFieldTrigger {
+        self.inner.get_trigger_unkeyed(path)
+    }
+
     fn reader(&self) -> Option<Self::Reader> {
         let inner = self.inner.reader()?;
         Some(Mapped::new_with_guard(inner, self.read))
@@ -432,7 +436,7 @@ where
         let this = keys
             .with_field_keys(
                 inner.clone(),
-                |keys| keys.get(&self.key),
+                |keys| (keys.get(&self.key), vec![]),
                 || self.inner.latest_keys(),
             )
             .flatten()
@@ -444,6 +448,10 @@ where
         self.inner.get_trigger(path)
     }
 
+    fn get_trigger_unkeyed(&self, path: StorePath) -> StoreFieldTrigger {
+        self.inner.get_trigger_unkeyed(path)
+    }
+
     fn reader(&self) -> Option<Self::Reader> {
         let inner = self.inner.reader()?;
 
@@ -452,7 +460,7 @@ where
         let index = keys
             .with_field_keys(
                 inner_path,
-                |keys| keys.get(&self.key),
+                |keys| (keys.get(&self.key), vec![]),
                 || self.inner.latest_keys(),
             )
             .flatten()
@@ -476,7 +484,7 @@ where
         let index = keys
             .with_field_keys(
                 inner_path.clone(),
-                |keys| keys.get(&self.key),
+                |keys| (keys.get(&self.key), vec![]),
                 || self.inner.latest_keys(),
             )
             .flatten()
@@ -624,9 +632,7 @@ where
         let latest = self.latest_keys();
         keys.with_field_keys(
             inner_path,
-            |keys| {
-                keys.update(latest);
-            },
+            |keys| ((), keys.update(latest)),
             || self.latest_keys(),
         );
     }

reactive_stores/src/lib.rs

@@ -364,13 +364,18 @@ where
         })
     }
 
-    fn update(&mut self, iter: impl IntoIterator<Item = K>) {
+    fn update(
+        &mut self,
+        iter: impl IntoIterator<Item = K>,
+    ) -> Vec<(usize, StorePathSegment)> {
         let new_keys = iter
             .into_iter()
             .enumerate()
             .map(|(idx, key)| (key, idx))
             .collect::<FxHashMap<K, usize>>();
 
+        let mut index_keys = Vec::with_capacity(new_keys.len());
+
         // remove old keys and recycle the slots
         self.keys.retain(|key, old_entry| match new_keys.get(key) {
             Some(idx) => {
@@ -385,14 +390,17 @@ where
 
         // add new keys
         for (key, idx) in new_keys {
-            // the suggestion doesn't compile because we need &mut for self.next_key(),
-            // and we don't want to call that until after the check
-            #[allow(clippy::map_entry)]
-            if !self.keys.contains_key(&key) {
-                let path = self.next_key();
-                self.keys.insert(key, (path, idx));
+            match self.keys.get(&key) {
+                Some((segment, idx)) => index_keys.push((*idx, *segment)),
+                None => {
+                    let path = self.next_key();
+                    self.keys.insert(key, (path, idx));
+                    index_keys.push((idx, path));
+                }
             }
         }
+
+        index_keys
     }
 }
 
@@ -415,14 +423,20 @@ type HashMap<K, V> = send_wrapper::SendWrapper<
 
 /// A map of the keys for a keyed subfield.
 #[derive(Clone)]
-pub struct KeyMap(HashMap<StorePath, Box<dyn Any + Send + Sync>>);
+pub struct KeyMap(
+    HashMap<StorePath, Box<dyn Any + Send + Sync>>,
+    HashMap<(StorePath, usize), StorePathSegment>,
+);
 
 impl Default for KeyMap {
     fn default() -> Self {
         #[cfg(not(target_arch = "wasm32"))]
-        return Self(Default::default());
+        return Self(Default::default(), Default::default());
         #[cfg(target_arch = "wasm32")]
-        return Self(send_wrapper::SendWrapper::new(Default::default()));
+        return Self(
+            send_wrapper::SendWrapper::new(Default::default()),
+            send_wrapper::SendWrapper::new(Default::default()),
+        );
     }
 }
 
@@ -430,31 +444,70 @@ impl KeyMap {
     fn with_field_keys<K, T>(
         &self,
         path: StorePath,
-        fun: impl FnOnce(&mut FieldKeys<K>) -> T,
+        fun: impl FnOnce(&mut FieldKeys<K>) -> (T, Vec<(usize, StorePathSegment)>),
         initialize: impl FnOnce() -> Vec<K>,
     ) -> Option<T>
     where
         K: Debug + Hash + PartialEq + Eq + Send + Sync + 'static,
     {
+        let initial_keys = initialize();
+
         #[cfg(not(target_arch = "wasm32"))]
         let mut entry = self
             .0
-            .entry(path)
-            .or_insert_with(|| Box::new(FieldKeys::new(initialize())));
+            .entry(path.clone())
+            .or_insert_with(|| Box::new(FieldKeys::new(initial_keys)));
 
         #[cfg(target_arch = "wasm32")]
         let entry = if !self.0.borrow().contains_key(&path) {
-            Some(Box::new(FieldKeys::new(initialize())))
+            Some(Box::new(FieldKeys::new(initial_keys)))
         } else {
             None
         };
         #[cfg(target_arch = "wasm32")]
         let mut map = self.0.borrow_mut();
         #[cfg(target_arch = "wasm32")]
-        let entry = map.entry(path).or_insert_with(|| entry.unwrap());
+        let entry = map.entry(path.clone()).or_insert_with(|| entry.unwrap());
 
         let entry = entry.downcast_mut::<FieldKeys<K>>()?;
-        Some(fun(entry))
+        let (result, new_keys) = fun(entry);
+        if !new_keys.is_empty() {
+            for (idx, segment) in new_keys {
+                #[cfg(not(target_arch = "wasm32"))]
+                self.1.insert((path.clone(), idx), segment);
+
+                #[cfg(target_arch = "wasm32")]
+                self.1.borrow_mut().insert((path.clone(), idx), segment);
+            }
+        }
+        Some(result)
+    }
+
+    fn contains_key(&self, key: &StorePath) -> bool {
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            self.0.contains_key(key)
+        }
+
+        #[cfg(target_arch = "wasm32")]
+        {
+            self.0.borrow_mut().contains_key(key)
+        }
+    }
+
+    fn get_key_for_index(
+        &self,
+        key: &(StorePath, usize),
+    ) -> Option<StorePathSegment> {
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            self.1.get(key).as_deref().copied()
+        }
+
+        #[cfg(target_arch = "wasm32")]
+        {
+            self.1.borrow().get(key).as_deref().copied()
+        }
     }
 }
 
@@ -832,6 +885,30 @@ mod tests {
         }
     }
 
+    #[derive(Debug, Clone, Store, Patch, Default)]
+    struct Foo {
+        id: i32,
+        bar: Bar,
+    }
+
+    #[derive(Debug, Clone, Store, Patch, Default)]
+    struct Bar {
+        bar_signature: i32,
+        baz: Baz,
+    }
+
+    #[derive(Debug, Clone, Store, Patch, Default)]
+    struct Baz {
+        more_data: i32,
+        baw: Baw,
+    }
+
+    #[derive(Debug, Clone, Store, Patch, Default)]
+    struct Baw {
+        more_data: i32,
+        end: i32,
+    }
+
     #[tokio::test]
     async fn mutating_field_triggers_effect() {
         _ = any_spawner::Executor::init_tokio();
@@ -1112,30 +1189,6 @@ mod tests {
 
         _ = any_spawner::Executor::init_tokio();
 
-        #[derive(Debug, Clone, Store, Patch, Default)]
-        struct Foo {
-            id: i32,
-            bar: Bar,
-        }
-
-        #[derive(Debug, Clone, Store, Patch, Default)]
-        struct Bar {
-            bar_signature: i32,
-            baz: Baz,
-        }
-
-        #[derive(Debug, Clone, Store, Patch, Default)]
-        struct Baz {
-            more_data: i32,
-            baw: Baw,
-        }
-
-        #[derive(Debug, Clone, Store, Patch, Default)]
-        struct Baw {
-            more_data: i32,
-            end: i32,
-        }
-
         let store = Store::new(Foo {
             id: 42,
             bar: Bar {
@@ -1219,4 +1272,107 @@ mod tests {
         assert_eq!(more_data_runs.get_value(), 3);
         assert_eq!(baz_baw_end_runs.get_value(), 3);
     }
+
+    #[tokio::test]
+    async fn changing_parent_notifies_subfield() {
+        _ = any_spawner::Executor::init_tokio();
+
+        let combined_count = Arc::new(AtomicUsize::new(0));
+
+        let store = Store::new(Foo {
+            id: 42,
+            bar: Bar {
+                bar_signature: 69,
+                baz: Baz {
+                    more_data: 9999,
+                    baw: Baw {
+                        more_data: 22,
+                        end: 1112,
+                    },
+                },
+            },
+        });
+
+        let tracked_field = store.bar().baz().more_data();
+
+        Effect::new_sync({
+            let combined_count = Arc::clone(&combined_count);
+            move |prev: Option<()>| {
+                if prev.is_none() {
+                    println!("first run");
+                } else {
+                    println!("next run");
+                }
+
+                // we only track `more`, but this should still be notified
+                // when its parent fields `bar` or `baz` change
+                println!("{:?}", *tracked_field.read());
+                combined_count.fetch_add(1, Ordering::Relaxed);
+            }
+        });
+        tick().await;
+        tick().await;
+
+        store.bar().baz().set(Baz {
+            more_data: 42,
+            baw: Baw {
+                more_data: 11,
+                end: 31,
+            },
+        });
+        tick().await;
+        store.bar().set(Bar {
+            bar_signature: 23,
+            baz: Baz {
+                more_data: 32,
+                baw: Baw {
+                    more_data: 432,
+                    end: 423,
+                },
+            },
+        });
+        tick().await;
+
+        assert_eq!(combined_count.load(Ordering::Relaxed), 3);
+    }
+
+    #[tokio::test]
+    async fn changing_parent_notifies_unkeyed_child() {
+        _ = any_spawner::Executor::init_tokio();
+
+        let combined_count = Arc::new(AtomicUsize::new(0));
+
+        let store = Store::new(data());
+
+        let tracked_field = store.todos().at_unkeyed(0);
+
+        Effect::new_sync({
+            let combined_count = Arc::clone(&combined_count);
+            move |prev: Option<()>| {
+                if prev.is_none() {
+                    println!("first run");
+                } else {
+                    println!("next run");
+                }
+
+                // we only track `more`, but this should still be notified
+                // when its parent fields `bar` or `baz` change
+                println!("{:?}", *tracked_field.read());
+                combined_count.fetch_add(1, Ordering::Relaxed);
+            }
+        });
+        tick().await;
+        tick().await;
+
+        store.todos().write().pop();
+        tick().await;
+
+        store.todos().write().push(Todo {
+            label: "another one".into(),
+            completed: false,
+        });
+        tick().await;
+
+        assert_eq!(combined_count.load(Ordering::Relaxed), 3);
+    }
 }

reactive_stores/src/patch.rs

@@ -35,7 +35,7 @@ where
             // don't track the writer for the whole store
             writer.untrack();
             let mut notify = |path: &StorePath| {
-                self.triggers_for_path(path.to_owned()).notify();
+                self.triggers_for_path_unkeyed(path.to_owned()).notify();
             };
             writer.patch_field(new, &path, &mut notify);
         }

reactive_stores/src/path.rs

@@ -11,6 +11,15 @@ impl IntoIterator for StorePath {
     }
 }
 
+impl<'a> IntoIterator for &'a StorePath {
+    type Item = &'a StorePathSegment;
+    type IntoIter = std::slice::Iter<'a, StorePathSegment>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.iter()
+    }
+}
+
 impl From<Vec<StorePathSegment>> for StorePath {
     fn from(value: Vec<StorePathSegment>) -> Self {
         Self(value)
@@ -18,6 +27,16 @@ impl From<Vec<StorePathSegment>> for StorePath {
 }
 
 impl StorePath {
+    /// Creates a new path.
+    pub fn new() -> Self {
+        Self(Vec::new())
+    }
+
+    /// Creates a new path with storage capacity for `capacity` segments.
+    pub fn with_capacity(capacity: usize) -> Self {
+        Self(Vec::with_capacity(capacity))
+    }
+
     /// Adds a new segment to the path.
     pub fn push(&mut self, segment: impl Into<StorePathSegment>) {
         self.0.push(segment.into());

reactive_stores/src/store_field.rs

@@ -26,6 +26,14 @@ pub trait StoreField: Sized {
     #[track_caller]
     fn get_trigger(&self, path: StorePath) -> StoreFieldTrigger;
 
+    /// Returns the trigger that tracks access and updates for this field.
+    ///
+    /// This uses *unkeyed* paths: i.e., if any field in the path is keyed, it will
+    /// try to look up the key for the item at the index given in the path, rather than
+    /// the keyed item.
+    #[track_caller]
+    fn get_trigger_unkeyed(&self, path: StorePath) -> StoreFieldTrigger;
+
     /// The path of this field (see [`StorePath`]).
     #[track_caller]
     fn path(&self) -> impl IntoIterator<Item = StorePathSegment>;
@@ -84,6 +92,26 @@ pub trait StoreField: Sized {
 
         triggers
     }
+
+    /// Returns triggers for the field at the given path, and all parent fields
+    fn triggers_for_path_unkeyed(&self, path: StorePath) -> Vec<ArcTrigger> {
+        // see notes on triggers_for_path() for additional comments on implementation
+
+        let trigger = self.get_trigger_unkeyed(path.clone());
+        let mut full_path = path;
+
+        let mut triggers = Vec::with_capacity(full_path.len() + 2);
+        triggers.push(trigger.this.clone());
+        triggers.push(trigger.children.clone());
+        while !full_path.is_empty() {
+            full_path.pop();
+            let inner = self.get_trigger_unkeyed(full_path.clone());
+            triggers.push(inner.children.clone());
+        }
+        triggers.reverse();
+
+        triggers
+    }
 }
 
 impl<T> StoreField for ArcStore<T>
@@ -101,6 +129,26 @@ where
         trigger
     }
 
+    fn get_trigger_unkeyed(&self, path: StorePath) -> StoreFieldTrigger {
+        let orig_path = path.clone();
+
+        let mut path = StorePath::with_capacity(orig_path.len());
+        for segment in &orig_path {
+            let parent_is_keyed = self.keys.contains_key(&path);
+
+            if parent_is_keyed {
+                let key = self
+                    .keys
+                    .get_key_for_index(&(path.clone(), segment.0))
+                    .expect("could not find key for index");
+                path.push(key);
+            } else {
+                path.push(*segment);
+            }
+        }
+        self.get_trigger(path)
+    }
+
     #[track_caller]
     fn path(&self) -> impl IntoIterator<Item = StorePathSegment> {
         iter::empty()
@@ -141,6 +189,14 @@ where
             .unwrap_or_default()
     }
 
+    #[track_caller]
+    fn get_trigger_unkeyed(&self, path: StorePath) -> StoreFieldTrigger {
+        self.inner
+            .try_get_value()
+            .map(|n| n.get_trigger_unkeyed(path))
+            .unwrap_or_default()
+    }
+
     #[track_caller]
     fn path(&self) -> impl IntoIterator<Item = StorePathSegment> {
         self.inner

reactive_stores/src/subfield.rs

@@ -88,6 +88,10 @@ where
         self.inner.get_trigger(path)
     }
 
+    fn get_trigger_unkeyed(&self, path: StorePath) -> StoreFieldTrigger {
+        self.inner.get_trigger_unkeyed(path)
+    }
+
     fn reader(&self) -> Option<Self::Reader> {
         let inner = self.inner.reader()?;
         Some(Mapped::new_with_guard(inner, self.read))

router/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_router"
-version = "0.8.7"
+version = "0.8.8"
 authors = ["Greg Johnston", "Ben Wishovich"]
 license = "MIT"
 readme = "../README.md"

router/src/flat_router.rs

@@ -364,6 +364,12 @@ where
 #[derive(Debug)]
 pub(crate) struct MatchedRoute(pub String, pub AnyView);
 
+impl MatchedRoute {
+    fn branch_name(&self) -> String {
+        format!("{:?}", self.1.as_type_id())
+    }
+}
+
 impl Render for MatchedRoute {
     type State = <AnyView as Render>::State;
 
@@ -414,8 +420,9 @@ impl RenderHtml for MatchedRoute {
         mark_branches: bool,
         extra_attrs: Vec<AnyAttribute>,
     ) {
-        if mark_branches && escape {
-            buf.open_branch(&self.0);
+        let branch_name = (mark_branches && escape).then(|| self.branch_name());
+        if let Some(bn) = &branch_name {
+            buf.open_branch(bn);
         }
         self.1.to_html_with_buf(
             buf,
@@ -424,8 +431,8 @@ impl RenderHtml for MatchedRoute {
             mark_branches,
             extra_attrs,
         );
-        if mark_branches && escape {
-            buf.close_branch(&self.0);
+        if let Some(bn) = &branch_name {
+            buf.close_branch(bn);
             if *position == Position::NextChildAfterText {
                 *position = Position::NextChild;
             }
@@ -442,8 +449,9 @@ impl RenderHtml for MatchedRoute {
     ) where
         Self: Sized,
     {
-        if mark_branches && escape {
-            buf.open_branch(&self.0);
+        let branch_name = (mark_branches && escape).then(|| self.branch_name());
+        if let Some(bn) = &branch_name {
+            buf.open_branch(bn);
         }
         self.1.to_html_async_with_buf::<OUT_OF_ORDER>(
             buf,
@@ -452,8 +460,8 @@ impl RenderHtml for MatchedRoute {
             mark_branches,
             extra_attrs,
         );
-        if mark_branches && escape {
-            buf.close_branch(&self.0);
+        if let Some(bn) = &branch_name {
+            buf.close_branch(bn);
             if *position == Position::NextChildAfterText {
                 *position = Position::NextChild;
             }

router/src/location/history.rs

@@ -3,7 +3,7 @@ use crate::{hooks::use_navigate, params::ParamsMap};
 use core::fmt;
 use futures::channel::oneshot;
 use js_sys::{try_iter, Array, JsString};
-use leptos::prelude::*;
+use leptos::{ev, prelude::*};
 use or_poisoned::OrPoisoned;
 use reactive_graph::{
     signal::ArcRwSignal,
@@ -11,13 +11,12 @@ use reactive_graph::{
 };
 use std::{
     borrow::Cow,
-    boxed::Box,
     string::String,
     sync::{Arc, Mutex},
 };
 use tachys::dom::{document, window};
-use wasm_bindgen::{closure::Closure, JsCast, JsValue};
-use web_sys::{Event, UrlSearchParams};
+use wasm_bindgen::{JsCast, JsValue};
+use web_sys::UrlSearchParams;
 
 #[derive(Clone)]
 pub struct BrowserUrl {
@@ -116,7 +115,6 @@ impl LocationProvider for BrowserUrl {
     }
 
     fn init(&self, base: Option<Cow<'static, str>>) {
-        let window = window();
         let navigate = {
             let url = self.url.clone();
             let pending = Arc::clone(&self.pending_navigation);
@@ -159,37 +157,32 @@ impl LocationProvider for BrowserUrl {
 
         let handle_anchor_click =
             handle_anchor_click(base, Self::parse_with_base, navigate);
-        let closure = Closure::wrap(Box::new(move |ev: Event| {
+
+        let click_handle = window_event_listener(ev::click, move |ev| {
             if let Err(e) = handle_anchor_click(ev) {
                 #[cfg(feature = "tracing")]
                 tracing::error!("{e:?}");
                 #[cfg(not(feature = "tracing"))]
                 web_sys::console::error_1(&e);
             }
-        }) as Box<dyn FnMut(Event)>)
-        .into_js_value();
-        window
-            .add_event_listener_with_callback(
-                "click",
-                closure.as_ref().unchecked_ref(),
-            )
-            .expect(
-                "couldn't add `click` listener to `window` to handle `<a>` \
-                 clicks",
-            );
+        });
 
         // handle popstate event (forward/back navigation)
-        let cb = {
+        let popstate_cb = {
             let url = self.url.clone();
             let path_stack = self.path_stack.clone();
             let is_back = self.is_back.clone();
             move || match Self::current() {
                 Ok(new_url) => {
-                    let stack = path_stack.read_value();
+                    let mut stack = path_stack.write_value();
                     let is_navigating_back = stack.len() == 1
                         || (stack.len() >= 2
                             && stack.get(stack.len() - 2) == Some(&new_url));
 
+                    if is_navigating_back {
+                        stack.pop();
+                    }
+
                     is_back.set(is_navigating_back);
 
                     url.set(new_url);
@@ -202,14 +195,14 @@ impl LocationProvider for BrowserUrl {
                 }
             }
         };
-        let closure =
-            Closure::wrap(Box::new(cb) as Box<dyn Fn()>).into_js_value();
-        window
-            .add_event_listener_with_callback(
-                "popstate",
-                closure.as_ref().unchecked_ref(),
-            )
-            .expect("couldn't add `popstate` listener to `window`");
+
+        let popstate_handle =
+            window_event_listener(ev::popstate, move |_| popstate_cb());
+
+        on_cleanup(|| {
+            click_handle.remove();
+            popstate_handle.remove();
+        });
     }
 
     fn ready_to_complete(&self) {

router/src/location/mod.rs

@@ -14,7 +14,7 @@ use send_wrapper::SendWrapper;
 use std::{borrow::Cow, future::Future};
 use tachys::dom::window;
 use wasm_bindgen::{JsCast, JsValue};
-use web_sys::{Event, HtmlAnchorElement, MouseEvent};
+use web_sys::{HtmlAnchorElement, MouseEvent};
 
 mod history;
 mod server;
@@ -300,15 +300,14 @@ pub(crate) fn handle_anchor_click<NavFn, NavFut>(
     router_base: Option<Cow<'static, str>>,
     parse_with_base: fn(&str, &str) -> Result<Url, JsValue>,
     navigate: NavFn,
-) -> Box<dyn Fn(Event) -> Result<(), JsValue>>
+) -> Box<dyn Fn(MouseEvent) -> Result<(), JsValue>>
 where
     NavFn: Fn(Url, LocationChange) -> NavFut + 'static,
     NavFut: Future<Output = ()> + 'static,
 {
     let router_base = router_base.unwrap_or_default();
 
-    Box::new(move |ev: Event| {
-        let ev = ev.unchecked_into::<MouseEvent>();
+    Box::new(move |ev: MouseEvent| {
         let origin = window().location().origin()?;
         if ev.default_prevented()
             || ev.button() != 0

tachys/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tachys"
-version = "0.2.8"
+version = "0.2.9"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"

tachys/src/html/attribute/global.rs

@@ -205,6 +205,14 @@ where
         self.add_any_attr(enterkeyhint(value))
     }
 
+    /// The `exportparts` attribute enables the sharing of parts of an element's shadow DOM with a containing document.
+    fn exportparts(
+        self,
+        value: V,
+    ) -> <Self as AddAnyAttr>::Output<Attr<Exportparts, V>> {
+        self.add_any_attr(exportparts(value))
+    }
+
     /// The `hidden` global attribute is a Boolean attribute indicating that the element is not yet, or is no longer, relevant.
     fn hidden(self, value: V) -> <Self as AddAnyAttr>::Output<Attr<Hidden, V>> {
         self.add_any_attr(hidden(value))

tachys/src/html/element/elements.rs

@@ -212,7 +212,7 @@ html_self_closing_elements! {
     /// The `<img>` HTML element embeds an image into the document.
     img HtmlImageElement [alt, attributionsrc, crossorigin, decoding, elementtiming, fetchpriority, height, ismap, loading, referrerpolicy, sizes, src, srcset, usemap, width] true,
     /// The `<input>` HTML element is used to create interactive controls for web-based forms in order to accept data from the user; a wide variety of types of input data and control widgets are available, depending on the device and user agent. The `<input>` element is one of the most powerful and complex in all of HTML due to the sheer number of combinations of input types and attributes.
-    input HtmlInputElement [accept, alt, autocomplete, capture, checked, disabled, form, formaction, formenctype, formmethod, formnovalidate, formtarget, height, list, max, maxlength, min, minlength, multiple, name, pattern, placeholder, popovertarget, popovertargetaction, readonly, required, size, src, step, r#type, value, width] true,
+    input HtmlInputElement [accept, alt, autocomplete, capture, checked, dirname, disabled, form, formaction, formenctype, formmethod, formnovalidate, formtarget, height, list, max, maxlength, min, minlength, multiple, name, pattern, placeholder, popovertarget, popovertargetaction, readonly, required, size, src, step, r#type, value, width] true,
     ///	The `<link>` HTML element specifies relationships between the current document and an external resource. This element is most commonly used to link to CSS, but is also used to establish site icons (both "favicon" style icons and icons for the home screen and apps on mobile devices) among other things.
     link HtmlLinkElement [r#as, blocking, crossorigin, fetchpriority, href, hreflang, imagesizes, imagesrcset, integrity, media, rel, referrerpolicy, sizes, r#type] true,
     ///	The `<meta>` HTML element represents Metadata that cannot be represented by other HTML meta-related elements, like base, link, script, style or title.

tachys/src/html/event.rs

@@ -323,7 +323,9 @@ where
     fn rebuild(self, state: &mut Self::State) {
         let (el, prev_cleanup) = state;
         if let Some(prev) = prev_cleanup.take() {
-            (prev.into_inner())(el);
+            if let Some(remove) = prev.into_inner() {
+                remove();
+            }
         }
         *prev_cleanup = Some(if E::CAPTURE {
             self.attach_capture(el)

tachys/src/reactive_graph/bind.rs

@@ -258,7 +258,9 @@ where
         prop(self.key(), signal).rebuild(attr_state);
 
         if let Some(prev) = prev_cleanup.take() {
-            (prev.into_inner())(el);
+            if let Some(remove) = prev.into_inner() {
+                remove();
+            }
         }
         *prev_cleanup = Some(self.attach(el));
     }

tachys/src/reactive_graph/node_ref.rs

@@ -7,8 +7,8 @@ use reactive_graph::{
         RwSignal,
     },
     traits::{
-        DefinedAt, Get, Notify, ReadUntracked, Set, Track, UntrackableGuard,
-        Write,
+        DefinedAt, Get, IsDisposed, Notify, ReadUntracked, Set, Track,
+        UntrackableGuard, Write,
     },
 };
 use send_wrapper::SendWrapper;
@@ -158,6 +158,16 @@ where
     }
 }
 
+impl<E> IsDisposed for NodeRef<E>
+where
+    E: ElementType,
+    E::Output: 'static,
+{
+    fn is_disposed(&self) -> bool {
+        self.0.is_disposed()
+    }
+}
+
 /// Create a [NodeRef].
 #[inline(always)]
 #[track_caller]

tachys/src/renderer/dom.rs

@@ -296,19 +296,20 @@ impl Dom {
         // return the remover
         RemoveEventHandler::new({
             let name = name.to_owned();
+            let el = el.clone();
             // safe to construct this here, because it will only run in the browser
             // so it will always be accessed or dropped from the main thread
-            let cb = send_wrapper::SendWrapper::new(cb);
-            move |el: &Element| {
+            let cb = send_wrapper::SendWrapper::new(move || {
                 or_debug!(
                     el.remove_event_listener_with_callback(
                         intern(&name),
                         cb.as_ref().unchecked_ref()
                     ),
-                    el,
+                    &el,
                     "removeEventListener"
                 )
-            }
+            });
+            move || cb()
         })
     }
 
@@ -334,20 +335,21 @@ impl Dom {
         // return the remover
         RemoveEventHandler::new({
             let name = name.to_owned();
+            let el = el.clone();
             // safe to construct this here, because it will only run in the browser
             // so it will always be accessed or dropped from the main thread
-            let cb = send_wrapper::SendWrapper::new(cb);
-            move |el: &Element| {
+            let cb = send_wrapper::SendWrapper::new(move || {
                 or_debug!(
                     el.remove_event_listener_with_callback_and_bool(
                         intern(&name),
                         cb.as_ref().unchecked_ref(),
                         true
                     ),
-                    el,
+                    &el,
                     "removeEventListener"
                 )
-            }
+            });
+            move || cb()
         })
     }
 
@@ -448,17 +450,19 @@ impl Dom {
         // return the remover
         RemoveEventHandler::new({
             let key = key.to_owned();
+            let el = el.clone();
             // safe to construct this here, because it will only run in the browser
             // so it will always be accessed or dropped from the main thread
-            let cb = send_wrapper::SendWrapper::new(cb);
-            move |el: &Element| {
-                drop(cb.take());
+            let el_cb = send_wrapper::SendWrapper::new((el, cb));
+            move || {
+                let (el, cb) = el_cb.take();
+                drop(cb);
                 or_debug!(
                     js_sys::Reflect::delete_property(
-                        el,
+                        &el,
                         &JsValue::from_str(&key)
                     ),
-                    el,
+                    &el,
                     "delete property"
                 );
             }

tachys/src/renderer/mod.rs

@@ -1,5 +1,5 @@
 use crate::view::{Mountable, ToTemplate};
-use std::{borrow::Cow, fmt::Debug};
+use std::{borrow::Cow, fmt::Debug, marker::PhantomData};
 use wasm_bindgen::JsValue;
 
 /// A DOM renderer.
@@ -120,16 +120,33 @@ pub trait Renderer: Send + Sized + Debug + 'static {
               should store it in some other data structure to clean it up \
               later to avoid dropping it immediately, or leak it with \
               std::mem::forget() to never drop it."]
-pub struct RemoveEventHandler<T>(Box<dyn FnOnce(&T) + Send + Sync>);
+#[allow(clippy::type_complexity)]
+pub struct RemoveEventHandler<T>(
+    Option<Box<dyn FnOnce() + Send + Sync>>,
+    // only here to keep the generic, removing which would be a breaking change
+    // TODO remove generic in 0.9
+    PhantomData<fn() -> T>,
+);
 
 impl<T> RemoveEventHandler<T> {
     /// Creates a new container with a function that will be called when it is dropped.
-    pub(crate) fn new(remove: impl FnOnce(&T) + Send + Sync + 'static) -> Self {
-        Self(Box::new(remove))
+    pub(crate) fn new(remove: impl FnOnce() + Send + Sync + 'static) -> Self {
+        Self(Some(Box::new(remove)), PhantomData)
     }
 
-    pub(crate) fn into_inner(self) -> Box<dyn FnOnce(&T) + Send + Sync> {
-        self.0
+    #[allow(clippy::type_complexity)]
+    pub(crate) fn into_inner(
+        mut self,
+    ) -> Option<Box<dyn FnOnce() + Send + Sync>> {
+        self.0.take()
+    }
+}
+
+impl<T> Drop for RemoveEventHandler<T> {
+    fn drop(&mut self) {
+        if let Some(cb) = self.0.take() {
+            cb()
+        }
     }
 }
 

tachys/src/ssr/mod.rs

@@ -378,83 +378,91 @@ impl Stream for StreamBuilder {
             let next_chunk = this.chunks.pop_front();
             match next_chunk {
                 None => {
-                    // now, handle out-of-order chunks
-                    if let Some(mut pending) = this.pending_ooo.pop_front() {
-                        match pending.as_mut().poll(cx) {
-                            Poll::Ready(OooChunk {
-                                id,
-                                chunks,
-                                replace,
-                                nonce,
-                            }) => {
-                                let opening = format!("<!--s-{id}o-->");
-                                let placeholder_at =
-                                    this.sync_buf.find(&opening);
-                                if let Some(start) = placeholder_at {
-                                    let closing = format!("<!--s-{id}c-->");
-                                    let end =
-                                        this.sync_buf.find(&closing).unwrap();
-                                    let chunks_iter = chunks.into_iter().rev();
+                    if this.pending_ooo.is_empty() {
+                        if this.sync_buf.is_empty() {
+                            Poll::Ready(None)
+                        } else {
+                            Poll::Ready(Some(mem::take(&mut this.sync_buf)))
+                        }
+                    } else {
+                        // check if *any* pending out-of-order chunk is ready
+                        for mut chunk in mem::take(&mut this.pending_ooo) {
+                            match chunk.as_mut().poll(cx) {
+                                Poll::Ready(OooChunk {
+                                    id,
+                                    chunks,
+                                    replace,
+                                    nonce,
+                                }) => {
+                                    let opening = format!("<!--s-{id}o-->");
+                                    let placeholder_at =
+                                        this.sync_buf.find(&opening);
+                                    if let Some(start) = placeholder_at {
+                                        let closing = format!("<!--s-{id}c-->");
+                                        let end = this
+                                            .sync_buf
+                                            .find(&closing)
+                                            .unwrap();
+                                        let chunks_iter =
+                                            chunks.into_iter().rev();
 
-                                    // TODO can probably make this more efficient
-                                    let (before, replaced) =
-                                        this.sync_buf.split_at(start);
-                                    let (_, after) = replaced
-                                        .split_at(end - start + closing.len());
-                                    let mut buf = String::new();
-                                    buf.push_str(before);
+                                        // TODO can probably make this more efficient
+                                        let (before, replaced) =
+                                            this.sync_buf.split_at(start);
+                                        let (_, after) = replaced.split_at(
+                                            end - start + closing.len(),
+                                        );
+                                        let mut buf = String::new();
+                                        buf.push_str(before);
 
-                                    let mut held_chunks = VecDeque::new();
-                                    for chunk in chunks_iter {
-                                        if let StreamChunk::Sync(ready) = chunk
-                                        {
-                                            buf.push_str(&ready);
-                                        } else {
-                                            held_chunks.push_front(chunk);
+                                        let mut held_chunks = VecDeque::new();
+                                        for chunk in chunks_iter {
+                                            if let StreamChunk::Sync(ready) =
+                                                chunk
+                                            {
+                                                buf.push_str(&ready);
+                                            } else {
+                                                held_chunks.push_front(chunk);
+                                            }
                                         }
-                                    }
-                                    buf.push_str(after);
-                                    this.sync_buf = buf;
-                                    for chunk in held_chunks {
-                                        this.chunks.push_front(chunk);
-                                    }
-                                } else {
-                                    OooChunk::push_start(
-                                        &id,
-                                        &mut this.sync_buf,
-                                    );
-                                    for chunk in chunks.into_iter().rev() {
-                                        if let StreamChunk::Sync(ready) = chunk
-                                        {
-                                            this.sync_buf.push_str(&ready);
-                                        } else {
+                                        buf.push_str(after);
+                                        this.sync_buf = buf;
+                                        for chunk in held_chunks {
                                             this.chunks.push_front(chunk);
                                         }
+                                    } else {
+                                        OooChunk::push_start(
+                                            &id,
+                                            &mut this.sync_buf,
+                                        );
+                                        for chunk in chunks.into_iter().rev() {
+                                            if let StreamChunk::Sync(ready) =
+                                                chunk
+                                            {
+                                                this.sync_buf.push_str(&ready);
+                                            } else {
+                                                this.chunks.push_front(chunk);
+                                            }
+                                        }
+                                        OooChunk::push_end_with_nonce(
+                                            replace,
+                                            &id,
+                                            &mut this.sync_buf,
+                                            nonce.as_deref(),
+                                        );
                                     }
-                                    OooChunk::push_end_with_nonce(
-                                        replace,
-                                        &id,
-                                        &mut this.sync_buf,
-                                        nonce.as_deref(),
-                                    );
                                 }
-                                self.poll_next(cx)
-                            }
-                            Poll::Pending => {
-                                this.pending_ooo.push_back(pending);
-                                if this.sync_buf.is_empty() {
-                                    Poll::Pending
-                                } else {
-                                    Poll::Ready(Some(mem::take(
-                                        &mut this.sync_buf,
-                                    )))
+                                Poll::Pending => {
+                                    this.pending_ooo.push_back(chunk);
                                 }
                             }
                         }
-                    } else if this.sync_buf.is_empty() {
-                        Poll::Ready(None)
-                    } else {
-                        Poll::Ready(Some(mem::take(&mut this.sync_buf)))
+
+                        if this.sync_buf.is_empty() {
+                            Poll::Pending
+                        } else {
+                            Poll::Ready(Some(mem::take(&mut this.sync_buf)))
+                        }
                     }
                 }
                 Some(StreamChunk::Sync(value)) => {

tachys/src/view/any_view.rs

@@ -79,6 +79,13 @@ pub struct AnyView {
     ) -> Pin<Box<dyn Future<Output = AnyViewState>>>,
 }
 
+impl AnyView {
+    #[doc(hidden)]
+    pub fn as_type_id(&self) -> TypeId {
+        self.type_id
+    }
+}
+
 impl Debug for AnyView {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("AnyView")