merge from dev

.changes/app-manifest.md

@@ -0,0 +1,9 @@
+---
+"tauri": patch:enhance
+"tauri-build": patch:breaking
+"tauri-utils": patch:breaking
+"tauri-plugin": patch:breaking
+"tauri-codegen": patch:breaking
+---
+
+Allow defining permissions for the application commands via `tauri_build::Attributes::app_manifest`.

.changes/cli-mobile-init-partition.md

@@ -0,0 +1,6 @@
+---
+'tauri-cli': 'patch:bug'
+'@tauri-apps/cli': 'patch:bug'
+---
+
+Fixes Android and iOS project initialization when the Tauri CLI is on a different disk partition.

.changes/fix-add-child-deadlock.md

@@ -0,0 +1,5 @@
+---
+"tauri": patch:bug
+---
+
+Fixes `Window::add_child` deadlock.

.changes/fix-clear-residual-listeners.md

@@ -0,0 +1,5 @@
+---
+"tauri": patch:bug
+---
+
+Clear JS event listeneres on page load, which fixes zombie listeners when the page reloads.

.changes/fix-reparent.md

@@ -0,0 +1,5 @@
+---
+"tauri": patch:bug
+---
+
+Fixes `Webview::reparent` not updating the webview parent window reference.

.changes/ico-featrue-flags.md

@@ -0,0 +1,5 @@
+---
+'tauri': 'major:breaking'
+---
+
+Renamed `icon-ico` and `icon-png` feature flags to `image-ico` and `image-png` respectively

.changes/mobile-watcher.md

@@ -0,0 +1,6 @@
+---
+"@tauri-apps/cli": patch:bug
+"tauri-cli": patch:bug
+---
+
+Fixes dev watcher on mobile dev.

.changes/multiwebview-bounds-fixes.md

@@ -0,0 +1,5 @@
+---
+"tauri-runtime-wry": patch:bug
+---
+
+Fixes auto resize and positioning when using the multiwebview mode.

.changes/permission-platforms.md

@@ -0,0 +1,6 @@
+---
+"tauri": patch:feat
+"tauri-utils": patch:feat
+---
+
+Allow defining a permission that only applies to a set of target platforms via the `platforms` configuration option.

.changes/permission-table.md

@@ -0,0 +1,5 @@
+---
+"tauri-utils": patch:enhance
+---
+
+Changed plugin markdown docs generation to table format.

.changes/pre.json

@@ -7,13 +7,15 @@
     ".changes/api-webview-window-new-methods.md",
     ".changes/api-webview-window.md",
     ".changes/api-window-on-filedrop.md",
+    ".changes/app-manifest.md",
     ".changes/beta.md",
     ".changes/bundler-license.md",
     ".changes/bundler-rpm-license.md",
     ".changes/capabilities-multiwebview.md",
     ".changes/capabilities-tauri-conf.md",
     ".changes/capability-context-refactor.md",
     ".changes/cli-acl-subcommands.md",
+    ".changes/cli-mobile-init-partition.md",
     ".changes/cli-plugin-android-init.md",
     ".changes/cli-plugins-migrate.md",
     ".changes/cli-windows-build-tools-detect-utf8.md",
@@ -25,7 +27,10 @@
     ".changes/csp-header-linux.md",
     ".changes/downgrade-minisign.md",
     ".changes/enhance-resource-dir-resolution.md",
+    ".changes/fix-acl-webview-check.md",
+    ".changes/fix-add-child-deadlock.md",
     ".changes/fix-capability-schema-definitions.md",
+    ".changes/fix-clear-residual-listeners.md",
     ".changes/fix-codegen-rerun-if-changed.md",
     ".changes/fix-config-arg.md",
     ".changes/fix-invoke-devtools-by-hotkey.md",
@@ -34,6 +39,7 @@
     ".changes/fix-mobile-cmd-case.md",
     ".changes/fix-mobile-process-spawn.md",
     ".changes/fix-process-ipc-message-fn.md",
+    ".changes/fix-reparent.md",
     ".changes/fix-rewrite-schema.md",
     ".changes/fix-tauri-build-license-field.md",
     ".changes/fix-tauri-build-unix.md",
@@ -43,7 +49,11 @@
     ".changes/handle-empty-permissions.md",
     ".changes/inline-plugins.md",
     ".changes/ios-signing-optional.md",
+    ".changes/mobile-watcher.md",
+    ".changes/multiwebview-bounds-fixes.md",
     ".changes/nsis-dpi-aware.md",
+    ".changes/permission-platforms.md",
+    ".changes/permission-table.md",
     ".changes/progress-bar-state-refactor.md",
     ".changes/re-export-progress-bar-status.md",
     ".changes/refactor-capabilities-schema.md",
