Merge branch 'dev' into feat/bundler/nsis/update-mode

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

Hide file tree

Showing 96 changed files with 2,358 additions and 820 deletions.
diff --git a/.cargo/config → .cargo/config.toml b/.cargo/config → .cargo/config.toml
diff --git a/.changes/api-isTauri-type.md b/.changes/api-isTauri-type.md
@@ -0,0 +1,5 @@
+---
+"@tauri-apps/api": "patch:bug"
+---
+
+Fix `isTauri` incorrect return type. 
diff --git a/.changes/better-error-for-invalid-plugin-config.md b/.changes/better-error-for-invalid-plugin-config.md
@@ -0,0 +1,5 @@
+---
+'tauri': patch:enhance
+---
+
+Improve the error message that is shown when deserializing the Tauri plugin config.
diff --git a/.changes/bundler-nsis-tauri-utils.md b/.changes/bundler-nsis-tauri-utils.md
@@ -0,0 +1,5 @@
+---
+'tauri-bundler': 'patch:enhance'
+---
+
+Update `nsis_tauri_utils` plugin to `0.3` and use the built-in NSIS download plugin, which reduces the NSIS installer size by 775kb.
diff --git a/.changes/cli-icon-non-0-exit.md b/.changes/cli-icon-non-0-exit.md
@@ -0,0 +1,6 @@
+---
+"tauri-cli": "patch:bug"
+"@tauri-apps/cli": "patch:bug"
+---
+
+Exit `tauri icon` with non-zero code when it fails.
diff --git a/.changes/cli-windows-sys.md b/.changes/cli-windows-sys.md
@@ -0,0 +1,5 @@
+---
+"tauri-cli": "patch:bug"
+---
+
+Use `windows-sys` crate instead of `winapi` which fixes installing the published cli from crates.io using `cargo install tauri-cli --version "^2.0.0-beta"`.
diff --git a/.changes/cursor_position.md b/.changes/cursor_position.md
@@ -0,0 +1,7 @@
+---
+'tauri': 'patch:feat'
+'tauri-runtime': 'patch:feat'
+'tauri-runtime-wry': 'patch:feat'
+---
+
+Add `App/AppHandle/Window/Webview/WebviewWindow::cursor_position` getter to get the current cursor position.
diff --git a/.changes/cursor_position_js.md b/.changes/cursor_position_js.md
@@ -0,0 +1,5 @@
+---
+'@tauri-apps/api': 'patch:feat'
+---
+
+Add `cursorPosition` function in `window` module to get the current cursor position.
diff --git a/.changes/default-generic-for-menu.md b/.changes/default-generic-for-menu.md
@@ -0,0 +1,5 @@
+---
+'tauri': patch:enhance
+---
+
+Provide a default for the runtime generic on `Menu`, `MenuItem`, `Submenu`, `PredefinedMenuItem`, `CheckMenuItem` and `IconMenuItem`.
diff --git a/.changes/default-generic-for-tray.md b/.changes/default-generic-for-tray.md
@@ -0,0 +1,5 @@
+---
+'tauri': patch:enhance
+---
+
+Provide a default for the runtime generic on `TrayIcon`.
diff --git a/.changes/drop-nsis-applicationid.md b/.changes/drop-nsis-applicationid.md
@@ -2,4 +2,4 @@
 'tauri-bundler': 'patch:enhance'
 ---
 
-Use nsis's built-in com plugin instead of ApplicationID plugin, this reduces the installer size by 150-200 KB, and also fixes pinned shortcut not getting cleaned up on uninstall
+Use nsis's built-in COM plugin instead of `ApplicationID` plugin, this reduces the installer size by 100 KB, and also fixes pinned shortcut not getting cleaned up on uninstall.
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/hide-windows-on-cleanup.md b/.changes/hide-windows-on-cleanup.md
@@ -0,0 +1,5 @@
+---
+"tauri": "patch:bug"
+---
+
+Fix window white flashing on exit on Windows
diff --git a/.changes/improve-errors-for-missing-links-property.md b/.changes/improve-errors-for-missing-links-property.md
@@ -0,0 +1,6 @@
+---
+'tauri-plugin': patch:enhance
+---
+
+Improve the error message that is shown when the `links` property is missing from a Tauri Plugin.
+
diff --git a/.changes/ipc-allow-headers.md b/.changes/ipc-allow-headers.md
@@ -0,0 +1,5 @@
+---
+"tauri": patch:bug
+---
+
+Allow any headers on the IPC custom protocol.
diff --git a/.changes/plugin-init-script-context.md b/.changes/plugin-init-script-context.md
@@ -0,0 +1,5 @@
+---
+"tauri": patch:enhance
+---
+
+Run each plugin initialization script on its own context so they do not interfere with each other or the Tauri init script.
diff --git a/.changes/pre.json b/.changes/pre.json
@@ -6,6 +6,7 @@
     ".changes/acl-scope-refactor.md",
     ".changes/acl-urlpattern.md",
     ".changes/allow-recursive-asset-scope-on-file-drop-directory.md",
