rc2

docs: adds more helpful text for hydration errors (closes #3267 ) (#3275 )
chore: expose some internals of routing to make wrappers easier (#3232 )
2025-12-28 09:02:37 -05:00 · 2024-11-22 15:27:00 -05:00 · 2024-11-22 15:10:37 -05:00 · 2024-11-22 15:10:23 -05:00 · 2024-11-22 14:55:24 -05:00 · 2024-11-21 19:24:47 -05:00
31 changed files with 446 additions and 209 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -88,7 +88,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
 dependencies = [
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -205,7 +205,7 @@ dependencies = [
 "actix-router",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -333,7 +333,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -350,7 +350,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -364,23 +364,23 @@ dependencies = [

 [[package]]
 name = "attribute-derive"
-version = "0.10.2"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1800e974930e9079c965b9ffbcb6667a40401063a26396c7b4f15edc92da690"
+checksum = "0053e96dd3bec5b4879c23a138d6ef26f2cb936c9cdc96274ac2b9ed44b5bb54"
 dependencies = [
 "attribute-derive-macro",
 "derive-where",
 "manyhow",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
 name = "attribute-derive-macro"
-version = "0.10.2"
+version = "0.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d908eb786ef94296bff86f90130b3b748b49401dc81fd2bb8b3dccd44cfacbd"
+checksum = "463b53ad0fd5b460af4b1915fe045ff4d946d025fb6c4dc3337752eaa980f71b"
 dependencies = [
 "collection_literals",
 "interpolator",
@@ -389,7 +389,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "quote-use",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -400,9 +400,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"

 [[package]]
 name = "axum"
-version = "0.7.8"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49c41b948da08fb481a94546cd874843adc1142278b0af4badf9b1b78599d68d"
+checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
 dependencies = [
 "async-trait",
 "axum-core",
@@ -571,7 +571,7 @@ checksum = "523363cbe1df49b68215efdf500b103ac3b0fb4836aed6d15689a076eadb8fff"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -867,7 +867,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -880,7 +880,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "rustc_version",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -901,7 +901,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -1109,7 +1109,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -1213,7 +1213,7 @@ dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -1448,7 +1448,7 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"

 [[package]]
 name = "hydration_context"
-version = "0.2.0-rc1"
+version = "0.2.0-rc2"
 dependencies = [
 "futures",
 "js-sys",
@@ -1648,7 +1648,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -1765,7 +1765,7 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"

 [[package]]
 name = "leptos"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 dependencies = [
 "any_spawner",
 "base64",
@@ -1810,12 +1810,12 @@ dependencies = [
 "http 1.1.0",
 "proc-macro-error",
 "server_fn_macro 0.6.15",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
 name = "leptos_actix"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 dependencies = [
 "actix-files",
 "actix-http",
@@ -1840,7 +1840,7 @@ dependencies = [

 [[package]]
 name = "leptos_axum"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 dependencies = [
 "any_spawner",
 "axum",
@@ -1863,7 +1863,7 @@ dependencies = [

 [[package]]
 name = "leptos_config"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 dependencies = [
 "config",
 "regex",
@@ -1877,7 +1877,7 @@ dependencies = [

 [[package]]
 name = "leptos_dom"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 dependencies = [
 "js-sys",
 "leptos",
@@ -1894,7 +1894,7 @@ dependencies = [

 [[package]]
 name = "leptos_hot_reload"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 dependencies = [
 "anyhow",
 "camino",
@@ -1904,13 +1904,13 @@ dependencies = [
 "quote",
 "rstml",
 "serde",
- "syn 2.0.87",
+ "syn 2.0.89",
 "walkdir",
 ]

 [[package]]
 name = "leptos_integration_utils"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 dependencies = [
 "futures",
 "hydration_context",
@@ -1923,7 +1923,7 @@ dependencies = [

 [[package]]
 name = "leptos_macro"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 dependencies = [
 "attribute-derive",
 "cfg-if",
@@ -1941,8 +1941,8 @@ dependencies = [
 "rstml",
 "serde",
 "server_fn",
- "server_fn_macro 0.7.0-rc1",
- "syn 2.0.87",
+ "server_fn_macro 0.7.0-rc2",
+ "syn 2.0.89",
 "tracing",
 "trybuild",
 "typed-builder",
@@ -1951,7 +1951,7 @@ dependencies = [

 [[package]]
 name = "leptos_meta"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 dependencies = [
 "futures",
 "indexmap",
@@ -1966,7 +1966,7 @@ dependencies = [

 [[package]]
 name = "leptos_router"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 dependencies = [
 "any_spawner",
 "either_of",
@@ -1990,7 +1990,7 @@ dependencies = [

 [[package]]
 name = "leptos_router_macro"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 dependencies = [
 "leptos_router",
 "proc-macro-error2",
@@ -2000,7 +2000,7 @@ dependencies = [

 [[package]]
 name = "leptos_server"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 dependencies = [
 "any_spawner",
 "base64",
@@ -2091,7 +2091,7 @@ dependencies = [
 "manyhow-macros",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -2141,7 +2141,7 @@ checksum = "f3cd9f9bbedc1b92683a9847b8db12f3203cf32af6a11db085fa007708dc9555"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -2217,7 +2217,7 @@ checksum = "1bb5c1d8184f13f7d0ccbeeca0def2f9a181bce2624302793005f5ca8aa62e5e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -2239,7 +2239,7 @@ dependencies = [

 [[package]]
 name = "next_tuple"
-version = "0.1.0-rc1"
+version = "0.1.0-rc2"

 [[package]]
 name = "nom"
@@ -2323,7 +2323,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -2412,7 +2412,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -2468,7 +2468,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
 dependencies = [
 "proc-macro2",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -2523,7 +2523,7 @@ dependencies = [
 "proc-macro-error-attr2",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -2539,9 +2539,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.89"
+version = "1.0.91"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
+checksum = "307e3004becf10f5a6e0d59d20f3cd28231b0e0827a96cd3e0ce6d14bc1e4bb3"
 dependencies = [
 "unicode-ident",
 ]
@@ -2554,7 +2554,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 "version_check",
 "yansi",
 ]
@@ -2596,7 +2596,7 @@ checksum = "ca414edb151b4c8d125c12566ab0d74dc9cdba36fb80eb7b848c15f495fd32d1"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -2676,7 +2676,7 @@ dependencies = [
 "proc-macro-utils",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -2726,7 +2726,7 @@ dependencies = [

 [[package]]
 name = "reactive_graph"
-version = "0.1.0-rc1"
+version = "0.1.0-rc2"
 dependencies = [
 "any_spawner",
 "async-lock",
@@ -2748,7 +2748,7 @@ dependencies = [

 [[package]]
 name = "reactive_stores"
-version = "0.1.0-rc1"
+version = "0.1.0-rc2"
 dependencies = [
 "any_spawner",
 "guardian",
@@ -2764,13 +2764,13 @@ dependencies = [

 [[package]]
 name = "reactive_stores_macro"
-version = "0.1.0-rc1"
+version = "0.1.0-rc2"
 dependencies = [
 "convert_case 0.6.0",
 "proc-macro-error2",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -2954,7 +2954,7 @@ checksum = "09cb82b74b4810f07e460852c32f522e979787691b0b7b7439fe473e49d49b2f"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -2989,7 +2989,7 @@ dependencies = [
 "proc-macro2",
 "proc-macro2-diagnostics",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 "syn_derive",
 "thiserror 1.0.68",
 ]
@@ -3181,7 +3181,7 @@ checksum = "7ce26a84e3d8d10853301cf6a75c58132b8f5d5e8fee65949ea8dd7758d6760b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -3203,14 +3203,14 @@ checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.132"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
 "itoa",
 "memchr",
@@ -3262,7 +3262,7 @@ dependencies = [

 [[package]]
 name = "server_fn"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 dependencies = [
 "actix-web",
 "axum",
@@ -3312,28 +3312,28 @@ dependencies = [
 "convert_case 0.6.0",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 "xxhash-rust",
 ]

 [[package]]
 name = "server_fn_macro"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 dependencies = [
 "const_format",
 "convert_case 0.6.0",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 "xxhash-rust",
 ]

 [[package]]
 name = "server_fn_macro_default"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 dependencies = [
- "server_fn_macro 0.7.0-rc1",
- "syn 2.0.87",
+ "server_fn_macro 0.7.0-rc2",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -3400,7 +3400,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33a1b4f13e2bbf2f5b29d09dfebc9de69229ffee245aed80e3b70f9b5fd28c06"
 dependencies = [
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -3471,9 +3471,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.87"
+version = "2.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
+checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3489,7 +3489,7 @@ dependencies = [
 "proc-macro-error",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -3515,7 +3515,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -3533,7 +3533,7 @@ dependencies = [

 [[package]]
 name = "tachys"
-version = "0.1.0-rc1"
+version = "0.1.0-rc2"
 dependencies = [
 "any_spawner",
 "const_str_slice_concat",
@@ -3642,7 +3642,7 @@ checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -3653,12 +3653,12 @@ checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
 name = "throw_error"
-version = "0.2.0-rc1"
+version = "0.2.0-rc2"
 dependencies = [
 "pin-project-lite",
 ]
@@ -3745,7 +3745,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -3858,9 +3858,9 @@ dependencies = [

 [[package]]
 name = "tower-http"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8437150ab6bbc8c5f0f519e3d5ed4aa883a83dd4cdd3d1b21f9482936046cb97"
+checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697"
 dependencies = [
 "bitflags",
 "bytes",
@@ -3913,7 +3913,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -3963,7 +3963,7 @@ checksum = "560b82d656506509d43abe30e0ba64c56b1953ab3d4fe7ba5902747a7a3cedd5"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -4111,7 +4111,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 "wasm-bindgen-shared",
 ]

@@ -4145,7 +4145,7 @@ checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@@ -4371,7 +4371,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 "synstructure",
 ]

@@ -4393,7 +4393,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
@@ -4413,7 +4413,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 "synstructure",
 ]

@@ -4442,7 +4442,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.87",
+ "syn 2.0.89",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,36 +40,36 @@ members = [
 exclude = ["benchmarks", "examples", "projects"]

 [workspace.package]
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 edition = "2021"
 rust-version = "1.76"

 [workspace.dependencies]
-throw_error = { path = "./any_error/", version = "0.2.0-rc1" }
+throw_error = { path = "./any_error/", version = "0.2.0-rc2" }
 any_spawner = { path = "./any_spawner/", version = "0.1.0" }
 const_str_slice_concat = { path = "./const_str_slice_concat", version = "0.1.0" }
 either_of = { path = "./either_of/", version = "0.1.0" }
-hydration_context = { path = "./hydration_context", version = "0.2.0-rc1" }
-leptos = { path = "./leptos", version = "0.7.0-rc1" }
-leptos_config = { path = "./leptos_config", version = "0.7.0-rc1" }
-leptos_dom = { path = "./leptos_dom", version = "0.7.0-rc1" }
-leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.7.0-rc1" }
-leptos_integration_utils = { path = "./integrations/utils", version = "0.7.0-rc1" }
-leptos_macro = { path = "./leptos_macro", version = "0.7.0-rc1" }
-leptos_router = { path = "./router", version = "0.7.0-rc1" }
-leptos_router_macro = { path = "./router_macro", version = "0.7.0-rc1" }
-leptos_server = { path = "./leptos_server", version = "0.7.0-rc1" }
-leptos_meta = { path = "./meta", version = "0.7.0-rc1" }
-next_tuple = { path = "./next_tuple", version = "0.1.0-rc1" }
+hydration_context = { path = "./hydration_context", version = "0.2.0-rc2" }
+leptos = { path = "./leptos", version = "0.7.0-rc2" }
+leptos_config = { path = "./leptos_config", version = "0.7.0-rc2" }
+leptos_dom = { path = "./leptos_dom", version = "0.7.0-rc2" }
+leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.7.0-rc2" }
+leptos_integration_utils = { path = "./integrations/utils", version = "0.7.0-rc2" }
+leptos_macro = { path = "./leptos_macro", version = "0.7.0-rc2" }
+leptos_router = { path = "./router", version = "0.7.0-rc2" }
+leptos_router_macro = { path = "./router_macro", version = "0.7.0-rc2" }
+leptos_server = { path = "./leptos_server", version = "0.7.0-rc2" }
+leptos_meta = { path = "./meta", version = "0.7.0-rc2" }
+next_tuple = { path = "./next_tuple", version = "0.1.0-rc2" }
 oco_ref = { path = "./oco", version = "0.2.0" }
 or_poisoned = { path = "./or_poisoned", version = "0.1.0" }
-reactive_graph = { path = "./reactive_graph", version = "0.1.0-rc1" }
-reactive_stores = { path = "./reactive_stores", version = "0.1.0-rc1" }
-reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.1.0-rc1" }
-server_fn = { path = "./server_fn", version = "0.7.0-rc1" }
-server_fn_macro = { path = "./server_fn_macro", version = "0.7.0-rc1" }
-server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.7.0-rc1" }
-tachys = { path = "./tachys", version = "0.1.0-rc1" }
+reactive_graph = { path = "./reactive_graph", version = "0.1.0-rc2" }
+reactive_stores = { path = "./reactive_stores", version = "0.1.0-rc2" }
+reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.1.0-rc2" }
+server_fn = { path = "./server_fn", version = "0.7.0-rc2" }
+server_fn_macro = { path = "./server_fn_macro", version = "0.7.0-rc2" }
+server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.7.0-rc2" }
+tachys = { path = "./tachys", version = "0.1.0-rc2" }

 [profile.release]
 codegen-units = 1
--- a/any_error/Cargo.toml
+++ b/any_error/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "throw_error"
-version = "0.2.0-rc1"
+version = "0.2.0-rc2"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
--- a/examples/todo_app_sqlite_csr/src/todo.rs
+++ b/examples/todo_app_sqlite_csr/src/todo.rs
@@ -4,25 +4,6 @@ use leptos::prelude::*;
 use serde::{Deserialize, Serialize};
 use server_fn::ServerFnError;

-pub fn shell(leptos_options: &LeptosOptions) -> impl IntoView {
-    view! {
-        <!DOCTYPE html>
-        <html lang="en">
-            <head>
-                <meta charset="utf-8"/>
-                <meta name="viewport" content="width=device-width, initial-scale=1"/>
-                <AutoReload options=leptos_options.clone() />
-                <HydrationScripts options=leptos_options.clone()/>
-                <link rel="stylesheet" id="leptos" href="/pkg/todo_app_sqlite_csr.css"/>
-                <link rel="shortcut icon" type="image/ico" href="/favicon.ico"/>
-            </head>
-            <body>
-                <TodoApp/>
-            </body>
-        </html>
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
 #[cfg_attr(feature = "ssr", derive(sqlx::FromRow))]
 pub struct Todo {
--- a/hydration_context/Cargo.toml
+++ b/hydration_context/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hydration_context"
-version = "0.2.0-rc1"
+version = "0.2.0-rc2"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
--- a/integrations/axum/Cargo.toml
+++ b/integrations/axum/Cargo.toml
@@ -11,7 +11,7 @@ edition.workspace = true
 [dependencies]
 any_spawner = { workspace = true, features = ["tokio"] }
 hydration_context = { workspace = true }
-axum = { version = "0.7.8", default-features = false, features = [
+axum = { version = "0.7.9", default-features = false, features = [
  "matched-path",
 ] }
 dashmap = "6"
@@ -26,11 +26,11 @@ once_cell = "1"
 parking_lot = "0.12.3"
 tokio = { version = "1.41", default-features = false }
 tower = { version = "0.5.1", features = ["util"] }
-tower-http = "0.6.1"
+tower-http = "0.6.2"
 tracing = { version = "0.1.40", optional = true }

 [dev-dependencies]
-axum = "0.7.8"
+axum = "0.7.9"
 tokio = { version = "1.41", features = ["net", "rt-multi-thread"] }

 [features]
--- a/leptos_macro/Cargo.toml
+++ b/leptos_macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leptos_macro"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
@@ -13,7 +13,7 @@ edition.workspace = true
 proc-macro = true

 [dependencies]
-attribute-derive = { version = "0.10.2", features = ["syn-full"] }
+attribute-derive = { version = "0.10.3", features = ["syn-full"] }
 cfg-if = "1.0"
 html-escape = "0.2.13"
 itertools = "0.13.0"
--- a/meta/Cargo.toml
+++ b/meta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leptos_meta"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
--- a/next_tuple/Cargo.toml
+++ b/next_tuple/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "next_tuple"
-version = "0.1.0-rc1"
+version = "0.1.0-rc2"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
--- a/reactive_graph/Cargo.toml
+++ b/reactive_graph/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reactive_graph"
-version = "0.1.0-rc1"
+version = "0.1.0-rc2"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
--- a/reactive_graph/src/computed/async_derived/arc_async_derived.rs
+++ b/reactive_graph/src/computed/async_derived/arc_async_derived.rs
@@ -117,6 +117,7 @@ pub struct ArcAsyncDerived<T> {
    pub(crate) loading: Arc<AtomicBool>,
 }

+#[allow(dead_code)]
 pub(crate) trait BlockingLock<T> {
    fn blocking_read_arc(self: &Arc<Self>)
        -> async_lock::RwLockReadGuardArc<T>;
@@ -583,19 +584,17 @@ impl<T: 'static> ReadUntracked for ArcAsyncDerived<T> {

    fn try_read_untracked(&self) -> Option<Self::Value> {
        if let Some(suspense_context) = use_context::<SuspenseContext>() {
-            if self.value.blocking_read().is_none() {
-                let handle = suspense_context.task_id();
-                let ready = SpecialNonReactiveFuture::new(self.ready());
-                crate::spawn(async move {
-                    ready.await;
-                    drop(handle);
-                });
-                self.inner
-                    .write()
-                    .or_poisoned()
-                    .suspenses
-                    .push(suspense_context);
-            }
+            let handle = suspense_context.task_id();
+            let ready = SpecialNonReactiveFuture::new(self.ready());
+            crate::spawn(async move {
+                ready.await;
+                drop(handle);
+            });
+            self.inner
+                .write()
+                .or_poisoned()
+                .suspenses
+                .push(suspense_context);
        }
        AsyncPlain::try_new(&self.value).map(ReadGuard::new)
    }
--- a/reactive_stores/Cargo.toml
+++ b/reactive_stores/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reactive_stores"
-version = "0.1.0-rc1"
+version = "0.1.0-rc2"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
--- a/reactive_stores/src/arc_field.rs
+++ b/reactive_stores/src/arc_field.rs
@@ -7,6 +7,7 @@ use reactive_graph::{
    owner::Storage,
    traits::{
        DefinedAt, IsDisposed, Notify, ReadUntracked, Track, UntrackableGuard,
+        Write,
    },
 };
 use std::{
@@ -31,7 +32,8 @@ where
    trigger: StoreFieldTrigger,
    get_trigger: Arc<dyn Fn(StorePath) -> StoreFieldTrigger + Send + Sync>,
    read: Arc<dyn Fn() -> Option<StoreFieldReader<T>> + Send + Sync>,
-    write: Arc<dyn Fn() -> Option<StoreFieldWriter<T>> + Send + Sync>,
+    pub(crate) write:
+        Arc<dyn Fn() -> Option<StoreFieldWriter<T>> + Send + Sync>,
    keys: Arc<dyn Fn() -> Option<KeyMap> + Send + Sync>,
    track_field: Arc<dyn Fn() + Send + Sync>,
 }
@@ -329,6 +331,22 @@ impl<T> ReadUntracked for ArcField<T> {
    }
 }

+impl<T> Write for ArcField<T> {
+    type Value = T;
+
+    fn try_write(&self) -> Option<impl UntrackableGuard<Target = Self::Value>> {
+        (self.write)()
+    }
+
+    fn try_write_untracked(
+        &self,
+    ) -> Option<impl DerefMut<Target = Self::Value>> {
+        let mut guard = (self.write)()?;
+        guard.untrack();
+        Some(guard)
+    }
+}
+
 impl<T> IsDisposed for ArcField<T> {
    fn is_disposed(&self) -> bool {
        false
--- a/reactive_stores/src/field.rs
+++ b/reactive_stores/src/field.rs
@@ -6,10 +6,18 @@ use crate::{
 };
 use reactive_graph::{
    owner::{ArenaItem, Storage, SyncStorage},
-    traits::{DefinedAt, IsDisposed, Notify, ReadUntracked, Track},
+    traits::{
+        DefinedAt, IsDisposed, Notify, ReadUntracked, Track, UntrackableGuard,
+        Write,
+    },
    unwrap_signal,
 };
-use std::{fmt::Debug, hash::Hash, ops::IndexMut, panic::Location};
+use std::{
+    fmt::Debug,
+    hash::Hash,
+    ops::{DerefMut, IndexMut},
+    panic::Location,
+};

 /// Wraps access to a single field of type `T`.
 ///
@@ -204,6 +212,24 @@ where
    }
 }

+impl<T> Write for Field<T> {
+    type Value = T;
+
+    fn try_write(&self) -> Option<impl UntrackableGuard<Target = Self::Value>> {
+        self.inner.try_get_value().and_then(|inner| (inner.write)())
+    }
+
+    fn try_write_untracked(
+        &self,
+    ) -> Option<impl DerefMut<Target = Self::Value>> {
+        self.inner.try_get_value().and_then(|inner| {
+            let mut guard = (inner.write)()?;
+            guard.untrack();
+            Some(guard)
+        })
+    }
+}
+
 impl<T, S> IsDisposed for Field<T, S> {
    fn is_disposed(&self) -> bool {
        self.inner.is_disposed()
--- a/reactive_stores/src/option.rs
+++ b/reactive_stores/src/option.rs
@@ -1,5 +1,5 @@
 use crate::{StoreField, Subfield};
-use reactive_graph::traits::Read;
+use reactive_graph::traits::{Read, ReadUntracked};
 use std::ops::Deref;

 /// Extends optional store fields, with the ability to unwrap or map over them.
@@ -23,12 +23,23 @@ where
        self,
        map_fn: impl FnOnce(Subfield<Self, Option<Self::Output>, Self::Output>) -> U,
    ) -> Option<U>;
+
+    /// Unreactively maps over the field.
+    ///
+    /// This returns `None` if the subfield is currently `None`,
+    /// and a new store subfield with the inner value if it is `Some`. This is an unreactive variant of
+    /// `[OptionStoreExt::map]`, and will not cause the reactive context to re-run if the field changes.
+    fn map_untracked<U>(
+        self,
+        map_fn: impl FnOnce(Subfield<Self, Option<Self::Output>, Self::Output>) -> U,
+    ) -> Option<U>;
 }

 impl<T, S> OptionStoreExt for S
 where
-    S: StoreField<Value = Option<T>> + Read,
+    S: StoreField<Value = Option<T>> + Read + ReadUntracked,
    <S as Read>::Value: Deref<Target = Option<T>>,
+    <S as ReadUntracked>::Value: Deref<Target = Option<T>>,
 {
    type Output = T;

@@ -51,6 +62,17 @@ where
            None
        }
    }
+
+    fn map_untracked<U>(
+        self,
+        map_fn: impl FnOnce(Subfield<S, Option<T>, T>) -> U,
+    ) -> Option<U> {
+        if self.read_untracked().is_some() {
+            Some(map_fn(self.unwrap()))
+        } else {
+            None
+        }
+    }
 }

 #[cfg(test)]
--- a/reactive_stores_macro/Cargo.toml
+++ b/reactive_stores_macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reactive_stores_macro"
-version = "0.1.0-rc1"
+version = "0.1.0-rc2"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
--- a/router/Cargo.toml
+++ b/router/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leptos_router"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 authors = ["Greg Johnston", "Ben Wishovich"]
 license = "MIT"
 readme = "../README.md"
--- a/router/src/components.rs
+++ b/router/src/components.rs
@@ -13,8 +13,8 @@ use crate::{
    resolve_path::resolve_path,
    ChooseView, MatchNestedRoutes, NestedRoute, RouteDefs, SsrMode,
 };
-use either_of::Either;
-use leptos::prelude::*;
+use either_of::EitherOf3;
+use leptos::{children, prelude::*};
 use reactive_graph::{
    owner::{provide_context, use_context, Owner},
    signal::ArcRwSignal,
@@ -389,6 +389,9 @@ pub fn ProtectedRoute<Segments, ViewFn, View, C, PathFn, P>(
    condition: C,
    /// The path that will be redirected to if the condition is `Some(false)`.
    redirect_path: PathFn,
+    /// Will be displayed while the condition is pending. By default this is the empty view.
+    #[prop(optional, into)]
+    fallback: children::ViewFn,
    /// The mode that this route prefers during server-side rendering.
    /// Defaults to out-of-order streaming.
    #[prop(optional)]
@@ -401,23 +404,26 @@ where
    PathFn: Fn() -> P + Send + Clone + 'static,
    P: Display + 'static,
 {
+    let fallback = move || fallback.run();
    let view = move || {
        let condition = condition.clone();
        let redirect_path = redirect_path.clone();
        let view = view.clone();
+        let fallback = fallback.clone();
        (view! {
-            <Transition>
+            <Transition fallback=fallback.clone()>
                {move || {
                    let condition = condition();
                    let view = view.clone();
                    let redirect_path = redirect_path.clone();
+                    let fallback = fallback.clone();
                    Unsuspend::new(move || match condition {
-                        Some(true) => Either::Left(view()),
+                        Some(true) => EitherOf3::A(view()),
                        #[allow(clippy::unit_arg)]
                        Some(false) => {
-                            Either::Right(view! { <Redirect path=redirect_path()/> }.into_inner())
+                            EitherOf3::B(view! { <Redirect path=redirect_path()/> }.into_inner())
                        }
-                        None => Either::Right(()),
+                        None => EitherOf3::C(fallback()),
                    })
                }}

@@ -441,6 +447,9 @@ pub fn ProtectedParentRoute<Segments, ViewFn, View, C, PathFn, P, Children>(
    /// the page, `Some(false)` means the user cannot access the page, and `None` means this
    /// information is still loading.
    condition: C,
+    /// Will be displayed while the condition is pending. By default this is the empty view.
+    #[prop(optional, into)]
+    fallback: children::ViewFn,
    /// The path that will be redirected to if the condition is `Some(false)`.
    redirect_path: PathFn,
    /// Nested child routes.
@@ -457,17 +466,21 @@ where
    PathFn: Fn() -> P + Send + Clone + 'static,
    P: Display + 'static,
 {
+    let fallback = move || fallback.run();
    let children = children.into_inner();
    let view = move || {
        let condition = condition.clone();
        let redirect_path = redirect_path.clone();
+        let fallback = fallback.clone();
        let view = view.clone();
        let owner = Owner::current().unwrap();
        let view = {
+            let fallback = fallback.clone();
            move || {
                let condition = condition();
                let view = view.clone();
                let redirect_path = redirect_path.clone();
+                let fallback = fallback.clone();
                let owner = owner.clone();
                Unsuspend::new(move || match condition {
                    // reset the owner so that things like providing context work
@@ -476,16 +489,16 @@ where
                    //
                    // clippy: not redundant, a FnOnce vs FnMut issue
                    #[allow(clippy::redundant_closure)]
-                    Some(true) => Either::Left(owner.with(|| view())),
+                    Some(true) => EitherOf3::A(owner.with(|| view())),
                    #[allow(clippy::unit_arg)]
-                    Some(false) => Either::Right(
+                    Some(false) => EitherOf3::B(
                        view! { <Redirect path=redirect_path()/> }.into_inner(),
                    ),
-                    None => Either::Right(()),
+                    None => EitherOf3::C(fallback()),
                })
            }
        };
-        (view! { <Transition>{view}</Transition> }).into_any()
+        (view! { <Transition fallback>{view}</Transition> }).into_any()
    };
    NestedRoute::new(path, view).ssr_mode(ssr).child(children)
 }
--- a/router/src/matching/mod.rs
+++ b/router/src/matching/mod.rs
@@ -11,7 +11,7 @@ mod vertical;
 use crate::{static_routes::RegenerationFn, Method, SsrMode};
 pub use horizontal::*;
 pub use nested::*;
-use std::{borrow::Cow, collections::HashSet};
+use std::{borrow::Cow, collections::HashSet, sync::atomic::Ordering};
 pub use vertical::*;

 #[derive(Debug)]
@@ -91,6 +91,16 @@ where
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub struct RouteMatchId(pub(crate) u16);

+impl RouteMatchId {
+    /// Creates a new match ID based on the current route ID used in nested route generation.
+    ///
+    /// In general, you do not need this; it should only be used for custom route matching behavior
+    /// in a library that creates its own route types.
+    pub fn new_from_route_id() -> RouteMatchId {
+        RouteMatchId(ROUTE_ID.fetch_add(1, Ordering::Relaxed))
+    }
+}
+
 pub trait MatchInterface {
    type Child: MatchInterface + MatchParams + 'static;

--- a/router/src/matching/nested/mod.rs
+++ b/router/src/matching/nested/mod.rs
@@ -13,7 +13,7 @@ use std::{

 mod tuples;

-static ROUTE_ID: AtomicU16 = AtomicU16::new(1);
+pub(crate) static ROUTE_ID: AtomicU16 = AtomicU16::new(1);

 #[derive(Debug, PartialEq, Eq)]
 pub struct NestedRoute<Segments, Children, Data, View> {
--- a/router_macro/Cargo.toml
+++ b/router_macro/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "leptos_router_macro"
-version = "0.7.0-rc1"
+version = "0.7.0-rc2"
 authors = ["Greg Johnston", "Ben Wishovich"]
 license = "MIT"
 readme = "../README.md"
--- a/server_fn/Cargo.toml
+++ b/server_fn/Cargo.toml
@@ -30,7 +30,7 @@ once_cell = "1.20"
 actix-web = { version = "4.9", optional = true }

 # axum
-axum = { version = "0.7.8", optional = true, default-features = false, features = [
+axum = { version = "0.7.9", optional = true, default-features = false, features = [
  "multipart",
 ] }
 tower = { version = "0.5.1", optional = true }
--- a/tachys/Cargo.toml
+++ b/tachys/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tachys"
-version = "0.1.0-rc1"
+version = "0.1.0-rc2"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
--- a/tachys/src/html/element/custom.rs
+++ b/tachys/src/html/element/custom.rs
@@ -9,8 +9,9 @@ where
    E: AsRef<str>,
 {
    HtmlElement {
+        #[cfg(debug_assertions)]
+        defined_at: std::panic::Location::caller(),
        tag: Custom(tag),
-
        attributes: (),
        children: (),
    }
--- a/tachys/src/html/element/elements.rs
+++ b/tachys/src/html/element/elements.rs
@@ -25,10 +25,11 @@ macro_rules! html_element_inner {

            {
                HtmlElement {
+                    #[cfg(debug_assertions)]
+                    defined_at: std::panic::Location::caller(),
                    tag: $struct_name,
                    attributes: (),
                    children: (),
-
                }
            }

@@ -55,10 +56,17 @@ macro_rules! html_element_inner {
                        At: NextTuple,
                        <At as NextTuple>::Output<Attr<$crate::html::attribute::[<$attr:camel>], V>>: Attribute,
                    {
-                        let HtmlElement { tag, children, attributes } = self;
-                        HtmlElement {
+                        let HtmlElement {
+                            #[cfg(debug_assertions)]
+                            defined_at,
+                            tag,
+                            children,
+                            attributes
+                        } = self;
+                        HtmlElement {
+                            #[cfg(debug_assertions)]
+                            defined_at,
                            tag,
-
                            children,
                            attributes: attributes.next_tuple($crate::html::attribute::$attr(value)),
                        }
@@ -118,14 +126,16 @@ macro_rules! html_self_closing_elements {
        paste::paste! {
            $(
                #[$meta]
+                #[track_caller]
                pub fn $tag() -> HtmlElement<[<$tag:camel>], (), ()>
                where

                {
                    HtmlElement {
+                        #[cfg(debug_assertions)]
+                        defined_at: std::panic::Location::caller(),
                        attributes: (),
                        children: (),
-
                        tag: [<$tag:camel>],
                    }
                }
@@ -138,7 +148,6 @@ macro_rules! html_self_closing_elements {
                impl<At> HtmlElement<[<$tag:camel>], At, ()>
                where
                    At: Attribute,
-
                {
                    $(
                        #[doc = concat!("The [`", stringify!($attr), "`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/", stringify!($tag), "#", stringify!($attr) ,") attribute on `<", stringify!($tag), ">`.")]
@@ -151,13 +160,18 @@ macro_rules! html_self_closing_elements {
                            V: AttributeValue,
                            At: NextTuple,
                            <At as NextTuple>::Output<Attr<$crate::html::attribute::[<$attr:camel>], V>>: Attribute,
-
                        {
-                            let HtmlElement { tag, children, attributes,
+                            let HtmlElement {
+                                 #[cfg(debug_assertions)]
+                                 defined_at,
+                                tag,
+                                children,
+                                attributes,
                            } = self;
                            HtmlElement {
+                                #[cfg(debug_assertions)]
+                                defined_at,
                                tag,
-
                                children,
                                attributes: attributes.next_tuple($crate::html::attribute::$attr(value)),
                            }
--- a/tachys/src/html/element/mod.rs
+++ b/tachys/src/html/element/mod.rs
@@ -1,6 +1,8 @@
+#[cfg(debug_assertions)]
+use crate::hydration::set_currently_hydrating;
 use crate::{
    html::attribute::Attribute,
-    hydration::Cursor,
+    hydration::{failed_to_cast_element, Cursor},
    renderer::{CastFrom, Rndr},
    ssr::StreamBuilder,
    view::{
@@ -24,10 +26,14 @@ pub use custom::*;
 pub use element_ext::*;
 pub use elements::*;
 pub use inner_html::*;
+#[cfg(debug_assertions)]
+use std::panic::Location;

 /// The typed representation of an HTML element.
 #[derive(Debug, PartialEq, Eq)]
 pub struct HtmlElement<E, At, Ch> {
+    #[cfg(debug_assertions)]
+    pub(crate) defined_at: &'static Location<'static>,
    pub(crate) tag: E,
    pub(crate) attributes: At,
    pub(crate) children: Ch,
@@ -36,8 +42,9 @@ pub struct HtmlElement<E, At, Ch> {
 impl<E: Clone, At: Clone, Ch: Clone> Clone for HtmlElement<E, At, Ch> {
    fn clone(&self) -> Self {
        HtmlElement {
+            #[cfg(debug_assertions)]
+            defined_at: self.defined_at,
            tag: self.tag.clone(),
-
            attributes: self.attributes.clone(),
            children: self.children.clone(),
        }
@@ -75,14 +82,16 @@ where

    fn child(self, child: NewChild) -> Self::Output {
        let HtmlElement {
+            #[cfg(debug_assertions)]
+            defined_at,
            tag,
-
            attributes,
            children,
        } = self;
        HtmlElement {
+            #[cfg(debug_assertions)]
+            defined_at,
            tag,
-
            attributes,
            children: children.next_tuple(child.into_render()),
        }
@@ -103,11 +112,15 @@ where
        attr: NewAttr,
    ) -> Self::Output<NewAttr> {
        let HtmlElement {
+            #[cfg(debug_assertions)]
+            defined_at,
            tag,
            attributes,
            children,
        } = self;
        HtmlElement {
+            #[cfg(debug_assertions)]
+            defined_at,
            tag,
            attributes: attributes.add_any_attr(attr),
            children,
@@ -229,8 +242,9 @@ where
        let (attributes, children) =
            join(self.attributes.resolve(), self.children.resolve()).await;
        HtmlElement {
+            #[cfg(debug_assertions)]
+            defined_at: self.defined_at,
            tag: self.tag,
-
            attributes,
            children,
        }
@@ -336,6 +350,11 @@ where
        cursor: &Cursor,
        position: &PositionState,
    ) -> Self::State {
+        #[cfg(debug_assertions)]
+        {
+            set_currently_hydrating(Some(self.defined_at));
+        }
+
        // non-Static custom elements need special support in templates
        // because they haven't been inserted type-wise
        if E::TAG.is_empty() && !FROM_SERVER {
@@ -349,7 +368,9 @@ where
            cursor.sibling();
        }
        let el = crate::renderer::types::Element::cast_from(cursor.current())
-            .unwrap();
+            .unwrap_or_else(|| {
+                failed_to_cast_element(E::TAG, cursor.current())
+            });

        let attrs = self.attributes.hydrate::<FROM_SERVER>(&el);

--- a/tachys/src/hydration.rs
+++ b/tachys/src/hydration.rs
@@ -2,7 +2,10 @@ use crate::{
    renderer::{CastFrom, Rndr},
    view::{Position, PositionState},
 };
-use std::{cell::RefCell, rc::Rc};
+#[cfg(debug_assertions)]
+use std::cell::Cell;
+use std::{cell::RefCell, panic::Location, rc::Rc};
+use web_sys::{Comment, Element, Node, Text};

 /// Hydration works by walking over the DOM, adding interactivity as needed.
 ///
@@ -95,13 +98,121 @@ where
        }
        let marker = self.current();
        position.set(Position::NextChild);
-        crate::renderer::types::Placeholder::cast_from(marker)
-            .expect("could not convert current node into marker node")
-        /*let marker2 = marker.clone();
-        Rndr::Placeholder::cast_from(marker).unwrap_or_else(|| {
-            crate::dom::log("expecting to find a marker. instead, found");
-            Rndr::log_node(&marker2);
-            panic!("oops.");
-        })*/
+        crate::renderer::types::Placeholder::cast_from(marker.clone())
+            .unwrap_or_else(|| failed_to_cast_marker_node(marker))
+    }
+}
+
+#[cfg(debug_assertions)]
+thread_local! {
+    static CURRENTLY_HYDRATING: Cell<Option<&'static Location<'static>>> = const { Cell::new(None) };
+}
+
+pub(crate) fn set_currently_hydrating(
+    location: Option<&'static Location<'static>>,
+) {
+    #[cfg(debug_assertions)]
+    {
+        CURRENTLY_HYDRATING.set(location);
+    }
+    #[cfg(not(debug_assertions))]
+    {
+        _ = location;
+    }
+}
+
+pub(crate) fn failed_to_cast_element(tag_name: &str, node: Node) -> Element {
+    #[cfg(not(debug_assertions))]
+    {
+        _ = node;
+        unreachable!();
+    }
+    #[cfg(debug_assertions)]
+    {
+        let hydrating = CURRENTLY_HYDRATING
+            .take()
+            .map(|n| n.to_string())
+            .unwrap_or_else(|| "{unknown}".to_string());
+        web_sys::console::error_3(
+            &wasm_bindgen::JsValue::from_str(&format!(
+                "A hydration error occurred while trying to hydrate an \
+                 element defined at {hydrating}.\n\nThe framework expected an \
+                 HTML <{tag_name}> element, but found this instead: ",
+            )),
+            &node,
+            &wasm_bindgen::JsValue::from_str(
+                "\n\nThe hydration mismatch may have occurred slightly \
+                 earlier, but this is the first time the framework found a \
+                 node of an unexpected type.",
+            ),
+        );
+        panic!(
+            "Unrecoverable hydration error. Please read the error message \
+             directly above this for more details."
+        );
+    }
+}
+
+pub(crate) fn failed_to_cast_marker_node(node: Node) -> Comment {
+    #[cfg(not(debug_assertions))]
+    {
+        _ = node;
+        unreachable!();
+    }
+    #[cfg(debug_assertions)]
+    {
+        let hydrating = CURRENTLY_HYDRATING
+            .take()
+            .map(|n| n.to_string())
+            .unwrap_or_else(|| "{unknown}".to_string());
+        web_sys::console::error_3(
+            &wasm_bindgen::JsValue::from_str(&format!(
+                "A hydration error occurred while trying to hydrate an \
+                 element defined at {hydrating}.\n\nThe framework expected a \
+                 marker node, but found this instead: ",
+            )),
+            &node,
+            &wasm_bindgen::JsValue::from_str(
+                "\n\nThe hydration mismatch may have occurred slightly \
+                 earlier, but this is the first time the framework found a \
+                 node of an unexpected type.",
+            ),
+        );
+        panic!(
+            "Unrecoverable hydration error. Please read the error message \
+             directly above this for more details."
+        );
+    }
+}
+
+pub(crate) fn failed_to_cast_text_node(node: Node) -> Text {
+    #[cfg(not(debug_assertions))]
+    {
+        _ = node;
+        unreachable!();
+    }
+    #[cfg(debug_assertions)]
+    {
+        let hydrating = CURRENTLY_HYDRATING
+            .take()
+            .map(|n| n.to_string())
+            .unwrap_or_else(|| "{unknown}".to_string());
+        web_sys::console::error_3(
+            &wasm_bindgen::JsValue::from_str(&format!(
+                "A hydration error occurred while trying to hydrate an \
+                 element defined at {hydrating}.\n\nThe framework expected a \
+                 text node, but found this instead: ",
+            )),
+            &node,
+            &wasm_bindgen::JsValue::from_str(
+                "\n\nThe hydration mismatch may have occurred slightly \
+                 earlier, but this is the first time the framework found a \
+                 node of an unexpected type.",
+            ),
+        );
+        panic!(
+            "Unrecoverable hydration error. Please read the error message \
+             directly above this for more details."
+        );
    }
 }
--- a/tachys/src/mathml/mod.rs
+++ b/tachys/src/mathml/mod.rs
@@ -22,10 +22,17 @@ macro_rules! mathml_global {
 				At: NextTuple,
 				<At as NextTuple>::Output<Attr<$crate::html::attribute::[<$attr:camel>], V>>: Attribute,
 			{
-				let HtmlElement { tag, children, attributes } = self;
+				let HtmlElement {
+                    #[cfg(debug_assertions)]
+                    defined_at,
+                    tag,
+                    children,
+                    attributes
+                } = self;
 				HtmlElement {
+                    #[cfg(debug_assertions)]
+                    defined_at,
 					tag,
-
 					children,
 					attributes: attributes.next_tuple($crate::html::attribute::$attr(value)),
 				}
@@ -46,10 +53,11 @@ macro_rules! mathml_elements {

                {
                    HtmlElement {
+                        #[cfg(debug_assertions)]
+                        defined_at: std::panic::Location::caller(),
                        tag: [<$tag:camel>],
                        attributes: (),
                        children: (),
-
                    }
                }

@@ -84,10 +92,17 @@ macro_rules! mathml_elements {
                            At: NextTuple,
                            <At as NextTuple>::Output<Attr<$crate::html::attribute::[<$attr:camel>], V>>: Attribute,
                        {
-                            let HtmlElement { tag, children, attributes } = self;
-                            HtmlElement {
+                            let HtmlElement {
+                                #[cfg(debug_assertions)]
+                                defined_at,
+                                tag,
+                                children,
+                                attributes
+                            } = self;
+                            HtmlElement {
+                                #[cfg(debug_assertions)]
+                                defined_at,
                                tag,
-
                                children,
                                attributes: attributes.next_tuple($crate::html::attribute::$attr(value)),
                            }
--- a/tachys/src/svg/mod.rs
+++ b/tachys/src/svg/mod.rs
@@ -14,15 +14,16 @@ macro_rules! svg_elements {
                /// An SVG element.
                // `tag()` function
                #[allow(non_snake_case)]
+                #[track_caller]
                pub fn $tag() -> HtmlElement<[<$tag:camel>], (), ()>
                where
-
                {
                    HtmlElement {
+                        #[cfg(debug_assertions)]
+                        defined_at: std::panic::Location::caller(),
                        tag: [<$tag:camel>],
                        attributes: (),
                        children: (),
-
                    }
                }

@@ -153,9 +154,12 @@ svg_elements![

 /// An SVG element.
 #[allow(non_snake_case)]
+#[track_caller]
 pub fn r#use() -> HtmlElement<Use, (), ()>
 where {
    HtmlElement {
+        #[cfg(debug_assertions)]
+        defined_at: std::panic::Location::caller(),
        tag: Use,
        attributes: (),
        children: (),
--- a/tachys/src/view/primitives.rs
+++ b/tachys/src/view/primitives.rs
@@ -100,8 +100,8 @@ macro_rules! render_primitive {
 					}

 					let node = cursor.current();
-					let node = crate::renderer::types::Text::cast_from(node)
-						.expect("couldn't cast text node from node");
+					let node = crate::renderer::types::Text::cast_from(node.clone())
+						.unwrap_or_else(|| crate::hydration::failed_to_cast_text_node(node));

 					if !FROM_SERVER {
 						Rndr::set_text(&node, &self.to_string());
--- a/tachys/src/view/strings.rs
+++ b/tachys/src/view/strings.rs
@@ -90,8 +90,10 @@ impl RenderHtml for &str {
        }

        let node = cursor.current();
-        let node = crate::renderer::types::Text::cast_from(node)
-            .expect("couldn't cast text node from node");
+        let node = crate::renderer::types::Text::cast_from(node.clone())
+            .unwrap_or_else(|| {
+                crate::hydration::failed_to_cast_text_node(node)
+            });

        if !FROM_SERVER {
            Rndr::set_text(&node, self);
Author	SHA1	Message	Date
Greg Johnston	14eb707e82	`rc2`	2024-11-22 15:27:00 -05:00
Greg Johnston	3de0414ed5	docs: adds more helpful text for hydration errors (closes #3267 ) (#3275 )	2024-11-22 15:10:37 -05:00
Greg Johnston	75cae91661	chore: expose some internals of routing to make wrappers easier (#3232 )	2024-11-22 15:10:23 -05:00
Greg Johnston	8b258b0d26	fix: notify Suspense on subsequent reloads (closes #3277 ) (#3278 )	2024-11-22 14:55:24 -05:00
dependabot[bot]	84bdd6b568	chore(deps): bump serde_json from 1.0.132 to 1.0.133 (#3261 ) Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.132 to 1.0.133. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.132...v1.0.133) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-11-21 19:24:47 -05:00
dependabot[bot]	809023a2ad	chore(deps): bump attribute-derive from 0.10.2 to 0.10.3 (#3260 ) Bumps [attribute-derive](https://github.com/ModProg/attribute-derive) from 0.10.2 to 0.10.3. - [Release notes](https://github.com/ModProg/attribute-derive/releases) - [Changelog](https://github.com/ModProg/attribute-derive/blob/main/CHANGELOG.md) - [Commits](https://github.com/ModProg/attribute-derive/commits) --- updated-dependencies: - dependency-name: attribute-derive dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-11-21 19:24:39 -05:00
dependabot[bot]	1477ae2cfb	chore(deps): bump axum from 0.7.8 to 0.7.9 (#3259 ) Bumps [axum](https://github.com/tokio-rs/axum) from 0.7.8 to 0.7.9. - [Release notes](https://github.com/tokio-rs/axum/releases) - [Changelog](https://github.com/tokio-rs/axum/blob/main/CHANGELOG.md) - [Commits](https://github.com/tokio-rs/axum/compare/axum-v0.7.8...axum-v0.7.9) --- updated-dependencies: - dependency-name: axum dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-11-21 19:24:31 -05:00
dependabot[bot]	26995f8efd	chore(deps): bump tower-http from 0.6.1 to 0.6.2 (#3266 ) Bumps [tower-http](https://github.com/tower-rs/tower-http) from 0.6.1 to 0.6.2. - [Release notes](https://github.com/tower-rs/tower-http/releases) - [Commits](https://github.com/tower-rs/tower-http/compare/tower-http-0.6.1...tower-http-0.6.2) --- updated-dependencies: - dependency-name: tower-http dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-11-21 19:24:23 -05:00
dependabot[bot]	3c174b26a5	chore(deps): bump syn from 2.0.87 to 2.0.89 (#3272 ) Bumps [syn](https://github.com/dtolnay/syn) from 2.0.87 to 2.0.89. - [Release notes](https://github.com/dtolnay/syn/releases) - [Commits](https://github.com/dtolnay/syn/compare/2.0.87...2.0.89) --- updated-dependencies: - dependency-name: syn dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-11-21 19:24:13 -05:00
dependabot[bot]	0c7e77800a	chore(deps): bump proc-macro2 from 1.0.89 to 1.0.91 (#3273 ) Bumps [proc-macro2](https://github.com/dtolnay/proc-macro2) from 1.0.89 to 1.0.91. - [Release notes](https://github.com/dtolnay/proc-macro2/releases) - [Commits](https://github.com/dtolnay/proc-macro2/compare/1.0.89...1.0.91) --- updated-dependencies: - dependency-name: proc-macro2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-11-21 19:24:04 -05:00
Greg Johnston	fee2421047	chore: fix broken links, etc. in docs (#3269 )	2024-11-21 19:23:55 -05:00
Ari Seyhun	89f26f6e9b	feat: add `fallback` prop to `ProtectedRoute` and `ProtectedParentRoute` (#3264 )	2024-11-19 22:32:45 -08:00
Silver	e76b22bec8	Remove unused shell() function definition (#3254 )	2024-11-19 12:17:45 -08:00
Greg Johnston	cff277b3db	fix: add `Write` implementatations for `Field<T>` and `ArcField<T>` (closes #3257 ) (#3262 )	2024-11-19 10:04:40 -05:00
Ari Seyhun	0258ac6df4	feat(reactive_stores): add `map_untracked` to `OptionStoreExt` (#3245 )	2024-11-18 09:41:04 -05:00