Merge branch 'dev' into chore/unsused-cli-deps

tauri-apps · May 9, 2024 · cd442fe · cd442fe
2 parents cc58301 + 1bee4f2
commit cd442fe
Show file tree

Hide file tree

Showing 32 changed files with 179 additions and 62 deletions.
diff --git a/.changes/fix-draw-tracing.md b/.changes/fix-draw-tracing.md
@@ -0,0 +1,5 @@
+---
+"tauri-runtime-wry": patch:bug
+---
+
+Fixes redraw tracing span not closing.
diff --git a/.changes/fix-incompatible-ipc-field-postmessage.md b/.changes/fix-incompatible-ipc-field-postmessage.md
@@ -0,0 +1,5 @@
+---
+"tauri": patch:bug
+---
+
+Fix IPC tracing format incompatible between the custom protocol and the postMessage implementations.
diff --git a/.changes/pre.json b/.changes/pre.json
@@ -90,6 +90,7 @@
     ".changes/enhance-event-emit.md",
     ".changes/enhance-ipc-url-check.md",
     ".changes/enhance-resource-dir-resolution.md",
+    ".changes/event-reopen.md",
     ".changes/expose-image-constructor.md",
     ".changes/expose-js-image.md",
     ".changes/fix-acl-webview-check.md",
@@ -102,6 +103,7 @@
     ".changes/fix-codegen-rerun-if-changed.md",
     ".changes/fix-config-arg.md",
     ".changes/fix-fs-scope-check-symlink.md",
+    ".changes/fix-incompatible-ipc-field-postmessage.md",
     ".changes/fix-inner-size.md",
     ".changes/fix-invoke-devtools-by-hotkey.md",
     ".changes/fix-ios-dev-logs.md",
@@ -112,6 +114,7 @@
     ".changes/fix-mobile-cmd-case.md",
     ".changes/fix-mobile-process-spawn.md",
     ".changes/fix-process-ipc-message-fn.md",
+    ".changes/fix-proxy-url-totokens-impl.md",
     ".changes/fix-remote-domain-url.md",
     ".changes/fix-reparent.md",
     ".changes/fix-rewrite-schema.md",
@@ -201,6 +204,8 @@
     ".changes/update-acl-paths-cli.md",
     ".changes/update-app-template-capabilities-conf.md",
     ".changes/update-plugin-template.md",
+    ".changes/url-result-runtime.md",
+    ".changes/url-result.md",
     ".changes/utils-bundle-target-all.md",
     ".changes/utils-bundle-type-all.md",
     ".changes/utils-debug-eprintln.md",

diff --git a/.github/workflows/supply-chain.yml b/.github/workflows/supply-chain.yml
@@ -37,8 +37,9 @@ jobs:
       - name: Ensure that the tool cache is populated with the cargo-vet binary
         run: cargo install --root ${{ runner.tool_cache }}/cargo-vet --version ${{ env.CARGO_VET_VERSION }} cargo-vet
 
-      - name: Invoke cargo-vet
-        run: cargo vet --locked
+# Enable this again to break the workflow once we have a reasonable amount of suggestions to get to a clean base line
+#      - name: Invoke cargo-vet
+#        run: cargo vet --locked
 
       - name: Provide audit suggestions
         run: cargo vet --locked suggestions
diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
@@ -93,8 +93,9 @@ jobs:
 
       - name: test (using cross)
         if: ${{ matrix.platform.cross }}
+        # update or remove the rev once we update the MSRV from 1.70.0
         run: |
-          cargo install cross --git https://github.com/cross-rs/cross --locked
+          cargo install cross --git https://github.com/cross-rs/cross --rev 20c73df79c9aaf78a2ad2e9fe8ae981668a729dc --locked
           cross ${{ matrix.platform.command }} --target ${{ matrix.platform.target }} ${{ matrix.features.args }}
 
       - name: test (using cargo)

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/tauri-build/CHANGELOG.md b/core/tauri-build/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## \[2.0.0-beta.15]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.15`
+- Upgraded to `tauri-codegen@2.0.0-beta.15`
+
 ## \[2.0.0-beta.14]
 
 ### Dependencies

diff --git a/core/tauri-build/Cargo.toml b/core/tauri-build/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-build"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 description = "build time code to pair with https://crates.io/crates/tauri"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -28,8 +28,8 @@ rustdoc-args = [ "--cfg", "docsrs" ]
 [dependencies]
 anyhow = "1"
 quote = { version = "1", optional = true }