@@ -64,6 +74,8 @@
     ".changes/tauri-scope-object-error-sync.md",
     ".changes/tauri-utils-capability-refactor.md",
     ".changes/tauri-webview-events.md",
+    ".changes/truncate-before-write-buildtask.md",
+    ".changes/update-acl-paths-cli.md",
     ".changes/update-app-template-capabilities-conf.md",
     ".changes/update-plugin-template.md",
     ".changes/wry-0.36.md",

.changes/runtime-icon-lifetime.md

@@ -0,0 +1,5 @@
+---
+'tauri-runtime': 'major:breaking'
+---
+
+Add a lifetime parameter for `Icon` type. Also changed `rgba` field to be `Cow<'a, [u8]>`

.changes/tauri-context-icon-methods.md

@@ -0,0 +1,5 @@
+---
+'tauri': 'major:breaking'
+---
+
+Removed `Context::default_window_icon_mut` and `Context::tray_icon_mut`, use `Context::set_default_window_icon` and `Context::set_tray_icon` instead. Also changed `Context::set_tray_icon` to accept `Option<T>`.

.changes/tauri-icon-removed.md

@@ -0,0 +1,5 @@
+---
+'tauri': 'major:breaking'
+---
+
+Removed `Icon` enum, use the new `Image` type instead. All APIs that previously accepted `Icon` have changed to accept `Image` instead.

.changes/tauri-image-codegen.md

@@ -0,0 +1,5 @@
+---
+'tauri-codegen': 'major:breaking'
+---
+
+Change the generated context code to use the new `Image` type in tauri.

.changes/tauri-image.md

@@ -0,0 +1,5 @@
+---
+'tauri': 'minor:feat'
+---
+
+Add `Image` type.

.changes/truncate-before-write-buildtask.md

@@ -0,0 +1,6 @@
+---
+"tauri-cli": patch:bug
+"@tauri-apps/cli": patch:bug
+---
+
+Fixes truncation of existing BuildTask.kt when running `tauri android init`.

.changes/update-acl-paths-cli.md

@@ -0,0 +1,6 @@
+---
+"tauri-cli": patch:changes
+"@tauri-apps/cli": patch:changes
+---
+
+Updates to new ACL manifest path.

.github/workflows/covector-version-or-publish-v1.yml

