Merge branch 'main' into dependabot/cargo/wasm-bindgen-0.2.97

leptos-rs · Dec 3, 2024 · acb5394 · acb5394
2 parents 45fe304 + a04bca5
commit acb5394
Show file tree

Hide file tree

Showing 15 changed files with 56 additions and 41 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/any_spawner/Cargo.toml b/any_spawner/Cargo.toml
@@ -16,8 +16,8 @@ thiserror = "2.0"
 tokio = { version = "1.41", optional = true, default-features = false, features = [
   "rt",
 ] }
-tracing = { version = "0.1.40", optional = true }
-wasm-bindgen-futures = { version = "0.4.45", optional = true }
+tracing = { version = "0.1.41", optional = true }
+wasm-bindgen-futures = { version = "0.4.47", optional = true }
 
 [features]
 async-executor = ["dep:async-executor"]

diff --git a/hydration_context/Cargo.toml b/hydration_context/Cargo.toml
@@ -15,7 +15,7 @@ or_poisoned = { workspace = true }
 futures = "0.3.31"
 serde = { version = "1.0", features = ["derive"] }
 wasm-bindgen = { version = "0.2.97", optional = true }
-js-sys = { version = "0.3.72", optional = true }
+js-sys = { version = "0.3.74", optional = true }
 once_cell = "1.20"
 pin-project-lite = "0.2.15"
 

diff --git a/integrations/axum/Cargo.toml b/integrations/axum/Cargo.toml
@@ -27,7 +27,7 @@ parking_lot = "0.12.3"
 tokio = { version = "1.41", default-features = false }
 tower = { version = "0.5.1", features = ["util"] }
 tower-http = "0.6.2"
-tracing = { version = "0.1.40", optional = true }
+tracing = { version = "0.1.41", optional = true }
 
 [dev-dependencies]
 axum = "0.7.9"