-tauri-codegen = { version = "2.0.0-beta.14", path = "../tauri-codegen", optional = true }
-tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils", features = [ "build", "resources" ] }
+tauri-codegen = { version = "2.0.0-beta.15", path = "../tauri-codegen", optional = true }
+tauri-utils = { version = "2.0.0-beta.15", path = "../tauri-utils", features = [ "build", "resources" ] }
 cargo_toml = "0.17"
 serde = "1"
 serde_json = "1"

diff --git a/core/tauri-codegen/CHANGELOG.md b/core/tauri-codegen/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.0-beta.15]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.15`
+
 ## \[2.0.0-beta.14]
 
 ### Dependencies

diff --git a/core/tauri-codegen/Cargo.toml b/core/tauri-codegen/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-codegen"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 description = "code generation meant to be consumed inside of `tauri` through `tauri-build` or `tauri-macros`"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -20,7 +20,7 @@ quote = "1"
 syn = "2"
 serde = { version = "1", features = [ "derive" ] }
 serde_json = "1"
-tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils", features = [ "build" ] }
+tauri-utils = { version = "2.0.0-beta.15", path = "../tauri-utils", features = [ "build" ] }
 thiserror = "1"
 walkdir = "2"
 brotli = { version = "3", optional = true, default-features = false, features = [ "std" ] }

diff --git a/core/tauri-macros/CHANGELOG.md b/core/tauri-macros/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## \[2.0.0-beta.15]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.15`
+- Upgraded to `tauri-codegen@2.0.0-beta.15`
+
 ## \[2.0.0-beta.14]
 
 ### Dependencies

diff --git a/core/tauri-macros/Cargo.toml b/core/tauri-macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-macros"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 description = "Macros for the tauri crate."
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -20,8 +20,8 @@ proc-macro2 = { version = "1", features = [ "span-locations" ] }
 quote = "1"
 syn = { version = "2", features = [ "full" ] }
 heck = "0.5"
-tauri-codegen = { version = "2.0.0-beta.14", default-features = false, path = "../tauri-codegen" }
-tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils" }
+tauri-codegen = { version = "2.0.0-beta.15", default-features = false, path = "../tauri-codegen" }
+tauri-utils = { version = "2.0.0-beta.15", path = "../tauri-utils" }
 
 [features]
 custom-protocol = [ ]