@@ -0,0 +1,228 @@
+# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+name: covector version or publish
+
+on:
+  push:
+    branches:
+      - 1.x
+
+jobs:
+  msrv-list:
+    runs-on: ${{ matrix.platform.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+          - {
+              target: x86_64-pc-windows-msvc,
+              os: windows-latest,
+              toolchain: '1.61.0'
+            }
+          - {
+              target: x86_64-unknown-linux-gnu,
+              os: ubuntu-latest,
+              toolchain: '1.60.0'
+            }
+          - {
+              target: x86_64-apple-darwin,
+              os: macos-latest,
+              toolchain: '1.60.0'
+            }
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: install rust ${{ matrix.platform.toolchain }}
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: ${{ matrix.platform.toolchain }}
+          target: ${{ matrix.platform.target }}
+          override: true
+          default: true
+
+      - name: install Linux dependencies
+        if: contains(matrix.platform.target, 'unknown-linux')
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev
+
+      - uses: Swatinem/rust-cache@v2
+
+      - name: delete lockfile
+        run: rm Cargo.lock
+
+      - name: Downgrade crates with MSRV conflict
+        # The --precise flag can only be used once per invocation.
+        run: |
+          cargo update -p system-deps:6.2.0 --precise 6.1.1
+          cargo update -p toml:0.7.8 --precise 0.7.3
+          cargo update -p toml_edit:0.19.15 --precise 0.19.8
+          cargo update -p embed-resource --precise 2.3.0
+          cargo update -p toml_datetime --precise 0.6.1
+          cargo update -p serde_spanned --precise 0.6.1
+          cargo update -p winnow --precise 0.4.1
+          cargo update -p plist --precise 1.5.1
+          cargo update -p time --precise 0.3.15
+          cargo update -p ignore --precise 0.4.18
+          cargo update -p raw-window-handle --precise 0.5.0
+          cargo update -p cargo_toml:0.15.3 --precise 0.15.2
+          cargo update -p zbus --precise 3.13.0
+          cargo update -p zbus_names --precise 2.5.0
+          cargo update -p colored --precise 2.0.2
+          cargo update -p arboard --precise 3.2.1
+          cargo update -p tempfile --precise 3.6.0
+          cargo update -p serde_with:3.6.1 --precise 3.0.0
+          cargo update -p tokio --precise 1.29.0
+          cargo update -p flate2 --precise 1.0.26
+          cargo update -p h2 --precise 0.3.20
+          cargo update -p reqwest --precise 0.11.18
+          cargo update -p bstr --precise 1.6.2
+          cargo update -p cfg-expr:0.15.7 --precise 0.15.4
+          cargo update -p memchr --precise 2.6.2
+          cargo update -p async-executor --precise 1.5.1
+          cargo update -p proptest --precise 1.2.0
+          cargo update -p regex --precise 1.9.6
+          cargo update -p bstr --precise 1.6.2
+          cargo update -p backtrace --precise 0.3.68
+          cargo update -p blocking --precise 1.4.1
+          cargo update -p ignore --precise 0.4.18
+          cargo update -p regex --precise 1.9.6
+          cargo update -p globset --precise 0.4.13
+          cargo update -p crossbeam-channel --precise 0.5.8
+          cargo update -p crossbeam-utils --precise 0.8.16
+          cargo update -p image --precise 0.24.4
+          cargo update -p async-process --precise 1.7.0
+          cargo update -p is-terminal --precise 0.4.7
+          cargo update -p tar --precise 0.4.39
+          cargo update -p serde_json --precise 1.0.97
+          cargo update -p petgraph --precise 0.6.3
+          cargo update -p os_str_bytes --precise 6.5.1
+
+      - name: test build
+        run: cargo check --target ${{ matrix.platform.target }} --features tracing,compression,wry,linux-protocol-headers,isolation,custom-protocol,api-all,cli,updater,system-tray,windows7-compat,http-multipart,test
+
+  run-integration-tests:
+    runs-on: ${{ matrix.platform }}
+    needs: msrv-list
+
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [ubuntu-latest, macos-latest, windows-latest]
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: install stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+      - name: install Linux dependencies
+        if: matrix.platform == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y webkit2gtk-4.0 libayatana-appindicator3-dev libfuse2
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: |
+            core -> ../target
+            tooling/cli
+
+      - name: build CLI
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: --manifest-path ./tooling/cli/Cargo.toml
+
+      - name: run integration tests
+        run: cargo test --test '*' -- --ignored
+
+      - name: run CLI tests
+        timeout-minutes: 30
+        run: |
+          cd ./tooling/cli/node
+          yarn
+          yarn build
+          yarn test
+
+  version-or-publish:
+    runs-on: ubuntu-latest
+    timeout-minutes: 65
+    outputs:
+      change: ${{ steps.covector.outputs.change }}
+      commandRan: ${{ steps.covector.outputs.commandRan }}
+      successfulPublish: ${{ steps.covector.outputs.successfulPublish }}
+    needs:
+      - run-integration-tests
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 14
+          registry-url: 'https://registry.npmjs.org'
+          cache: yarn
+          cache-dependency-path: tooling/*/yarn.lock
+
+      - name: cargo login
+        run: cargo login ${{ secrets.ORG_CRATES_IO_TOKEN }}
+      - name: git config
+        run: |
+          git config --global user.name "${{ github.event.pusher.name }}"
+          git config --global user.email "${{ github.event.pusher.email }}"
+
+      - name: covector version or publish (publish when no change files present)
+        uses: jbolda/covector/packages/action@covector-v0
+        id: covector
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.ORG_NPM_TOKEN }}
+          CARGO_AUDIT_OPTIONS: ${{ secrets.CARGO_AUDIT_OPTIONS }}
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          command: 'version-or-publish'
+          createRelease: true
+
+      - name: Create Pull Request With Versions Bumped
+        if: steps.covector.outputs.commandRan == 'version'
+        uses: tauri-apps/create-pull-request@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          branch: release/version-updates-v1
+          title: Apply Version Updates From Current Changes (v1)
+          commit-message: 'apply version updates'
+          labels: 'version updates'
+          body: ${{ steps.covector.outputs.change }}
+
+      - name: Trigger doc update
+        if: |
+          steps.covector.outputs.successfulPublish == 'true' &&
+          steps.covector.outputs.packagesPublished != ''
+        uses: peter-evans/repository-dispatch@v1
+        with:
+          token: ${{ secrets.ORG_TAURI_BOT_PAT }}
+          repository: tauri-apps/tauri-docs
+          event-type: update-docs
+
+      - name: Trigger `@tauri-apps/cli` publishing workflow
+        if: |
+          steps.covector.outputs.successfulPublish == 'true' &&
+          contains(steps.covector.outputs.packagesPublished, '@tauri-apps/cli')
+        uses: peter-evans/repository-dispatch@v1
+        with:
+          event-type: publish-js-cli
+          client-payload: >-
+            {"releaseId": "${{ steps.covector.outputs['-tauri-apps-cli-releaseId'] }}" }
+
+      - name: Trigger `tauri-cli` publishing workflow
+        if: |
+          steps.covector.outputs.successfulPublish == 'true' &&
+          contains(steps.covector.outputs.packagesPublished, 'tauri-cli')
+        uses: peter-evans/repository-dispatch@v1
+        with:
+          event-type: publish-clirs