Merge branch 'dev' into fix/codegen/read-all-configs

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

Hide file tree

Showing 61 changed files with 1,924 additions and 667 deletions.
diff --git a/.cargo/config → .cargo/config.toml b/.cargo/config → .cargo/config.toml
diff --git a/.changes/event-reopen.md b/.changes/event-reopen.md
@@ -0,0 +1,7 @@
+---
+'tauri': 'minor:feat'
+'tauri-runtime': 'minor:feat'
+'tauri-runtime-wry': 'minor:feat'
+---
+
+Add `RunEvent::Reopen` for handle click on dock icon on macOS.
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/fix-proxy-url-totokens-impl.md b/.changes/fix-proxy-url-totokens-impl.md
@@ -0,0 +1,5 @@
+---
+"tauri-utils": patch:bug
+---
+
+Fixes the ToTokens implementation of the window configuration `proxy_url` field.
diff --git a/.changes/fix-schemars-compatibility.md b/.changes/fix-schemars-compatibility.md
@@ -0,0 +1,5 @@
+---
+tauri-utils: "patch:bug"
+---
+
+Fixes `schemars` compilation issue.
diff --git a/.changes/pre.json b/.changes/pre.json
@@ -20,6 +20,7 @@
     ".changes/app-manifest.md",
     ".changes/assets-setup.md",
     ".changes/beta.md",
+    ".changes/better-error-for-invalid-plugin-config.md",
     ".changes/build-schema-generation.md",
     ".changes/bundler-deep-link-reg-path.md",
     ".changes/bundler-license.md",
@@ -40,6 +41,7 @@
     ".changes/cli-ds-store-dev-watch.md",
     ".changes/cli-empty-responses.md",
     ".changes/cli-frontend-dist-expected-path.md",
+    ".changes/cli-icon-non-0-exit.md",
     ".changes/cli-include-dir-cargo-manifest-dir.md",
     ".changes/cli-migrate-non-utf8.md",
     ".changes/cli-migrate-unknown-plugins.md",
@@ -80,12 +82,15 @@
     ".changes/deb-rpm-post-pre-scripts-bundler.md",
     ".changes/deb-rpm-post-pre-scripts-config.md",
     ".changes/deb-rpm-provides-conflicts-replaces.md",
+    ".changes/default-generic-for-menu.md",
+    ".changes/default-generic-for-tray.md",
     ".changes/dev-fn.md",
     ".changes/downgrade-minisign.md",
     ".changes/drop-nsis-applicationid.md",
     ".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",
@@ -98,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",
@@ -108,10 +114,12 @@
     ".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",
     ".changes/fix-runtime-wry-32bit.md",
+    ".changes/fix-schemars-compatibility.md",
     ".changes/fix-scope-resolution.md",
     ".changes/fix-tauri-build-license-field.md",
     ".changes/fix-tauri-build-unix.md",
@@ -130,6 +138,7 @@
     ".changes/image-crate.md",
     ".changes/image-rgba-uint8array.md",
     ".changes/image-size-refactor.md",
+    ".changes/improve-errors-for-missing-links-property.md",
     ".changes/inline-plugins.md",
     ".changes/ios-signing-optional.md",
     ".changes/ipc-allow-headers.md",
@@ -188,12 +197,15 @@
     ".changes/tauri-utils-capability-refactor.md",
     ".changes/tauri-utils-plugin-module.md",
     ".changes/tauri-webview-events.md",
+    ".changes/tray-icon-rect.md",
     ".changes/tray-rect.md",
     ".changes/truncate-before-write-buildtask.md",
     ".changes/unstable-child-webview.md",
     ".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/.changes/tray-icon-rect.md b/.changes/tray-icon-rect.md
@@ -0,0 +1,5 @@
+---
+"tauri": "minor:feat"
+---
+
+Add `TrayIcon::rect` method to retrieve the tray icon rectangle
diff --git a/.changes/url-result-runtime.md b/.changes/url-result-runtime.md
@@ -0,0 +1,6 @@
+---
+"tauri-runtime": "patch"
+"tauri-runtime-wry": "patch"
+---
+
+Changed `WebviewDispatch::url` getter to return a result.
diff --git a/.changes/url-result.md b/.changes/url-result.md
@@ -0,0 +1,5 @@
+---
+"tauri": "patch:breaking"
+---
+
+Changed `WebviewWindow::url` and `Webview::url` getter to return a result.
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/SECURITY.md b/SECURITY.md
@@ -10,8 +10,8 @@
 ## Reporting a Vulnerability
 
 If you have found a potential security threat, vulnerability or exploit in Tauri
-or one of its upstream dependencies, please DON’T create a pull-request, DON’T
-file an issue on GitHub, DON’T mention it on Discord and DON’T create a forum thread.
+or one of its upstream dependencies, please DON'T create a pull-request, DON'T
+file an issue on GitHub, DON'T mention it on Discord and DON'T create a forum thread.
 
 Please submit your report via the GitHub Private Vulnerability Disclosure functionality.
 

diff --git a/core/tauri-build/CHANGELOG.md b/core/tauri-build/CHANGELOG.md
@@ -1,5 +1,19 @@
 # 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
+
+- Upgraded to `tauri-utils@2.0.0-beta.14`
+- Upgraded to `tauri-codegen@2.0.0-beta.14`
+
 ## \[2.0.0-beta.13]
 
 ### Bug Fixes

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.13"
+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.13", path = "../tauri-codegen", optional = true }
-tauri-utils = { version = "2.0.0-beta.13", 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"
@@ -41,7 +41,7 @@ semver = "1"
 dirs-next = "2"
 glob = "0.3"
 toml = "0.8"
-schemars = { version = "0.8", features = [ "preserve_order" ] }
+schemars = { version = "0.8.18", features = [ "preserve_order" ] }
 
 [features]
 default = [ "config-json" ]

diff --git a/core/tauri-build/src/manifest.rs b/core/tauri-build/src/manifest.rs
@@ -65,7 +65,7 @@ pub fn check(config: &Config, manifest: &mut Manifest) -> Result<()> {
     if deps.is_empty() {
       if let Some(alias) = &metadata.alias {
         deps = find_dependency(manifest, alias, metadata.kind);
-        name = alias.clone();
+        name.clone_from(alias)
       }
     }
 

diff --git a/core/tauri-codegen/CHANGELOG.md b/core/tauri-codegen/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## \[2.0.0-beta.15]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.15`
+
+## \[2.0.0-beta.14]
+
+### Dependencies
+
+- Upgraded to `tauri-utils@2.0.0-beta.14`
+
 ## \[2.0.0-beta.13]
 
 ### 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.13"
+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.13", 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" ] }