diff --git a/core/tauri-plugin/CHANGELOG.md b/core/tauri-plugin/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.0-beta.15]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.15`
+
 ## \[2.0.0-beta.14]
 
 ### Enhancements

diff --git a/core/tauri-plugin/Cargo.toml b/core/tauri-plugin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin"
-version = "2.0.0-beta.14"
+version = "2.0.0-beta.15"
 description = "Build script and runtime Tauri plugin definitions"
 authors = { workspace = true }
 homepage = { workspace = true }
@@ -30,7 +30,7 @@ runtime = [ ]
 [dependencies]
 anyhow = { version = "1", optional = true }
 serde = { version = "1", optional = true }
-tauri-utils = { version = "2.0.0-beta.14", default-features = false, features = [ "build" ], path = "../tauri-utils" }
+tauri-utils = { version = "2.0.0-beta.15", default-features = false, features = [ "build" ], path = "../tauri-utils" }
 serde_json = { version = "1", optional = true }
 glob = { version = "0.3", optional = true }
 toml = { version = "0.8", optional = true }

diff --git a/core/tauri-runtime-wry/CHANGELOG.md b/core/tauri-runtime-wry/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## \[2.0.0-beta.16]
+
+### New Features
+
+- [`78839b6d2`](https://www.github.com/tauri-apps/tauri/commit/78839b6d2f1005a5e6e1a54b0305136bae0c3a7c)([#4865](https://www.github.com/tauri-apps/tauri/pull/4865)) Add `RunEvent::Reopen` for handle click on dock icon on macOS.
+
+### What's Changed
+
+- [`783ef0f2d`](https://www.github.com/tauri-apps/tauri/commit/783ef0f2d331f520fa827c3112f36c0b519b9292)([#9647](https://www.github.com/tauri-apps/tauri/pull/9647)) Changed `WebviewDispatch::url` getter to return a result.
+
+### Dependencies
+
+- Upgraded to `tauri-runtime@2.0.0-beta.16`
+- Upgraded to `tauri-utils@2.0.0-beta.15`
+
 ## \[2.0.0-beta.15]
 
 ### 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 = "2.0.0-beta.15"
+version = "2.0.0-beta.16"
 description = "Wry bindings to the Tauri runtime"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -15,8 +15,8 @@ rust-version = { workspace = true }
 [dependencies]
 wry = { version = "0.39.3", default-features = false, features = [ "drag-drop", "protocol", "os-webview" ] }
 tao = { version = "0.28", default-features = false, features = [ "rwh_06" ] }
-tauri-runtime = { version = "2.0.0-beta.15", path = "../tauri-runtime" }
-tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils" }
+tauri-runtime = { version = "2.0.0-beta.16", path = "../tauri-runtime" }
+tauri-utils = { version = "2.0.0-beta.15", path = "../tauri-utils" }
 raw-window-handle = "0.6"
 http = "1.1"
 url = "2"

diff --git a/core/tauri-runtime-wry/src/lib.rs b/core/tauri-runtime-wry/src/lib.rs
@@ -345,14 +345,11 @@ pub struct ActiveTraceSpanStore(Rc<RefCell<Vec<ActiveTracingSpan>>>);
 
 #[cfg(feature = "tracing")]
 impl ActiveTraceSpanStore {
-  pub fn remove_window_draw(&self, window_id: TaoWindowId) {
-    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: _ }));
   }
 }
 
@@ -3242,9 +3239,8 @@ fn handle_event_loop<T: UserEvent>(
       callback(RunEvent::Exit);
     }
 
-    #[cfg(any(feature = "tracing", windows))]
+    #[cfg(windows)]
     Event::RedrawRequested(id) => {
-      #[cfg(windows)]
       if let Some(window_id) = window_id_map.get(&id) {
         let mut windows_ref = windows.0.borrow_mut();
         if let Some(window) = windows_ref.get_mut(&window_id) {
@@ -3257,9 +3253,11 @@ fn handle_event_loop<T: UserEvent>(
           }
         }
       }
+    }
 
-      #[cfg(feature = "tracing")]
-      active_tracing_spans.remove_window_draw(id);
+    #[cfg(feature = "tracing")]
+    Event::RedrawEventsCleared => {
+      active_tracing_spans.remove_window_draw();
     }
 
     Event::UserEvent(Message::Webview(

diff --git a/core/tauri-runtime/CHANGELOG.md b/core/tauri-runtime/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## \[2.0.0-beta.16]
+
+### New Features
+
+- [`78839b6d2`](https://www.github.com/tauri-apps/tauri/commit/78839b6d2f1005a5e6e1a54b0305136bae0c3a7c)([#4865](https://www.github.com/tauri-apps/tauri/pull/4865)) Add `RunEvent::Reopen` for handle click on dock icon on macOS.
+
+### What's Changed
+
+- [`783ef0f2d`](https://www.github.com/tauri-apps/tauri/commit/783ef0f2d331f520fa827c3112f36c0b519b9292)([#9647](https://www.github.com/tauri-apps/tauri/pull/9647)) Changed `WebviewDispatch::url` getter to return a result.
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.15`
+
 ## \[2.0.0-beta.15]
 
 ### Dependencies

diff --git a/core/tauri-runtime/Cargo.toml b/core/tauri-runtime/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-runtime"
-version = "2.0.0-beta.15"
+version = "2.0.0-beta.16"
 description = "Runtime for Tauri applications"
 exclude = [ "CHANGELOG.md", "/target" ]
 readme = "README.md"
@@ -29,7 +29,7 @@ targets = [
 serde = { version = "1.0", features = [ "derive" ] }
 serde_json = "1.0"
 thiserror = "1.0"
-tauri-utils = { version = "2.0.0-beta.14", path = "../tauri-utils" }
+tauri-utils = { version = "2.0.0-beta.15", path = "../tauri-utils" }
 http = "1.1"
 raw-window-handle = "0.6"
 url = { version = "2" }

diff --git a/core/tauri-utils/CHANGELOG.md b/core/tauri-utils/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.0.0-beta.15]
+
+### Bug Fixes
+
+- [`a5205f179`](https://www.github.com/tauri-apps/tauri/commit/a5205f179e577cce5c05b710b597da8f4e1d0780)([#9691](https://www.github.com/tauri-apps/tauri/pull/9691)) Fixes the ToTokens implementation of the window configuration `proxy_url` field.
+
 ## \[2.0.0-beta.14]
 
 ### Bug Fixes