diff --git a/integrations/utils/src/lib.rs b/integrations/utils/src/lib.rs
@@ -40,15 +40,28 @@ pub trait ExtendResponse: Sized {
             let (owner, stream) =
                 build_response(app_fn, additional_context, stream_builder);
 
+            let sc = owner.shared_context().unwrap();
+
             let stream = stream.await.ready_chunks(32).map(|n| n.join(""));
 
-            let sc = owner.shared_context().unwrap();
             while let Some(pending) = sc.await_deferred() {
                 pending.await;
             }
 
-            let mut stream =
-                Box::pin(meta_context.inject_meta_context(stream).await);
+            let mut stream = Box::pin(
+                meta_context.inject_meta_context(stream).await.then({
+                    let sc = Arc::clone(&sc);
+                    move |chunk| {
+                        let sc = Arc::clone(&sc);
+                        async move {
+                            while let Some(pending) = sc.await_deferred() {
+                                pending.await;
+                            }
+                            chunk
+                        }
+                    }
+                }),
+            );
 
             // wait for the first chunk of the stream, then set the status and headers
             let first_chunk = stream.next().await.unwrap_or_default();

diff --git a/leptos/Cargo.toml b/leptos/Cargo.toml
@@ -30,7 +30,7 @@ reactive_graph = { workspace = true, features = ["serde"] }
 rustc-hash = "2.0"
 tachys = { workspace = true, features = ["reactive_graph", "reactive_stores", "oco"] }
 thiserror = "2.0"
-tracing = { version = "0.1.40", optional = true }
+tracing = { version = "0.1.41", optional = true }
 typed-builder = "0.20.0"
 typed-builder-macro = "0.20.0"
 serde = "1.0"

diff --git a/leptos_dom/Cargo.toml b/leptos_dom/Cargo.toml
@@ -12,9 +12,9 @@ edition.workspace = true
 tachys = { workspace = true }
 reactive_graph = { workspace = true }
 or_poisoned = { workspace = true }
-js-sys = "0.3.72"
+js-sys = "0.3.74"
 send_wrapper = "0.6.0"
-tracing = { version = "0.1.40", optional = true }
+tracing = { version = "0.1.41", optional = true }
 wasm-bindgen = "0.2.97"
 serde_json = { version = "1.0", optional = true }
 serde = { version = "1.0", optional = true }

diff --git a/leptos_macro/Cargo.toml b/leptos_macro/Cargo.toml
@@ -27,7 +27,7 @@ leptos_hot_reload = { workspace = true }
 server_fn_macro = { workspace = true }
 convert_case = "0.6.0"
 uuid = { version = "1.11", features = ["v4"] }
-tracing = { version = "0.1.40", optional = true }
+tracing = { version = "0.1.41", optional = true }
 
 [dev-dependencies]
 log = "0.4.22"

diff --git a/leptos_server/Cargo.toml b/leptos_server/Cargo.toml
@@ -15,7 +15,7 @@ codee = { version = "0.2.0", features = ["json_serde"] }
 hydration_context = { workspace = true }
 reactive_graph = { workspace = true, features = ["hydration"] }
 server_fn = { workspace = true }
-tracing = { version = "0.1.40", optional = true }
+tracing = { version = "0.1.41", optional = true }
 futures = "0.3.31"
 
 any_spawner = { workspace = true }
@@ -25,7 +25,7 @@ send_wrapper = "0.6"
 
 # serialization formats
 serde = { version = "1.0" }
-js-sys = { version = "0.3.72", optional = true }
+js-sys = { version = "0.3.74", optional = true }
 wasm-bindgen = { version = "0.2.97", optional = true }
 serde_json = { version = "1.0" }
 

diff --git a/meta/Cargo.toml b/meta/Cargo.toml
@@ -14,7 +14,7 @@ once_cell = "1.20"
 or_poisoned = { workspace = true }
 indexmap = "2.6"
 send_wrapper = "0.6.0"
-tracing = { version = "0.1.40", optional = true }
+tracing = { version = "0.1.41", optional = true }
 wasm-bindgen = "0.2.97"
 futures = "0.3.31"
 

diff --git a/reactive_graph/Cargo.toml b/reactive_graph/Cargo.toml
@@ -19,7 +19,7 @@ rustc-hash = "2.0"
 serde = { version = "1.0", features = ["derive"], optional = true }
 slotmap = "1.0"
 thiserror = "2.0"
-tracing = { version = "0.1.40", optional = true }
+tracing = { version = "0.1.41", optional = true }
 guardian = "1.2"
 async-lock = "3.4.0"
 send_wrapper = { version = "0.6.0", features = ["futures"] }

diff --git a/reactive_graph/src/computed/memo.rs b/reactive_graph/src/computed/memo.rs
@@ -207,7 +207,7 @@ where
 
     /// Creates a new memo by passing a function that computes the value.
     ///
-    /// Unlike [`ArcMemo::new`](), this receives ownership of the previous value. As a result, it
+    /// Unlike [`Memo::new`](), this receives ownership of the previous value. As a result, it
     /// must return both the new value and a `bool` that is `true` if the value has changed.
     ///
     /// This is lazy: the function will not be called until the memo's value is read for the first

diff --git a/router/Cargo.toml b/router/Cargo.toml
@@ -19,9 +19,9 @@ reactive_graph = { workspace = true }
 tachys = { workspace = true, features = ["reactive_graph"] }
 futures = "0.3.31"
 url = "2.5"
-js-sys = { version = "0.3.72" }
+js-sys = { version = "0.3.74" }
 wasm-bindgen = { version = "0.2.97" }
-tracing = { version = "0.1.40", optional = true }
+tracing = { version = "0.1.41", optional = true }
 once_cell = "1.20"
 send_wrapper = "0.6.0"
 thiserror = "2.0"

diff --git a/server_fn/Cargo.toml b/server_fn/Cargo.toml
@@ -49,16 +49,16 @@ http = { version = "1.1" }
 ciborium = { version = "0.2.2", optional = true }
 postcard = { version = "1", features = ["alloc"], optional = true }
 hyper = { version = "1.5", optional = true }
-bytes = "1.8"
+bytes = "1.9"
 http-body-util = { version = "0.1.2", optional = true }
 rkyv = { version = "0.8.8", optional = true }
 rmp-serde = { version = "1.3.0", optional = true }
 
 # client
 gloo-net = { version = "0.6.0", optional = true }
-js-sys = { version = "0.3.72", optional = true }
+js-sys = { version = "0.3.74", optional = true }
 wasm-bindgen = { version = "0.2.97", optional = true }
-wasm-bindgen-futures = { version = "0.4.45", optional = true }
+wasm-bindgen-futures = { version = "0.4.47", optional = true }
 wasm-streams = { version = "0.4.2", optional = true }
 web-sys = { version = "0.3.72", optional = true, features = [
   "console",

diff --git a/tachys/Cargo.toml b/tachys/Cargo.toml
@@ -24,7 +24,7 @@ once_cell = "1.20"
 paste = "1.0"
 wasm-bindgen = "0.2.97"
 html-escape = "0.2.13"
-js-sys = "0.3.72"
+js-sys = "0.3.74"
 web-sys = { version = "0.3.72", features = [
   "Window",
   "Document",
@@ -159,7 +159,7 @@ sledgehammer_bindgen = { version = "0.6.0", features = [
   "web",
 ], optional = true }
 sledgehammer_utils = { version = "0.3.1", optional = true }
-tracing = { version = "0.1.40", optional = true }
+tracing = { version = "0.1.41", optional = true }
 
 [dev-dependencies]
 tokio-test = "0.4.4"