+    ".changes/api-isTauri-type.md",
     ".changes/api-isTauri.md",
     ".changes/api-position-size-args.md",
     ".changes/api-readd-window-created-event.md",
@@ -19,10 +20,12 @@
     ".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",
     ".changes/bundler-long_description.md",
+    ".changes/bundler-nsis-tauri-utils.md",
     ".changes/bundler-r-flag.md",
     ".changes/bundler-resources-unix.md",
     ".changes/bundler-rpm-license.md",
@@ -38,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",
@@ -48,6 +52,7 @@
     ".changes/cli-update-deps-fix-log.md",
     ".changes/cli-updater-unkown-fields.md",
     ".changes/cli-windows-build-tools-detect-utf8.md",
+    ".changes/cli-windows-sys.md",
     ".changes/closeable-maximizable.md",
     ".changes/codegen-capabilities-attribute.md",
     ".changes/codegen-set-assets.md",
@@ -68,17 +73,24 @@
     ".changes/core-menu-resources-deadlock.md",
     ".changes/core-once-event-return-event-id.md",
     ".changes/core-path-basename-replace.md",
+    ".changes/core-specta-integration.md",
     ".changes/core-start-resize-permission.md",
     ".changes/core-window-hasdisplayhandle.md",
     ".changes/csp-header-linux.md",
+    ".changes/cursor_position.md",
+    ".changes/cursor_position_js.md",
     ".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",
@@ -91,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",
@@ -101,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",
@@ -117,13 +132,16 @@
     ".changes/fix-window-inner-size-crash.md",
     ".changes/global-api-script-path-plugins.md",
     ".changes/handle-empty-permissions.md",
+    ".changes/hide-windows-on-cleanup.md",
     ".changes/http-v1.md",
     ".changes/ico-featrue-flags.md",
     ".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",
     ".changes/ipc-post-message-fallback.md",
     ".changes/ipc-request-param-refactor.md",
     ".changes/isolation-pattern-key-extractable.md",
@@ -136,6 +154,7 @@
     ".changes/permission-platforms.md",
     ".changes/permission-table.md",
     ".changes/plugin-global-api-script.md",
+    ".changes/plugin-init-script-context.md",
     ".changes/preserve-channel-order.md",
     ".changes/progress-bar-state-refactor.md",
     ".changes/re-export-progress-bar-status.md",
@@ -178,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/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -14,7 +14,7 @@ Before submitting a PR, please read https://github.com/tauri-apps/tauri/blob/dev
     - fix bugs
 
 2. If there is a related issue, reference it in the PR text, e.g. closes #123.
-3. If this change requires a new version, then add a change file in `.changes` directory with the appropriate bump, see https://github.com/tauri-apps/tauri/blob/dev/.changes/readme.md
+3. If this change requires a new version, then add a change file in `.changes` directory with the appropriate bump, see https://github.com/tauri-apps/tauri/blob/dev/.changes/README.md
 4. Ensure that all your commits are signed https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits
 5. Ensure `cargo test` and `cargo clippy` passes.
 6. Propose your changes as a draft PR if your work is still in progress.

diff --git a/.github/workflows/publish-cli-js.yml b/.github/workflows/publish-cli-js.yml
@@ -30,7 +30,7 @@ jobs:
             target: x86_64-apple-darwin
             architecture: x64
             build: |
-              yarn build:release
+              yarn build:release --target=x86_64-apple-darwin
               strip -x *.node
           - host: windows-latest
             build: yarn build:release
@@ -195,13 +195,13 @@ jobs:
       matrix:
         settings:
           - host: macos-latest
-            target: 'x86_64-apple-darwin'
+            target: aarch64-apple-darwin
           - host: windows-latest
             target: x86_64-pc-windows-msvc
         node:
-          - '14'
           - '16'
           - '18'
+          - '20'
     runs-on: ${{ matrix.settings.host }}
     steps:
       - uses: actions/checkout@v4
@@ -232,9 +232,9 @@ jobs:
       fail-fast: false
       matrix:
         node:
-          - '14'
           - '16'
           - '18'
+          - '20'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -269,9 +269,9 @@ jobs:
       fail-fast: false
       matrix:
         node:
-          - '14'
           - '16'
           - '18'
+          - '20'
     runs-on: ubuntu-latest
     container:
       image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
@@ -312,9 +312,9 @@ jobs:
       fail-fast: false
       matrix:
         node:
-          - '14'
           - '16'
           - '18'
+          - '20'
         image:
           - ghcr.io/napi-rs/napi-rs/nodejs:aarch64-16
           - ghcr.io/napi-rs/napi-rs/nodejs:armhf-16
@@ -372,7 +372,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
           check-latest: true
           cache: yarn
           cache-dependency-path: 'tooling/cli/node/yarn.lock'

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)