tauri-apps · Dec 20, 2023 · Dec 27, 2023 · Dec 27, 2023 · Dec 28, 2023 · Dec 28, 2023
diff --git a/.cargo/config → .cargo/config.toml b/.cargo/config → .cargo/config.toml
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,30 +1,21 @@
 <!--
-Update "[ ]" to "[x]" to check a box
+Before submitting a PR, please read https://github.com/tauri-apps/tauri/blob/dev/.github/CONTRIBUTING.md#pull-request-guidelines
 
-Please make sure to read the Pull Request Guidelines: https://github.com/tauri-apps/tauri/blob/dev/.github/CONTRIBUTING.md#pull-request-guidelines
--->
-
-### What kind of change does this PR introduce?
-<!-- Check at least one. If you are introducing a new binding, you must reference an issue where this binding has been proposed, discussed and approved by the maintainers. -->
-
-- [ ] Bugfix
-- [ ] Feature
-- [ ] Docs
-- [ ] New Binding issue #___
-- [ ] Code style update
-- [ ] Refactor
-- [ ] Build-related changes
-- [ ] Other, please describe:
+1. Give the PR a descriptive title.
 
-### Does this PR introduce a breaking change?
-<!-- If yes, please describe the impact and migration path for existing applications in an attached issue. -->
+  Examples of good title:
+    - fix(windows): fix race condition in event loop
+    - docs: update docstrings
+    - feat: add `Window::set_fullscreen`
 
-- [ ] Yes, and the changes were approved in issue #___
-- [ ] No
+  Examples of bad title:
+    - fix #7123
+    - update docs
+    - fix bugs
 
-### Checklist
-- [ ] When resolving issues, they are referenced in the PR's title (e.g `fix: remove a typo, closes #___, #___`)
-- [ ] A change file is added if any packages will require a version bump due to this PR per [the instructions in the readme](https://github.com/tauri-apps/tauri/blob/dev/.changes/readme.md).
-- [ ] I have added a convincing reason for adding this feature, if necessary
-
-### Other information
+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
+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/covector-version-or-publish-v1.yml b/.github/workflows/covector-version-or-publish-v1.yml
@@ -10,16 +10,117 @@ on:
       - 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-13,
+              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.2 --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 notify-rust --precise 4.10.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.8.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.8 --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 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
+          cargo update -p thread_local --precise 1.1.7
+          cargo update -p cc --precise 1.0.94
+          cargo update -p home --precise 0.5.5
+          cargo update -p tree_magic_mini --precise 3.0.3
+          cargo update -p tokio-test --precise 0.4.3
+          cargo update -p tokio-stream --precise 0.1.14
+          cargo update -p tokio-util --precise 0.7.10
+
+      - 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]
+        platform: [ubuntu-latest, macos-13, windows-latest]
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: install stable
@@ -66,12 +167,12 @@ jobs:
       - run-integration-tests
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
           registry-url: 'https://registry.npmjs.org'
           cache: yarn
           cache-dependency-path: tooling/*/yarn.lock
@@ -121,8 +222,6 @@ jobs:
           contains(steps.covector.outputs.packagesPublished, '@tauri-apps/cli')
         uses: peter-evans/repository-dispatch@v1
         with:
-          token: ${{ secrets.ORG_TAURI_BOT_PAT }}
-          repository: tauri-apps/tauri
           event-type: publish-js-cli
           client-payload: >-
             {"releaseId": "${{ steps.covector.outputs['-tauri-apps-cli-releaseId'] }}" }
@@ -133,6 +232,4 @@ jobs:
           contains(steps.covector.outputs.packagesPublished, 'tauri-cli')
         uses: peter-evans/repository-dispatch@v1
         with:
-          token: ${{ secrets.ORG_TAURI_BOT_PAT }}
-          repository: tauri-apps/tauri
           event-type: publish-clirs
diff --git a/.github/workflows/covector-version-or-publish.yml b/.github/workflows/covector-version-or-publish.yml
@@ -71,7 +71,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
           registry-url: 'https://registry.npmjs.org'
           cache: yarn
           cache-dependency-path: tooling/*/yarn.lock
@@ -121,8 +121,6 @@ jobs:
           contains(steps.covector.outputs.packagesPublished, '@tauri-apps/cli')
         uses: peter-evans/repository-dispatch@v1
         with:
-          token: ${{ secrets.ORG_TAURI_BOT_PAT }}
-          repository: tauri-apps/tauri
           event-type: publish-js-cli
           client-payload: >-
             {"releaseId": "${{ steps.covector.outputs['-tauri-apps-cli-releaseId'] }}" }
@@ -133,6 +131,4 @@ jobs:
           contains(steps.covector.outputs.packagesPublished, 'tauri-cli')
         uses: peter-evans/repository-dispatch@v1
         with:
-          token: ${{ secrets.ORG_TAURI_BOT_PAT }}
-          repository: tauri-apps/tauri
           event-type: publish-clirs
diff --git a/.github/workflows/lint-js.yml b/.github/workflows/lint-js.yml
@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: 16
           cache: yarn
           cache-dependency-path: tooling/cli/node/yarn.lock
       - name: install deps via yarn
@@ -42,7 +42,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: 16
           cache: yarn
           cache-dependency-path: tooling/api/yarn.lock
 

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
@@ -158,7 +158,7 @@ jobs:
   #          usesh: true
   #          mem: 3000
   #          prepare: |
-  #            pkg install -y curl node14 python2
+  #            pkg install -y curl node16 python2
   #            curl -qL https://www.npmjs.com/install.sh | sh
   #            npm install -g yarn
   #            curl https://sh.rustup.rs -sSf --output rustup.sh
@@ -198,13 +198,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@v3
@@ -235,9 +235,9 @@ jobs:
       fail-fast: false
       matrix:
         node:
-          - '14'
           - '16'
           - '18'
+          - '20'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -272,9 +272,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
@@ -315,9 +315,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
@@ -375,7 +375,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/test-cli-js.yml b/.github/workflows/test-cli-js.yml
@@ -43,7 +43,7 @@ jobs:
       - name: setup node
         uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 16
           cache: yarn
           cache-dependency-path: tooling/cli/node/yarn.lock
 

diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
@@ -43,7 +43,7 @@ jobs:
             }
           - {
               target: x86_64-apple-darwin,
-              os: macos-latest,
+              os: macos-13,
               toolchain: '1.60.0'
             }
         features:
@@ -82,47 +82,5 @@ jobs:
           workspaces: core -> ../target
           save-if: ${{ matrix.features.key == 'all' }}
 
-      - 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 tempfile --precise 3.6.0
-          cargo update -p serde_with:3.4.0 --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 cfg-expr:0.15.5 --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
-
       - name: test
         run: cargo test --target ${{ matrix.platform.target }} ${{ matrix.features.args }}
diff --git a/.gitignore b/.gitignore
@@ -73,7 +73,7 @@ TODO.md
 target
 
 # lock for libs
-/Cargo.lock
+#/Cargo.lock Committed to prevent msrv checks from failing
 /tooling/bench/tests/Cargo.lock
 /yarn.lock