Merge branch '1.x' into fix/shell/retry-emits

tauri-apps · May 9, 2024 · e6df15a · e6df15a
2 parents d4a6bc9 + 6bb721c
commit e6df15a
Show file tree

Hide file tree

Showing 21 changed files with 294 additions and 194 deletions.
diff --git a/.changes/shell-execute-extra-newline.md b/.changes/shell-execute-extra-newline.md
@@ -0,0 +1,6 @@
+---
+"@tauri-apps/api": "patch:bug"
+---
+
+Fix The JS `Command.execute` API from `shell` module including extra new lines.
+
diff --git a/.changes/shell-execute-performance.md b/.changes/shell-execute-performance.md
@@ -0,0 +1,7 @@
+---
+"tauri": "patch:enhance"
+"@tauri-apps/api": "patch:enhance"
+---
+
+Enhance the speed of The JS `Command.execute` API from `shell` module.
+
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/tauri-runtime-wry/CHANGELOG.md b/core/tauri-runtime-wry/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## \[0.14.7]
+
+### Bug Fixes
+
+- [`2eb21378a`](https://www.github.com/tauri-apps/tauri/commit/2eb21378a65107da0d4a1ab425767e99580966c2)([#9718](https://www.github.com/tauri-apps/tauri/pull/9718)) Fixes redraw tracing span not closing.
+
 ## \[0.14.6]
 
 ### Dependencies

diff --git a/core/tauri-runtime-wry/Cargo.toml b/core/tauri-runtime-wry/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-runtime-wry"
-version = "0.14.6"
+version = "0.14.7"
 authors = [ "Tauri Programme within The Commons Conservancy" ]
 categories = [ "gui", "web-programming" ]
 license = "Apache-2.0 OR MIT"

diff --git a/core/tauri-runtime-wry/src/lib.rs b/core/tauri-runtime-wry/src/lib.rs
@@ -248,14 +248,11 @@ pub struct ActiveTraceSpanStore(Rc<RefCell<Vec<ActiveTracingSpan>>>);
 
 #[cfg(feature = "tracing")]
 impl ActiveTraceSpanStore {
-  pub fn remove_window_draw(&self, window_id: WindowId) {
-    let mut store = self.0.borrow_mut();
-    if let Some(index) = store
-      .iter()
-      .position(|t| matches!(t, ActiveTracingSpan::WindowDraw { id, span: _ } if id == &window_id))
-    {
-      store.remove(index);
-    }
+  pub fn remove_window_draw(&self) {
+    self
+      .0
+      .borrow_mut()
+      .retain(|t| !matches!(t, ActiveTracingSpan::WindowDraw { id: _, span: _ }));
   }
 }
 
@@ -2839,8 +2836,8 @@ fn handle_event_loop<T: UserEvent>(
     }
 
     #[cfg(feature = "tracing")]
-    Event::RedrawRequested(id) => {
-      active_tracing_spans.remove_window_draw(id);
+    Event::RedrawEventsCleared => {
+      active_tracing_spans.remove_window_draw();
     }
 
     #[cfg(all(desktop, feature = "global-shortcut"))]

diff --git a/core/tauri/CHANGELOG.md b/core/tauri/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## \[1.6.4]
+
+### Dependencies
+
+- Upgraded to `tauri-runtime-wry@0.14.7`
+
 ## \[1.6.3]
 
 ### Enhancements

diff --git a/core/tauri/Cargo.toml b/core/tauri/Cargo.toml
@@ -10,7 +10,7 @@ license = "Apache-2.0 OR MIT"
 name = "tauri"
 readme = "README.md"
 repository = "https://github.com/tauri-apps/tauri"
-version = "1.6.3"
+version = "1.6.4"
 
 [package.metadata.docs.rs]
 no-default-features = true
@@ -61,7 +61,7 @@ once_cell = "1"
 tauri-runtime = { version = "0.14.3", path = "../tauri-runtime" }
 tauri-macros = { version = "1.4.4", path = "../tauri-macros" }
 tauri-utils = { version = "1.5.4", features = [ "resources" ], path = "../tauri-utils" }
-tauri-runtime-wry = { version = "0.14.6", path = "../tauri-runtime-wry", optional = true }
+tauri-runtime-wry = { version = "0.14.7", path = "../tauri-runtime-wry", optional = true }
 rand = "0.8"
 semver = { version = "1.0", features = [ "serde" ] }
 serde_repr = "0.1"

diff --git a/core/tauri/scripts/bundle.global.js b/core/tauri/scripts/bundle.global.js