Merge remote-tracking branch 'origin' into wasm-splitting-support

Cargo.lock

@@ -1777,7 +1777,7 @@ checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388"
 
 [[package]]
 name = "leptos"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "any_spawner",
  "base64",
@@ -1832,7 +1832,7 @@ dependencies = [
 
 [[package]]
 name = "leptos_actix"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "actix-files",
  "actix-http",
@@ -1857,7 +1857,7 @@ dependencies = [
 
 [[package]]
 name = "leptos_axum"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "any_spawner",
  "axum",
@@ -1880,7 +1880,7 @@ dependencies = [
 
 [[package]]
 name = "leptos_config"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "config",
  "regex",
@@ -1894,7 +1894,7 @@ dependencies = [
 
 [[package]]
 name = "leptos_dom"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "js-sys",
  "leptos",
@@ -1911,7 +1911,7 @@ dependencies = [
 
 [[package]]
 name = "leptos_hot_reload"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "anyhow",
  "camino",
@@ -1927,7 +1927,7 @@ dependencies = [
 
 [[package]]
 name = "leptos_integration_utils"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "futures",
  "hydration_context",
@@ -1940,7 +1940,7 @@ dependencies = [
 
 [[package]]
 name = "leptos_macro"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "attribute-derive",
  "cfg-if",
@@ -1960,7 +1960,7 @@ dependencies = [
  "rustc_version",
  "serde",
  "server_fn",
- "server_fn_macro 0.8.2",
+ "server_fn_macro 0.8.3",
  "syn 2.0.104",
  "tracing",
  "trybuild",
@@ -1970,7 +1970,7 @@ dependencies = [
 
 [[package]]
 name = "leptos_meta"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "futures",
  "indexmap",
@@ -1984,7 +1984,7 @@ dependencies = [
 
 [[package]]
 name = "leptos_router"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "any_spawner",
  "either_of",
@@ -2008,7 +2008,7 @@ dependencies = [
 
 [[package]]
 name = "leptos_router_macro"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "leptos_macro",
  "leptos_router",
@@ -2020,7 +2020,7 @@ dependencies = [
 
 [[package]]
 name = "leptos_server"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "any_spawner",
  "base64",
@@ -2733,7 +2733,7 @@ dependencies = [
 
 [[package]]
 name = "reactive_graph"
-version = "0.2.2"
+version = "0.2.3"
 dependencies = [
  "any_spawner",
  "async-lock",
@@ -2756,7 +2756,7 @@ dependencies = [
 
 [[package]]
 name = "reactive_stores"
-version = "0.2.2"
+version = "0.2.3"
 dependencies = [
  "any_spawner",
  "dashmap",
@@ -2775,7 +2775,7 @@ dependencies = [
 
 [[package]]
 name = "reactive_stores_macro"
-version = "0.2.2"
+version = "0.2.3"
 dependencies = [
  "convert_case 0.8.0",
  "proc-macro-error2",
@@ -3260,7 +3260,7 @@ dependencies = [
 
 [[package]]
 name = "server_fn"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "actix-web",
  "actix-ws",
@@ -3323,7 +3323,7 @@ dependencies = [
 
 [[package]]
 name = "server_fn_macro"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
  "const_format",
  "convert_case 0.8.0",
@@ -3336,9 +3336,9 @@ dependencies = [
 
 [[package]]
 name = "server_fn_macro_default"
-version = "0.8.2"
+version = "0.8.3"
 dependencies = [
- "server_fn_macro 0.8.2",
+ "server_fn_macro 0.8.3",
  "syn 2.0.104",
 ]
 
@@ -3540,7 +3540,7 @@ dependencies = [
 
 [[package]]
 name = "tachys"
-version = "0.2.3"
+version = "0.2.4"
 dependencies = [
  "any_spawner",
  "async-trait",

Cargo.toml

@@ -40,7 +40,7 @@ members = [
 exclude = ["benchmarks", "examples", "projects"]
 
 [workspace.package]
-version = "0.8.2"
+version = "0.8.3"
 edition = "2021"
 rust-version = "1.80"
 
@@ -49,28 +49,28 @@ rust-version = "1.80"
 throw_error = { path = "./any_error/", version = "0.3.0" }
 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.5" }
+either_of = { path = "./either_of/", version = "0.1.6" }
 hydration_context = { path = "./hydration_context", version = "0.3.0" }
-leptos = { path = "./leptos", version = "0.8.2" }
-leptos_config = { path = "./leptos_config", version = "0.8.2" }
-leptos_dom = { path = "./leptos_dom", version = "0.8.2" }
-leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.8.2" }
-leptos_integration_utils = { path = "./integrations/utils", version = "0.8.2" }
-leptos_macro = { path = "./leptos_macro", version = "0.8.2" }
-leptos_router = { path = "./router", version = "0.8.2" }
-leptos_router_macro = { path = "./router_macro", version = "0.8.2" }
-leptos_server = { path = "./leptos_server", version = "0.8.2" }
-leptos_meta = { path = "./meta", version = "0.8.2" }
+leptos = { path = "./leptos", version = "0.8.3" }
+leptos_config = { path = "./leptos_config", version = "0.8.3" }
+leptos_dom = { path = "./leptos_dom", version = "0.8.3" }
+leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.8.3" }
+leptos_integration_utils = { path = "./integrations/utils", version = "0.8.3" }
+leptos_macro = { path = "./leptos_macro", version = "0.8.3" }
+leptos_router = { path = "./router", version = "0.8.3" }
+leptos_router_macro = { path = "./router_macro", version = "0.8.3" }
+leptos_server = { path = "./leptos_server", version = "0.8.3" }
+leptos_meta = { path = "./meta", version = "0.8.3" }
 next_tuple = { path = "./next_tuple", version = "0.1.0" }
 oco_ref = { path = "./oco", version = "0.2.0" }
 or_poisoned = { path = "./or_poisoned", version = "0.1.0" }
-reactive_graph = { path = "./reactive_graph", version = "0.2.0" }
-reactive_stores = { path = "./reactive_stores", version = "0.2.0" }
-reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.2.0" }
-server_fn = { path = "./server_fn", version = "0.8.2" }
-server_fn_macro = { path = "./server_fn_macro", version = "0.8.2" }
-server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.8.2" }
-tachys = { path = "./tachys", version = "0.2.0" }
+reactive_graph = { path = "./reactive_graph", version = "0.2.3" }
+reactive_stores = { path = "./reactive_stores", version = "0.2.3" }
+reactive_stores_macro = { path = "./reactive_stores_macro", version = "0.2.3" }
+server_fn = { path = "./server_fn", version = "0.8.3" }
+server_fn_macro = { path = "./server_fn_macro", version = "0.8.3" }
+server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.8.3" }
+tachys = { path = "./tachys", version = "0.2.4" }
 wasm_split = { path = "./wasm_split", version = "0.1.0" }
 wasm_split_macros = { path = "./wasm_split_macros", version = "0.1.0" }
 

integrations/axum/Cargo.toml

@@ -4,7 +4,7 @@ authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
 description = "Axum integrations for the Leptos web framework."
-version = "0.8.2"
+version = "0.8.3"
 rust-version.workspace = true
 edition.workspace = true
 
@@ -13,7 +13,7 @@ any_spawner = { workspace = true, features = ["tokio"] }
 hydration_context = { workspace = true }
 axum = { default-features = false, features = [
   "matched-path",
-] , workspace = true }
+], workspace = true }
 dashmap = { workspace = true, default-features = true }
 futures = { workspace = true, default-features = true }
 leptos = { workspace = true, features = ["nonce", "ssr"] }
@@ -24,14 +24,17 @@ leptos_router = { workspace = true, features = ["ssr"] }
 leptos_integration_utils = { workspace = true }
 tachys = { workspace = true }
 parking_lot = { workspace = true, default-features = true }
-tokio = { default-features = false , workspace = true }
-tower = { features = ["util"] , workspace = true, default-features = true }
+tokio = { default-features = false, workspace = true }
+tower = { features = ["util"], workspace = true, default-features = true }
 tower-http = { workspace = true, default-features = true }
-tracing = { optional = true , workspace = true, default-features = true }
+tracing = { optional = true, workspace = true, default-features = true }
 
 [dev-dependencies]
 axum = { workspace = true, default-features = true }
-tokio = { features = ["net", "rt-multi-thread"] , workspace = true, default-features = true }
+tokio = { features = [
+  "net",
+  "rt-multi-thread",
+], workspace = true, default-features = true }
 
 [features]
 wasm = []

meta/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_meta"
-version = "0.8.2"
+version = "0.8.3"
 authors = ["Greg Johnston"]
 license = "MIT"
 repository = "https://github.com/leptos-rs/leptos"
@@ -13,8 +13,8 @@ leptos = { workspace = true }
 or_poisoned = { workspace = true }
 indexmap = { workspace = true, default-features = true }
 send_wrapper = { workspace = true, default-features = true }
-tracing = { optional = true , workspace = true, default-features = true }
-wasm-bindgen = { workspace = true , default-features = true }
+tracing = { optional = true, workspace = true, default-features = true }
+wasm-bindgen = { workspace = true, default-features = true }
 futures = { workspace = true, default-features = true }
 
 [dependencies.web-sys]

reactive_graph/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reactive_graph"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
@@ -16,19 +16,26 @@ futures = { workspace = true, default-features = true }
 hydration_context = { workspace = true, optional = true }
 pin-project-lite = { workspace = true, default-features = true }
 rustc-hash = { workspace = true, default-features = true }
-serde = { features = ["derive"], optional = true , workspace = true, default-features = true }
+serde = { features = [
+  "derive",
+], optional = true, workspace = true, default-features = true }
 slotmap = { workspace = true, default-features = true }
-thiserror = { workspace = true , default-features = true }
-tracing = { optional = true , workspace = true, default-features = true }
+thiserror = { workspace = true, default-features = true }
+tracing = { optional = true, workspace = true, default-features = true }
 guardian = { workspace = true, default-features = true }
 async-lock = { workspace = true, default-features = true }
-send_wrapper = { features = ["futures"] , workspace = true, default-features = true }
+send_wrapper = { features = [
+  "futures",
+], workspace = true, default-features = true }
 
 [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
 web-sys = { version = "0.3.77", features = ["console"] }
 
 [dev-dependencies]
-tokio = { features = ["rt-multi-thread", "macros"] , workspace = true, default-features = true }
+tokio = { features = [
+  "rt-multi-thread",
+  "macros",
+], workspace = true, default-features = true }
 tokio-test = { workspace = true, default-features = true }
 any_spawner = { workspace = true, features = ["futures-executor", "tokio"] }
 

reactive_stores/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reactive_stores"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
@@ -11,7 +11,7 @@ edition.workspace = true
 
 [dependencies]
 guardian = { workspace = true, default-features = true }
-itertools = { workspace = true , default-features = true }
+itertools = { workspace = true, default-features = true }
 or_poisoned = { workspace = true }
 paste = { workspace = true, default-features = true }
 reactive_graph = { workspace = true }
@@ -21,7 +21,10 @@ dashmap = { workspace = true, default-features = true }
 send_wrapper = { workspace = true, default-features = true }
 
 [dev-dependencies]
-tokio = { features = ["rt-multi-thread", "macros"] , workspace = true, default-features = true }
+tokio = { features = [
+	"rt-multi-thread",
+	"macros",
+], workspace = true, default-features = true }
 tokio-test = { workspace = true, default-features = true }
 any_spawner = { workspace = true, features = ["futures-executor", "tokio"] }
 reactive_graph = { workspace = true, features = ["effects"] }

reactive_stores_macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "reactive_stores_macro"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Greg Johnston"]
 license = "MIT"
 readme = "../README.md"
@@ -13,8 +13,8 @@ edition.workspace = true
 proc-macro = true
 
 [dependencies]
-convert_case = { workspace = true , default-features = true }
+convert_case = { workspace = true, default-features = true }
 proc-macro-error2 = { workspace = true, default-features = true }
 proc-macro2 = { workspace = true, default-features = true }
 quote = { workspace = true, default-features = true }
-syn = { features = ["full"] , workspace = true, default-features = true }
+syn = { features = ["full"], workspace = true, default-features = true }

reactive_stores_macro/src/lib.rs

@@ -111,10 +111,8 @@ impl ToTokens for Model {
         } = &self;
         let any_store_field = Ident::new("AnyStoreField", Span::call_site());
         let trait_name = Ident::new(&format!("{name}StoreFields"), name.span());
-        let generics_with_orig = {
-            let params = &generics.params;
-            quote! { <#any_store_field, #params> }
-        };
+        let params = &generics.params;
+        let generics_with_orig = quote! { <#any_store_field, #params> };
         let where_with_orig = {
             generics
                 .where_clause
@@ -140,13 +138,13 @@ impl ToTokens for Model {
 
         // read access
         tokens.extend(quote! {
-            #vis trait #trait_name <AnyStoreField>
+            #vis trait #trait_name <AnyStoreField, #params>
             #where_with_orig
             {
                 #(#trait_fields)*
             }
 
-            impl #generics_with_orig #trait_name <AnyStoreField> for AnyStoreField
+            impl #generics_with_orig #trait_name <AnyStoreField, #params> for AnyStoreField
             #where_with_orig
             {
                #(#read_fields)*

router/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_router"
-version = "0.8.2"
+version = "0.8.3"
 authors = ["Greg Johnston", "Ben Wishovich"]
 license = "MIT"
 readme = "../README.md"
@@ -20,11 +20,11 @@ tachys = { workspace = true, features = ["reactive_graph"] }
 futures = { workspace = true, default-features = true }
 url = { workspace = true, default-features = true }
 js-sys = { workspace = true, default-features = true }
-wasm-bindgen = { workspace = true , default-features = true }
-tracing = { optional = true , workspace = true, default-features = true }
+wasm-bindgen = { workspace = true, default-features = true }
+tracing = { optional = true, workspace = true, default-features = true }
 send_wrapper = { workspace = true, default-features = true }
-thiserror = { workspace = true , default-features = true }
-percent-encoding = { optional = true , workspace = true, default-features = true }
+thiserror = { workspace = true, default-features = true }
+percent-encoding = { optional = true, workspace = true, default-features = true }
 gloo-net = { workspace = true, default-features = true }
 
 [dependencies.web-sys]

router_macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "leptos_router_macro"
-version = "0.8.2"
+version = "0.8.3"
 authors = ["Greg Johnston", "Ben Wishovich"]
 license = "MIT"
 readme = "../README.md"
@@ -13,10 +13,10 @@ edition.workspace = true
 proc-macro = true
 
 [dependencies]
-proc-macro-error2 = { default-features = false , workspace = true }
+proc-macro-error2 = { default-features = false, workspace = true }
 proc-macro2 = { workspace = true, default-features = true }
 quote = { workspace = true, default-features = true }
-syn = { features = ["full"] , workspace = true, default-features = true }
+syn = { features = ["full"], workspace = true, default-features = true }
 
 [dev-dependencies]
 leptos_router = { path = "../router" }

tachys/Cargo.toml

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