Merge branch 'v2' into v2

tauri-apps · Dec 10, 2024 · b467270 · b467270
2 parents d32b766 + eb94dda
commit b467270
Show file tree

Hide file tree

Showing 164 changed files with 1,330 additions and 1,375 deletions.
diff --git a/.changes/add-fs-size.md b/.changes/add-fs-size.md
diff --git a/.changes/add-total-transferred-field.md b/.changes/add-total-transferred-field.md
diff --git a/.changes/config.json b/.changes/config.json
@@ -14,10 +14,20 @@
           "command": "pnpm build",
           "dryRunCommand": "pnpm build"
         },
+        {
+          "command": "echo '<details>\n<summary><em><h4>PNPM Publish</h4></em></summary>\n\n```'",
+          "dryRunCommand": true,
+          "pipe": true
+        },
         {
           "command": "npm publish --provenance --access public",
           "dryRunCommand": "npm publish --provenance --access public --dry-run",
           "pipe": true
+        },
+        {
+          "command": "echo '```\n\n</details>\n'",
+          "dryRunCommand": true,
+          "pipe": true
         }
       ]
     },
@@ -56,7 +66,7 @@
       "dependencies": [
         "barcode-scanner",
         "biometric",
-        "log-plugin",
+        "log",
         "cli",
         "clipboard-manager",
         "dialog",
@@ -170,7 +180,8 @@
     },
     "dialog-js": {
       "path": "./plugins/dialog",
-      "manager": "javascript"
+      "manager": "javascript",
+      "dependencies": ["fs-js"]
     },
     "geolocation": {
       "path": "./plugins/geolocation",
@@ -211,13 +222,14 @@
     },
     "http-js": {
       "path": "./plugins/http",
-      "manager": "javascript"
+      "manager": "javascript",
+      "dependencies": ["fs-js"]
     },
     "localhost": {
       "path": "./plugins/localhost",
       "manager": "rust"
     },
-    "log-plugin": {
+    "log": {
       "path": "./plugins/log",
       "manager": "rust"
     },

diff --git a/.changes/deb-update-support.md b/.changes/deb-update-support.md
diff --git a/.changes/fix-clipboard-html-write.md b/.changes/fix-clipboard-html-write.md
diff --git a/.changes/fix-deep-link-onopenurl-current.md b/.changes/fix-deep-link-onopenurl-current.md
diff --git a/.changes/fix-dialog-export-dialog.md b/.changes/fix-dialog-export-dialog.md
diff --git a/.changes/fix-fs-scope-escape-paths.md b/.changes/fix-fs-scope-escape-paths.md
diff --git a/.changes/fix-inconsistent-webview-log-target.md b/.changes/fix-inconsistent-webview-log-target.md
diff --git a/.changes/fs-perf.md b/.changes/fs-perf.md
diff --git a/.changes/fs-read-dir-broken-symlink.md b/.changes/fs-read-dir-broken-symlink.md
diff --git a/.changes/fs-readable-stream.md b/.changes/fs-readable-stream.md
diff --git a/.changes/http-tracing.md b/.changes/http-tracing.md
diff --git a/.changes/localhost-custom-host-binding.md b/.changes/localhost-custom-host-binding.md
diff --git a/.changes/opener-initial.md b/.changes/opener-initial.md
diff --git a/.changes/positioner-move-window-constrained-js.md b/.changes/positioner-move-window-constrained-js.md
diff --git a/.changes/positioner-move-window-constrained.md b/.changes/positioner-move-window-constrained.md
diff --git a/.changes/readme.md b/.changes/readme.md
@@ -6,6 +6,8 @@ As you create PRs and make changes that require a version bump, please add a new
 
 When you select the version bump required, you do _not_ need to consider dependencies. Only note the package with the actual change, and any packages that depend on that package will be bumped automatically in the process.
 
+**Note, that in this repository, even if only the Rust code or only the JavaScript code of a plugin changed, both packages need to be bumped with the same increment!**
+
 Use the following format:
 
 ```md

diff --git a/.changes/sql-allow-blocking-without-nested-runtime.md b/.changes/sql-allow-blocking-without-nested-runtime.md
diff --git a/.github/workflows/check-change-files.yml b/.github/workflows/check-change-files.yml
@@ -0,0 +1,44 @@
+# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+name: check change files
+
+on:
+  pull_request:
+    paths:
+      - '.changes/*.md'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: check change files end with .md
+        run: |
+          for file in .changes/*
+          do
+            if [[ ! "$file" =~ \.(md|json)$ ]]; then
+              echo ".changes directory should only contain files that end with .md"
+              echo "found an invalid file in .changes directory:"
+              echo "$file"
+              exit 1
+            fi
+          done
+
+      - uses: dorny/paths-filter@v3
+        id: filter
+        with:
+          list-files: shell
+          filters: |
+            changes:
+              - added|modified: '.changes/*.md'
+
+      - name: check
+        run: node ./.scripts/ci/check-change-files.js ${{ steps.filter.outputs.changes_files }}
+        if: ${{ steps.filter.outputs.changes == 'true' }}
diff --git a/.github/workflows/test-rust.yml b/.github/workflows/test-rust.yml
@@ -47,113 +47,140 @@ jobs:
             tauri-plugin-autostart:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/autostart/**
             tauri-plugin-cli:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/cli/**
             tauri-plugin-clipboard-manager:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/clipboard-manager/**
             tauri-plugin-deep-link:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/deep-link/**
             tauri-plugin-dialog:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/dialog/**
               - plugins/fs/**
             tauri-plugin-fs:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/fs/**
             tauri-plugin-geolocation:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/geolocation/**
             tauri-plugin-global-shortcut:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/global-shortcut/**
             tauri-plugin-opener:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/opener/**
             tauri-plugin-haptics:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/haptics/**
             tauri-plugin-http:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/http/**
               - plugins/fs/**
             tauri-plugin-localhost:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/localhost/**
             tauri-plugin-log:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/log/**
             tauri-plugin-notification:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/notification/**
             tauri-plugin-os:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/os/**
             tauri-plugin-persisted-scope:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/persisted-scope/**
               - plugins/fs/**
             tauri-plugin-positioner:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/positioner/**
             tauri-plugin-process:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/process/**
             tauri-plugin-shell:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/shell/**
             tauri-plugin-single-instance:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/single-instance/**
             tauri-plugin-sql:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/sql/**
             tauri-plugin-store:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/store/**
             tauri-plugin-stronghold:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/stronghold/**
             tauri-plugin-updater:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/updater/**
             tauri-plugin-upload:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/upload/**
             tauri-plugin-websocket:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/websocket/**
             tauri-plugin-window-state:
               - .github/workflows/test-rust.yml
               - Cargo.toml
+              - Cargo.lock
               - plugins/window-state/**
 
   test:
-Original file line number
+Diff line change
@@ Expand Up @@
     When you select the version bump required, you do _not_ need to consider dependencies. Only note the package with the actual change, and any packages that depend on that package will be bumped automatically in the process.
+    **Note, that in this repository, even if only the Rust code or only the JavaScript code of a plugin changed, both packages need to be bumped with the same increment!**
     Use the following format:
     ```md
@@ Expand Down @@