diff --git a/.changes/config.json b/.changes/config.json
index 13b5a6c2..93ed46e3 100644
--- a/.changes/config.json
+++ b/.changes/config.json
@@ -14,10 +14,20 @@
"command": "pnpm build",
"dryRunCommand": "pnpm build"
},
+ {
+ "command": "echo '\nPNPM Publish
\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 \n'",
+ "dryRunCommand": true,
+ "pipe": true
}
]
},
diff --git a/.changes/log-caller-location-throw.md b/.changes/log-caller-location-throw.md
deleted file mode 100644
index 98ab68cd..00000000
--- a/.changes/log-caller-location-throw.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"log": patch
-"log-js": patch
----
-
-Make log functions omit caller location when failed to parse it instead of throwing
diff --git a/.github/workflows/audit-javascript.yml b/.github/workflows/audit-javascript.yml
index 702811c2..f1a3ec3f 100644
--- a/.github/workflows/audit-javascript.yml
+++ b/.github/workflows/audit-javascript.yml
@@ -46,7 +46,7 @@ jobs:
node-version: 'lts/*'
- uses: pnpm/action-setup@v4
with:
- version: 9.x.x
+ version: 10.x.x
run_install: true
- name: audit
run: pnpm audit
diff --git a/.github/workflows/check-generated-files.yml b/.github/workflows/check-generated-files.yml
index d2c2c874..6a513b23 100644
--- a/.github/workflows/check-generated-files.yml
+++ b/.github/workflows/check-generated-files.yml
@@ -8,6 +8,7 @@ on:
pull_request:
paths:
- '.github/workflows/check-generated-files.yml'
+ - pnpm-lock.yaml
- '**/guest-js/**'
concurrency:
@@ -27,94 +28,117 @@ jobs:
filters: |
autostart:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/autostart/guest-js/**
- plugins/autostart/src/api-iife.js
cli:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/cli/guest-js/**
- plugins/cli/src/api-iife.js
clipboard-manager:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/clipboard-manager/guest-js/**
- plugins/clipboard-manager/src/api-iife.js
dialog:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/dialog/guest-js/**
- plugins/dialog/src/api-iife.js
fs:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/fs/guest-js/**
- plugins/fs/src/api-iife.js
geolocation:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/geolocation/guest-js/**
- plugins/geolocation/src/api-iife.js
global-shortcut:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/global-shortcut/guest-js/**
- plugins/global-shortcut/src/api-iife.js
opener:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/opener/guest-js/**
- plugins/opener/src/api-iife.js
haptics:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/haptics/guest-js/**
- plugins/haptics/src/api-iife.js
http:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/http/guest-js/**
- plugins/http/src/api-iife.js
log:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/log/guest-js/**
- plugins/log/src/api-iife.js
notification:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/notification/guest-js/**
- plugins/notification/src/api-iife.js
os:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/os/guest-js/**
- plugins/os/src/api-iife.js
positioner:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/positioner/guest-js/**
- plugins/positioner/src/api-iife.js
process:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/process/guest-js/**
- plugins/process/src/api-iife.js
shell:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/shell/guest-js/**
- plugins/shell/src/api-iife.js
sql:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/sql/guest-js/**
- plugins/sql/src/api-iife.js
store:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/store/guest-js/**
- plugins/store/src/api-iife.js
stronghold:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/stronghold/guest-js/**
- plugins/stronghold/src/api-iife.js
updater:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/updater/guest-js/**
- plugins/updater/src/api-iife.js
upload:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/upload/guest-js/**
- plugins/upload/src/api-iife.js
websocket:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/websocket/guest-js/**
- plugins/websocket/src/api-iife.js
window-state:
- .github/workflows/check-generated-files.yml
+ - pnpm-lock.yaml
- plugins/window-state/guest-js/**
- plugins/window-state/src/api-iife.js
@@ -143,7 +167,7 @@ jobs:
node-version: 'lts/*'
- uses: pnpm/action-setup@v4
with:
- version: 9.x.x
+ version: 10.x.x
run_install: true
- name: build api
diff --git a/.github/workflows/covector-version-or-publish.yml b/.github/workflows/covector-version-or-publish.yml
index 22e945af..34bd0178 100644
--- a/.github/workflows/covector-version-or-publish.yml
+++ b/.github/workflows/covector-version-or-publish.yml
@@ -39,7 +39,7 @@ jobs:
- uses: pnpm/action-setup@v4
with:
- version: 9.x.x
+ version: 10.x.x
run_install: true
- name: cargo login
@@ -75,7 +75,7 @@ jobs:
- name: Create Pull Request With Versions Bumped
id: cpr
- uses: tauri-apps/create-pull-request@v3
+ uses: peter-evans/create-pull-request@dd2324fc52d5d43c699a5636bcf19fceaa70c284 # 7.0.7
if: steps.covector.outputs.commandRan == 'version'
with:
title: 'Publish New Versions (${{ github.ref_name }})'
diff --git a/.github/workflows/fmt.yml b/.github/workflows/fmt.yml
index bd378799..087b7674 100644
--- a/.github/workflows/fmt.yml
+++ b/.github/workflows/fmt.yml
@@ -38,7 +38,7 @@ jobs:
node-version: 'lts/*'
- uses: pnpm/action-setup@v4
with:
- version: 9.x.x
+ version: 10.x.x
run_install: true
- run: pnpm format:check
diff --git a/.github/workflows/lint-javascript.yml b/.github/workflows/lint-javascript.yml
index df6b17d9..4c9db35e 100644
--- a/.github/workflows/lint-javascript.yml
+++ b/.github/workflows/lint-javascript.yml
@@ -49,7 +49,7 @@ jobs:
node-version: 'lts/*'
- uses: pnpm/action-setup@v4
with:
- version: 9.x.x
+ version: 10.x.x
run_install: true
- name: eslint
run: pnpm lint
diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
index 3b8e70db..6764cf8a 100644
--- a/.github/workflows/sync.yml
+++ b/.github/workflows/sync.yml
@@ -38,7 +38,7 @@ jobs:
- uses: pnpm/action-setup@v4
with:
- version: 9.x.x
+ version: 10.x.x
run_install: true
- name: Build packages
diff --git a/.gitignore b/.gitignore
index 72e5a397..56b2e525 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,8 @@ target/
# .vscode workspace settings file
.vscode/settings.json
+.vscode/launch.json
+.vscode/tasks.json
# npm, yarn and bun lock files
package-lock.json
diff --git a/.prettierrc b/.prettierrc
index 299b9e14..6ca6fdd2 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,5 +1,6 @@
{
"singleQuote": true,
"semi": false,
- "trailingComma": "none"
+ "trailingComma": "none",
+ "experimentalOperatorPosition": "start"
}
diff --git a/.scripts/ci/check-change-files.js b/.scripts/ci/check-change-files.js
index aece556f..c9ff7e9b 100644
--- a/.scripts/ci/check-change-files.js
+++ b/.scripts/ci/check-change-files.js
@@ -14,7 +14,7 @@ import { join } from 'path'
'deep-link-example-js'
] */
-const rsOnly = ['localhost', 'persisted-scope']
+const rsOnly = ['localhost', 'persisted-scope', 'single-instance']
function checkChangeFiles(changeFiles) {
let code = 0
diff --git a/.scripts/ci/check-license-header.js b/.scripts/ci/check-license-header.js
index ed653809..4341e5a2 100644
--- a/.scripts/ci/check-license-header.js
+++ b/.scripts/ci/check-license-header.js
@@ -32,8 +32,8 @@ const ignore = [
async function checkFile(file) {
if (
- extensions.some((e) => file.endsWith(e)) &&
- !ignore.some((i) => file.includes(`${path.sep}${i}`))
+ extensions.some((e) => file.endsWith(e))
+ && !ignore.some((i) => file.includes(`${path.sep}${i}`))
) {
const fileStream = fs.createReadStream(file)
const rl = readline.createInterface({
@@ -46,10 +46,10 @@ async function checkFile(file) {
for await (let line of rl) {
// ignore empty lines, allow shebang, swift-tools-version and bundler license
if (
- line.length === 0 ||
- line.startsWith('#!') ||
- line.startsWith('// swift-tools-version:') ||
- ignoredLicenses.includes(line)
+ line.length === 0
+ || line.startsWith('#!')
+ || line.startsWith('// swift-tools-version:')
+ || ignoredLicenses.includes(line)
) {
continue
}
diff --git a/.taurignore b/.taurignore
index ea7a984c..28a49db3 100644
--- a/.taurignore
+++ b/.taurignore
@@ -1 +1,2 @@
-plugins/*/permissions/autogenerated/
\ No newline at end of file
+plugins/*/permissions/autogenerated/
+plugins/*/android/.tauri/tauri-api/build/
diff --git a/Cargo.lock b/Cargo.lock
index a7bc742c..9b6b0cbd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -125,15 +125,15 @@ checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
[[package]]
name = "android_log-sys"
-version = "0.3.1"
+version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937"
+checksum = "84521a3cf562bc62942e294181d9eef17eb38ceb8c68677bc49f144e4c3d4f8d"
[[package]]
name = "android_logger"
-version = "0.14.1"
+version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05b07e8e73d720a1f2e4b6014766e6039fd2e96a4fa44e2a78d0e1fa2ff49826"
+checksum = "f6f39be698127218cca460cb624878c9aa4e2b47dba3b277963d2bf00bad263b"
dependencies = [
"android_log-sys",
"env_filter",
@@ -206,7 +206,7 @@ checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
[[package]]
name = "api"
-version = "2.0.6"
+version = "2.0.22"
dependencies = [
"log",
"serde",
@@ -291,11 +291,12 @@ dependencies = [
"core-graphics 0.23.2",
"image",
"log",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-app-kit 0.2.2",
+ "objc2-foundation 0.2.2",
"parking_lot",
"windows-sys 0.48.0",
+ "wl-clipboard-rs",
"x11rb",
]
@@ -334,8 +335,8 @@ dependencies = [
"url",
"wayland-backend",
"wayland-client",
- "wayland-protocols",
- "zbus 5.1.1",
+ "wayland-protocols 0.32.5",
+ "zbus",
]
[[package]]
@@ -622,9 +623,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.6.0"
+version = "2.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+checksum = "1be3f42a67d6d345ecd59f675f3f012d6974981560836e938c22b424b85ce1be"
dependencies = [
"serde",
]
@@ -691,7 +692,16 @@ version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
dependencies = [
- "objc2",
+ "objc2 0.5.2",
+]
+
+[[package]]
+name = "block2"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d59b4c170e16f0405a2e95aff44432a0d41aa97675f3d52623effe95792a037"
+dependencies = [
+ "objc2 0.6.0",
]
[[package]]
@@ -714,7 +724,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2506947f73ad44e344215ccd6403ac2ae18cd8e046e581a441bf8d199f257f03"
dependencies = [
"borsh-derive",
- "cfg_aliases",
+ "cfg_aliases 0.2.1",
]
[[package]]
@@ -823,7 +833,7 @@ version = "0.18.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
"cairo-sys-rs",
"glib",
"libc",
@@ -862,9 +872,9 @@ dependencies = [
[[package]]
name = "cargo_metadata"
-version = "0.18.1"
+version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
+checksum = "afc309ed89476c8957c50fb818f56fe894db857866c3e163335faa91dc34eb85"
dependencies = [
"camino",
"cargo-platform",
@@ -876,12 +886,12 @@ dependencies = [
[[package]]
name = "cargo_toml"
-version = "0.17.2"
+version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a969e13a7589e9e3e4207e153bae624ade2b5622fb4684a4923b23ec3d57719"
+checksum = "5fbd1fe9db3ebf71b89060adaf7b0504c2d6a425cf061313099547e382c2e472"
dependencies = [
"serde",
- "toml 0.8.19",
+ "toml",
]
[[package]]
@@ -926,6 +936,12 @@ version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
[[package]]
name = "cfg_aliases"
version = "0.2.1"
@@ -1022,41 +1038,11 @@ dependencies = [
"error-code",
]
-[[package]]
-name = "cocoa"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2"
-dependencies = [
- "bitflags 2.6.0",
- "block",
- "cocoa-foundation",
- "core-foundation 0.10.0",
- "core-graphics 0.24.0",
- "foreign-types 0.5.0",
- "libc",
- "objc",
-]
-
-[[package]]
-name = "cocoa-foundation"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d"
-dependencies = [
- "bitflags 2.6.0",
- "block",
- "core-foundation 0.10.0",
- "core-graphics-types 0.2.0",
- "libc",
- "objc",
-]
-
[[package]]
name = "color-backtrace"
-version = "0.6.1"
+version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "150fd80a270c0671379f388c8204deb6a746bb4eac8a6c03fe2460b2c0127ea0"
+checksum = "2123a5984bd52ca861c66f66a9ab9883b27115c607f801f86c1bc2a84eb69f0f"
dependencies = [
"backtrace",
"termcolor",
@@ -1215,7 +1201,7 @@ version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
"core-foundation 0.10.0",
"core-graphics-types 0.2.0",
"foreign-types 0.5.0",
@@ -1239,7 +1225,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
"core-foundation 0.10.0",
"libc",
]
@@ -1500,6 +1486,17 @@ dependencies = [
"serde",
]
+[[package]]
+name = "derive-new"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d150dea618e920167e5973d70ae6ece4385b7164e0d799fe7c122dd0a5d912ad"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.90",
+]
+
[[package]]
name = "derive_arbitrary"
version = "1.4.1"
@@ -1547,11 +1544,11 @@ dependencies = [
[[package]]
name = "dirs"
-version = "5.0.1"
+version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
dependencies = [
- "dirs-sys 0.4.1",
+ "dirs-sys 0.5.0",
]
[[package]]
@@ -1571,20 +1568,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
dependencies = [
"libc",
- "redox_users",
+ "redox_users 0.4.6",
"winapi",
]
[[package]]
name = "dirs-sys"
-version = "0.4.1"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
+checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
dependencies = [
"libc",
"option-ext",
- "redox_users",
- "windows-sys 0.48.0",
+ "redox_users 0.5.0",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -1594,7 +1591,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
dependencies = [
"libc",
- "redox_users",
+ "redox_users 0.4.6",
"winapi",
]
@@ -1781,14 +1778,14 @@ dependencies = [
[[package]]
name = "embed-resource"
-version = "2.5.1"
+version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b68b6f9f63a0b6a38bc447d4ce84e2b388f3ec95c99c641c8ff0dd3ef89a6379"
+checksum = "4762ce03154ba57ebaeee60cc631901ceae4f18219cbb874e464347471594742"
dependencies = [
"cc",
"memchr",
"rustc_version",
- "toml 0.8.19",
+ "toml",
"vswhom",
"winreg 0.52.0",
]
@@ -1981,6 +1978,12 @@ dependencies = [
"windows-sys 0.59.0",
]
+[[package]]
+name = "fixedbitset"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+
[[package]]
name = "flate2"
version = "1.0.35"
@@ -2328,9 +2331,9 @@ dependencies = [
[[package]]
name = "gethostname"
-version = "0.5.0"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc3655aa6818d65bc620d6911f05aa7b6aeb596291e1e9f79e52df85583d1e30"
+checksum = "4fd4b8790c0792e3b11895efdf5f289ebe8b59107a6624f1cce68f24ff8c7035"
dependencies = [
"rustix",
"windows-targets 0.52.6",
@@ -2414,7 +2417,7 @@ version = "0.18.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
"futures-channel",
"futures-core",
"futures-executor",
@@ -2463,17 +2466,17 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
[[package]]
name = "global-hotkey"
-version = "0.6.3"
+version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b00d88f1be7bf4cd2e61623ce08e84be2dfa4eab458e5d632d3dab95f16c1f64"
+checksum = "41fbb3a4e56c901ee66c190fdb3fa08344e6d09593cc6c61f8eb9add7144b271"
dependencies = [
"crossbeam-channel",
"keyboard-types",
- "objc2",
- "objc2-app-kit",
+ "objc2 0.6.0",
+ "objc2-app-kit 0.3.0",
"once_cell",
"serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.9",
"windows-sys 0.59.0",
"x11-dl",
]
@@ -2822,9 +2825,9 @@ dependencies = [
[[package]]
name = "ico"
-version = "0.3.0"
+version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3804960be0bb5e4edb1e1ad67afd321a9ecfd875c3e65c099468fd2717d7cae"
+checksum = "cc50b891e4acf8fe0e71ef88ec43ad82ee07b3810ad09de10f1d01f072ed4b98"
dependencies = [
"byteorder",
"png",
@@ -3012,20 +3015,20 @@ dependencies = [
[[package]]
name = "infer"
-version = "0.16.0"
+version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc150e5ce2330295b8616ce0e3f53250e53af31759a9dbedad1621ba29151847"
+checksum = "a588916bfdfd92e71cacef98a63d9b1f0d74d6599980d11894290e7ddefffcf7"
dependencies = [
"cfb",
]
[[package]]
name = "inotify"
-version = "0.10.2"
+version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd168d97690d0b8c412d6b6c10360277f4d7ee495c5d0d5d5fe0854923255cc"
+checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.7.0",
"inotify-sys",
"libc",
]
@@ -3049,15 +3052,6 @@ dependencies = [
"generic-array",
]
-[[package]]
-name = "instant"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
-dependencies = [
- "cfg-if",
-]
-
[[package]]
name = "iota-crypto"
version = "0.23.2"
@@ -3261,7 +3255,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
"serde",
"unicode-segmentation",
]
@@ -3394,7 +3388,7 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
"libc",
"redox_syscall",
]
@@ -3634,21 +3628,22 @@ dependencies = [
[[package]]
name = "muda"
-version = "0.15.3"
+version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdae9c00e61cc0579bcac625e8ad22104c60548a025bfc972dc83868a28e1484"
+checksum = "89fed9ce3e5c01700e3a129d3d74619bbf468645b58274b420885107e496ecff"
dependencies = [
"crossbeam-channel",
"dpi",
"gtk",
"keyboard-types",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
+ "objc2 0.6.0",
+ "objc2-app-kit 0.3.0",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.0",
"once_cell",
"png",
"serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.9",
"windows-sys 0.59.0",
]
@@ -3675,7 +3670,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
"jni-sys",
"log",
"ndk-sys",
@@ -3717,15 +3712,27 @@ dependencies = [
"memoffset 0.6.5",
]
+[[package]]
+name = "nix"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
+dependencies = [
+ "bitflags 2.7.0",
+ "cfg-if",
+ "cfg_aliases 0.1.1",
+ "libc",
+]
+
[[package]]
name = "nix"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
"cfg-if",
- "cfg_aliases",
+ "cfg_aliases 0.2.1",
"libc",
"memoffset 0.9.1",
]
@@ -3748,11 +3755,11 @@ dependencies = [
[[package]]
name = "notify"
-version = "7.0.0"
+version = "8.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c533b4c39709f9ba5005d8002048266593c1cfaf3c5f0739d5b8ab0c6c504009"
+checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
"filetime",
"fsevent-sys",
"inotify",
@@ -3762,14 +3769,14 @@ dependencies = [
"mio",
"notify-types",
"walkdir",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
]
[[package]]
name = "notify-debouncer-full"
-version = "0.4.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dcf855483228259b2353f89e99df35fc639b2b2510d1166e4858e3f67ec1afb"
+checksum = "d2d88b1a7538054351c8258338df7c931a590513fb3745e8c15eb9ff4199b8d1"
dependencies = [
"file-id",
"log",
@@ -3780,24 +3787,23 @@ dependencies = [
[[package]]
name = "notify-rust"
-version = "4.11.3"
+version = "4.11.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5134a72dc570b178bff81b01e81ab14a6fcc015391ed4b3b14853090658cd3a3"
+checksum = "96ae13fb6065b0865d2310dfa55ce319245052ed95fbbe2bc87c99962c58d73f"
dependencies = [
"log",
"mac-notification-sys",
"serde",
"tauri-winrt-notification",
- "zbus 4.4.0",
+ "zbus",
]
[[package]]
name = "notify-types"
-version = "1.0.0"
+version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7393c226621f817964ffb3dc5704f9509e107a8b024b489cc2c1b217378785df"
+checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d"
dependencies = [
- "instant",
"serde",
]
@@ -3909,9 +3915,6 @@ name = "objc-sys"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
-dependencies = [
- "cc",
-]
[[package]]
name = "objc2"
@@ -3923,44 +3926,60 @@ dependencies = [
"objc2-encode",
]
+[[package]]
+name = "objc2"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3531f65190d9cff863b77a99857e74c314dd16bf56c538c4b57c7cbc3f3a6e59"
+dependencies = [
+ "objc2-encode",
+ "objc2-exception-helper",
+]
+
[[package]]
name = "objc2-app-kit"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
dependencies = [
- "bitflags 2.6.0",
- "block2",
+ "bitflags 2.7.0",
+ "block2 0.5.1",
"libc",
- "objc2",
- "objc2-core-data",
- "objc2-core-image",
- "objc2-foundation",
- "objc2-quartz-core",
+ "objc2 0.5.2",
+ "objc2-core-data 0.2.2",
+ "objc2-core-image 0.2.2",
+ "objc2-foundation 0.2.2",
+ "objc2-quartz-core 0.2.2",
]
[[package]]
-name = "objc2-cloud-kit"
-version = "0.2.2"
+name = "objc2-app-kit"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74dd3b56391c7a0596a295029734d3c1c5e7e510a4cb30245f8221ccea96b009"
+checksum = "5906f93257178e2f7ae069efb89fbd6ee94f0592740b5f8a1512ca498814d0fb"
dependencies = [
- "bitflags 2.6.0",
- "block2",
- "objc2",
- "objc2-core-location",
- "objc2-foundation",
+ "bitflags 2.7.0",
+ "block2 0.6.0",
+ "libc",
+ "objc2 0.6.0",
+ "objc2-cloud-kit",
+ "objc2-core-data 0.3.0",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-core-image 0.3.0",
+ "objc2-foundation 0.3.0",
+ "objc2-quartz-core 0.3.0",
]
[[package]]
-name = "objc2-contacts"
-version = "0.2.2"
+name = "objc2-cloud-kit"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5ff520e9c33812fd374d8deecef01d4a840e7b41862d849513de77e44aa4889"
+checksum = "6c1948a9be5f469deadbd6bcb86ad7ff9e47b4f632380139722f7d9840c0d42c"
dependencies = [
- "block2",
- "objc2",
- "objc2-foundation",
+ "bitflags 2.7.0",
+ "objc2 0.6.0",
+ "objc2-foundation 0.3.0",
]
[[package]]
@@ -3969,10 +3988,43 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
dependencies = [
- "bitflags 2.6.0",
- "block2",
- "objc2",
- "objc2-foundation",
+ "bitflags 2.7.0",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+]
+
+[[package]]
+name = "objc2-core-data"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f860f8e841f6d32f754836f51e6bc7777cd7e7053cf18528233f6811d3eceb4"
+dependencies = [
+ "bitflags 2.7.0",
+ "objc2 0.6.0",
+ "objc2-foundation 0.3.0",
+]
+
+[[package]]
+name = "objc2-core-foundation"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daeaf60f25471d26948a1c2f840e3f7d86f4109e3af4e8e4b5cd70c39690d925"
+dependencies = [
+ "bitflags 2.7.0",
+ "objc2 0.6.0",
+]
+
+[[package]]
+name = "objc2-core-graphics"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dca602628b65356b6513290a21a6405b4d4027b8b250f0b98dddbb28b7de02"
+dependencies = [
+ "bitflags 2.7.0",
+ "objc2 0.6.0",
+ "objc2-core-foundation",
+ "objc2-io-surface",
]
[[package]]
@@ -3981,29 +4033,36 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
dependencies = [
- "block2",
- "objc2",
- "objc2-foundation",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
"objc2-metal",
]
[[package]]
-name = "objc2-core-location"
-version = "0.2.2"
+name = "objc2-core-image"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "000cfee34e683244f284252ee206a27953279d370e309649dc3ee317b37e5781"
+checksum = "6ffa6bea72bf42c78b0b34e89c0bafac877d5f80bf91e159a5d96ea7f693ca56"
dependencies = [
- "block2",
- "objc2",
- "objc2-contacts",
- "objc2-foundation",
+ "objc2 0.6.0",
+ "objc2-foundation 0.3.0",
]
[[package]]
name = "objc2-encode"
-version = "4.0.3"
+version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7891e71393cd1f227313c9379a26a584ff3d7e6e7159e988851f0934c993f0f8"
+checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33"
+
+[[package]]
+name = "objc2-exception-helper"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7a1c5fbb72d7735b076bb47b578523aedc40f3c439bea6dfd595c089d79d98a"
+dependencies = [
+ "cc",
+]
[[package]]
name = "objc2-foundation"
@@ -4011,116 +4070,109 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
dependencies = [
- "bitflags 2.6.0",
- "block2",
+ "bitflags 2.7.0",
+ "block2 0.5.1",
"dispatch",
"libc",
- "objc2",
+ "objc2 0.5.2",
]
[[package]]
-name = "objc2-link-presentation"
-version = "0.2.2"
+name = "objc2-foundation"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1a1ae721c5e35be65f01a03b6d2ac13a54cb4fa70d8a5da293d7b0020261398"
+checksum = "3a21c6c9014b82c39515db5b396f91645182611c97d24637cf56ac01e5f8d998"
dependencies = [
- "block2",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
+ "bitflags 2.7.0",
+ "block2 0.6.0",
+ "libc",
+ "objc2 0.6.0",
+ "objc2-core-foundation",
]
[[package]]
-name = "objc2-metal"
-version = "0.2.2"
+name = "objc2-io-surface"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
+checksum = "161a8b87e32610086e1a7a9e9ec39f84459db7b3a0881c1f16ca5a2605581c19"
dependencies = [
- "bitflags 2.6.0",
- "block2",
- "objc2",
- "objc2-foundation",
+ "bitflags 2.7.0",
+ "objc2 0.6.0",
+ "objc2-core-foundation",
]
[[package]]
-name = "objc2-quartz-core"
+name = "objc2-metal"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
+checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
dependencies = [
- "bitflags 2.6.0",
- "block2",
- "objc2",
- "objc2-foundation",
- "objc2-metal",
+ "bitflags 2.7.0",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
]
[[package]]
-name = "objc2-symbols"
-version = "0.2.2"
+name = "objc2-osa-kit"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a684efe3dec1b305badae1a28f6555f6ddd3bb2c2267896782858d5a78404dc"
+checksum = "a1ac59da3ceebc4a82179b35dc550431ad9458f9cc326e053f49ba371ce76c5a"
dependencies = [
- "objc2",
- "objc2-foundation",
+ "bitflags 2.7.0",
+ "objc2 0.6.0",
+ "objc2-app-kit 0.3.0",
+ "objc2-foundation 0.3.0",
]
[[package]]
-name = "objc2-ui-kit"
+name = "objc2-quartz-core"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8bb46798b20cd6b91cbd113524c490f1686f4c4e8f49502431415f3512e2b6f"
+checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
dependencies = [
- "bitflags 2.6.0",
- "block2",
- "objc2",
- "objc2-cloud-kit",
- "objc2-core-data",
- "objc2-core-image",
- "objc2-core-location",
- "objc2-foundation",
- "objc2-link-presentation",
- "objc2-quartz-core",
- "objc2-symbols",
- "objc2-uniform-type-identifiers",
- "objc2-user-notifications",
+ "bitflags 2.7.0",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+ "objc2-metal",
]
[[package]]
-name = "objc2-uniform-type-identifiers"
-version = "0.2.2"
+name = "objc2-quartz-core"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44fa5f9748dbfe1ca6c0b79ad20725a11eca7c2218bceb4b005cb1be26273bfe"
+checksum = "6fb3794501bb1bee12f08dcad8c61f2a5875791ad1c6f47faa71a0f033f20071"
dependencies = [
- "block2",
- "objc2",
- "objc2-foundation",
+ "bitflags 2.7.0",
+ "objc2 0.6.0",
+ "objc2-foundation 0.3.0",
]
[[package]]
-name = "objc2-user-notifications"
-version = "0.2.2"
+name = "objc2-ui-kit"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76cfcbf642358e8689af64cee815d139339f3ed8ad05103ed5eaf73db8d84cb3"
+checksum = "777a571be14a42a3990d4ebedaeb8b54cd17377ec21b92e8200ac03797b3bee1"
dependencies = [
- "bitflags 2.6.0",
- "block2",
- "objc2",
- "objc2-core-location",
- "objc2-foundation",
+ "bitflags 2.7.0",
+ "objc2 0.6.0",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.0",
]
[[package]]
name = "objc2-web-kit"
-version = "0.2.2"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68bc69301064cebefc6c4c90ce9cba69225239e4b8ff99d445a2b5563797da65"
+checksum = "b717127e4014b0f9f3e8bba3d3f2acec81f1bde01f656823036e823ed2c94dce"
dependencies = [
- "bitflags 2.6.0",
- "block2",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
+ "bitflags 2.7.0",
+ "block2 0.6.0",
+ "objc2 0.6.0",
+ "objc2-app-kit 0.3.0",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.0",
]
[[package]]
@@ -4166,11 +4218,11 @@ dependencies = [
[[package]]
name = "openssl"
-version = "0.10.68"
+version = "0.10.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6174bc48f102d208783c2c84bf931bb75927a617866870de8a4ea85597f871f5"
+checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
"cfg-if",
"foreign-types 0.3.2",
"libc",
@@ -4207,9 +4259,9 @@ dependencies = [
[[package]]
name = "openssl-sys"
-version = "0.9.104"
+version = "0.9.106"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45abf306cbf99debc8195b66b7346498d7b10c210de50418b5ccd7ceba08c741"
+checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd"
dependencies = [
"cc",
"libc",
@@ -4265,6 +4317,20 @@ dependencies = [
"windows-sys 0.59.0",
]
+[[package]]
+name = "osakit"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "732c71caeaa72c065bb69d7ea08717bd3f4863a4f451402fc9513e29dbd5261b"
+dependencies = [
+ "objc2 0.6.0",
+ "objc2-foundation 0.3.0",
+ "objc2-osa-kit",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.9",
+]
+
[[package]]
name = "pango"
version = "0.18.3"
@@ -4356,6 +4422,16 @@ version = "2.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+[[package]]
+name = "petgraph"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+dependencies = [
+ "fixedbitset",
+ "indexmap 2.7.0",
+]
+
[[package]]
name = "phf"
version = "0.8.0"
@@ -4774,7 +4850,7 @@ dependencies = [
"rustc-hash",
"rustls",
"socket2",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"tokio",
"tracing",
]
@@ -4793,7 +4869,7 @@ dependencies = [
"rustls",
"rustls-pki-types",
"slab",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"tinyvec",
"tracing",
"web-time",
@@ -4805,7 +4881,7 @@ version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d5a626c6807713b15cac82a6acaccd6043c9a5408c24baae07611fec3f243da"
dependencies = [
- "cfg_aliases",
+ "cfg_aliases 0.2.1",
"libc",
"once_cell",
"socket2",
@@ -4932,7 +5008,7 @@ version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
]
[[package]]
@@ -4946,6 +5022,17 @@ dependencies = [
"thiserror 1.0.69",
]
+[[package]]
+name = "redox_users"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
+dependencies = [
+ "getrandom 0.2.15",
+ "libredox",
+ "thiserror 2.0.9",
+]
+
[[package]]
name = "regex"
version = "1.11.1"
@@ -5058,15 +5145,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "46f6f80a9b882647d9014673ca9925d30ffc9750f2eed2b4490e189eaebd01e8"
dependencies = [
"ashpd",
- "block2",
+ "block2 0.5.1",
"glib-sys",
"gobject-sys",
"gtk-sys",
"js-sys",
"log",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
+ "objc2 0.5.2",
+ "objc2-app-kit 0.2.2",
+ "objc2-foundation 0.2.2",
"raw-window-handle",
"wasm-bindgen",
"wasm-bindgen-futures",
@@ -5221,7 +5308,7 @@ version = "0.38.41"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
"errno",
"libc",
"linux-raw-sys",
@@ -5404,7 +5491,7 @@ version = "2.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
"core-foundation 0.9.4",
"core-foundation-sys",
"libc",
@@ -5417,7 +5504,7 @@ version = "3.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e1415a607e92bec364ea2cf9264646dcce0f91e6d65281bd6f2819cca3bf39c8"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
"core-foundation 0.10.0",
"core-foundation-sys",
"libc",
@@ -5739,14 +5826,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18051cdd562e792cad055119e0cdb2cfc137e44e3987532e0f9659a77931bb08"
dependencies = [
"bytemuck",
- "cfg_aliases",
+ "cfg_aliases 0.2.1",
"core-graphics 0.24.0",
"foreign-types 0.5.0",
"js-sys",
"log",
- "objc2",
- "objc2-foundation",
- "objc2-quartz-core",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+ "objc2-quartz-core 0.2.2",
"raw-window-handle",
"redox_syscall",
"wasm-bindgen",
@@ -5935,7 +6022,7 @@ checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a"
dependencies = [
"atoi",
"base64 0.22.1",
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
"byteorder",
"bytes",
"crc",
@@ -5978,7 +6065,7 @@ checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8"
dependencies = [
"atoi",
"base64 0.22.1",
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
"byteorder",
"crc",
"dotenvy",
@@ -6220,7 +6307,7 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
"core-foundation 0.9.4",
"system-configuration-sys",
]
@@ -6244,18 +6331,17 @@ dependencies = [
"cfg-expr",
"heck 0.5.0",
"pkg-config",
- "toml 0.8.19",
+ "toml",
"version-compare",
]
[[package]]
name = "tao"
-version = "0.30.8"
+version = "0.32.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6682a07cf5bab0b8a2bd20d0a542917ab928b5edb75ebd4eda6b05cbaab872da"
+checksum = "3d8f5e5fe19612f3dd187ac3928d48f5ad23d3edd9821806d05b0c3beb6537bd"
dependencies = [
- "bitflags 2.6.0",
- "cocoa",
+ "bitflags 2.7.0",
"core-foundation 0.10.0",
"core-graphics 0.24.0",
"crossbeam-channel",
@@ -6265,7 +6351,6 @@ dependencies = [
"gdkwayland-sys",
"gdkx11-sys",
"gtk",
- "instant",
"jni",
"lazy_static",
"libc",
@@ -6273,7 +6358,9 @@ dependencies = [
"ndk",
"ndk-context",
"ndk-sys",
- "objc",
+ "objc2 0.6.0",
+ "objc2-app-kit 0.3.0",
+ "objc2-foundation 0.3.0",
"once_cell",
"parking_lot",
"raw-window-handle",
@@ -6281,8 +6368,8 @@ dependencies = [
"tao-macros",
"unicode-segmentation",
"url",
- "windows 0.58.0",
- "windows-core 0.58.0",
+ "windows 0.60.0",
+ "windows-core 0.60.1",
"windows-version",
"x11-dl",
]
@@ -6323,13 +6410,13 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
[[package]]
name = "tauri"
-version = "2.1.1"
+version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e545de0a2dfe296fa67db208266cd397c5a55ae782da77973ef4c4fac90e9f2c"
+checksum = "0f32eadd4a507f1b61e4fd1f792d0ed4184127a3241ff5bcb1848b9a574a58d6"
dependencies = [
"anyhow",
"bytes",
- "dirs 5.0.1",
+ "dirs 6.0.0",
"dunce",
"embed_plist",
"futures-util",
@@ -6345,9 +6432,9 @@ dependencies = [
"log",
"mime",
"muda",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
+ "objc2 0.6.0",
+ "objc2-app-kit 0.3.0",
+ "objc2-foundation 0.3.0",
"percent-encoding",
"plist",
"raw-window-handle",
@@ -6363,7 +6450,7 @@ dependencies = [
"tauri-runtime",
"tauri-runtime-wry",
"tauri-utils",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"tokio",
"tray-icon",
"url",
@@ -6372,18 +6459,18 @@ dependencies = [
"webkit2gtk",
"webview2-com",
"window-vibrancy",
- "windows 0.58.0",
+ "windows 0.60.0",
]
[[package]]
name = "tauri-build"
-version = "2.0.3"
+version = "2.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd2a4bcfaf5fb9f4be72520eefcb61ae565038f8ccba2a497d8c28f463b8c01"
+checksum = "51a2e96f3c0baa0581656bb58e6fdd0f7c9c31eaf6721a0c08689d938fe85f2d"
dependencies = [
"anyhow",
"cargo_toml",
- "dirs 5.0.1",
+ "dirs 6.0.0",
"glob",
"heck 0.5.0",
"json-patch",
@@ -6395,15 +6482,15 @@ dependencies = [
"tauri-codegen",
"tauri-utils",
"tauri-winres",
- "toml 0.8.19",
+ "toml",
"walkdir",
]
[[package]]
name = "tauri-codegen"
-version = "2.0.3"
+version = "2.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf79faeecf301d3e969b1fae977039edb77a4c1f25cc0a961be298b54bff97cf"
+checksum = "e357ec3daf8faad1029bc7109e7f5b308ceb63b6073d110d7388923a4cce5e55"
dependencies = [
"base64 0.22.1",
"brotli",
@@ -6419,7 +6506,7 @@ dependencies = [
"sha2",
"syn 2.0.90",
"tauri-utils",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"time",
"url",
"uuid",
@@ -6428,9 +6515,9 @@ dependencies = [
[[package]]
name = "tauri-macros"
-version = "2.0.3"
+version = "2.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c52027c8c5afb83166dacddc092ee8fff50772f9646d461d8c33ee887e447a03"
+checksum = "447ee4dd94690d77f1422f2b57e783c654ba75c535ad6f6e727887330804fff2"
dependencies = [
"heck 0.5.0",
"proc-macro2",
@@ -6442,9 +6529,9 @@ dependencies = [
[[package]]
name = "tauri-plugin"
-version = "2.0.3"
+version = "2.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e753f2a30933a9bbf0a202fa47d7cc4a3401f06e8d6dcc53b79aa62954828c79"
+checksum = "0ad3021d8e60ec7672f51ecb67c5e1a514a4d7a9a5ffc9d85090739378047502"
dependencies = [
"anyhow",
"glob",
@@ -6453,37 +6540,37 @@ dependencies = [
"serde",
"serde_json",
"tauri-utils",
- "toml 0.8.19",
+ "toml",
"walkdir",
]
[[package]]
name = "tauri-plugin-autostart"
-version = "2.0.1"
+version = "2.2.0"
dependencies = [
"auto-launch",
"serde",
"serde_json",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
]
[[package]]
name = "tauri-plugin-barcode-scanner"
-version = "2.0.1"
+version = "2.2.0"
dependencies = [
"log",
"serde",
"serde_json",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
]
[[package]]
name = "tauri-plugin-biometric"
-version = "2.0.1"
+version = "2.2.0"
dependencies = [
"log",
"serde",
@@ -6491,12 +6578,12 @@ dependencies = [
"serde_repr",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
]
[[package]]
name = "tauri-plugin-cli"
-version = "2.0.1"
+version = "2.2.0"
dependencies = [
"clap",
"log",
@@ -6504,12 +6591,12 @@ dependencies = [
"serde_json",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
]
[[package]]
name = "tauri-plugin-clipboard-manager"
-version = "2.0.2"
+version = "2.2.2"
dependencies = [
"arboard",
"log",
@@ -6517,12 +6604,12 @@ dependencies = [
"serde_json",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
]
[[package]]
name = "tauri-plugin-deep-link"
-version = "2.0.2"
+version = "2.2.0"
dependencies = [
"dunce",
"rust-ini",
@@ -6531,16 +6618,16 @@ dependencies = [
"tauri",
"tauri-plugin",
"tauri-utils",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"tracing",
"url",
- "windows-registry 0.3.0",
- "windows-result 0.2.0",
+ "windows-registry 0.5.0",
+ "windows-result 0.3.1",
]
[[package]]
name = "tauri-plugin-dialog"
-version = "2.0.4"
+version = "2.2.0"
dependencies = [
"log",
"raw-window-handle",
@@ -6550,13 +6637,13 @@ dependencies = [
"tauri",
"tauri-plugin",
"tauri-plugin-fs",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"url",
]
[[package]]
name = "tauri-plugin-fs"
-version = "2.1.0"
+version = "2.2.0"
dependencies = [
"anyhow",
"dunce",
@@ -6571,15 +6658,15 @@ dependencies = [
"tauri",
"tauri-plugin",
"tauri-utils",
- "thiserror 2.0.3",
- "toml 0.8.19",
+ "thiserror 2.0.9",
+ "toml",
"url",
"uuid",
]
[[package]]
name = "tauri-plugin-geolocation"
-version = "2.0.1"
+version = "2.2.4"
dependencies = [
"log",
"serde",
@@ -6587,12 +6674,12 @@ dependencies = [
"specta",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
]
[[package]]
name = "tauri-plugin-global-shortcut"
-version = "2.0.1"
+version = "2.2.0"
dependencies = [
"global-hotkey",
"log",
@@ -6600,12 +6687,12 @@ dependencies = [
"serde_json",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
]
[[package]]
name = "tauri-plugin-haptics"
-version = "2.0.1"
+version = "2.2.4"
dependencies = [
"log",
"serde",
@@ -6613,12 +6700,12 @@ dependencies = [
"specta",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
]
[[package]]
name = "tauri-plugin-http"
-version = "2.0.4"
+version = "2.4.1"
dependencies = [
"bytes",
"cookie_store",
@@ -6632,7 +6719,7 @@ dependencies = [
"tauri",
"tauri-plugin",
"tauri-plugin-fs",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"tokio",
"tracing",
"url",
@@ -6641,40 +6728,40 @@ dependencies = [
[[package]]
name = "tauri-plugin-localhost"
-version = "2.1.0"
+version = "2.2.0"
dependencies = [
"http",
"log",
"serde",
"serde_json",
"tauri",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"tiny_http",
]
[[package]]
name = "tauri-plugin-log"
-version = "2.0.3"
+version = "2.3.1"
dependencies = [
"android_logger",
"byte-unit",
- "cocoa",
"fern",
"log",
- "objc",
+ "objc2 0.6.0",
+ "objc2-foundation 0.3.0",
"serde",
"serde_json",
"serde_repr",
"swift-rs",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"time",
]
[[package]]
name = "tauri-plugin-nfc"
-version = "2.0.1"
+version = "2.2.0"
dependencies = [
"log",
"serde",
@@ -6682,12 +6769,12 @@ dependencies = [
"serde_repr",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
]
[[package]]
name = "tauri-plugin-notification"
-version = "2.0.1"
+version = "2.2.2"
dependencies = [
"color-backtrace",
"ctor",
@@ -6700,7 +6787,7 @@ dependencies = [
"serde_repr",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"time",
"url",
"win7-notifications",
@@ -6709,29 +6796,29 @@ dependencies = [
[[package]]
name = "tauri-plugin-opener"
-version = "2.0.0"
+version = "2.2.6"
dependencies = [
"dunce",
"glob",
- "objc2-app-kit",
- "objc2-foundation",
+ "objc2-app-kit 0.3.0",
+ "objc2-foundation 0.3.0",
"open",
"schemars",
"serde",
"serde_json",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"url",
- "windows 0.58.0",
- "zbus 4.4.0",
+ "windows 0.60.0",
+ "zbus",
]
[[package]]
name = "tauri-plugin-os"
-version = "2.0.1"
+version = "2.2.1"
dependencies = [
- "gethostname 0.5.0",
+ "gethostname 1.0.0",
"log",
"os_info",
"serde",
@@ -6740,12 +6827,12 @@ dependencies = [
"sys-locale",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
]
[[package]]
name = "tauri-plugin-persisted-scope"
-version = "2.1.0"
+version = "2.2.0"
dependencies = [
"aho-corasick",
"bincode",
@@ -6754,12 +6841,12 @@ dependencies = [
"serde_json",
"tauri",
"tauri-plugin-fs",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
]
[[package]]
name = "tauri-plugin-positioner"
-version = "2.1.0"
+version = "2.2.0"
dependencies = [
"log",
"serde",
@@ -6767,12 +6854,12 @@ dependencies = [
"serde_repr",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
]
[[package]]
name = "tauri-plugin-process"
-version = "2.0.1"
+version = "2.2.0"
dependencies = [
"tauri",
"tauri-plugin",
@@ -6780,7 +6867,7 @@ dependencies = [
[[package]]
name = "tauri-plugin-shell"
-version = "2.0.2"
+version = "2.2.0"
dependencies = [
"encoding_rs",
"log",
@@ -6793,28 +6880,28 @@ dependencies = [
"shared_child",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"tokio",
]
[[package]]
name = "tauri-plugin-single-instance"
-version = "2.0.2"
+version = "2.2.2"
dependencies = [
"semver",
"serde",
"serde_json",
"tauri",
"tauri-plugin-deep-link",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"tracing",
"windows-sys 0.59.0",
- "zbus 4.4.0",
+ "zbus",
]
[[package]]
name = "tauri-plugin-sql"
-version = "2.0.3"
+version = "2.2.0"
dependencies = [
"futures-core",
"indexmap 2.7.0",
@@ -6824,28 +6911,28 @@ dependencies = [
"sqlx",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"time",
"tokio",
]
[[package]]
name = "tauri-plugin-store"
-version = "2.1.0"
+version = "2.2.0"
dependencies = [
"dunce",
"serde",
"serde_json",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"tokio",
"tracing",
]
[[package]]
name = "tauri-plugin-stronghold"
-version = "2.0.1"
+version = "2.2.0"
dependencies = [
"hex",
"iota-crypto",
@@ -6860,21 +6947,23 @@ dependencies = [
"serde_json",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"zeroize",
]
[[package]]
name = "tauri-plugin-updater"
-version = "2.1.0"
+version = "2.6.0"
dependencies = [
"base64 0.22.1",
- "dirs 5.0.1",
+ "dirs 6.0.0",
"flate2",
"futures-util",
"http",
"infer",
+ "log",
"minisign-verify",
+ "osakit",
"percent-encoding",
"reqwest",
"semver",
@@ -6884,7 +6973,7 @@ dependencies = [
"tauri",
"tauri-plugin",
"tempfile",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"time",
"tokio",
"url",
@@ -6905,14 +6994,14 @@ dependencies = [
"serde_json",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"tokio",
"tokio-util",
]
[[package]]
name = "tauri-plugin-websocket"
-version = "2.0.1"
+version = "2.3.0"
dependencies = [
"futures-util",
"http",
@@ -6922,29 +7011,29 @@ dependencies = [
"serde_json",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"tokio",
"tokio-tungstenite",
]
[[package]]
name = "tauri-plugin-window-state"
-version = "2.0.2"
+version = "2.2.1"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
"log",
"serde",
"serde_json",
"tauri",
"tauri-plugin",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
]
[[package]]
name = "tauri-runtime"
-version = "2.2.0"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cce18d43f80d4aba3aa8a0c953bbe835f3d0f2370aca75e8dbb14bd4bab27958"
+checksum = "e758a405ab39e25f4d1235c5f06fe563f44b01ee18bbe38ddec5356d4f581908"
dependencies = [
"dpi",
"gtk",
@@ -6954,24 +7043,24 @@ dependencies = [
"serde",
"serde_json",
"tauri-utils",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"url",
- "windows 0.58.0",
+ "windows 0.60.0",
]
[[package]]
name = "tauri-runtime-wry"
-version = "2.2.0"
+version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f442a38863e10129ffe2cec7bd09c2dcf8a098a3a27801a476a304d5bb991d2"
+checksum = "5ef46e0c9c30d3524990cb10556f82cde0aa2281e9600e7ed2f499842db8b080"
dependencies = [
"gtk",
"http",
"jni",
"log",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
+ "objc2 0.6.0",
+ "objc2-app-kit 0.3.0",
+ "objc2-foundation 0.3.0",
"percent-encoding",
"raw-window-handle",
"softbuffer",
@@ -6981,15 +7070,15 @@ dependencies = [
"url",
"webkit2gtk",
"webview2-com",
- "windows 0.58.0",
+ "windows 0.60.0",
"wry",
]
[[package]]
name = "tauri-utils"
-version = "2.1.0"
+version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9271a88f99b4adea0dc71d0baca4505475a0bbd139fb135f62958721aaa8fe54"
+checksum = "107a959dbd5ff53d89a98f6f2e3e987c611334141a43630caae1d80e79446dd6"
dependencies = [
"aes-gcm",
"brotli",
@@ -7017,8 +7106,8 @@ dependencies = [
"serde_with",
"serialize-to-javascript",
"swift-rs",
- "thiserror 2.0.3",
- "toml 0.8.19",
+ "thiserror 2.0.9",
+ "toml",
"url",
"urlpattern",
"uuid",
@@ -7027,12 +7116,12 @@ dependencies = [
[[package]]
name = "tauri-winres"
-version = "0.1.1"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5993dc129e544393574288923d1ec447c857f3f644187f4fbf7d9a875fbfc4fb"
+checksum = "56eaa45f707bedf34d19312c26d350bc0f3c59a47e58e8adbeecdc850d2c13a0"
dependencies = [
"embed-resource",
- "toml 0.7.8",
+ "toml",
]
[[package]]
@@ -7096,11 +7185,11 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "2.0.3"
+version = "2.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
+checksum = "f072643fd0190df67a8bab670c20ef5d8737177d6ac6b2e9a236cb096206b2cc"
dependencies = [
- "thiserror-impl 2.0.3",
+ "thiserror-impl 2.0.9",
]
[[package]]
@@ -7116,9 +7205,9 @@ dependencies = [
[[package]]
name = "thiserror-impl"
-version = "2.0.3"
+version = "2.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
+checksum = "7b50fa271071aae2e6ee85f842e2e28ba8cd2c5fb67f11fcb1fd70b276f9e7d4"
dependencies = [
"proc-macro2",
"quote",
@@ -7291,9 +7380,9 @@ dependencies = [
[[package]]
name = "tokio-tungstenite"
-version = "0.24.0"
+version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edc5f74e248dc973e0dbb7b74c7e0d6fcc301c694ff50049504004ef4d0cdcd9"
+checksum = "be4bf6fecd69fcdede0ec680aaf474cdab988f9de6bc73d3758f0160e3b7025a"
dependencies = [
"futures-util",
"log",
@@ -7321,18 +7410,6 @@ dependencies = [
"tokio",
]
-[[package]]
-name = "toml"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
-dependencies = [
- "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.19.15",
-]
-
[[package]]
name = "toml"
version = "0.8.19"
@@ -7361,8 +7438,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
dependencies = [
"indexmap 2.7.0",
- "serde",
- "serde_spanned",
"toml_datetime",
"winnow 0.5.40",
]
@@ -7431,25 +7506,39 @@ dependencies = [
[[package]]
name = "tray-icon"
-version = "0.19.2"
+version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d48a05076dd272615d03033bf04f480199f7d1b66a8ac64d75c625fc4a70c06b"
+checksum = "d433764348e7084bad2c5ea22c96c71b61b17afe3a11645710f533bd72b6a2b5"
dependencies = [
- "core-graphics 0.24.0",
"crossbeam-channel",
- "dirs 5.0.1",
+ "dirs 6.0.0",
"libappindicator",
"muda",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
+ "objc2 0.6.0",
+ "objc2-app-kit 0.3.0",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-foundation 0.3.0",
"once_cell",
"png",
"serde",
- "thiserror 1.0.69",
+ "thiserror 2.0.9",
"windows-sys 0.59.0",
]
+[[package]]
+name = "tree_magic_mini"
+version = "3.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aac5e8971f245c3389a5a76e648bfc80803ae066a1243a75db0064d7c1129d63"
+dependencies = [
+ "fnv",
+ "memchr",
+ "nom",
+ "once_cell",
+ "petgraph",
+]
+
[[package]]
name = "trim-in-place"
version = "0.1.7"
@@ -7464,9 +7553,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
[[package]]
name = "tungstenite"
-version = "0.24.0"
+version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18e5b8366ee7a95b16d32197d0b2604b43a0be89dc5fac9f8e96ccafbaedda8a"
+checksum = "413083a99c579593656008130e29255e54dcaae495be556cc26888f211648c24"
dependencies = [
"byteorder",
"bytes",
@@ -7479,7 +7568,7 @@ dependencies = [
"rustls",
"rustls-pki-types",
"sha1",
- "thiserror 1.0.69",
+ "thiserror 2.0.9",
"utf-8",
]
@@ -7888,24 +7977,49 @@ version = "0.31.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b66249d3fc69f76fd74c82cc319300faa554e9d865dab1f7cd66cc20db10b280"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
"rustix",
"wayland-backend",
"wayland-scanner",
]
+[[package]]
+name = "wayland-protocols"
+version = "0.31.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4"
+dependencies = [
+ "bitflags 2.7.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-scanner",
+]
+
[[package]]
name = "wayland-protocols"
version = "0.32.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7cd0ade57c4e6e9a8952741325c30bf82f4246885dca8bf561898b86d0c1f58e"
dependencies = [
- "bitflags 2.6.0",
+ "bitflags 2.7.0",
"wayland-backend",
"wayland-client",
"wayland-scanner",
]
+[[package]]
+name = "wayland-protocols-wlr"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad1f61b76b6c2d8742e10f9ba5c3737f6530b4c243132c2a2ccc8aa96fe25cd6"
+dependencies = [
+ "bitflags 2.7.0",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols 0.31.2",
+ "wayland-scanner",
+]
+
[[package]]
name = "wayland-scanner"
version = "0.31.5"
@@ -8017,16 +8131,16 @@ dependencies = [
[[package]]
name = "webview2-com"
-version = "0.33.0"
+version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f61ff3d9d0ee4efcb461b14eb3acfda2702d10dc329f339303fc3e57215ae2c"
+checksum = "b0d606f600e5272b514dbb66539dd068211cc20155be8d3958201b4b5bd79ed3"
dependencies = [
"webview2-com-macros",
"webview2-com-sys",
- "windows 0.58.0",
- "windows-core 0.58.0",
- "windows-implement 0.58.0",
- "windows-interface 0.58.0",
+ "windows 0.60.0",
+ "windows-core 0.60.1",
+ "windows-implement 0.59.0",
+ "windows-interface 0.59.0",
]
[[package]]
@@ -8042,13 +8156,13 @@ dependencies = [
[[package]]
name = "webview2-com-sys"
-version = "0.33.0"
+version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3a3e2eeb58f82361c93f9777014668eb3d07e7d174ee4c819575a9208011886"
+checksum = "bfb27fccd3c27f68e9a6af1bcf48c2d82534b8675b83608a4d81446d095a17ac"
dependencies = [
- "thiserror 1.0.69",
- "windows 0.58.0",
- "windows-core 0.58.0",
+ "thiserror 2.0.9",
+ "windows 0.60.0",
+ "windows-core 0.60.1",
]
[[package]]
@@ -8110,13 +8224,14 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "window-vibrancy"
-version = "0.5.2"
+version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ea403deff7b51fff19e261330f71608ff2cdef5721d72b64180bb95be7c4150"
+checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c"
dependencies = [
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
+ "objc2 0.6.0",
+ "objc2-app-kit 0.3.0",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.0",
"raw-window-handle",
"windows-sys 0.59.0",
"windows-version",
@@ -8147,12 +8262,24 @@ dependencies = [
[[package]]
name = "windows"
-version = "0.58.0"
+version = "0.60.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
+checksum = "ddf874e74c7a99773e62b1c671427abf01a425e77c3d3fb9fb1e4883ea934529"
dependencies = [
- "windows-core 0.58.0",
- "windows-targets 0.52.6",
+ "windows-collections",
+ "windows-core 0.60.1",
+ "windows-future",
+ "windows-link",
+ "windows-numerics",
+]
+
+[[package]]
+name = "windows-collections"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5467f79cc1ba3f52ebb2ed41dbb459b8e7db636cc3429458d9a852e15bc24dec"
+dependencies = [
+ "windows-core 0.60.1",
]
[[package]]
@@ -8178,15 +8305,25 @@ dependencies = [
[[package]]
name = "windows-core"
-version = "0.58.0"
+version = "0.60.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
+checksum = "ca21a92a9cae9bf4ccae5cf8368dce0837100ddf6e6d57936749e85f152f6247"
dependencies = [
- "windows-implement 0.58.0",
- "windows-interface 0.58.0",
- "windows-result 0.2.0",
- "windows-strings 0.1.0",
- "windows-targets 0.52.6",
+ "windows-implement 0.59.0",
+ "windows-interface 0.59.0",
+ "windows-link",
+ "windows-result 0.3.1",
+ "windows-strings 0.3.1",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a787db4595e7eb80239b74ce8babfb1363d8e343ab072f2ffe901400c03349f0"
+dependencies = [
+ "windows-core 0.60.1",
+ "windows-link",
]
[[package]]
@@ -8202,9 +8339,9 @@ dependencies = [
[[package]]
name = "windows-implement"
-version = "0.58.0"
+version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
+checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1"
dependencies = [
"proc-macro2",
"quote",
@@ -8224,15 +8361,31 @@ dependencies = [
[[package]]
name = "windows-interface"
-version = "0.58.0"
+version = "0.59.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
+checksum = "cb26fd936d991781ea39e87c3a27285081e3c0da5ca0fcbc02d368cc6f52ff01"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.90",
]
+[[package]]
+name = "windows-link"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
+
+[[package]]
+name = "windows-numerics"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "005dea54e2f6499f2cee279b8f703b3cf3b5734a2d8d21867c8f44003182eeed"
+dependencies = [
+ "windows-core 0.60.1",
+ "windows-link",
+]
+
[[package]]
name = "windows-registry"
version = "0.2.0"
@@ -8246,13 +8399,13 @@ dependencies = [
[[package]]
name = "windows-registry"
-version = "0.3.0"
+version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bafa604f2104cf5ae2cc2db1dee84b7e6a5d11b05f737b60def0ffdc398cbc0a"
+checksum = "6c44a98275e31bfd112bb06ba96c8ab13c03383a3753fdddd715406a1824c7e0"
dependencies = [
- "windows-result 0.2.0",
- "windows-strings 0.2.0",
- "windows-targets 0.52.6",
+ "windows-link",
+ "windows-result 0.3.1",
+ "windows-strings 0.3.1",
]
[[package]]
@@ -8273,6 +8426,15 @@ dependencies = [
"windows-targets 0.52.6",
]
+[[package]]
+name = "windows-result"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06374efe858fab7e4f881500e6e86ec8bc28f9462c47e5a9941a0142ad86b189"
+dependencies = [
+ "windows-link",
+]
+
[[package]]
name = "windows-strings"
version = "0.1.0"
@@ -8285,11 +8447,11 @@ dependencies = [
[[package]]
name = "windows-strings"
-version = "0.2.0"
+version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978d65aedf914c664c510d9de43c8fd85ca745eaff1ed53edf409b479e441663"
+checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
dependencies = [
- "windows-targets 0.52.6",
+ "windows-link",
]
[[package]]
@@ -8582,6 +8744,26 @@ dependencies = [
"windows-sys 0.48.0",
]
+[[package]]
+name = "wl-clipboard-rs"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12b41773911497b18ca8553c3daaf8ec9fe9819caf93d451d3055f69de028adb"
+dependencies = [
+ "derive-new",
+ "libc",
+ "log",
+ "nix 0.28.0",
+ "os_pipe",
+ "tempfile",
+ "thiserror 1.0.69",
+ "tree_magic_mini",
+ "wayland-backend",
+ "wayland-client",
+ "wayland-protocols 0.31.2",
+ "wayland-protocols-wlr",
+]
+
[[package]]
name = "write16"
version = "1.0.0"
@@ -8596,12 +8778,12 @@ checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
[[package]]
name = "wry"
-version = "0.47.2"
+version = "0.50.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61ce51277d65170f6379d8cda935c80e3c2d1f0ff712a123c8bddb11b31a4b73"
+checksum = "2a5eabce267929af61619166232d5221aeec2d7af8712bc33cf54a78416ad711"
dependencies = [
"base64 0.22.1",
- "block2",
+ "block2 0.6.0",
"cookie",
"crossbeam-channel",
"dpi",
@@ -8615,9 +8797,10 @@ dependencies = [
"kuchikiki",
"libc",
"ndk",
- "objc2",
- "objc2-app-kit",
- "objc2-foundation",
+ "objc2 0.6.0",
+ "objc2-app-kit 0.3.0",
+ "objc2-core-foundation",
+ "objc2-foundation 0.3.0",
"objc2-ui-kit",
"objc2-web-kit",
"once_cell",
@@ -8626,13 +8809,13 @@ dependencies = [
"sha2",
"soup3",
"tao-macros",
- "thiserror 1.0.69",
+ "thiserror 2.0.9",
"url",
"webkit2gtk",
"webkit2gtk-sys",
"webview2-com",
- "windows 0.58.0",
- "windows-core 0.58.0",
+ "windows 0.60.0",
+ "windows-core 0.60.1",
"windows-version",
"x11-dl",
]
@@ -8742,9 +8925,9 @@ dependencies = [
[[package]]
name = "zbus"
-version = "4.4.0"
+version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb97012beadd29e654708a0fdb4c84bc046f537aecfde2c3ee0a9e4b4d48c725"
+checksum = "192a0d989036cd60a1e91a54c9851fb9ad5bd96125d41803eed79d2e2ef74bd7"
dependencies = [
"async-broadcast",
"async-executor",
@@ -8759,37 +8942,6 @@ dependencies = [
"enumflags2",
"event-listener",
"futures-core",
- "futures-sink",
- "futures-util",
- "hex",
- "nix 0.29.0",
- "ordered-stream",
- "rand 0.8.5",
- "serde",
- "serde_repr",
- "sha1",
- "static_assertions",
- "tracing",
- "uds_windows",
- "windows-sys 0.52.0",
- "xdg-home",
- "zbus_macros 4.4.0",
- "zbus_names 3.0.0",
- "zvariant 4.2.0",
-]
-
-[[package]]
-name = "zbus"
-version = "5.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1162094dc63b1629fcc44150bcceeaa80798cd28bcbe7fa987b65a034c258608"
-dependencies = [
- "async-broadcast",
- "async-recursion",
- "async-trait",
- "enumflags2",
- "event-listener",
- "futures-core",
"futures-util",
"hex",
"nix 0.29.0",
@@ -8803,60 +8955,36 @@ dependencies = [
"windows-sys 0.59.0",
"winnow 0.6.20",
"xdg-home",
- "zbus_macros 5.1.1",
- "zbus_names 4.1.0",
- "zvariant 5.1.0",
-]
-
-[[package]]
-name = "zbus_macros"
-version = "4.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267db9407081e90bbfa46d841d3cbc60f59c0351838c4bc65199ecd79ab1983e"
-dependencies = [
- "proc-macro-crate 3.2.0",
- "proc-macro2",
- "quote",
- "syn 2.0.90",
- "zvariant_utils 2.1.0",
+ "zbus_macros",
+ "zbus_names",
+ "zvariant",
]
[[package]]
name = "zbus_macros"
-version = "5.1.1"
+version = "5.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cd2dcdce3e2727f7d74b7e33b5a89539b3cc31049562137faf7ae4eb86cd16d"
+checksum = "3685b5c81fce630efc3e143a4ded235b107f1b1cdf186c3f115529e5e5ae4265"
dependencies = [
"proc-macro-crate 3.2.0",
"proc-macro2",
"quote",
"syn 2.0.90",
- "zbus_names 4.1.0",
- "zvariant 5.1.0",
- "zvariant_utils 3.0.2",
-]
-
-[[package]]
-name = "zbus_names"
-version = "3.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
-dependencies = [
- "serde",
- "static_assertions",
- "zvariant 4.2.0",
+ "zbus_names",
+ "zvariant",
+ "zvariant_utils",
]
[[package]]
name = "zbus_names"
-version = "4.1.0"
+version = "4.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "856b7a38811f71846fd47856ceee8bccaec8399ff53fb370247e66081ace647b"
+checksum = "519629a3f80976d89c575895b05677cbc45eaf9f70d62a364d819ba646409cc8"
dependencies = [
"serde",
"static_assertions",
"winnow 0.6.20",
- "zvariant 5.1.0",
+ "zvariant",
]
[[package]]
@@ -8957,7 +9085,7 @@ dependencies = [
"flate2",
"indexmap 2.7.0",
"memchr",
- "thiserror 2.0.3",
+ "thiserror 2.0.9",
"zopfli",
]
@@ -8977,22 +9105,9 @@ dependencies = [
[[package]]
name = "zvariant"
-version = "4.2.0"
+version = "5.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2084290ab9a1c471c38fc524945837734fbf124487e105daec2bb57fd48c81fe"
-dependencies = [
- "endi",
- "enumflags2",
- "serde",
- "static_assertions",
- "zvariant_derive 4.2.0",
-]
-
-[[package]]
-name = "zvariant"
-version = "5.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1200ee6ac32f1e5a312e455a949a4794855515d34f9909f4a3e082d14e1a56f"
+checksum = "55e6b9b5f1361de2d5e7d9fd1ee5f6f7fcb6060618a1f82f3472f58f2b8d4be9"
dependencies = [
"endi",
"enumflags2",
@@ -9000,52 +9115,28 @@ dependencies = [
"static_assertions",
"url",
"winnow 0.6.20",
- "zvariant_derive 5.1.0",
- "zvariant_utils 3.0.2",
+ "zvariant_derive",
+ "zvariant_utils",
]
[[package]]
name = "zvariant_derive"
-version = "4.2.0"
+version = "5.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73e2ba546bda683a90652bac4a279bc146adad1386f25379cf73200d2002c449"
+checksum = "573a8dd76961957108b10f7a45bac6ab1ea3e9b7fe01aff88325dc57bb8f5c8b"
dependencies = [
"proc-macro-crate 3.2.0",
"proc-macro2",
"quote",
"syn 2.0.90",
- "zvariant_utils 2.1.0",
-]
-
-[[package]]
-name = "zvariant_derive"
-version = "5.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "687e3b97fae6c9104fbbd36c73d27d149abf04fb874e2efbd84838763daa8916"
-dependencies = [
- "proc-macro-crate 3.2.0",
- "proc-macro2",
- "quote",
- "syn 2.0.90",
- "zvariant_utils 3.0.2",
-]
-
-[[package]]
-name = "zvariant_utils"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.90",
+ "zvariant_utils",
]
[[package]]
name = "zvariant_utils"
-version = "3.0.2"
+version = "3.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20d1d011a38f12360e5fcccceeff5e2c42a8eb7f27f0dcba97a0862ede05c9c6"
+checksum = "ddd46446ea2a1f353bfda53e35f17633afa79f4fe290a611c94645c69fe96a50"
dependencies = [
"proc-macro2",
"quote",
diff --git a/Cargo.toml b/Cargo.toml
index d7543fd8..d85be889 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,10 +21,9 @@ thiserror = "2"
url = "2"
schemars = "0.8"
dunce = "1"
-specta = "=2.0.0-rc.20"
+specta = "^2.0.0-rc.16"
glob = "0.3"
-zbus = "4"
-#tauri-specta = "=2.0.0-rc.11"
+zbus = "5"
[workspace.package]
edition = "2021"
diff --git a/README.md b/README.md
index f9fa736a..33039295 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ This repo and all plugins require a Rust version of at least **1.77.2**
| [process](plugins/process) | This plugin provides APIs to access the current process. To spawn child processes, see the [`shell`](https://github.com/tauri-apps/tauri-plugin-shell) plugin. | ✅ | ✅ | ✅ | ? | ? |
| [shell](plugins/shell) | Access the system shell. Allows you to spawn child processes and manage files and URLs using their default application. | ✅ | ✅ | ✅ | ? | ? |
| [single-instance](plugins/single-instance) | Ensure a single instance of your tauri app is running. | ✅ | ✅ | ✅ | ❌ | ❌ |
-| [sql](plugins/sql) | Interface with SQL databases. | ✅ | ✅ | ✅ | ? | ✅ |
+| [sql](plugins/sql) | Interface with SQL databases. | ✅ | ✅ | ✅ | ✅ | ✅ |
| [store](plugins/store) | Persistent key value storage. | ✅ | ✅ | ✅ | ✅ | ✅ |
| [stronghold](plugins/stronghold) | Encrypted, secure database. | ✅ | ✅ | ✅ | ? | ? |
| [updater](plugins/updater) | In-app updates for Tauri applications. | ✅ | ✅ | ✅ | ❌ | ❌ |
diff --git a/examples/api/CHANGELOG.md b/examples/api/CHANGELOG.md
index 49dc568e..e09692f2 100644
--- a/examples/api/CHANGELOG.md
+++ b/examples/api/CHANGELOG.md
@@ -1,5 +1,126 @@
# Changelog
+## \[2.0.18]
+
+### Dependencies
+
+- Upgraded to `http-js@2.4.1`
+
+## \[2.0.17]
+
+### Dependencies
+
+- Upgraded to `log-js@2.3.1`
+
+## \[2.0.16]
+
+### Dependencies
+
+- Upgraded to `clipboard-manager-js@2.2.2`
+- Upgraded to `notification-js@2.2.2`
+- Upgraded to `os-js@2.2.1`
+- Upgraded to `http-js@2.4.0`
+- Upgraded to `log-js@2.3.0`
+- Upgraded to `updater-js@2.6.0`
+
+## \[2.0.15]
+
+### Dependencies
+
+- Upgraded to `log-js@2.2.3`
+- Upgraded to `opener-js@2.2.6`
+
+## \[2.0.14]
+
+### Dependencies
+
+- Upgraded to `log-js@2.2.2`
+- Upgraded to `updater-js@2.5.1`
+
+## \[2.0.13]
+
+### Dependencies
+
+- Upgraded to `updater-js@2.5.0`
+
+## \[2.0.12]
+
+### Dependencies
+
+- Upgraded to `clipboard-manager-js@2.2.1`
+- Upgraded to `http-js@2.3.0`
+- Upgraded to `log-js@2.2.1`
+- Upgraded to `updater-js@2.4.0`
+
+## \[2.0.11]
+
+### Dependencies
+
+- Upgraded to `opener-js@2.2.5`
+
+## \[2.0.10]
+
+### Dependencies
+
+- Upgraded to `notification-js@2.2.1`
+- Upgraded to `opener-js@2.2.4`
+
+## \[2.0.9]
+
+### Dependencies
+
+- Upgraded to `opener-js@2.2.3`
+- Upgraded to `updater-js@2.3.1`
+
+## \[2.0.8]
+
+### Dependencies
+
+- Upgraded to `opener-js@2.2.2`
+
+## \[2.0.7]
+
+### Dependencies
+
+- Upgraded to `updater-js@2.3.0`
+- Upgraded to `opener-js@2.2.1`
+
+## \[2.0.6]
+
+### Dependencies
+
+- Upgraded to `barcode-scanner-js@2.1.0`
+- Upgraded to `biometric-js@2.1.0`
+- Upgraded to `cli-js@2.1.0`
+- Upgraded to `clipboard-manager-js@2.1.0`
+- Upgraded to `dialog-js@2.1.0`
+- Upgraded to `fs-js@2.1.0`
+- Upgraded to `global-shortcut-js@2.1.0`
+- Upgraded to `http-js@2.1.0`
+- Upgraded to `log-js@2.1.0`
+- Upgraded to `nfc-js@2.1.0`
+- Upgraded to `notification-js@2.1.0`
+- Upgraded to `opener-js@2.1.0`
+- Upgraded to `os-js@2.1.0`
+- Upgraded to `process-js@2.1.0`
+- Upgraded to `shell-js@2.1.0`
+- Upgraded to `store-js@2.2.0`
+- Upgraded to `updater-js@2.1.0`
+
+## \[2.0.5]
+
+### Dependencies
+
+- Upgraded to `fs-js@2.0.4`
+- Upgraded to `dialog-js@2.0.2`
+- Upgraded to `http-js@2.0.2`
+
+## \[2.0.4]
+
+### Dependencies
+
+- Upgraded to `log-js@2.0.2`
+
## \[2.0.3]
### Dependencies
diff --git a/examples/api/package.json b/examples/api/package.json
index 8cecc3f4..3e2c5237 100644
--- a/examples/api/package.json
+++ b/examples/api/package.json
@@ -1,7 +1,7 @@
{
"name": "api",
"private": true,
- "version": "2.0.3",
+ "version": "2.0.18",
"type": "module",
"scripts": {
"dev": "vite --clearScreen false",
@@ -10,35 +10,35 @@
"tauri": "tauri"
},
"dependencies": {
- "@tauri-apps/api": "2.1.1",
- "@tauri-apps/plugin-barcode-scanner": "2.0.0",
- "@tauri-apps/plugin-biometric": "2.0.0",
- "@tauri-apps/plugin-cli": "2.0.0",
- "@tauri-apps/plugin-clipboard-manager": "2.0.1",
- "@tauri-apps/plugin-dialog": "2.0.1",
- "@tauri-apps/plugin-fs": "2.0.3",
- "@tauri-apps/plugin-geolocation": "2.0.0",
- "@tauri-apps/plugin-global-shortcut": "2.0.0",
- "@tauri-apps/plugin-opener": "2.0.0",
- "@tauri-apps/plugin-haptics": "2.0.0",
- "@tauri-apps/plugin-http": "2.0.1",
- "@tauri-apps/plugin-nfc": "2.0.0",
- "@tauri-apps/plugin-notification": "2.0.0",
- "@tauri-apps/plugin-os": "2.0.0",
- "@tauri-apps/plugin-process": "2.0.0",
- "@tauri-apps/plugin-shell": "2.0.1",
- "@tauri-apps/plugin-store": "2.1.0",
- "@tauri-apps/plugin-updater": "2.0.0",
+ "@tauri-apps/api": "2.3.0",
+ "@tauri-apps/plugin-barcode-scanner": "^2.2.0",
+ "@tauri-apps/plugin-biometric": "^2.2.0",
+ "@tauri-apps/plugin-cli": "^2.2.0",
+ "@tauri-apps/plugin-clipboard-manager": "^2.2.2",
+ "@tauri-apps/plugin-dialog": "^2.2.0",
+ "@tauri-apps/plugin-fs": "^2.2.0",
+ "@tauri-apps/plugin-geolocation": "^2.2.0",
+ "@tauri-apps/plugin-global-shortcut": "^2.2.0",
+ "@tauri-apps/plugin-haptics": "^2.2.0",
+ "@tauri-apps/plugin-http": "^2.4.1",
+ "@tauri-apps/plugin-nfc": "^2.2.0",
+ "@tauri-apps/plugin-notification": "^2.2.2",
+ "@tauri-apps/plugin-opener": "^2.2.6",
+ "@tauri-apps/plugin-os": "^2.2.1",
+ "@tauri-apps/plugin-process": "^2.2.0",
+ "@tauri-apps/plugin-shell": "^2.2.0",
+ "@tauri-apps/plugin-store": "^2.2.0",
+ "@tauri-apps/plugin-updater": "^2.6.0",
"@zerodevx/svelte-json-view": "1.0.11"
},
"devDependencies": {
- "@iconify-json/codicon": "^1.1.37",
- "@iconify-json/ph": "^1.1.8",
- "@sveltejs/vite-plugin-svelte": "^5.0.0",
- "@tauri-apps/cli": "2.1.0",
- "@unocss/extractor-svelte": "^0.65.0",
- "svelte": "^5.0.0",
- "unocss": "^0.65.0",
- "vite": "^6.0.0"
+ "@iconify-json/codicon": "^1.2.12",
+ "@iconify-json/ph": "^1.2.2",
+ "@sveltejs/vite-plugin-svelte": "^5.0.3",
+ "@tauri-apps/cli": "2.3.1",
+ "@unocss/extractor-svelte": "^66.0.0",
+ "svelte": "^5.20.4",
+ "unocss": "^66.0.0",
+ "vite": "^6.2.0"
}
}
diff --git a/examples/api/src-tauri/CHANGELOG.md b/examples/api/src-tauri/CHANGELOG.md
index e8fea24b..e735a65c 100644
--- a/examples/api/src-tauri/CHANGELOG.md
+++ b/examples/api/src-tauri/CHANGELOG.md
@@ -1,5 +1,141 @@
# Changelog
+## \[2.0.22]
+
+### Dependencies
+
+- Upgraded to `http@2.4.1`
+
+## \[2.0.21]
+
+### Dependencies
+
+- Upgraded to `log@2.3.1`
+
+## \[2.0.20]
+
+### Dependencies
+
+- Upgraded to `clipboard-manager@2.2.2`
+- Upgraded to `geolocation@2.2.4`
+- Upgraded to `haptics@2.2.4`
+- Upgraded to `notification@2.2.2`
+- Upgraded to `os@2.2.1`
+- Upgraded to `http@2.4.0`
+- Upgraded to `log@2.3.0`
+- Upgraded to `updater@2.6.0`
+
+## \[2.0.19]
+
+### Dependencies
+
+- Upgraded to `log@2.2.3`
+- Upgraded to `opener@2.2.6`
+
+## \[2.0.18]
+
+### Dependencies
+
+- Upgraded to `log@2.2.2`
+- Upgraded to `updater@2.5.1`
+
+## \[2.0.17]
+
+### Dependencies
+
+- Upgraded to `updater@2.5.0`
+
+## \[2.0.16]
+
+### Dependencies
+
+- Upgraded to `clipboard-manager@2.2.1`
+- Upgraded to `http@2.3.0`
+- Upgraded to `log@2.2.1`
+- Upgraded to `updater@2.4.0`
+
+## \[2.0.15]
+
+### Dependencies
+
+- Upgraded to `haptics@2.2.3`
+- Upgraded to `geolocation@2.2.3`
+- Upgraded to `opener@2.2.5`
+
+## \[2.0.14]
+
+### Dependencies
+
+- Upgraded to `geolocation@2.2.2`
+- Upgraded to `haptics@2.2.2`
+- Upgraded to `notification@2.2.1`
+- Upgraded to `opener@2.2.4`
+
+## \[2.0.13]
+
+### Dependencies
+
+- Upgraded to `geolocation@2.2.1`
+- Upgraded to `haptics@2.2.1`
+
+## \[2.0.12]
+
+### Dependencies
+
+- Upgraded to `opener@2.2.3`
+- Upgraded to `updater@2.3.1`
+
+## \[2.0.11]
+
+### Dependencies
+
+- Upgraded to `opener@2.2.2`
+
+## \[2.0.10]
+
+### Dependencies
+
+- Upgraded to `updater@2.3.0`
+- Upgraded to `opener@2.2.1`
+
+## \[2.0.9]
+
+### Dependencies
+
+- Upgraded to `barcode-scanner@2.1.0`
+- Upgraded to `biometric@2.1.0`
+- Upgraded to `cli@2.1.0`
+- Upgraded to `clipboard-manager@2.1.0`
+- Upgraded to `dialog@2.1.0`
+- Upgraded to `fs@2.2.0`
+- Upgraded to `geolocation@2.1.0`
+- Upgraded to `global-shortcut@2.1.0`
+- Upgraded to `haptics@2.1.0`
+- Upgraded to `http@2.1.0`
+- Upgraded to `log@2.1.0`
+- Upgraded to `nfc@2.1.0`
+- Upgraded to `notification@2.1.0`
+- Upgraded to `opener@2.1.0`
+- Upgraded to `os@2.1.0`
+- Upgraded to `process@2.1.0`
+- Upgraded to `shell@2.1.0`
+- Upgraded to `store@2.2.0`
+- Upgraded to `updater@2.2.0`
+
+## \[2.0.8]
+
+### Dependencies
+
+- Upgraded to `fs@2.1.1`
+- Upgraded to `dialog@2.0.5`
+- Upgraded to `http@2.0.5`
+
+## \[2.0.7]
+
+### Dependencies
+
+- Upgraded to `log@2.0.4`
+
## \[2.0.6]
### Dependencies
diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml
index 6a60f5b7..3cc99d89 100644
--- a/examples/api/src-tauri/Cargo.toml
+++ b/examples/api/src-tauri/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "api"
publish = false
-version = "2.0.6"
+version = "2.0.22"
description = "An example Tauri Application showcasing the api"
edition = "2021"
rust-version = { workspace = true }
@@ -19,23 +19,23 @@ serde_json = { workspace = true }
serde = { workspace = true }
tiny_http = "0.12"
log = { workspace = true }
-tauri-plugin-log = { path = "../../../plugins/log", version = "2.0.3" }
-tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.1.0", features = [
+tauri-plugin-log = { path = "../../../plugins/log", version = "2.3.1" }
+tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.2.0", features = [
"watch",
] }
-tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.0.2" }
-tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.0.4" }
+tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.2.2" }
+tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.2.0" }
tauri-plugin-http = { path = "../../../plugins/http", features = [
"multipart",
-], version = "2.0.4" }
-tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.0.1", features = [
+], version = "2.4.1" }
+tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.2.2", features = [
"windows7-compat",
] }
-tauri-plugin-os = { path = "../../../plugins/os", version = "2.0.1" }
-tauri-plugin-process = { path = "../../../plugins/process", version = "2.0.1" }
-tauri-plugin-opener = { path = "../../../plugins/opener", version = "2.0.0" }
-tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.0.2" }
-tauri-plugin-store = { path = "../../../plugins/store", version = "2.1.0" }
+tauri-plugin-os = { path = "../../../plugins/os", version = "2.2.1" }
+tauri-plugin-process = { path = "../../../plugins/process", version = "2.2.0" }
+tauri-plugin-opener = { path = "../../../plugins/opener", version = "2.2.6" }
+tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.2.0" }
+tauri-plugin-store = { path = "../../../plugins/store", version = "2.2.0" }
[dependencies.tauri]
workspace = true
@@ -51,17 +51,17 @@ features = [
]
[target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
-tauri-plugin-cli = { path = "../../../plugins/cli", version = "2.0.1" }
-tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.0.1" }
-tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.1.0" }
-tauri-plugin-window-state = { path = "../../../plugins/window-state", version = "2.0.0" }
+tauri-plugin-cli = { path = "../../../plugins/cli", version = "2.2.0" }
+tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.2.0" }
+tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.6.0" }
+tauri-plugin-window-state = { path = "../../../plugins/window-state", version = "2.2.0" }
[target."cfg(any(target_os = \"android\", target_os = \"ios\"))".dependencies]
-tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.0.1" }
-tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "2.0.1" }
-tauri-plugin-biometric = { path = "../../../plugins/biometric/", version = "2.0.1" }
-tauri-plugin-geolocation = { path = "../../../plugins/geolocation/", version = "2.0.1" }
-tauri-plugin-haptics = { path = "../../../plugins/haptics/", version = "2.0.1" }
+tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.2.0" }
+tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "2.2.0" }
+tauri-plugin-biometric = { path = "../../../plugins/biometric/", version = "2.2.0" }
+tauri-plugin-geolocation = { path = "../../../plugins/geolocation/", version = "2.2.4" }
+tauri-plugin-haptics = { path = "../../../plugins/haptics/", version = "2.2.4" }
[features]
prod = ["tauri/custom-protocol"]
diff --git a/examples/api/src-tauri/src/tray.rs b/examples/api/src-tauri/src/tray.rs
index bf3ba5d6..7b1321a5 100644
--- a/examples/api/src-tauri/src/tray.rs
+++ b/examples/api/src-tauri/src/tray.rs
@@ -45,7 +45,7 @@ pub fn create_tray(app: &tauri::AppHandle) -> tauri::Result<()> {
.tooltip("Tauri")
.icon(app.default_window_icon().unwrap().clone())
.menu(&menu1)
- .menu_on_left_click(false)
+ .show_menu_on_left_click(false)
.on_menu_event(move |app, event| match event.id.as_ref() {
"quit" => {
app.exit(0);
diff --git a/package.json b/package.json
index c01095b6..34889a0e 100644
--- a/package.json
+++ b/package.json
@@ -11,26 +11,29 @@
"example:api:dev": "pnpm run --filter \"api\" tauri dev"
},
"devDependencies": {
- "@eslint/js": "9.16.0",
- "@rollup/plugin-node-resolve": "15.3.0",
+ "@eslint/js": "9.22.0",
+ "@rollup/plugin-node-resolve": "16.0.1",
"@rollup/plugin-terser": "0.4.4",
- "@rollup/plugin-typescript": "11.1.6",
- "@types/eslint__js": "8.42.3",
- "covector": "^0.12.3",
- "eslint": "9.16.0",
- "eslint-config-prettier": "9.1.0",
+ "@rollup/plugin-typescript": "12.1.2",
+ "covector": "^0.12.4",
+ "eslint": "9.22.0",
+ "eslint-config-prettier": "10.1.1",
"eslint-plugin-security": "3.0.1",
- "prettier": "3.4.2",
- "rollup": "4.28.1",
+ "prettier": "3.5.3",
+ "rollup": "4.35.0",
"tslib": "2.8.1",
- "typescript": "5.7.2",
- "typescript-eslint": "8.17.0"
+ "typescript": "5.8.2",
+ "typescript-eslint": "8.26.1"
},
- "resolutions": {
- "semver": ">=7.5.2",
- "optionator": ">=0.9.3"
+ "pnpm": {
+ "overrides": {
+ "esbuild@<0.25.0": ">=0.25.0"
+ },
+ "onlyBuiltDependencies": [
+ "esbuild"
+ ]
},
"engines": {
- "pnpm": "^9.0.0"
+ "pnpm": "^10.0.0"
}
}
diff --git a/plugins/autostart/CHANGELOG.md b/plugins/autostart/CHANGELOG.md
index cd26fad7..85b3d5c1 100644
--- a/plugins/autostart/CHANGELOG.md
+++ b/plugins/autostart/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.0.1]
- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
@@ -88,11 +92,3 @@
## \[2.0.0-alpha.0]
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- te to alpha.11.
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- ae67\`]\(https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
diff --git a/plugins/autostart/Cargo.toml b/plugins/autostart/Cargo.toml
index 69848bf6..d0a80ddf 100644
--- a/plugins/autostart/Cargo.toml
+++ b/plugins/autostart/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-autostart"
-version = "2.0.1"
+version = "2.2.0"
description = "Automatically launch your application at startup."
authors = { workspace = true }
license = { workspace = true }
diff --git a/plugins/autostart/package.json b/plugins/autostart/package.json
index 9ea68630..876d9295 100644
--- a/plugins/autostart/package.json
+++ b/plugins/autostart/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-autostart",
- "version": "2.0.0",
+ "version": "2.2.0",
"license": "MIT OR Apache-2.0",
"authors": [
"Tauri Programme within The Commons Conservancy"
diff --git a/plugins/barcode-scanner/CHANGELOG.md b/plugins/barcode-scanner/CHANGELOG.md
index 447499bc..3fa878fd 100644
--- a/plugins/barcode-scanner/CHANGELOG.md
+++ b/plugins/barcode-scanner/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.0.1]
- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
diff --git a/plugins/barcode-scanner/Cargo.toml b/plugins/barcode-scanner/Cargo.toml
index 8fabe711..018b4908 100644
--- a/plugins/barcode-scanner/Cargo.toml
+++ b/plugins/barcode-scanner/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-barcode-scanner"
-version = "2.0.1"
+version = "2.2.0"
description = "Scan QR codes, EAN-13 and other kinds of barcodes on Android and iOS"
edition = { workspace = true }
authors = { workspace = true }
diff --git a/plugins/barcode-scanner/package.json b/plugins/barcode-scanner/package.json
index b90be3d7..9e8c8b56 100644
--- a/plugins/barcode-scanner/package.json
+++ b/plugins/barcode-scanner/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-barcode-scanner",
- "version": "2.0.0",
+ "version": "2.2.0",
"description": "Scan QR codes, EAN-13 and other kinds of barcodes on Android and iOS",
"license": "MIT OR Apache-2.0",
"authors": [
diff --git a/plugins/biometric/CHANGELOG.md b/plugins/biometric/CHANGELOG.md
index 1eac8a95..4cd2731d 100644
--- a/plugins/biometric/CHANGELOG.md
+++ b/plugins/biometric/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.0.1]
- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
diff --git a/plugins/biometric/Cargo.toml b/plugins/biometric/Cargo.toml
index 816c5ef1..b96f55b3 100644
--- a/plugins/biometric/Cargo.toml
+++ b/plugins/biometric/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-biometric"
-version = "2.0.1"
+version = "2.2.0"
description = "Prompt the user for biometric authentication on Android and iOS."
edition = { workspace = true }
authors = { workspace = true }
diff --git a/plugins/biometric/package.json b/plugins/biometric/package.json
index 5d0cd5c0..fe689d45 100644
--- a/plugins/biometric/package.json
+++ b/plugins/biometric/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-biometric",
- "version": "2.0.0",
+ "version": "2.2.0",
"license": "MIT OR Apache-2.0",
"authors": [
"Tauri Programme within The Commons Conservancy"
diff --git a/plugins/cli/CHANGELOG.md b/plugins/cli/CHANGELOG.md
index 879c20b6..c2c011e2 100644
--- a/plugins/cli/CHANGELOG.md
+++ b/plugins/cli/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.0.1]
- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
@@ -89,10 +93,3 @@
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
te to alpha.11.
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- ae67\`]\(https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- om/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
diff --git a/plugins/cli/Cargo.toml b/plugins/cli/Cargo.toml
index b4db6991..500ba957 100644
--- a/plugins/cli/Cargo.toml
+++ b/plugins/cli/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-cli"
-version = "2.0.1"
+version = "2.2.0"
description = "Parse arguments from your Tauri application's command line interface."
edition = { workspace = true }
authors = { workspace = true }
diff --git a/plugins/cli/package.json b/plugins/cli/package.json
index 481082bb..e5ff8b73 100644
--- a/plugins/cli/package.json
+++ b/plugins/cli/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-cli",
- "version": "2.0.0",
+ "version": "2.2.0",
"license": "MIT OR Apache-2.0",
"authors": [
"Tauri Programme within The Commons Conservancy"
diff --git a/plugins/clipboard-manager/CHANGELOG.md b/plugins/clipboard-manager/CHANGELOG.md
index 1ab76211..895d8c71 100644
--- a/plugins/clipboard-manager/CHANGELOG.md
+++ b/plugins/clipboard-manager/CHANGELOG.md
@@ -1,5 +1,19 @@
# Changelog
+## \[2.2.2]
+
+### bug
+
+- [`d37bbdef`](https://github.com/tauri-apps/plugins-workspace/commit/d37bbdef8dc70e61e59f9fe0bb8b2a48999d0aa1) ([#2507](https://github.com/tauri-apps/plugins-workspace/pull/2507) by [@SquitchYT](https://github.com/tauri-apps/plugins-workspace/../../SquitchYT)) Fix clipboard-manager Wayland support.
+
+## \[2.2.1]
+
+- [`ce11079f`](https://github.com/tauri-apps/plugins-workspace/commit/ce11079f19852fbefdecf0e4c7d947af3624fee0) ([#2280](https://github.com/tauri-apps/plugins-workspace/pull/2280) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Explicitly drop `arboard::Clipboard` on exit. Add recommendation to not use read methods on the mainthread.
+
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.0.1]
- [`3fa0fc09`](https://github.com/tauri-apps/plugins-workspace/commit/3fa0fc09bbee0d619801e5757af9fb3c09883c97) ([#2099](https://github.com/tauri-apps/plugins-workspace/pull/2099) by [@rasteiner](https://github.com/tauri-apps/plugins-workspace/../../rasteiner)) Fix clipboard manager client side api not copying fallback alternative text when calling `writeHtml`.
@@ -116,38 +130,3 @@
## \[2.0.0-alpha.0]
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- te to alpha.11.
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- \`]\(https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- te to alpha.11.
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- hub.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- \`]\(https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- te to alpha.11.
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- te to alpha.11.
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- !
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- ps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- !
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- om/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
diff --git a/plugins/clipboard-manager/Cargo.toml b/plugins/clipboard-manager/Cargo.toml
index cd30b4d0..0c35e591 100644
--- a/plugins/clipboard-manager/Cargo.toml
+++ b/plugins/clipboard-manager/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-clipboard-manager"
-version = "2.0.2"
+version = "2.2.2"
description = "Read and write to the system clipboard."
edition = { workspace = true }
authors = { workspace = true }
@@ -36,4 +36,4 @@ thiserror = { workspace = true }
tauri = { workspace = true, features = ["wry"] }
[target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
-arboard = "3"
+arboard = { version = "3", features = ["wayland-data-control"] }
diff --git a/plugins/clipboard-manager/README.md b/plugins/clipboard-manager/README.md
index 935d8ff9..57b89526 100644
--- a/plugins/clipboard-manager/README.md
+++ b/plugins/clipboard-manager/README.md
@@ -72,7 +72,6 @@ import {
writeText,
readText,
writeHtml,
- readHtml,
clear
} from '@tauri-apps/plugin-clipboard-manager'
await writeText('Tauri is awesome!')
diff --git a/plugins/clipboard-manager/api-iife.js b/plugins/clipboard-manager/api-iife.js
index 0b790d2b..f3e28be5 100644
--- a/plugins/clipboard-manager/api-iife.js
+++ b/plugins/clipboard-manager/api-iife.js
@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_CLIPBOARD_MANAGER__=function(e){"use strict";var t;async function r(e,t={},r){return window.__TAURI_INTERNALS__.invoke(e,t,r)}"function"==typeof SuppressedError&&SuppressedError;class n{get rid(){return function(e,t,r,n){if("a"===r&&!n)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof t?e!==t||!n:!t.has(e))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===r?n:"a"===r?n.call(e):n?n.value:t.get(e)}(this,t,"f")}constructor(e){t.set(this,void 0),function(e,t,r,n,a){if("function"==typeof t?e!==t||!a:!t.has(e))throw new TypeError("Cannot write private member to an object whose class did not declare it");t.set(e,r)}(this,t,e)}async close(){return r("plugin:resources|close",{rid:this.rid})}}t=new WeakMap;class a extends n{constructor(e){super(e)}static async new(e,t,n){return r("plugin:image|new",{rgba:i(e),width:t,height:n}).then((e=>new a(e)))}static async fromBytes(e){return r("plugin:image|from_bytes",{bytes:i(e)}).then((e=>new a(e)))}static async fromPath(e){return r("plugin:image|from_path",{path:e}).then((e=>new a(e)))}async rgba(){return r("plugin:image|rgba",{rid:this.rid}).then((e=>new Uint8Array(e)))}async size(){return r("plugin:image|size",{rid:this.rid})}}function i(e){return null==e?null:"string"==typeof e?e:e instanceof a?e.rid:e}return e.clear=async function(){await r("plugin:clipboard-manager|clear")},e.readImage=async function(){return await r("plugin:clipboard-manager|read_image").then((e=>new a(e)))},e.readText=async function(){return await r("plugin:clipboard-manager|read_text")},e.writeHtml=async function(e,t){await r("plugin:clipboard-manager|write_html",{html:e,altText:t})},e.writeImage=async function(e){await r("plugin:clipboard-manager|write_image",{image:i(e)})},e.writeText=async function(e,t){await r("plugin:clipboard-manager|write_text",{label:t?.label,text:e})},e}({});Object.defineProperty(window.__TAURI__,"clipboardManager",{value:__TAURI_PLUGIN_CLIPBOARD_MANAGER__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_CLIPBOARD_MANAGER__=function(e){"use strict";var n;async function t(e,n={},t){return window.__TAURI_INTERNALS__.invoke(e,n,t)}"function"==typeof SuppressedError&&SuppressedError;class r{get rid(){return function(e,n,t,r){if("function"==typeof n||!n.has(e))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===t?r:"a"===t?r.call(e):r?r.value:n.get(e)}(this,n,"f")}constructor(e){n.set(this,void 0),function(e,n,t){if("function"==typeof n||!n.has(e))throw new TypeError("Cannot write private member to an object whose class did not declare it");n.set(e,t)}(this,n,e)}async close(){return t("plugin:resources|close",{rid:this.rid})}}n=new WeakMap;class a extends r{constructor(e){super(e)}static async new(e,n,r){return t("plugin:image|new",{rgba:i(e),width:n,height:r}).then((e=>new a(e)))}static async fromBytes(e){return t("plugin:image|from_bytes",{bytes:i(e)}).then((e=>new a(e)))}static async fromPath(e){return t("plugin:image|from_path",{path:e}).then((e=>new a(e)))}async rgba(){return t("plugin:image|rgba",{rid:this.rid}).then((e=>new Uint8Array(e)))}async size(){return t("plugin:image|size",{rid:this.rid})}}function i(e){return null==e?null:"string"==typeof e?e:e instanceof a?e.rid:e}return e.clear=async function(){await t("plugin:clipboard-manager|clear")},e.readImage=async function(){return await t("plugin:clipboard-manager|read_image").then((e=>new a(e)))},e.readText=async function(){return await t("plugin:clipboard-manager|read_text")},e.writeHtml=async function(e,n){await t("plugin:clipboard-manager|write_html",{html:e,altText:n})},e.writeImage=async function(e){await t("plugin:clipboard-manager|write_image",{image:i(e)})},e.writeText=async function(e,n){await t("plugin:clipboard-manager|write_text",{label:n?.label,text:e})},e}({});Object.defineProperty(window.__TAURI__,"clipboardManager",{value:__TAURI_PLUGIN_CLIPBOARD_MANAGER__})}
diff --git a/plugins/clipboard-manager/guest-js/index.ts b/plugins/clipboard-manager/guest-js/index.ts
index fb730426..a37bbfab 100644
--- a/plugins/clipboard-manager/guest-js/index.ts
+++ b/plugins/clipboard-manager/guest-js/index.ts
@@ -91,7 +91,7 @@ async function writeImage(
* import { readImage } from '@tauri-apps/plugin-clipboard-manager';
*
* const clipboardImage = await readImage();
- * const blob = new Blob([await clipboardImage.rbga()], { type: 'image' })
+ * const blob = new Blob([await clipboardImage.rgba()], { type: 'image' })
* const url = URL.createObjectURL(blob)
* ```
* @since 2.0.0
@@ -111,9 +111,11 @@ async function readImage(): Promise {
*
* @example
* ```typescript
- * import { writeHtml, readHtml } from '@tauri-apps/plugin-clipboard-manager';
+ * import { writeHtml } from '@tauri-apps/plugin-clipboard-manager';
* await writeHtml('Tauri is awesome!
', 'plaintext');
- * await writeHtml('Tauri is awesome!
', 'Tauri is awesome
'); // Will write "Tauri is awesome
" as plain text
+ * // The following will write "Tauri is awesome
" as plain text
+ * await writeHtml('Tauri is awesome!
', 'Tauri is awesome
');
+ * // we can read html data only as a string so there's just readText(), no readHtml()
* assert(await readText(), 'Tauri is awesome!
');
* ```
*
diff --git a/plugins/clipboard-manager/package.json b/plugins/clipboard-manager/package.json
index 483d66b6..9b78843b 100644
--- a/plugins/clipboard-manager/package.json
+++ b/plugins/clipboard-manager/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-clipboard-manager",
- "version": "2.0.1",
+ "version": "2.2.2",
"license": "MIT OR Apache-2.0",
"authors": [
"Tauri Programme within The Commons Conservancy"
diff --git a/plugins/clipboard-manager/src/desktop.rs b/plugins/clipboard-manager/src/desktop.rs
index 5edd4934..f3570cc0 100644
--- a/plugins/clipboard-manager/src/desktop.rs
+++ b/plugins/clipboard-manager/src/desktop.rs
@@ -14,7 +14,7 @@ pub fn init(
) -> crate::Result> {
Ok(Clipboard {
app: app.clone(),
- clipboard: arboard::Clipboard::new().map(Mutex::new),
+ clipboard: arboard::Clipboard::new().map(|c| Mutex::new(Some(c))),
})
}
@@ -22,13 +22,21 @@ pub fn init(
pub struct Clipboard {
#[allow(dead_code)]
app: AppHandle,
- clipboard: Result, arboard::Error>,
+ // According to arboard docs the clipboard must be dropped before exit.
+ // Since tauri doesn't call drop on exit we'll use an Option to take() on RunEvent::Exit.
+ clipboard: Result>, arboard::Error>,
}
impl Clipboard {
pub fn write_text<'a, T: Into>>(&self, text: T) -> crate::Result<()> {
match &self.clipboard {
- Ok(clipboard) => clipboard.lock().unwrap().set_text(text).map_err(Into::into),
+ Ok(clipboard) => clipboard
+ .lock()
+ .unwrap()
+ .as_mut()
+ .unwrap()
+ .set_text(text)
+ .map_err(Into::into),
Err(e) => Err(crate::Error::Clipboard(e.to_string())),
}
}
@@ -38,6 +46,8 @@ impl Clipboard {
Ok(clipboard) => clipboard
.lock()
.unwrap()
+ .as_mut()
+ .unwrap()
.set_image(ImageData {
bytes: Cow::Borrowed(image.rgba()),
width: image.width() as usize,
@@ -48,10 +58,11 @@ impl Clipboard {
}
}
+ /// Warning: This method should not be used on the main thread! Otherwise the underlying libraries may deadlock on Linux, freezing the whole app, when trying to copy data copied from this app, for example if the user copies text from the WebView.
pub fn read_text(&self) -> crate::Result {
match &self.clipboard {
Ok(clipboard) => {
- let text = clipboard.lock().unwrap().get_text()?;
+ let text = clipboard.lock().unwrap().as_mut().unwrap().get_text()?;
Ok(text)
}
Err(e) => Err(crate::Error::Clipboard(e.to_string())),
@@ -67,6 +78,8 @@ impl Clipboard {
Ok(clipboard) => clipboard
.lock()
.unwrap()
+ .as_mut()
+ .unwrap()
.set_html(html, alt_text)
.map_err(Into::into),
Err(e) => Err(crate::Error::Clipboard(e.to_string())),
@@ -75,15 +88,22 @@ impl Clipboard {
pub fn clear(&self) -> crate::Result<()> {
match &self.clipboard {
- Ok(clipboard) => clipboard.lock().unwrap().clear().map_err(Into::into),
+ Ok(clipboard) => clipboard
+ .lock()
+ .unwrap()
+ .as_mut()
+ .unwrap()
+ .clear()
+ .map_err(Into::into),
Err(e) => Err(crate::Error::Clipboard(e.to_string())),
}
}
+ /// Warning: This method should not be used on the main thread! Otherwise the underlying libraries may deadlock on Linux, freezing the whole app, when trying to copy data copied from this app, for example if the user copies text from the WebView.
pub fn read_image(&self) -> crate::Result> {
match &self.clipboard {
Ok(clipboard) => {
- let image = clipboard.lock().unwrap().get_image()?;
+ let image = clipboard.lock().unwrap().as_mut().unwrap().get_image()?;
let image = Image::new_owned(
image.bytes.to_vec(),
image.width as u32,
@@ -94,4 +114,10 @@ impl Clipboard {
Err(e) => Err(crate::Error::Clipboard(e.to_string())),
}
}
+
+ pub(crate) fn cleanup(&self) {
+ if let Ok(clipboard) = &self.clipboard {
+ clipboard.lock().unwrap().take();
+ }
+ }
}
diff --git a/plugins/clipboard-manager/src/lib.rs b/plugins/clipboard-manager/src/lib.rs
index 133020d9..0cbb4e41 100644
--- a/plugins/clipboard-manager/src/lib.rs
+++ b/plugins/clipboard-manager/src/lib.rs
@@ -11,7 +11,7 @@
use tauri::{
plugin::{Builder, TauriPlugin},
- Manager, Runtime,
+ Manager, RunEvent, Runtime,
};
#[cfg(desktop)]
@@ -59,5 +59,11 @@ pub fn init() -> TauriPlugin {
app.manage(clipboard);
Ok(())
})
+ .on_event(|_app, _event| {
+ #[cfg(desktop)]
+ if let RunEvent::Exit = _event {
+ _app.clipboard().cleanup();
+ }
+ })
.build()
}
diff --git a/plugins/deep-link/CHANGELOG.md b/plugins/deep-link/CHANGELOG.md
index 4d049556..4c3c9b9a 100644
--- a/plugins/deep-link/CHANGELOG.md
+++ b/plugins/deep-link/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.0.1]
- [`b2aea045`](https://github.com/tauri-apps/plugins-workspace/commit/b2aea0456799775a7243706fdd7a5abf9a193992) ([#2008](https://github.com/tauri-apps/plugins-workspace/pull/2008) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) `onOpenUrl()` will now not call `getCurrent()` anymore, matching the documented behavior.
diff --git a/plugins/deep-link/Cargo.toml b/plugins/deep-link/Cargo.toml
index dabd1c3b..068cad08 100644
--- a/plugins/deep-link/Cargo.toml
+++ b/plugins/deep-link/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-deep-link"
-version = "2.0.2"
+version = "2.2.0"
description = "Set your Tauri application as the default handler for an URL"
authors = { workspace = true }
license = { workspace = true }
@@ -38,8 +38,8 @@ url = { workspace = true }
[target."cfg(windows)".dependencies]
dunce = "1"
-windows-registry = "0.3"
-windows-result = "0.2"
+windows-registry = "0.5"
+windows-result = "0.3"
[target."cfg(target_os = \"linux\")".dependencies]
rust-ini = "0.21"
diff --git a/plugins/deep-link/examples/app/CHANGELOG.md b/plugins/deep-link/examples/app/CHANGELOG.md
index be90bd2e..5e89d0f4 100644
--- a/plugins/deep-link/examples/app/CHANGELOG.md
+++ b/plugins/deep-link/examples/app/CHANGELOG.md
@@ -1,5 +1,11 @@
# Changelog
+## \[2.2.0]
+
+### Dependencies
+
+- Upgraded to `deep-link-js@2.1.0`
+
## \[2.0.1]
### Dependencies
diff --git a/plugins/deep-link/examples/app/package.json b/plugins/deep-link/examples/app/package.json
index 954b14b0..432e775f 100644
--- a/plugins/deep-link/examples/app/package.json
+++ b/plugins/deep-link/examples/app/package.json
@@ -1,7 +1,7 @@
{
"name": "deep-link-example",
"private": true,
- "version": "2.0.1",
+ "version": "2.2.0",
"type": "module",
"scripts": {
"dev": "vite",
@@ -10,12 +10,12 @@
"tauri": "tauri"
},
"dependencies": {
- "@tauri-apps/api": "2.1.1",
- "@tauri-apps/plugin-deep-link": "2.0.1"
+ "@tauri-apps/api": "2.3.0",
+ "@tauri-apps/plugin-deep-link": "2.2.0"
},
"devDependencies": {
- "@tauri-apps/cli": "2.1.0",
- "typescript": "^5.2.2",
- "vite": "^6.0.0"
+ "@tauri-apps/cli": "2.3.1",
+ "typescript": "^5.7.3",
+ "vite": "^6.2.0"
}
}
diff --git a/plugins/deep-link/package.json b/plugins/deep-link/package.json
index d92df8fe..0b05dd86 100644
--- a/plugins/deep-link/package.json
+++ b/plugins/deep-link/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-deep-link",
- "version": "2.0.1",
+ "version": "2.2.0",
"description": "Set your Tauri application as the default handler for an URL",
"license": "MIT OR Apache-2.0",
"authors": [
diff --git a/plugins/deep-link/src/lib.rs b/plugins/deep-link/src/lib.rs
index c259e6b2..f5565319 100644
--- a/plugins/deep-link/src/lib.rs
+++ b/plugins/deep-link/src/lib.rs
@@ -265,18 +265,15 @@ mod imp {
.to_string();
let key_reg = CURRENT_USER.create(&key_base)?;
- key_reg.set_string(
- "",
- &format!("URL:{} protocol", self.app.config().identifier),
- )?;
+ key_reg.set_string("", format!("URL:{} protocol", self.app.config().identifier))?;
key_reg.set_string("URL Protocol", "")?;
let icon_reg = CURRENT_USER.create(format!("{key_base}\\DefaultIcon"))?;
- icon_reg.set_string("", &format!("{exe},0"))?;
+ icon_reg.set_string("", format!("{exe},0"))?;
let cmd_reg = CURRENT_USER.create(format!("{key_base}\\shell\\open\\command"))?;
- cmd_reg.set_string("", &format!("\"{exe}\" \"%1\""))?;
+ cmd_reg.set_string("", format!("\"{exe}\" \"%1\""))?;
Ok(())
}
diff --git a/plugins/dialog/CHANGELOG.md b/plugins/dialog/CHANGELOG.md
index 9e893e0e..07989c79 100644
--- a/plugins/dialog/CHANGELOG.md
+++ b/plugins/dialog/CHANGELOG.md
@@ -1,5 +1,19 @@
# Changelog
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
+### Dependencies
+
+- Upgraded to `fs-js@2.1.0`
+
+## \[2.0.2]
+
+### Dependencies
+
+- Upgraded to `fs-js@2.0.4`
+
## \[2.0.4]
- [`76f99ce9`](https://github.com/tauri-apps/plugins-workspace/commit/76f99ce999a2ff9e40235c1675e3eb6570b5e1e2) ([#2108](https://github.com/tauri-apps/plugins-workspace/pull/2108) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) The `Dialog` struct is now correctly exported, primarily to fix the documentation on `docs.rs`.
@@ -224,88 +238,3 @@
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
d6e80b)([#545](https://github.com/tauri-apps/plugins-workspace/pull/545)) Fixes docs.rs build by enabling the `tauri/dox` feature flag.
-- [`d74fc0a`](https://github.com/tauri-apps/plugins-workspace/commit/d74fc0a097996e90a37be8f57d50b7d1f6ca616f)([#555](https://github.com/tauri-apps/plugins-workspace/pull/555)) Update to alpha.11.
-
-### Dependencies
-
-- Upgraded to `fs@2.0.0-alpha.1`
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- \`
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- pull/371)) First v2 alpha release!
- ri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- \`
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- pull/371)) First v2 alpha release!
- hub.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- pull/371)) First v2 alpha release!
- ri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- \`
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- pull/371)) First v2 alpha release!
- alpha release!
- pull/371)) First v2 alpha release!
- ri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- \`
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- pull/371)) First v2 alpha release!
- kspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- pull/371)) First v2 alpha release!
- 71]\(https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- pull/371)) First v2 alpha release!
- kspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- pull/371)) First v2 alpha release!
- lpha release!
- pull/371)) First v2 alpha release!
- 7ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- pull/371)) First v2 alpha release!
- 71]\(https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- pull/371)) First v2 alpha release!
- kspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- pull/371)) First v2 alpha release!
- lpha release!
- pull/371)) First v2 alpha release!
- lpha release!
- pull/371)) First v2 alpha release!
- lpha release!
- pull/371)) First v2 alpha release!
- lpha release!
- pull/371)) First v2 alpha release!
- lpha release!
- lpha release!
- pull/371)) First v2 alpha release!
- lpha release!
- pull/371)) First v2 alpha release!
- lpha release!
- pull/371)) First v2 alpha release!
- v2 alpha release!
- lpha release!
- pull/371)) First v2 alpha release!
- lpha release!
- pull/371)) First v2 alpha release!
- lpha release!
- pull/371)) First v2 alpha release!
- lpha release!
- lpha release!
- pull/371)) First v2 alpha release!
- lpha release!
- pull/371)) First v2 alpha release!
- lpha release!
- pull/371)) First v2 alpha release!
- lease!
- pull/371)) First v2 alpha release!
diff --git a/plugins/dialog/Cargo.toml b/plugins/dialog/Cargo.toml
index d63169b7..3ca0df2d 100644
--- a/plugins/dialog/Cargo.toml
+++ b/plugins/dialog/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-dialog"
-version = "2.0.4"
+version = "2.2.0"
description = "Native system dialogs for opening and saving files along with message dialogs on your Tauri application."
edition = { workspace = true }
authors = { workspace = true }
@@ -34,7 +34,7 @@ tauri = { workspace = true }
log = { workspace = true }
thiserror = { workspace = true }
url = { workspace = true }
-tauri-plugin-fs = { path = "../fs", version = "2.1.0" }
+tauri-plugin-fs = { path = "../fs", version = "2.2.0" }
[target.'cfg(target_os = "ios")'.dependencies]
tauri = { workspace = true, features = ["wry"] }
diff --git a/plugins/dialog/package.json b/plugins/dialog/package.json
index 27814aed..52fef579 100644
--- a/plugins/dialog/package.json
+++ b/plugins/dialog/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-dialog",
- "version": "2.0.1",
+ "version": "2.2.0",
"license": "MIT OR Apache-2.0",
"authors": [
"Tauri Programme within The Commons Conservancy"
diff --git a/plugins/fs/CHANGELOG.md b/plugins/fs/CHANGELOG.md
index eee42582..533714ad 100644
--- a/plugins/fs/CHANGELOG.md
+++ b/plugins/fs/CHANGELOG.md
@@ -1,5 +1,13 @@
# Changelog
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
+## \[2.0.4]
+
+- [`77b85507`](https://github.com/tauri-apps/plugins-workspace/commit/77b855074aad612f2b28e6a3b5881fac767a05ae) ([#2171](https://github.com/tauri-apps/plugins-workspace/pull/2171) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Fixed docs.rs build.
+
## \[2.0.3]
- [`ed981027`](https://github.com/tauri-apps/plugins-workspace/commit/ed981027dd4fba7d0e2f836eb5db34d344388d73) ([#1962](https://github.com/tauri-apps/plugins-workspace/pull/1962) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) Improve performance of `readTextFile` and `readTextFileLines` APIs
@@ -167,41 +175,3 @@
## \[2.0.0-alpha.0]
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- /pull/454)) Fix `writeBinaryFile` crashing with `command 'write_binary_file' not found`
-- [`d74fc0a`](https://github.com/tauri-apps/plugins-workspace/commit/d74fc0a097996e90a37be8f57d50b7d1f6ca616f)([#555](https://github.com/tauri-apps/plugins-workspace/pull/555)) Update to alpha.11.
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- ae67\`]\(https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- .com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- ac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- .com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- s/plugins-workspace/pull/371)) First v2 alpha release!
- ac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- .com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- kspace/pull/371)) First v2 alpha release!
- s/plugins-workspace/pull/371)) First v2 alpha release!
- ac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- .com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- uri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- .com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- kspace/pull/371)) First v2 alpha release!
- s/plugins-workspace/pull/371)) First v2 alpha release!
- ac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- .com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
-apps/plugins-workspace/pull/371)) First v2 alpha release!
- .com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- kspace/pull/371)) First v2 alpha release!
- s/plugins-workspace/pull/371)) First v2 alpha release!
- ac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- .com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
diff --git a/plugins/fs/Cargo.toml b/plugins/fs/Cargo.toml
index 402a254b..5768da73 100644
--- a/plugins/fs/Cargo.toml
+++ b/plugins/fs/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-fs"
-version = "2.1.0"
+version = "2.2.0"
description = "Access the file system."
authors = { workspace = true }
license = { workspace = true }
@@ -38,11 +38,11 @@ anyhow = "1"
uuid = { version = "1", features = ["v4"] }
glob = { workspace = true }
# TODO: Remove `serialization-compat-6` in v3
-notify = { version = "7", optional = true, features = [
+notify = { version = "8", optional = true, features = [
"serde",
"serialization-compat-6",
] }
-notify-debouncer-full = { version = "0.4", optional = true }
+notify-debouncer-full = { version = "0.5", optional = true }
dunce = { workspace = true }
percent-encoding = "2"
diff --git a/plugins/fs/api-iife.js b/plugins/fs/api-iife.js
index c7f53b9b..8c164cd4 100644
--- a/plugins/fs/api-iife.js
+++ b/plugins/fs/api-iife.js
@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_FS__=function(t){"use strict";function e(t,e,n,i){if("a"===n&&!i)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof e?t!==e||!i:!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===n?i:"a"===n?i.call(t):i?i.value:e.get(t)}function n(t,e,n,i,o){if("function"==typeof e?t!==e||!o:!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return e.set(t,n),n}var i,o,r,a;"function"==typeof SuppressedError&&SuppressedError;const s="__TAURI_TO_IPC_KEY__";class c{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,i.set(this,(()=>{})),o.set(this,0),r.set(this,{}),this.id=function(t,e=!1){return window.__TAURI_INTERNALS__.transformCallback(t,e)}((({message:t,id:a})=>{if(a===e(this,o,"f")){n(this,o,a+1),e(this,i,"f").call(this,t);const s=Object.keys(e(this,r,"f"));if(s.length>0){let t=a+1;for(const n of s.sort()){if(parseInt(n)!==t)break;{const o=e(this,r,"f")[n];delete e(this,r,"f")[n],e(this,i,"f").call(this,o),t+=1}}n(this,o,t)}}else e(this,r,"f")[a.toString()]=t}))}set onmessage(t){n(this,i,t)}get onmessage(){return e(this,i,"f")}[(i=new WeakMap,o=new WeakMap,r=new WeakMap,s)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[s]()}}async function f(t,e={},n){return window.__TAURI_INTERNALS__.invoke(t,e,n)}class l{get rid(){return e(this,a,"f")}constructor(t){a.set(this,void 0),n(this,a,t)}async close(){return f("plugin:resources|close",{rid:this.rid})}}var u,p;function w(t){return{isFile:t.isFile,isDirectory:t.isDirectory,isSymlink:t.isSymlink,size:t.size,mtime:null!==t.mtime?new Date(t.mtime):null,atime:null!==t.atime?new Date(t.atime):null,birthtime:null!==t.birthtime?new Date(t.birthtime):null,readonly:t.readonly,fileAttributes:t.fileAttributes,dev:t.dev,ino:t.ino,mode:t.mode,nlink:t.nlink,uid:t.uid,gid:t.gid,rdev:t.rdev,blksize:t.blksize,blocks:t.blocks}}a=new WeakMap,t.BaseDirectory=void 0,(u=t.BaseDirectory||(t.BaseDirectory={}))[u.Audio=1]="Audio",u[u.Cache=2]="Cache",u[u.Config=3]="Config",u[u.Data=4]="Data",u[u.LocalData=5]="LocalData",u[u.Document=6]="Document",u[u.Download=7]="Download",u[u.Picture=8]="Picture",u[u.Public=9]="Public",u[u.Video=10]="Video",u[u.Resource=11]="Resource",u[u.Temp=12]="Temp",u[u.AppConfig=13]="AppConfig",u[u.AppData=14]="AppData",u[u.AppLocalData=15]="AppLocalData",u[u.AppCache=16]="AppCache",u[u.AppLog=17]="AppLog",u[u.Desktop=18]="Desktop",u[u.Executable=19]="Executable",u[u.Font=20]="Font",u[u.Home=21]="Home",u[u.Runtime=22]="Runtime",u[u.Template=23]="Template",t.SeekMode=void 0,(p=t.SeekMode||(t.SeekMode={}))[p.Start=0]="Start",p[p.Current=1]="Current",p[p.End=2]="End";class d extends l{async read(t){if(0===t.byteLength)return 0;const e=await f("plugin:fs|read",{rid:this.rid,len:t.byteLength}),n=function(t){const e=new Uint8ClampedArray(t),n=e.byteLength;let i=0;for(let t=0;tt instanceof URL?t.toString():t)),options:i,onEvent:r});return()=>{y(a)}},t.watchImmediate=async function(t,e,n){const i={recursive:!1,...n,delayMs:null},o=Array.isArray(t)?t:[t];for(const t of o)if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");const r=new c;r.onmessage=e;const a=await f("plugin:fs|watch",{paths:o.map((t=>t instanceof URL?t.toString():t)),options:i,onEvent:r});return()=>{y(a)}},t.writeFile=async function(t,e,n){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");if(e instanceof ReadableStream){const i=await h(t,n);for await(const t of e)await i.write(t);await i.close()}else await f("plugin:fs|write_file",e,{headers:{path:encodeURIComponent(t instanceof URL?t.toString():t),options:JSON.stringify(n)}})},t.writeTextFile=async function(t,e,n){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");const i=new TextEncoder;await f("plugin:fs|write_text_file",i.encode(e),{headers:{path:encodeURIComponent(t instanceof URL?t.toString():t),options:JSON.stringify(n)}})},t}({});Object.defineProperty(window.__TAURI__,"fs",{value:__TAURI_PLUGIN_FS__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_FS__=function(t){"use strict";function e(t,e,n,i){if("function"==typeof e||!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===n?i:"a"===n?i.call(t):i?i.value:e.get(t)}function n(t,e,n,i,o){if("function"==typeof e||!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return e.set(t,n),n}var i,o,r,a;"function"==typeof SuppressedError&&SuppressedError;const s="__TAURI_TO_IPC_KEY__";class f{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,i.set(this,(()=>{})),o.set(this,0),r.set(this,[]),this.id=function(t,e=!1){return window.__TAURI_INTERNALS__.transformCallback(t,e)}((({message:t,id:a})=>{if(a==e(this,o,"f"))for(e(this,i,"f").call(this,t),n(this,o,e(this,o,"f")+1);e(this,o,"f")in e(this,r,"f");){const t=e(this,r,"f")[e(this,o,"f")];e(this,i,"f").call(this,t),delete e(this,r,"f")[e(this,o,"f")],n(this,o,e(this,o,"f")+1)}else e(this,r,"f")[a]=t}))}set onmessage(t){n(this,i,t)}get onmessage(){return e(this,i,"f")}[(i=new WeakMap,o=new WeakMap,r=new WeakMap,s)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[s]()}}async function c(t,e={},n){return window.__TAURI_INTERNALS__.invoke(t,e,n)}class l{get rid(){return e(this,a,"f")}constructor(t){a.set(this,void 0),n(this,a,t)}async close(){return c("plugin:resources|close",{rid:this.rid})}}var u,p;function w(t){return{isFile:t.isFile,isDirectory:t.isDirectory,isSymlink:t.isSymlink,size:t.size,mtime:null!==t.mtime?new Date(t.mtime):null,atime:null!==t.atime?new Date(t.atime):null,birthtime:null!==t.birthtime?new Date(t.birthtime):null,readonly:t.readonly,fileAttributes:t.fileAttributes,dev:t.dev,ino:t.ino,mode:t.mode,nlink:t.nlink,uid:t.uid,gid:t.gid,rdev:t.rdev,blksize:t.blksize,blocks:t.blocks}}a=new WeakMap,t.BaseDirectory=void 0,(u=t.BaseDirectory||(t.BaseDirectory={}))[u.Audio=1]="Audio",u[u.Cache=2]="Cache",u[u.Config=3]="Config",u[u.Data=4]="Data",u[u.LocalData=5]="LocalData",u[u.Document=6]="Document",u[u.Download=7]="Download",u[u.Picture=8]="Picture",u[u.Public=9]="Public",u[u.Video=10]="Video",u[u.Resource=11]="Resource",u[u.Temp=12]="Temp",u[u.AppConfig=13]="AppConfig",u[u.AppData=14]="AppData",u[u.AppLocalData=15]="AppLocalData",u[u.AppCache=16]="AppCache",u[u.AppLog=17]="AppLog",u[u.Desktop=18]="Desktop",u[u.Executable=19]="Executable",u[u.Font=20]="Font",u[u.Home=21]="Home",u[u.Runtime=22]="Runtime",u[u.Template=23]="Template",t.SeekMode=void 0,(p=t.SeekMode||(t.SeekMode={}))[p.Start=0]="Start",p[p.Current=1]="Current",p[p.End=2]="End";class h extends l{async read(t){if(0===t.byteLength)return 0;const e=await c("plugin:fs|read",{rid:this.rid,len:t.byteLength}),n=function(t){const e=new Uint8ClampedArray(t),n=e.byteLength;let i=0;for(let t=0;tt instanceof URL?t.toString():t)),options:i,onEvent:r});return()=>{y(a)}},t.watchImmediate=async function(t,e,n){const i={recursive:!1,...n,delayMs:null},o=Array.isArray(t)?t:[t];for(const t of o)if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");const r=new f;r.onmessage=e;const a=await c("plugin:fs|watch",{paths:o.map((t=>t instanceof URL?t.toString():t)),options:i,onEvent:r});return()=>{y(a)}},t.writeFile=async function(t,e,n){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");if(e instanceof ReadableStream){const i=await d(t,n);for await(const t of e)await i.write(t);await i.close()}else await c("plugin:fs|write_file",e,{headers:{path:encodeURIComponent(t instanceof URL?t.toString():t),options:JSON.stringify(n)}})},t.writeTextFile=async function(t,e,n){if(t instanceof URL&&"file:"!==t.protocol)throw new TypeError("Must be a file URL.");const i=new TextEncoder;await c("plugin:fs|write_text_file",i.encode(e),{headers:{path:encodeURIComponent(t instanceof URL?t.toString():t),options:JSON.stringify(n)}})},t}({});Object.defineProperty(window.__TAURI__,"fs",{value:__TAURI_PLUGIN_FS__})}
diff --git a/plugins/fs/build.rs b/plugins/fs/build.rs
index 3909b1c0..9c34586e 100644
--- a/plugins/fs/build.rs
+++ b/plugins/fs/build.rs
@@ -208,11 +208,18 @@ permissions = [
}
}
- tauri_plugin::Builder::new(&COMMANDS.iter().map(|c| c.0).collect::>())
- .global_api_script_path("./api-iife.js")
- .global_scope_schema(schemars::schema_for!(FsScopeEntry))
- .android_path("android")
- .build();
+ tauri_plugin::Builder::new(
+ &COMMANDS
+ .iter()
+ // FIXME: https://docs.rs/crate/tauri-plugin-fs/2.1.0/builds/1571296
+ .filter(|c| c.1.is_empty())
+ .map(|c| c.0)
+ .collect::>(),
+ )
+ .global_api_script_path("./api-iife.js")
+ .global_scope_schema(schemars::schema_for!(FsScopeEntry))
+ .android_path("android")
+ .build();
// workaround to include nested permissions as `tauri_plugin` doesn't support it
let permissions_dir = autogenerated.join("commands");
@@ -234,9 +241,11 @@ permissions = [
.iter_mut()
.filter(|p| p.identifier.starts_with("allow"))
{
- p.commands
- .allow
- .extend(nested_commands.iter().map(|s| s.to_string()));
+ for c in nested_commands.iter().map(|s| s.to_string()) {
+ if !p.commands.allow.contains(&c) {
+ p.commands.allow.push(c);
+ }
+ }
}
let out = toml::to_string_pretty(&permission_file)
@@ -248,7 +257,10 @@ permissions = [
{out}"#
);
- std::fs::write(permission_path, out)
- .unwrap_or_else(|_| panic!("failed to write {command}.toml"));
+
+ if content != out {
+ std::fs::write(permission_path, out)
+ .unwrap_or_else(|_| panic!("failed to write {command}.toml"));
+ }
}
}
diff --git a/plugins/fs/guest-js/index.ts b/plugins/fs/guest-js/index.ts
index 448335c4..e0438d58 100644
--- a/plugins/fs/guest-js/index.ts
+++ b/plugins/fs/guest-js/index.ts
@@ -10,7 +10,7 @@
* This module prevents path traversal, not allowing parent directory accessors to be used
* (i.e. "/usr/path/to/../file" or "../path/to/file" paths are not allowed).
* Paths accessed with this API must be either relative to one of the {@link BaseDirectory | base directories}
- * or created with the {@link https://v2.tauri.app/reference/javascript/api/namespacepath | path API}.
+ * or created with the {@link https://v2.tauri.app/reference/javascript/api/namespacepath/ | path API}.
*
* The API has a scope configuration that forces you to restrict the paths that can be accessed using glob patterns.
*
@@ -604,8 +604,8 @@ async function copyFile(
options?: CopyFileOptions
): Promise {
if (
- (fromPath instanceof URL && fromPath.protocol !== 'file:') ||
- (toPath instanceof URL && toPath.protocol !== 'file:')
+ (fromPath instanceof URL && fromPath.protocol !== 'file:')
+ || (toPath instanceof URL && toPath.protocol !== 'file:')
) {
throw new TypeError('Must be a file URL.')
}
@@ -919,8 +919,8 @@ async function rename(
options?: RenameOptions
): Promise {
if (
- (oldPath instanceof URL && oldPath.protocol !== 'file:') ||
- (newPath instanceof URL && newPath.protocol !== 'file:')
+ (oldPath instanceof URL && oldPath.protocol !== 'file:')
+ || (newPath instanceof URL && newPath.protocol !== 'file:')
) {
throw new TypeError('Must be a file URL.')
}
diff --git a/plugins/fs/package.json b/plugins/fs/package.json
index eeb9f8a4..09efc93d 100644
--- a/plugins/fs/package.json
+++ b/plugins/fs/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-fs",
- "version": "2.0.3",
+ "version": "2.2.0",
"description": "Access the file system.",
"license": "MIT OR Apache-2.0",
"authors": [
diff --git a/plugins/fs/src/file_path.rs b/plugins/fs/src/file_path.rs
index 735fc105..6316a248 100644
--- a/plugins/fs/src/file_path.rs
+++ b/plugins/fs/src/file_path.rs
@@ -53,10 +53,7 @@ impl FilePath {
#[inline]
pub fn into_path(self) -> Result {
match self {
- Self::Url(url) => url
- .to_file_path()
- .map(PathBuf::from)
- .map_err(|_| Error::InvalidPathUrl),
+ Self::Url(url) => url.to_file_path().map_err(|_| Error::InvalidPathUrl),
Self::Path(p) => Ok(p),
}
}
@@ -91,10 +88,7 @@ impl SafeFilePath {
#[inline]
pub fn into_path(self) -> Result {
match self {
- Self::Url(url) => url
- .to_file_path()
- .map(PathBuf::from)
- .map_err(|_| Error::InvalidPathUrl),
+ Self::Url(url) => url.to_file_path().map_err(|_| Error::InvalidPathUrl),
Self::Path(p) => Ok(p.as_ref().to_owned()),
}
}
diff --git a/plugins/geolocation/CHANGELOG.md b/plugins/geolocation/CHANGELOG.md
index 32952ac7..dbee2e7d 100644
--- a/plugins/geolocation/CHANGELOG.md
+++ b/plugins/geolocation/CHANGELOG.md
@@ -1,5 +1,26 @@
# Changelog
+## \[2.2.4]
+
+- [`a1b3fa27`](https://github.com/tauri-apps/plugins-workspace/commit/a1b3fa27f11022c9b6622b4fab12d93239eb05de) ([#2515](https://github.com/tauri-apps/plugins-workspace/pull/2515) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Re-exported the `Geolocation`, `Haptics`, `Notification`, and `Os` structs so that they show up on docs.rs.
+
+## \[2.2.3]
+
+- [`406e6f48`](https://github.com/tauri-apps/plugins-workspace/commit/406e6f484cdc13d35c50fb949f7489ca9eeccc44) ([#2323](https://github.com/tauri-apps/plugins-workspace/pull/2323) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Fixed an issue that caused build failures when the `haptics` or `geolocation` plugin was used without their `specta` feature flag enabled.
+
+## \[2.2.2]
+
+- [`c9c13a0f`](https://github.com/tauri-apps/plugins-workspace/commit/c9c13a0fe7cdaac223843f5ba33176252f8e22f5) ([#2316](https://github.com/tauri-apps/plugins-workspace/pull/2316) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) **Breaking change:** `specta` integration is now behind a `specta` feature flag like in Tauri.
+- [`c9c13a0f`](https://github.com/tauri-apps/plugins-workspace/commit/c9c13a0fe7cdaac223843f5ba33176252f8e22f5) ([#2316](https://github.com/tauri-apps/plugins-workspace/pull/2316) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Unlock and widen `specta` version range to match Tauri. No API changes.
+
+## \[2.2.1]
+
+- [`fb67ab2b`](https://github.com/tauri-apps/plugins-workspace/commit/fb67ab2b926502bfc20d6b43fbdd156691ea8526) ([#2281](https://github.com/tauri-apps/plugins-workspace/pull/2281) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Added `specta-util` to fix a "dependency not found" compilation error.
+
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.0.1]
- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
diff --git a/plugins/geolocation/Cargo.toml b/plugins/geolocation/Cargo.toml
index 550a66cb..7d01b526 100644
--- a/plugins/geolocation/Cargo.toml
+++ b/plugins/geolocation/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "tauri-plugin-geolocation"
description = "Get and track the device's current position"
-version = "2.0.1"
+version = "2.2.4"
edition = { workspace = true }
authors = { workspace = true }
license = { workspace = true }
@@ -26,10 +26,13 @@ tauri-plugin = { workspace = true, features = ["build"] }
[dependencies]
serde = { workspace = true }
serde_json = { workspace = true }
-tauri = { workspace = true, features = ["specta"] }
+tauri = { workspace = true }
log = { workspace = true }
thiserror = { workspace = true }
-specta = { workspace = true }
+specta = { workspace = true, optional = true }
[target.'cfg(target_os = "ios")'.dependencies]
tauri = { workspace = true, features = ["wry"] }
+
+[features]
+specta = ["dep:specta", "tauri/specta"]
diff --git a/plugins/geolocation/README.md b/plugins/geolocation/README.md
index bf8e1741..5d306cee 100644
--- a/plugins/geolocation/README.md
+++ b/plugins/geolocation/README.md
@@ -118,8 +118,8 @@ import {
let permissions = await checkPermissions()
if (
- permissions.location === 'prompt' ||
- permissions.location === 'prompt-with-rationale'
+ permissions.location === 'prompt'
+ || permissions.location === 'prompt-with-rationale'
) {
permissions = await requestPermissions(['location'])
}
diff --git a/plugins/geolocation/api-iife.js b/plugins/geolocation/api-iife.js
index 5dcae251..54d99272 100644
--- a/plugins/geolocation/api-iife.js
+++ b/plugins/geolocation/api-iife.js
@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_GEOLOCATION__=function(t){"use strict";function e(t,e,n,i){if("a"===n&&!i)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof e?t!==e||!i:!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===n?i:"a"===n?i.call(t):i?i.value:e.get(t)}function n(t,e,n,i,o){if("function"==typeof e?t!==e||!o:!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return e.set(t,n),n}var i,o,s;"function"==typeof SuppressedError&&SuppressedError;const r="__TAURI_TO_IPC_KEY__";class a{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,i.set(this,(()=>{})),o.set(this,0),s.set(this,{}),this.id=function(t,e=!1){return window.__TAURI_INTERNALS__.transformCallback(t,e)}((({message:t,id:r})=>{if(r===e(this,o,"f")){n(this,o,r+1),e(this,i,"f").call(this,t);const a=Object.keys(e(this,s,"f"));if(a.length>0){let t=r+1;for(const n of a.sort()){if(parseInt(n)!==t)break;{const o=e(this,s,"f")[n];delete e(this,s,"f")[n],e(this,i,"f").call(this,o),t+=1}}n(this,o,t)}}else e(this,s,"f")[r.toString()]=t}))}set onmessage(t){n(this,i,t)}get onmessage(){return e(this,i,"f")}[(i=new WeakMap,o=new WeakMap,s=new WeakMap,r)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[r]()}}async function c(t,e={},n){return window.__TAURI_INTERNALS__.invoke(t,e,n)}return t.checkPermissions=async function(){return await async function(t){return c(`plugin:${t}|check_permissions`)}("geolocation")},t.clearWatch=async function(t){await c("plugin:geolocation|clear_watch",{channelId:t})},t.getCurrentPosition=async function(t){return await c("plugin:geolocation|get_current_position",{options:t})},t.requestPermissions=async function(t){return await c("plugin:geolocation|request_permissions",{permissions:t})},t.watchPosition=async function(t,e){const n=new a;return n.onmessage=t=>{"string"==typeof t?e(null,t):e(t)},await c("plugin:geolocation|watch_position",{options:t,channel:n}),n.id},t}({});Object.defineProperty(window.__TAURI__,"geolocation",{value:__TAURI_PLUGIN_GEOLOCATION__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_GEOLOCATION__=function(t){"use strict";function n(t,n,e,i){if("function"==typeof n||!n.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===e?i:"a"===e?i.call(t):i?i.value:n.get(t)}function e(t,n,e,i,s){if("function"==typeof n||!n.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return n.set(t,e),e}var i,s,o;"function"==typeof SuppressedError&&SuppressedError;const r="__TAURI_TO_IPC_KEY__";class a{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,i.set(this,(()=>{})),s.set(this,0),o.set(this,[]),this.id=function(t,n=!1){return window.__TAURI_INTERNALS__.transformCallback(t,n)}((({message:t,id:r})=>{if(r==n(this,s,"f"))for(n(this,i,"f").call(this,t),e(this,s,n(this,s,"f")+1);n(this,s,"f")in n(this,o,"f");){const t=n(this,o,"f")[n(this,s,"f")];n(this,i,"f").call(this,t),delete n(this,o,"f")[n(this,s,"f")],e(this,s,n(this,s,"f")+1)}else n(this,o,"f")[r]=t}))}set onmessage(t){e(this,i,t)}get onmessage(){return n(this,i,"f")}[(i=new WeakMap,s=new WeakMap,o=new WeakMap,r)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[r]()}}async function c(t,n={},e){return window.__TAURI_INTERNALS__.invoke(t,n,e)}return t.checkPermissions=async function(){return await async function(t){return c(`plugin:${t}|check_permissions`)}("geolocation")},t.clearWatch=async function(t){await c("plugin:geolocation|clear_watch",{channelId:t})},t.getCurrentPosition=async function(t){return await c("plugin:geolocation|get_current_position",{options:t})},t.requestPermissions=async function(t){return await c("plugin:geolocation|request_permissions",{permissions:t})},t.watchPosition=async function(t,n){const e=new a;return e.onmessage=t=>{"string"==typeof t?n(null,t):n(t)},await c("plugin:geolocation|watch_position",{options:t,channel:e}),e.id},t}({});Object.defineProperty(window.__TAURI__,"geolocation",{value:__TAURI_PLUGIN_GEOLOCATION__})}
diff --git a/plugins/geolocation/package.json b/plugins/geolocation/package.json
index 998d2456..0e3b09cb 100644
--- a/plugins/geolocation/package.json
+++ b/plugins/geolocation/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-geolocation",
- "version": "2.0.0",
+ "version": "2.2.4",
"license": "MIT OR Apache-2.0",
"authors": [
"Tauri Programme within The Commons Conservancy"
diff --git a/plugins/geolocation/src/commands.rs b/plugins/geolocation/src/commands.rs
index 9f9b7aa0..d2cae848 100644
--- a/plugins/geolocation/src/commands.rs
+++ b/plugins/geolocation/src/commands.rs
@@ -7,7 +7,6 @@ use tauri::{command, ipc::Channel, AppHandle, Runtime};
use crate::{GeolocationExt, PermissionStatus, PermissionType, Position, PositionOptions, Result};
#[command]
-#[specta::specta]
pub(crate) async fn get_current_position(
app: AppHandle,
options: Option,
@@ -16,7 +15,6 @@ pub(crate) async fn get_current_position(
}
#[command]
-#[specta::specta]
pub(crate) async fn watch_position(
app: AppHandle,
options: PositionOptions,
@@ -26,19 +24,16 @@ pub(crate) async fn watch_position(
}
#[command]
-#[specta::specta]
pub(crate) async fn clear_watch(app: AppHandle, channel_id: u32) -> Result<()> {
app.geolocation().clear_watch(channel_id)
}
#[command]
-#[specta::specta]
pub(crate) async fn check_permissions(app: AppHandle) -> Result {
app.geolocation().check_permissions()
}
#[command]
-#[specta::specta]
pub(crate) async fn request_permissions(
app: AppHandle,
permissions: Option>,
diff --git a/plugins/geolocation/src/error.rs b/plugins/geolocation/src/error.rs
index 30ff7f44..0fba5445 100644
--- a/plugins/geolocation/src/error.rs
+++ b/plugins/geolocation/src/error.rs
@@ -3,18 +3,18 @@
// SPDX-License-Identifier: MIT
use serde::{ser::Serializer, Serialize};
-use specta::Type;
pub type Result = std::result::Result;
// TODO: Improve Error handling (different typed errors instead of one (stringified) PluginInvokeError for all mobile errors)
-#[derive(Debug, thiserror::Error, Type)]
+#[derive(Debug, thiserror::Error)]
+#[cfg_attr(feature = "specta", derive(specta::Type))]
pub enum Error {
#[cfg(mobile)]
#[error(transparent)]
PluginInvoke(
- #[serde(skip)]
+ #[cfg_attr(feature = "specta", serde(skip))]
#[from]
tauri::plugin::mobile::PluginInvokeError,
),
diff --git a/plugins/geolocation/src/lib.rs b/plugins/geolocation/src/lib.rs
index eed4a475..588f96e3 100644
--- a/plugins/geolocation/src/lib.rs
+++ b/plugins/geolocation/src/lib.rs
@@ -7,8 +7,6 @@ use tauri::{
Manager, Runtime,
};
-//use tauri_specta::*;
-
pub use models::*;
#[cfg(desktop)]
@@ -23,27 +21,9 @@ mod models;
pub use error::{Error, Result};
#[cfg(desktop)]
-use desktop::Geolocation;
+pub use desktop::Geolocation;
#[cfg(mobile)]
-use mobile::Geolocation;
-
-/* macro_rules! specta_builder {
- () => {
- ts::builder()
- .commands(collect_commands![
- commands::get_current_position,
- commands::watch_position,
- commands::clear_watch,
- commands::check_permissions,
- commands::request_permissions
- ])
- .header("// @ts-nocheck")
- .config(
- specta::ts::ExportConfig::default()
- .bigint(specta::ts::BigIntExportBehavior::Number),
- )
- };
-} */
+pub use mobile::Geolocation;
/// Extensions to [`tauri::App`], [`tauri::AppHandle`], [`tauri::WebviewWindow`], [`tauri::Webview`] and [`tauri::Window`] to access the geolocation APIs.
pub trait GeolocationExt {
@@ -58,9 +38,6 @@ impl> crate::GeolocationExt for T {
/// Initializes the plugin.
pub fn init() -> TauriPlugin {
- /* let (invoke_handler, register_events) =
- specta_builder!().build_plugin_utils("geolocation").unwrap(); */
-
Builder::new("geolocation")
.invoke_handler(tauri::generate_handler![
commands::get_current_position,
@@ -79,22 +56,3 @@ pub fn init() -> TauriPlugin {
})
.build()
}
-
-/* #[cfg(test)]
-mod test {
- use super::*;
-
- #[test]
- fn export_types() {
- specta_builder!()
- .path("./guest-js/bindings.ts")
- .config(
- specta::ts::ExportConfig::default()
- .formatter(specta::ts::formatter::prettier)
- .bigint(specta::ts::BigIntExportBehavior::Number),
- )
- .export_for_plugin("geolocation")
- .expect("failed to export specta types");
- }
-}
- */
diff --git a/plugins/geolocation/src/models.rs b/plugins/geolocation/src/models.rs
index 165c036f..c08bb27a 100644
--- a/plugins/geolocation/src/models.rs
+++ b/plugins/geolocation/src/models.rs
@@ -3,10 +3,10 @@
// SPDX-License-Identifier: MIT
use serde::{Deserialize, Serialize};
-use specta::Type;
use tauri::plugin::PermissionState;
-#[derive(Debug, Clone, Default, Serialize, Deserialize, Type)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[cfg_attr(feature = "specta", derive(specta::Type))]
#[serde(rename_all = "camelCase")]
pub struct PermissionStatus {
/// Permission state for the location alias.
@@ -25,7 +25,8 @@ pub struct PermissionStatus {
pub coarse_location: PermissionState,
}
-#[derive(Debug, Clone, Default, Serialize, Deserialize, Type)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[cfg_attr(feature = "specta", derive(specta::Type))]
#[serde(rename_all = "camelCase")]
pub struct PositionOptions {
/// High accuracy mode (such as GPS, if available)
@@ -46,14 +47,16 @@ pub struct PositionOptions {
pub maximum_age: u32,
}
-#[derive(Debug, Clone, Serialize, Deserialize, Type)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "specta", derive(specta::Type))]
#[serde(rename_all = "camelCase")]
pub enum PermissionType {
Location,
CoarseLocation,
}
-#[derive(Debug, Clone, Default, Serialize, Deserialize, Type)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[cfg_attr(feature = "specta", derive(specta::Type))]
#[serde(rename_all = "camelCase")]
pub struct Coordinates {
/// Latitude in decimal degrees.
@@ -73,7 +76,8 @@ pub struct Coordinates {
pub heading: Option,
}
-#[derive(Debug, Clone, Default, Serialize, Deserialize, Type)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[cfg_attr(feature = "specta", derive(specta::Type))]
#[serde(rename_all = "camelCase")]
pub struct Position {
/// Creation time for these coordinates.
@@ -83,7 +87,8 @@ pub struct Position {
pub coords: Coordinates,
}
-#[derive(Debug, Clone, Serialize, Deserialize, Type)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[cfg_attr(feature = "specta", derive(specta::Type))]
#[serde(untagged)]
pub enum WatchEvent {
Position(Position),
diff --git a/plugins/global-shortcut/CHANGELOG.md b/plugins/global-shortcut/CHANGELOG.md
index 5cd07c7d..32f8748d 100644
--- a/plugins/global-shortcut/CHANGELOG.md
+++ b/plugins/global-shortcut/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.0.1]
- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
@@ -104,22 +108,3 @@
## \[2.0.0-alpha.0]
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- te to alpha.11.
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- \-apps/plugins-workspace/pull/371)) First v2 alpha release!
- te to alpha.11.
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- ]\(https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- om/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- st v2 alpha release!
- ]\(https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- om/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
diff --git a/plugins/global-shortcut/Cargo.toml b/plugins/global-shortcut/Cargo.toml
index a26be3fb..a9ff1fe0 100644
--- a/plugins/global-shortcut/Cargo.toml
+++ b/plugins/global-shortcut/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-global-shortcut"
-version = "2.0.1"
+version = "2.2.0"
description = "Register global hotkeys listeners on your Tauri application."
edition = { workspace = true }
authors = { workspace = true }
diff --git a/plugins/global-shortcut/api-iife.js b/plugins/global-shortcut/api-iife.js
index b78e4084..9c44bd4e 100644
--- a/plugins/global-shortcut/api-iife.js
+++ b/plugins/global-shortcut/api-iife.js
@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_GLOBAL_SHORTCUT__=function(t){"use strict";function e(t,e,r,s){if("a"===r&&!s)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof e?t!==e||!s:!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===r?s:"a"===r?s.call(t):s?s.value:e.get(t)}function r(t,e,r,s,n){if("function"==typeof e?t!==e||!n:!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return e.set(t,r),r}var s,n,i;"function"==typeof SuppressedError&&SuppressedError;const o="__TAURI_TO_IPC_KEY__";class a{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,s.set(this,(()=>{})),n.set(this,0),i.set(this,{}),this.id=function(t,e=!1){return window.__TAURI_INTERNALS__.transformCallback(t,e)}((({message:t,id:o})=>{if(o===e(this,n,"f")){r(this,n,o+1),e(this,s,"f").call(this,t);const a=Object.keys(e(this,i,"f"));if(a.length>0){let t=o+1;for(const r of a.sort()){if(parseInt(r)!==t)break;{const n=e(this,i,"f")[r];delete e(this,i,"f")[r],e(this,s,"f").call(this,n),t+=1}}r(this,n,t)}}else e(this,i,"f")[o.toString()]=t}))}set onmessage(t){r(this,s,t)}get onmessage(){return e(this,s,"f")}[(s=new WeakMap,n=new WeakMap,i=new WeakMap,o)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[o]()}}async function _(t,e={},r){return window.__TAURI_INTERNALS__.invoke(t,e,r)}return t.isRegistered=async function(t){return await _("plugin:global-shortcut|is_registered",{shortcut:t})},t.register=async function(t,e){const r=new a;return r.onmessage=e,await _("plugin:global-shortcut|register",{shortcuts:Array.isArray(t)?t:[t],handler:r})},t.unregister=async function(t){return await _("plugin:global-shortcut|unregister",{shortcuts:Array.isArray(t)?t:[t]})},t.unregisterAll=async function(){return await _("plugin:global-shortcut|unregister_all",{})},t}({});Object.defineProperty(window.__TAURI__,"globalShortcut",{value:__TAURI_PLUGIN_GLOBAL_SHORTCUT__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_GLOBAL_SHORTCUT__=function(t){"use strict";function e(t,e,r,s){if("function"==typeof e||!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===r?s:"a"===r?s.call(t):s?s.value:e.get(t)}function r(t,e,r,s,i){if("function"==typeof e||!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return e.set(t,r),r}var s,i,n;"function"==typeof SuppressedError&&SuppressedError;const o="__TAURI_TO_IPC_KEY__";class a{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,s.set(this,(()=>{})),i.set(this,0),n.set(this,[]),this.id=function(t,e=!1){return window.__TAURI_INTERNALS__.transformCallback(t,e)}((({message:t,id:o})=>{if(o==e(this,i,"f"))for(e(this,s,"f").call(this,t),r(this,i,e(this,i,"f")+1);e(this,i,"f")in e(this,n,"f");){const t=e(this,n,"f")[e(this,i,"f")];e(this,s,"f").call(this,t),delete e(this,n,"f")[e(this,i,"f")],r(this,i,e(this,i,"f")+1)}else e(this,n,"f")[o]=t}))}set onmessage(t){r(this,s,t)}get onmessage(){return e(this,s,"f")}[(s=new WeakMap,i=new WeakMap,n=new WeakMap,o)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[o]()}}async function _(t,e={},r){return window.__TAURI_INTERNALS__.invoke(t,e,r)}return t.isRegistered=async function(t){return await _("plugin:global-shortcut|is_registered",{shortcut:t})},t.register=async function(t,e){const r=new a;return r.onmessage=e,await _("plugin:global-shortcut|register",{shortcuts:Array.isArray(t)?t:[t],handler:r})},t.unregister=async function(t){return await _("plugin:global-shortcut|unregister",{shortcuts:Array.isArray(t)?t:[t]})},t.unregisterAll=async function(){return await _("plugin:global-shortcut|unregister_all",{})},t}({});Object.defineProperty(window.__TAURI__,"globalShortcut",{value:__TAURI_PLUGIN_GLOBAL_SHORTCUT__})}
diff --git a/plugins/global-shortcut/package.json b/plugins/global-shortcut/package.json
index a247f93b..13f014b7 100644
--- a/plugins/global-shortcut/package.json
+++ b/plugins/global-shortcut/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-global-shortcut",
- "version": "2.0.0",
+ "version": "2.2.0",
"license": "MIT OR Apache-2.0",
"authors": [
"Tauri Programme within The Commons Conservancy"
diff --git a/plugins/haptics/CHANGELOG.md b/plugins/haptics/CHANGELOG.md
index f8e3fad7..aa3fbbd8 100644
--- a/plugins/haptics/CHANGELOG.md
+++ b/plugins/haptics/CHANGELOG.md
@@ -1,5 +1,26 @@
# Changelog
+## \[2.2.4]
+
+- [`a1b3fa27`](https://github.com/tauri-apps/plugins-workspace/commit/a1b3fa27f11022c9b6622b4fab12d93239eb05de) ([#2515](https://github.com/tauri-apps/plugins-workspace/pull/2515) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Re-exported the `Geolocation`, `Haptics`, `Notification`, and `Os` structs so that they show up on docs.rs.
+
+## \[2.2.3]
+
+- [`406e6f48`](https://github.com/tauri-apps/plugins-workspace/commit/406e6f484cdc13d35c50fb949f7489ca9eeccc44) ([#2323](https://github.com/tauri-apps/plugins-workspace/pull/2323) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Fixed an issue that caused build failures when the `haptics` or `geolocation` plugin was used without their `specta` feature flag enabled.
+
+## \[2.2.2]
+
+- [`c9c13a0f`](https://github.com/tauri-apps/plugins-workspace/commit/c9c13a0fe7cdaac223843f5ba33176252f8e22f5) ([#2316](https://github.com/tauri-apps/plugins-workspace/pull/2316) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) **Breaking change:** `specta` integration is now behind a `specta` feature flag like in Tauri.
+- [`c9c13a0f`](https://github.com/tauri-apps/plugins-workspace/commit/c9c13a0fe7cdaac223843f5ba33176252f8e22f5) ([#2316](https://github.com/tauri-apps/plugins-workspace/pull/2316) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Unlock and widen `specta` version range to match Tauri. No API changes.
+
+## \[2.2.1]
+
+- [`fb67ab2b`](https://github.com/tauri-apps/plugins-workspace/commit/fb67ab2b926502bfc20d6b43fbdd156691ea8526) ([#2281](https://github.com/tauri-apps/plugins-workspace/pull/2281) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Added `specta-util` to fix a "dependency not found" compilation error.
+
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.0.1]
- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
diff --git a/plugins/haptics/Cargo.toml b/plugins/haptics/Cargo.toml
index 8335475f..34c80bab 100644
--- a/plugins/haptics/Cargo.toml
+++ b/plugins/haptics/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "tauri-plugin-haptics"
description = "Haptic feedback and vibrations on Android and iOS"
-version = "2.0.1"
+version = "2.2.4"
edition = { workspace = true }
authors = { workspace = true }
license = { workspace = true }
@@ -26,10 +26,13 @@ tauri-plugin = { workspace = true, features = ["build"] }
[dependencies]
serde = { workspace = true }
serde_json = { workspace = true }
-tauri = { workspace = true, features = ["specta"] }
+tauri = { workspace = true }
log = { workspace = true }
thiserror = { workspace = true }
-specta = { workspace = true }
+specta = { workspace = true, optional = true }
[target.'cfg(target_os = "ios")'.dependencies]
tauri = { workspace = true, features = ["wry"] }
+
+[features]
+specta = ["dep:specta", "tauri/specta"]
diff --git a/plugins/haptics/README.md b/plugins/haptics/README.md
index e5f0e697..44118812 100644
--- a/plugins/haptics/README.md
+++ b/plugins/haptics/README.md
@@ -69,6 +69,19 @@ fn main() {
}
```
+Second, add the required permissions in the project:
+
+`src-tauri/capabilities/default.json`
+
+```json
+ "permissions": [
+ "haptics:allow-impact-feedback",
+ "haptics:allow-notification-feedback",
+ "haptics:allow-selection-feedback",
+ "haptics:allow-vibrate"
+ ]
+```
+
Afterwards all the plugin's APIs are available through the JavaScript guest bindings:
```javascript
diff --git a/plugins/haptics/package.json b/plugins/haptics/package.json
index f29bdc24..12c5b74b 100644
--- a/plugins/haptics/package.json
+++ b/plugins/haptics/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-haptics",
- "version": "2.0.0",
+ "version": "2.2.4",
"license": "MIT OR Apache-2.0",
"authors": [
"Tauri Programme within The Commons Conservancy"
diff --git a/plugins/haptics/src/commands.rs b/plugins/haptics/src/commands.rs
index b2bbd1b0..76f097c0 100644
--- a/plugins/haptics/src/commands.rs
+++ b/plugins/haptics/src/commands.rs
@@ -7,13 +7,11 @@ use tauri::{command, AppHandle, Runtime};
use crate::{HapticsExt, ImpactFeedbackStyle, NotificationFeedbackType, Result};
#[command]
-#[specta::specta]
pub(crate) async fn vibrate(app: AppHandle, duration: u32) -> Result<()> {
app.haptics().vibrate(duration)
}
#[command]
-#[specta::specta]
pub(crate) async fn impact_feedback(
app: AppHandle,
style: ImpactFeedbackStyle,
@@ -22,7 +20,6 @@ pub(crate) async fn impact_feedback(
}
#[command]
-#[specta::specta]
pub(crate) async fn notification_feedback(
app: AppHandle,
r#type: NotificationFeedbackType,
@@ -31,7 +28,6 @@ pub(crate) async fn notification_feedback(
}
#[command]
-#[specta::specta]
pub(crate) async fn selection_feedback(app: AppHandle) -> Result<()> {
app.haptics().selection_feedback()
}
diff --git a/plugins/haptics/src/error.rs b/plugins/haptics/src/error.rs
index 30ff7f44..0fba5445 100644
--- a/plugins/haptics/src/error.rs
+++ b/plugins/haptics/src/error.rs
@@ -3,18 +3,18 @@
// SPDX-License-Identifier: MIT
use serde::{ser::Serializer, Serialize};
-use specta::Type;
pub type Result = std::result::Result;
// TODO: Improve Error handling (different typed errors instead of one (stringified) PluginInvokeError for all mobile errors)
-#[derive(Debug, thiserror::Error, Type)]
+#[derive(Debug, thiserror::Error)]
+#[cfg_attr(feature = "specta", derive(specta::Type))]
pub enum Error {
#[cfg(mobile)]
#[error(transparent)]
PluginInvoke(
- #[serde(skip)]
+ #[cfg_attr(feature = "specta", serde(skip))]
#[from]
tauri::plugin::mobile::PluginInvokeError,
),
diff --git a/plugins/haptics/src/lib.rs b/plugins/haptics/src/lib.rs
index 0a727e14..31798743 100644
--- a/plugins/haptics/src/lib.rs
+++ b/plugins/haptics/src/lib.rs
@@ -7,8 +7,6 @@ use tauri::{
Manager, Runtime,
};
-//use tauri_specta::*;
-
pub use models::*;
#[cfg(desktop)]
@@ -23,26 +21,9 @@ mod models;
pub use error::{Error, Result};
#[cfg(desktop)]
-use desktop::Haptics;
+pub use desktop::Haptics;
#[cfg(mobile)]
-use mobile::Haptics;
-
-/* macro_rules! specta_builder {
- () => {
- ts::builder()
- .commands(collect_commands![
- commands::vibrate,
- commands::impact_feedback,
- commands::notification_feedback,
- commands::selection_feedback
- ])
- .header("// @ts-nocheck")
- .config(
- specta::ts::ExportConfig::default()
- .bigint(specta::ts::BigIntExportBehavior::Number),
- )
- };
-} */
+pub use mobile::Haptics;
/// Extensions to [`tauri::App`], [`tauri::AppHandle`], [`tauri::WebviewWindow`], [`tauri::Webview`] and [`tauri::Window`] to access the haptics APIs.
pub trait HapticsExt {
@@ -57,9 +38,6 @@ impl> crate::HapticsExt for T {
/// Initializes the plugin.
pub fn init() -> TauriPlugin {
- /* let (invoke_handler, register_events) =
- specta_builder!().build_plugin_utils("haptics").unwrap(); */
-
Builder::new("haptics")
.invoke_handler(tauri::generate_handler![
commands::vibrate,
@@ -77,22 +55,3 @@ pub fn init() -> TauriPlugin {
})
.build()
}
-
-/* #[cfg(test)]
-mod test {
- use super::*;
-
- #[test]
- fn export_types() {
- specta_builder!()
- .path("./guest-js/bindings.ts")
- .config(
- specta::ts::ExportConfig::default()
- .formatter(specta::ts::formatter::prettier)
- .bigint(specta::ts::BigIntExportBehavior::Number),
- )
- .export_for_plugin("haptics")
- .expect("failed to export specta types");
- }
-}
- */
diff --git a/plugins/haptics/src/models.rs b/plugins/haptics/src/models.rs
index 9f3b2035..50a1fb16 100644
--- a/plugins/haptics/src/models.rs
+++ b/plugins/haptics/src/models.rs
@@ -3,9 +3,9 @@
// SPDX-License-Identifier: MIT
use serde::{Deserialize, Serialize};
-use specta::Type;
/*
-#[derive(Debug, Clone, Default, Serialize, Deserialize, Type)]
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[cfg_attr(feature = "specta", derive(specta::Type))]
#[serde(rename_all = "camelCase")]
pub struct HapticsOptions {
// TODO: support array to match web api
@@ -13,7 +13,8 @@ pub struct HapticsOptions {
}
*/
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[cfg_attr(feature = "specta", derive(specta::Type))]
#[serde(rename_all = "camelCase")]
pub enum ImpactFeedbackStyle {
Light,
@@ -24,7 +25,8 @@ pub enum ImpactFeedbackStyle {
Rigid,
}
-#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize, Type)]
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[cfg_attr(feature = "specta", derive(specta::Type))]
#[serde(rename_all = "camelCase")]
pub enum NotificationFeedbackType {
#[default]
diff --git a/plugins/http/CHANGELOG.md b/plugins/http/CHANGELOG.md
index 8b03f22d..628f4715 100644
--- a/plugins/http/CHANGELOG.md
+++ b/plugins/http/CHANGELOG.md
@@ -1,5 +1,31 @@
# Changelog
+## \[2.4.1]
+
+- [`d3183aa9`](https://github.com/tauri-apps/plugins-workspace/commit/d3183aa99da7ca67e627394132ddeb3b85ccef06) ([#2522](https://github.com/tauri-apps/plugins-workspace/pull/2522) by [@adrieljss](https://github.com/tauri-apps/plugins-workspace/../../adrieljss)) Fix `fetch` blocking until the whole response is read even if it was a streaming response.
+
+## \[2.4.0]
+
+- [`cb38f54f`](https://github.com/tauri-apps/plugins-workspace/commit/cb38f54f4a4ef30995283cd82166c62da17bac44) ([#2479](https://github.com/tauri-apps/plugins-workspace/pull/2479) by [@adrieljss](https://github.com/tauri-apps/plugins-workspace/../../adrieljss)) Add stream support for HTTP stream responses.
+
+## \[2.3.0]
+
+- [`10513649`](https://github.com/tauri-apps/plugins-workspace/commit/105136494c5a5bf4b1f1cc06cc71815412d17ec8) ([#2204](https://github.com/tauri-apps/plugins-workspace/pull/2204) by [@RickeyWard](https://github.com/tauri-apps/plugins-workspace/../../RickeyWard)) Add `dangerous-settings` feature flag and new JS `danger` option to disable tls hostname/certificate validation.
+
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
+### Dependencies
+
+- Upgraded to `fs@2.2.0`
+
+## \[2.0.2]
+
+### Dependencies
+
+- Upgraded to `fs-js@2.0.4`
+
## \[2.0.4]
- [`a3b553dd`](https://github.com/tauri-apps/plugins-workspace/commit/a3b553ddb403771aa699362c4e69a064b7731da5) ([#2079](https://github.com/tauri-apps/plugins-workspace/pull/2079) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) Add tracing logs for requestes and responses behind `tracing` feature flag.
@@ -208,103 +234,3 @@
## \[2.0.0-alpha.0]
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- /717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- ace/pull/371)) First v2 alpha release!
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- 2 alpha release!
- !
- 371\)) First v2 alpha release!
- /717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- ace/pull/371)) First v2 alpha release!
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- lpha release!
- !
- 371\)) First v2 alpha release!
- ub.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- ace/pull/371)) First v2 alpha release!
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- lpha release!
- !
- 371\)) First v2 alpha release!
- lpha release!
- !
- 371\)) First v2 alpha release!
- t v2 alpha release!
- !
- 371\)) First v2 alpha release!
- ace/pull/371)) First v2 alpha release!
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- !
- 371\)) First v2 alpha release!
- lpha release!
- !
- 371\)) First v2 alpha release!
- lpha release!
- !
- 371\)) First v2 alpha release!
- lpha release!
- !
- 371\)) First v2 alpha release!
- lpha release!
- lpha release!
- !
- 371\)) First v2 alpha release!
- lpha release!
- !
- 371\)) First v2 alpha release!
- ha release!
- !
- 371\)) First v2 alpha release!
- lease!
- !
- 371\)) First v2 alpha release!
diff --git a/plugins/http/Cargo.toml b/plugins/http/Cargo.toml
index c88dc77c..b1cdaddb 100644
--- a/plugins/http/Cargo.toml
+++ b/plugins/http/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-http"
-version = "2.0.4"
+version = "2.4.1"
description = "Access an HTTP client written in Rust."
edition = { workspace = true }
authors = { workspace = true }
@@ -34,7 +34,7 @@ serde_json = { workspace = true }
tauri = { workspace = true }
thiserror = { workspace = true }
tokio = { version = "1", features = ["sync", "macros"] }
-tauri-plugin-fs = { path = "../fs", version = "2.1.0" }
+tauri-plugin-fs = { path = "../fs", version = "2.2.0" }
urlpattern = "0.3"
regex = "1"
http = "1"
@@ -75,3 +75,4 @@ charset = ["reqwest/charset"]
macos-system-configuration = ["reqwest/macos-system-configuration"]
unsafe-headers = []
tracing = ["dep:tracing"]
+dangerous-settings = []
diff --git a/plugins/http/api-iife.js b/plugins/http/api-iife.js
index 0cfeb063..07653dee 100644
--- a/plugins/http/api-iife.js
+++ b/plugins/http/api-iife.js
@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_HTTP__=function(e){"use strict";async function t(e,t={},r){return window.__TAURI_INTERNALS__.invoke(e,t,r)}"function"==typeof SuppressedError&&SuppressedError;const r="Request canceled";return e.fetch=async function(e,n){const a=n?.signal;if(a?.aborted)throw new Error(r);const o=n?.maxRedirections,s=n?.connectTimeout,i=n?.proxy;n&&(delete n.maxRedirections,delete n.connectTimeout,delete n.proxy);const d=n?.headers?n.headers instanceof Headers?n.headers:new Headers(n.headers):new Headers,c=new Request(e,n),u=await c.arrayBuffer(),f=0!==u.byteLength?Array.from(new Uint8Array(u)):null;for(const[e,t]of c.headers)d.get(e)||d.set(e,t);const _=(d instanceof Headers?Array.from(d.entries()):Array.isArray(d)?d:Object.entries(d)).map((([e,t])=>[e,"string"==typeof t?t:t.toString()]));if(a?.aborted)throw new Error(r);const h=await t("plugin:http|fetch",{clientConfig:{method:c.method,url:c.url,headers:_,data:f,maxRedirections:o,connectTimeout:s,proxy:i}}),l=()=>t("plugin:http|fetch_cancel",{rid:h});if(a?.aborted)throw l(),new Error(r);a?.addEventListener("abort",(()=>{l()}));const{status:p,statusText:w,url:y,headers:T,rid:A}=await t("plugin:http|fetch_send",{rid:h}),g=await t("plugin:http|fetch_read_body",{rid:A}),R=new Response(g instanceof ArrayBuffer&&0!==g.byteLength?g:g instanceof Array&&g.length>0?new Uint8Array(g):null,{status:p,statusText:w});return Object.defineProperty(R,"url",{value:y}),Object.defineProperty(R,"headers",{value:new Headers(T)}),R},e}({});Object.defineProperty(window.__TAURI__,"http",{value:__TAURI_PLUGIN_HTTP__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_HTTP__=function(e){"use strict";function t(e,t,r,n){if("function"==typeof t||!t.has(e))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===r?n:"a"===r?n.call(e):n?n.value:t.get(e)}function r(e,t,r,n,s){if("function"==typeof t||!t.has(e))throw new TypeError("Cannot write private member to an object whose class did not declare it");return t.set(e,r),r}var n,s,a;"function"==typeof SuppressedError&&SuppressedError;const i="__TAURI_TO_IPC_KEY__";class o{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,n.set(this,(()=>{})),s.set(this,0),a.set(this,[]),this.id=function(e,t=!1){return window.__TAURI_INTERNALS__.transformCallback(e,t)}((({message:e,id:i})=>{if(i==t(this,s,"f"))for(t(this,n,"f").call(this,e),r(this,s,t(this,s,"f")+1);t(this,s,"f")in t(this,a,"f");){const e=t(this,a,"f")[t(this,s,"f")];t(this,n,"f").call(this,e),delete t(this,a,"f")[t(this,s,"f")],r(this,s,t(this,s,"f")+1)}else t(this,a,"f")[i]=e}))}set onmessage(e){r(this,n,e)}get onmessage(){return t(this,n,"f")}[(n=new WeakMap,s=new WeakMap,a=new WeakMap,i)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[i]()}}async function c(e,t={},r){return window.__TAURI_INTERNALS__.invoke(e,t,r)}const d="Request cancelled";return e.fetch=async function(e,t){const r=t?.signal;if(r?.aborted)throw new Error(d);const n=t?.maxRedirections,s=t?.connectTimeout,a=t?.proxy,i=t?.danger;t&&(delete t.maxRedirections,delete t.connectTimeout,delete t.proxy,delete t.danger);const h=t?.headers?t.headers instanceof Headers?t.headers:new Headers(t.headers):new Headers,f=new Request(e,t),_=await f.arrayBuffer(),u=0!==_.byteLength?Array.from(new Uint8Array(_)):null;for(const[e,t]of f.headers)h.get(e)||h.set(e,t);const l=(h instanceof Headers?Array.from(h.entries()):Array.isArray(h)?h:Object.entries(h)).map((([e,t])=>[e,"string"==typeof t?t:t.toString()]));if(r?.aborted)throw new Error(d);const w=await c("plugin:http|fetch",{clientConfig:{method:f.method,url:f.url,headers:l,data:u,maxRedirections:n,connectTimeout:s,proxy:a,danger:i}}),p=()=>c("plugin:http|fetch_cancel",{rid:w});if(r?.aborted)throw p(),new Error(d);r?.addEventListener("abort",(()=>{p()}));const{status:y,statusText:m,url:T,headers:g,rid:A}=await c("plugin:http|fetch_send",{rid:w}),R=new ReadableStream({start:e=>{const t=new o;t.onmessage=t=>{r?.aborted?e.error(d):(t instanceof ArrayBuffer?0!=t.byteLength:0!=t.length)?e.enqueue(new Uint8Array(t)):e.close()},c("plugin:http|fetch_read_body",{rid:A,streamChannel:t}).catch((t=>{e.error(t)}))}}),b=new Response(R,{status:y,statusText:m});return Object.defineProperty(b,"url",{value:T}),Object.defineProperty(b,"headers",{value:new Headers(g)}),b},e}({});Object.defineProperty(window.__TAURI__,"http",{value:__TAURI_PLUGIN_HTTP__})}
diff --git a/plugins/http/guest-js/index.ts b/plugins/http/guest-js/index.ts
index 4362e893..4c33f072 100644
--- a/plugins/http/guest-js/index.ts
+++ b/plugins/http/guest-js/index.ts
@@ -26,7 +26,7 @@
* @module
*/
-import { invoke } from '@tauri-apps/api/core'
+import { Channel, invoke } from '@tauri-apps/api/core'
/**
* Configuration of a proxy that a Client should pass requests to.
@@ -84,9 +84,29 @@ export interface ClientOptions {
* Configuration of a proxy that a Client should pass requests to.
*/
proxy?: Proxy
+ /**
+ * Configuration for dangerous settings on the client such as disabling SSL verification.
+ */
+ danger?: DangerousSettings
+}
+
+/**
+ * Configuration for dangerous settings on the client such as disabling SSL verification.
+ *
+ * @since 2.3.0
+ */
+export interface DangerousSettings {
+ /**
+ * Disables SSL verification.
+ */
+ acceptInvalidCerts?: boolean
+ /**
+ * Disables hostname verification.
+ */
+ acceptInvalidHostnames?: boolean
}
-const ERROR_REQUEST_CANCELLED = 'Request canceled'
+const ERROR_REQUEST_CANCELLED = 'Request cancelled'
/**
* Fetch a resource from the network. It returns a `Promise` that resolves to the
@@ -115,12 +135,14 @@ export async function fetch(
const maxRedirections = init?.maxRedirections
const connectTimeout = init?.connectTimeout
const proxy = init?.proxy
+ const danger = init?.danger
// Remove these fields before creating the request
if (init) {
delete init.maxRedirections
delete init.connectTimeout
delete init.proxy
+ delete init.danger
}
const headers = init?.headers
@@ -172,7 +194,8 @@ export async function fetch(
data,
maxRedirections,
connectTimeout,
- proxy
+ proxy,
+ danger
}
})
@@ -206,24 +229,45 @@ export async function fetch(
rid
})
- const body = await invoke(
- 'plugin:http|fetch_read_body',
- {
- rid: responseRid
- }
- )
+ const readableStreamBody = new ReadableStream({
+ start: (controller) => {
+ const streamChannel = new Channel()
+ streamChannel.onmessage = (res: ArrayBuffer | number[]) => {
+ // close early if aborted
+ if (signal?.aborted) {
+ controller.error(ERROR_REQUEST_CANCELLED)
+ return
+ }
+
+ // close when the signal to close (an empty chunk)
+ // is sent from the IPC.
+ if (
+ res instanceof ArrayBuffer ? res.byteLength == 0 : res.length == 0
+ ) {
+ controller.close()
+ return
+ }
+
+ // the content conversion (like .text(), .json(), etc.) in Response
+ // must have Uint8Array as its content, else it will
+ // have untraceable error that's hard to debug.
+ controller.enqueue(new Uint8Array(res))
+ }
- const res = new Response(
- body instanceof ArrayBuffer && body.byteLength !== 0
- ? body
- : body instanceof Array && body.length > 0
- ? new Uint8Array(body)
- : null,
- {
- status,
- statusText
+ // run a non-blocking body stream fetch
+ invoke('plugin:http|fetch_read_body', {
+ rid: responseRid,
+ streamChannel
+ }).catch((e) => {
+ controller.error(e)
+ })
}
- )
+ })
+
+ const res = new Response(readableStreamBody, {
+ status,
+ statusText
+ })
// url and headers are read only properties
// but seems like we can set them like this
diff --git a/plugins/http/package.json b/plugins/http/package.json
index 493caf75..2c4ba838 100644
--- a/plugins/http/package.json
+++ b/plugins/http/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-http",
- "version": "2.0.1",
+ "version": "2.4.1",
"license": "MIT OR Apache-2.0",
"authors": [
"Tauri Programme within The Commons Conservancy"
diff --git a/plugins/http/src/commands.rs b/plugins/http/src/commands.rs
index 03c84adf..18953121 100644
--- a/plugins/http/src/commands.rs
+++ b/plugins/http/src/commands.rs
@@ -10,7 +10,7 @@ use serde::{Deserialize, Serialize};
use tauri::{
async_runtime::Mutex,
command,
- ipc::{CommandScope, GlobalScope},
+ ipc::{Channel, CommandScope, GlobalScope},
Manager, ResourceId, ResourceTable, Runtime, State, Webview,
};
use tokio::sync::oneshot::{channel, Receiver, Sender};
@@ -75,6 +75,14 @@ pub struct FetchResponse {
rid: ResourceId,
}
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+#[allow(dead_code)] //feature flags shoudln't affect api
+pub struct DangerousSettings {
+ accept_invalid_certs: bool,
+ accept_invalid_hostnames: bool,
+}
+
#[derive(Debug, Deserialize)]
#[serde(rename_all = "camelCase")]
pub struct ClientConfig {
@@ -85,6 +93,7 @@ pub struct ClientConfig {
connect_timeout: Option,
max_redirections: Option,
proxy: Option,
+ danger: Option,
}
#[derive(Debug, Deserialize)]
@@ -181,6 +190,7 @@ pub async fn fetch(
connect_timeout,
max_redirections,
proxy,
+ danger,
} = client_config;
let scheme = url.scheme();
@@ -220,6 +230,24 @@ pub async fn fetch(
{
let mut builder = reqwest::ClientBuilder::new();
+ if let Some(danger_config) = danger {
+ #[cfg(not(feature = "dangerous-settings"))]
+ {
+ #[cfg(debug_assertions)]
+ {
+ eprintln!("[\x1b[33mWARNING\x1b[0m] using dangerous settings requires `dangerous-settings` feature flag in your Cargo.toml");
+ }
+ let _ = danger_config;
+ return Err(Error::DangerousSettings);
+ }
+ #[cfg(feature = "dangerous-settings")]
+ {
+ builder = builder
+ .danger_accept_invalid_certs(danger_config.accept_invalid_certs)
+ .danger_accept_invalid_hostnames(danger_config.accept_invalid_hostnames)
+ }
+ }
+
if let Some(timeout) = connect_timeout {
builder = builder.connect_timeout(Duration::from_millis(timeout));
}
@@ -287,6 +315,7 @@ pub async fn fetch(
tracing::trace!("{:?}", request);
let fut = async move { request.send().await.map_err(Into::into) };
+
let mut resources_table = webview.resources_table();
let rid = resources_table.add_request(Box::pin(fut));
@@ -330,7 +359,7 @@ pub fn fetch_cancel(webview: Webview, rid: ResourceId) -> crate::
Ok(())
}
-#[tauri::command]
+#[command]
pub async fn fetch_send(
webview: Webview,
rid: ResourceId,
@@ -382,17 +411,28 @@ pub async fn fetch_send(
})
}
-#[tauri::command]
-pub(crate) async fn fetch_read_body(
+#[command]
+pub async fn fetch_read_body(
webview: Webview,
rid: ResourceId,
-) -> crate::Result {
+ stream_channel: Channel,
+) -> crate::Result<()> {
let res = {
let mut resources_table = webview.resources_table();
resources_table.take::(rid)?
};
- let res = Arc::into_inner(res).unwrap().0;
- Ok(tauri::ipc::Response::new(res.bytes().await?.to_vec()))
+
+ let mut res = Arc::into_inner(res).unwrap().0;
+
+ // send response through IPC channel
+ while let Some(chunk) = res.chunk().await? {
+ stream_channel.send(tauri::ipc::InvokeResponseBody::Raw(chunk.to_vec()))?;
+ }
+
+ // send empty vector when done
+ stream_channel.send(tauri::ipc::InvokeResponseBody::Raw(Vec::new()))?;
+
+ Ok(())
}
// forbidden headers per fetch spec https://fetch.spec.whatwg.org/#terminology-headers
diff --git a/plugins/http/src/error.rs b/plugins/http/src/error.rs
index 78ff08a2..ef8de0c5 100644
--- a/plugins/http/src/error.rs
+++ b/plugins/http/src/error.rs
@@ -41,6 +41,8 @@ pub enum Error {
Tauri(#[from] tauri::Error),
#[error(transparent)]
Utf8(#[from] std::string::FromUtf8Error),
+ #[error("dangerous settings used but are not enabled")]
+ DangerousSettings,
}
impl Serialize for Error {
diff --git a/plugins/http/src/lib.rs b/plugins/http/src/lib.rs
index 131d10d4..5e017c80 100644
--- a/plugins/http/src/lib.rs
+++ b/plugins/http/src/lib.rs
@@ -80,7 +80,7 @@ pub fn init() -> TauriPlugin {
commands::fetch,
commands::fetch_cancel,
commands::fetch_send,
- commands::fetch_read_body,
+ commands::fetch_read_body
])
.build()
}
diff --git a/plugins/localhost/CHANGELOG.md b/plugins/localhost/CHANGELOG.md
index 0b266925..f2b15a89 100644
--- a/plugins/localhost/CHANGELOG.md
+++ b/plugins/localhost/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.1.0]
- [`3449dd5a`](https://github.com/tauri-apps/plugins-workspace/commit/3449dd5a8f6d12fee8d6389c034fe47e19d72bcd) ([#1982](https://github.com/tauri-apps/plugins-workspace/pull/1982) by [@arihav](https://github.com/tauri-apps/plugins-workspace/../../arihav)) Add custom host binding to allow external access
diff --git a/plugins/localhost/Cargo.toml b/plugins/localhost/Cargo.toml
index 2f0fcebd..34ee7ee6 100644
--- a/plugins/localhost/Cargo.toml
+++ b/plugins/localhost/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-localhost"
-version = "2.1.0"
+version = "2.2.0"
description = "Expose your apps assets through a localhost server instead of the default custom protocol."
authors = { workspace = true }
license = { workspace = true }
diff --git a/plugins/log/CHANGELOG.md b/plugins/log/CHANGELOG.md
index d9b56460..98869ea1 100644
--- a/plugins/log/CHANGELOG.md
+++ b/plugins/log/CHANGELOG.md
@@ -1,5 +1,35 @@
# Changelog
+## \[2.3.1]
+
+- [`1bb1ced5`](https://github.com/tauri-apps/plugins-workspace/commit/1bb1ced53820127204aa7adf57510c1cbce55e12) ([#2524](https://github.com/tauri-apps/plugins-workspace/pull/2524) by [@elwerene](https://github.com/tauri-apps/plugins-workspace/../../elwerene)) enable TargetKind::LogDir on mobile
+
+## \[2.3.0]
+
+### feat
+
+- [`02481501`](https://github.com/tauri-apps/plugins-workspace/commit/024815018fbc63a37afc716796a454925aa7d25e) ([#2377](https://github.com/tauri-apps/plugins-workspace/pull/2377) by [@3lpsy](https://github.com/tauri-apps/plugins-workspace/../../3lpsy)) Add a `is_skip_logger` flag to the Log Plugin `Builder` struct, a `skip_logger()` method to the Builder, and logic to avoid acquiring (creating) a logger and attaching it to the global logger. Since acquire_logger is pub, a `LoggerNotInitialized` is added and returned if it's called when the `is_skip_looger` flag is set. Overall, this feature permits a user to avoid calling `attach_logger` which can only be called once in a program's lifetime and allows the user to control the logger returned from `logger()`. Additionally, it also will allow users to generate multiple Tauri Mock apps in test suites that run and parallel and have the `log` plugin attached (assuming they use `skip_logger()`).
+
+## \[2.2.3]
+
+- [`1a984659`](https://github.com/tauri-apps/plugins-workspace/commit/1a9846599b6a71faf330845847a30f6bf9735898) ([#2469](https://github.com/tauri-apps/plugins-workspace/pull/2469) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Update `objc2` crate to 0.6. No user facing changes.
+
+## \[2.2.2]
+
+- [`6b4c3917`](https://github.com/tauri-apps/plugins-workspace/commit/6b4c3917389f4bc489d03b48a837557ac0584175) ([#2401](https://github.com/tauri-apps/plugins-workspace/pull/2401) by [@Seishiin](https://github.com/tauri-apps/plugins-workspace/../../Seishiin)) Fix timezone_strategy overwriting previously set LogLevels.
+
+## \[2.2.1]
+
+- [`784a54a3`](https://github.com/tauri-apps/plugins-workspace/commit/784a54a39094dfbaaa8dd123eb083c04dc6c3bb2) ([#2344](https://github.com/tauri-apps/plugins-workspace/pull/2344) by [@madsmtm](https://github.com/tauri-apps/plugins-workspace/../../madsmtm)) Use `objc2` instead of `objc`.
+
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
+## \[2.0.2]
+
+- [`69d508ee`](https://github.com/tauri-apps/plugins-workspace/commit/69d508ee6910ae4064f2398fbacb803b3944d6a8) ([#2157](https://github.com/tauri-apps/plugins-workspace/pull/2157) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Make log functions omit caller location when failed to parse it instead of throwing
+
## \[2.0.1]
- [`371a2f73`](https://github.com/tauri-apps/plugins-workspace/commit/371a2f7361e0b91cf66f1287ffb18b34414a6cb8) ([#2021](https://github.com/tauri-apps/plugins-workspace/pull/2021) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Make webview log target more consistent that it always starts with `webview`
@@ -104,15 +134,3 @@
## \[2.0.0-alpha.0]
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- te to alpha.11.
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- v2 alpha release!
- https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- ase!
- https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
diff --git a/plugins/log/Cargo.toml b/plugins/log/Cargo.toml
index 89416ff1..a3b8b290 100644
--- a/plugins/log/Cargo.toml
+++ b/plugins/log/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-log"
-version = "2.0.3"
+version = "2.3.1"
description = "Configurable logging for your Tauri app."
authors = { workspace = true }
license = { workspace = true }
@@ -17,8 +17,8 @@ rustdoc-args = ["--cfg", "docsrs"]
windows = { level = "full", notes = "" }
linux = { level = "full", notes = "" }
macos = { level = "full", notes = "" }
-android = { level = "unknown", notes = "" }
-ios = { level = "unknown", notes = "" }
+android = { level = "full", notes = "" }
+ios = { level = "full", notes = "" }
[build-dependencies]
tauri-plugin = { workspace = true, features = ["build"] }
@@ -35,12 +35,15 @@ time = { version = "0.3", features = ["formatting", "local-offset"] }
fern = "0.7"
[target."cfg(target_os = \"android\")".dependencies]
-android_logger = "0.14"
+android_logger = "0.15"
[target."cfg(target_os = \"ios\")".dependencies]
swift-rs = "1"
-objc = "0.2"
-cocoa = "0.26"
+objc2 = "0.6"
+objc2-foundation = { version = "0.3", default-features = false, features = [
+ "std",
+ "NSString",
+] }
[features]
colored = ["fern/colored"]
diff --git a/plugins/log/README.md b/plugins/log/README.md
index 09369173..462bdab9 100644
--- a/plugins/log/README.md
+++ b/plugins/log/README.md
@@ -54,7 +54,23 @@ yarn add https://github.com/tauri-apps/tauri-plugin-log#v2
## Usage
-First you need to register the core plugin with Tauri:
+First, you should enable the `log:default` capability:
+
+```json
+{
+ "$schema": "../gen/schemas/desktop-schema.json",
+ "identifier": "default",
+ "description": "Capability for the main window",
+ "windows": ["main"],
+ "permissions": [
+ "core:default",
+ "opener:default",
+ "log:default" # add this!
+ ]
+}
+```
+
+Then, you need to register the core plugin with Tauri:
`src-tauri/src/lib.rs`
diff --git a/plugins/log/package.json b/plugins/log/package.json
index d2cecb03..290ab097 100644
--- a/plugins/log/package.json
+++ b/plugins/log/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-log",
- "version": "2.0.1",
+ "version": "2.3.1",
"description": "Configurable logging for your Tauri app.",
"license": "MIT OR Apache-2.0",
"authors": [
diff --git a/plugins/log/src/lib.rs b/plugins/log/src/lib.rs
index 6b07c9d2..9bf784c7 100644
--- a/plugins/log/src/lib.rs
+++ b/plugins/log/src/lib.rs
@@ -35,31 +35,6 @@ pub const WEBVIEW_TARGET: &str = "webview";
#[cfg(target_os = "ios")]
mod ios {
- use cocoa::base::id;
- use objc::*;
-
- const UTF8_ENCODING: usize = 4;
- pub struct NSString(pub id);
-
- impl NSString {
- pub fn new(s: &str) -> Self {
- // Safety: objc runtime calls are unsafe
- NSString(unsafe {
- let ns_string: id = msg_send![class!(NSString), alloc];
- let ns_string: id = msg_send![ns_string,
- initWithBytes:s.as_ptr()
- length:s.len()
- encoding:UTF8_ENCODING];
-
- // The thing is allocated in rust, the thing must be set to autorelease in rust to relinquish control
- // or it can not be released correctly in OC runtime
- let _: () = msg_send![ns_string, autorelease];
-
- ns_string
- })
- }
- }
-
swift_rs::swift!(pub fn tauri_log(
level: u8, message: *const std::ffi::c_void
));
@@ -83,6 +58,8 @@ pub enum Error {
TimeFormat(#[from] time::error::Format),
#[error(transparent)]
InvalidFormatDescription(#[from] time::error::InvalidFormatDescription),
+ #[error("Internal logger disabled and cannot be acquired or attached")]
+ LoggerNotInitialized,
}
/// An enum representing the available verbosity levels of the logger.
@@ -182,11 +159,12 @@ pub enum TargetKind {
///
/// ### Platform-specific
///
- /// |Platform | Value | Example |
- /// | ------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------- |
- /// | Linux | `$XDG_DATA_HOME/{bundleIdentifier}/logs` or `$HOME/.local/share/{bundleIdentifier}/logs` | `/home/alice/.local/share/com.tauri.dev/logs` |
- /// | macOS | `{homeDir}/Library/Logs/{bundleIdentifier}` | `/Users/Alice/Library/Logs/com.tauri.dev` |
- /// | Windows | `{FOLDERID_LocalAppData}/{bundleIdentifier}/logs` | `C:\Users\Alice\AppData\Local\com.tauri.dev\logs` |
+ /// |Platform | Value | Example |
+ /// | --------- | ----------------------------------------------------------------------------------------- | ----------------------------------------------------------- |
+ /// | Linux | `$XDG_DATA_HOME/{bundleIdentifier}/logs` or `$HOME/.local/share/{bundleIdentifier}/logs` | `/home/alice/.local/share/com.tauri.dev/logs` |
+ /// | macOS/iOS | `{homeDir}/Library/Logs/{bundleIdentifier}` | `/Users/Alice/Library/Logs/com.tauri.dev` |
+ /// | Windows | `{FOLDERID_LocalAppData}/{bundleIdentifier}/logs` | `C:\Users\Alice\AppData\Local\com.tauri.dev\logs` |
+ /// | Android | `{ConfigDir}/logs` | `/data/data/com.tauri.dev/files/logs` |
LogDir { file_name: Option },
/// Forward logs to the webview (via the `log://log` event).
///
@@ -255,6 +233,7 @@ pub struct Builder {
timezone_strategy: TimezoneStrategy,
max_file_size: u128,
targets: Vec,
+ is_skip_logger: bool,
}
impl Default for Builder {
@@ -283,6 +262,7 @@ impl Default for Builder {
timezone_strategy: DEFAULT_TIMEZONE_STRATEGY,
max_file_size: DEFAULT_MAX_FILE_SIZE,
targets: DEFAULT_LOG_TARGETS.into(),
+ is_skip_logger: false,
}
}
}
@@ -303,7 +283,7 @@ impl Builder {
let format =
time::format_description::parse("[[[year]-[month]-[day]][[[hour]:[minute]:[second]]")
.unwrap();
- self.dispatch = fern::Dispatch::new().format(move |out, message, record| {
+ self.dispatch = self.dispatch.format(move |out, message, record| {
out.finish(format_args!(
"{}[{}][{}] {}",
timezone_strategy.get_now().format(&format).unwrap(),
@@ -364,6 +344,22 @@ impl Builder {
self
}
+ /// Skip the creation and global registration of a logger
+ ///
+ /// If you wish to use your own global logger, you must call `skip_logger` so that the plugin does not attempt to set a second global logger. In this configuration, no logger will be created and the plugin's `log` command will rely on the result of `log::logger()`. You will be responsible for configuring the logger yourself and any included targets will be ignored. This can also be used with `tracing-log` or if running tests in parallel that require the plugin to be registered.
+ /// ```rust
+ /// static LOGGER: SimpleLogger = SimpleLogger;
+ ///
+ /// log::set_logger(&SimpleLogger)?;
+ /// log::set_max_level(LevelFilter::Info);
+ /// tauri_plugin_log::Builder::new()
+ /// .skip_logger();
+ /// ```
+ pub fn skip_logger(mut self) -> Self {
+ self.is_skip_logger = true;
+ self
+ }
+
/// Adds a collection of targets to the logger.
///
/// ```rust
@@ -429,7 +425,12 @@ impl Builder {
log::Level::Info => 2,
log::Level::Warn | log::Level::Error => 3,
},
- ios::NSString::new(message.as_str()).0 as _,
+ // The string is allocated in rust, so we must
+ // autorelease it rust to give it to the Swift
+ // runtime.
+ objc2::rc::Retained::autorelease_ptr(
+ objc2_foundation::NSString::from_str(message.as_str()),
+ ) as _,
);
}
}),
@@ -451,9 +452,6 @@ impl Builder {
)?)?
.into()
}
- #[cfg(mobile)]
- TargetKind::LogDir { .. } => continue,
- #[cfg(desktop)]
TargetKind::LogDir { file_name } => {
let path = app_handle.path().app_log_dir()?;
if !path.exists() {
@@ -501,6 +499,9 @@ impl Builder {
self,
app_handle: &AppHandle,
) -> Result<(TauriPlugin, log::LevelFilter, Box), Error> {
+ if self.is_skip_logger {
+ return Err(Error::LoggerNotInitialized);
+ }
let plugin = Self::plugin_builder();
let (max_level, log) = Self::acquire_logger(
app_handle,
@@ -517,17 +518,17 @@ impl Builder {
pub fn build(self) -> TauriPlugin {
Self::plugin_builder()
.setup(move |app_handle, _api| {
- let (max_level, log) = Self::acquire_logger(
- app_handle,
- self.dispatch,
- self.rotation_strategy,
- self.timezone_strategy,
- self.max_file_size,
- self.targets,
- )?;
-
- attach_logger(max_level, log)?;
-
+ if !self.is_skip_logger {
+ let (max_level, log) = Self::acquire_logger(
+ app_handle,
+ self.dispatch,
+ self.rotation_strategy,
+ self.timezone_strategy,
+ self.max_file_size,
+ self.targets,
+ )?;
+ attach_logger(max_level, log)?;
+ }
Ok(())
})
.build()
diff --git a/plugins/nfc/CHANGELOG.md b/plugins/nfc/CHANGELOG.md
index 7960011f..132ae5cc 100644
--- a/plugins/nfc/CHANGELOG.md
+++ b/plugins/nfc/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.0.1]
- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
diff --git a/plugins/nfc/Cargo.toml b/plugins/nfc/Cargo.toml
index 5cf4f6c4..56cc218b 100644
--- a/plugins/nfc/Cargo.toml
+++ b/plugins/nfc/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-nfc"
-version = "2.0.1"
+version = "2.2.0"
description = "Read and write NFC tags on Android and iOS."
edition = { workspace = true }
authors = { workspace = true }
diff --git a/plugins/nfc/guest-js/index.ts b/plugins/nfc/guest-js/index.ts
index 96f7a72d..051a1841 100644
--- a/plugins/nfc/guest-js/index.ts
+++ b/plugins/nfc/guest-js/index.ts
@@ -181,8 +181,8 @@ function encodeURI(uri: string): number[] {
protocols.slice(1).forEach(function (protocol) {
if (
- (prefix.length === 0 || prefix === 'urn:') &&
- uri.indexOf(protocol) === 0
+ (prefix.length === 0 || prefix === 'urn:')
+ && uri.indexOf(protocol) === 0
) {
prefix = protocol
}
diff --git a/plugins/nfc/package.json b/plugins/nfc/package.json
index e9c9ec8b..c4852e51 100644
--- a/plugins/nfc/package.json
+++ b/plugins/nfc/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-nfc",
- "version": "2.0.0",
+ "version": "2.2.0",
"license": "MIT OR Apache-2.0",
"authors": [
"Tauri Programme within The Commons Conservancy"
diff --git a/plugins/notification/CHANGELOG.md b/plugins/notification/CHANGELOG.md
index e8dc3380..42efb6ab 100644
--- a/plugins/notification/CHANGELOG.md
+++ b/plugins/notification/CHANGELOG.md
@@ -1,5 +1,17 @@
# Changelog
+## \[2.2.2]
+
+- [`a1b3fa27`](https://github.com/tauri-apps/plugins-workspace/commit/a1b3fa27f11022c9b6622b4fab12d93239eb05de) ([#2515](https://github.com/tauri-apps/plugins-workspace/pull/2515) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Re-exported the `Geolocation`, `Haptics`, `Notification`, and `Os` structs so that they show up on docs.rs.
+
+## \[2.2.1]
+
+- [`da5c59e2`](https://github.com/tauri-apps/plugins-workspace/commit/da5c59e2fe879d177e3cfd52fcacce85440423cb) ([#2271](https://github.com/tauri-apps/plugins-workspace/pull/2271) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated `zbus` dependency to version 5. No API changes.
+
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.0.1]
- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
@@ -124,25 +136,3 @@
## \[2.0.0-alpha.0]
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- ub.com/tauri-apps/plugins-workspace/pull/555)) Update to alpha.11.
-
-## \[2.0.0-alpha.1]
-
-- [`d8b4aca`](https://github.com/tauri-apps/plugins-workspace/commit/d8b4aca69f628b170804ecb982e2c319d026ef47)([#414](https://github.com/tauri-apps/plugins-workspace/pull/414)) Use `window.__TAURI_INVOKE__` instead of `window.__TAURI__` in init.js, fixes usage in apps without `withGlobalTauri` enabled.
-- [`7d71ad4`](https://github.com/tauri-apps/plugins-workspace/commit/7d71ad4e587bcf47ea34645f5b226945e487b765) Play a default sound when showing a notification on Windows.
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- ithub.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- ithub.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- !
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- /commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- !
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
diff --git a/plugins/notification/Cargo.toml b/plugins/notification/Cargo.toml
index a4a5a2d2..bca17c09 100644
--- a/plugins/notification/Cargo.toml
+++ b/plugins/notification/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-notification"
-version = "2.0.1"
+version = "2.2.2"
description = "Send desktop and mobile notifications on your Tauri application."
edition = { workspace = true }
authors = { workspace = true }
@@ -46,7 +46,7 @@ windows-version = { version = "0.1", optional = true }
notify-rust = "4.11"
[dev-dependencies]
-color-backtrace = "0.6"
+color-backtrace = "0.7"
ctor = "0.2"
maplit = "1"
diff --git a/plugins/notification/api-iife.js b/plugins/notification/api-iife.js
index 0d33ccac..1e5ead85 100644
--- a/plugins/notification/api-iife.js
+++ b/plugins/notification/api-iife.js
@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_NOTIFICATION__=function(i){"use strict";function t(i,t,n,e){if("a"===n&&!e)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof t?i!==t||!e:!t.has(i))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===n?e:"a"===n?e.call(i):e?e.value:t.get(i)}function n(i,t,n,e,o){if("function"==typeof t?i!==t||!o:!t.has(i))throw new TypeError("Cannot write private member to an object whose class did not declare it");return t.set(i,n),n}var e,o,a;"function"==typeof SuppressedError&&SuppressedError;const r="__TAURI_TO_IPC_KEY__";class c{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,e.set(this,(()=>{})),o.set(this,0),a.set(this,{}),this.id=function(i,t=!1){return window.__TAURI_INTERNALS__.transformCallback(i,t)}((({message:i,id:r})=>{if(r===t(this,o,"f")){n(this,o,r+1),t(this,e,"f").call(this,i);const c=Object.keys(t(this,a,"f"));if(c.length>0){let i=r+1;for(const n of c.sort()){if(parseInt(n)!==i)break;{const o=t(this,a,"f")[n];delete t(this,a,"f")[n],t(this,e,"f").call(this,o),i+=1}}n(this,o,i)}}else t(this,a,"f")[r.toString()]=i}))}set onmessage(i){n(this,e,i)}get onmessage(){return t(this,e,"f")}[(e=new WeakMap,o=new WeakMap,a=new WeakMap,r)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[r]()}}class s{constructor(i,t,n){this.plugin=i,this.event=t,this.channelId=n}async unregister(){return u(`plugin:${this.plugin}|remove_listener`,{event:this.event,channelId:this.channelId})}}async function l(i,t,n){const e=new c;return e.onmessage=n,u(`plugin:${i}|registerListener`,{event:t,handler:e}).then((()=>new s(i,t,e.id)))}async function u(i,t={},n){return window.__TAURI_INTERNALS__.invoke(i,t,n)}var f,d,w;i.ScheduleEvery=void 0,(f=i.ScheduleEvery||(i.ScheduleEvery={})).Year="year",f.Month="month",f.TwoWeeks="twoWeeks",f.Week="week",f.Day="day",f.Hour="hour",f.Minute="minute",f.Second="second";return i.Importance=void 0,(d=i.Importance||(i.Importance={}))[d.None=0]="None",d[d.Min=1]="Min",d[d.Low=2]="Low",d[d.Default=3]="Default",d[d.High=4]="High",i.Visibility=void 0,(w=i.Visibility||(i.Visibility={}))[w.Secret=-1]="Secret",w[w.Private=0]="Private",w[w.Public=1]="Public",i.Schedule=class{static at(i,t=!1,n=!1){return{at:{date:i,repeating:t,allowWhileIdle:n},interval:void 0,every:void 0}}static interval(i,t=!1){return{at:void 0,interval:{interval:i,allowWhileIdle:t},every:void 0}}static every(i,t,n=!1){return{at:void 0,interval:void 0,every:{interval:i,count:t,allowWhileIdle:n}}}},i.active=async function(){return await u("plugin:notification|get_active")},i.cancel=async function(i){await u("plugin:notification|cancel",{notifications:i})},i.cancelAll=async function(){await u("plugin:notification|cancel")},i.channels=async function(){return await u("plugin:notification|listChannels")},i.createChannel=async function(i){await u("plugin:notification|create_channel",{...i})},i.isPermissionGranted=async function(){return"default"!==window.Notification.permission?await Promise.resolve("granted"===window.Notification.permission):await u("plugin:notification|is_permission_granted")},i.onAction=async function(i){return await l("notification","actionPerformed",i)},i.onNotificationReceived=async function(i){return await l("notification","notification",i)},i.pending=async function(){return await u("plugin:notification|get_pending")},i.registerActionTypes=async function(i){await u("plugin:notification|register_action_types",{types:i})},i.removeActive=async function(i){await u("plugin:notification|remove_active",{notifications:i})},i.removeAllActive=async function(){await u("plugin:notification|remove_active")},i.removeChannel=async function(i){await u("plugin:notification|delete_channel",{id:i})},i.requestPermission=async function(){return await window.Notification.requestPermission()},i.sendNotification=function(i){"string"==typeof i?new window.Notification(i):new window.Notification(i.title,i)},i}({});Object.defineProperty(window.__TAURI__,"notification",{value:__TAURI_PLUGIN_NOTIFICATION__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_NOTIFICATION__=function(i){"use strict";function n(i,n,t,e){if("function"==typeof n||!n.has(i))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===t?e:"a"===t?e.call(i):e?e.value:n.get(i)}function t(i,n,t,e,o){if("function"==typeof n||!n.has(i))throw new TypeError("Cannot write private member to an object whose class did not declare it");return n.set(i,t),t}var e,o,a;"function"==typeof SuppressedError&&SuppressedError;const r="__TAURI_TO_IPC_KEY__";class c{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,e.set(this,(()=>{})),o.set(this,0),a.set(this,[]),this.id=function(i,n=!1){return window.__TAURI_INTERNALS__.transformCallback(i,n)}((({message:i,id:r})=>{if(r==n(this,o,"f"))for(n(this,e,"f").call(this,i),t(this,o,n(this,o,"f")+1);n(this,o,"f")in n(this,a,"f");){const i=n(this,a,"f")[n(this,o,"f")];n(this,e,"f").call(this,i),delete n(this,a,"f")[n(this,o,"f")],t(this,o,n(this,o,"f")+1)}else n(this,a,"f")[r]=i}))}set onmessage(i){t(this,e,i)}get onmessage(){return n(this,e,"f")}[(e=new WeakMap,o=new WeakMap,a=new WeakMap,r)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[r]()}}class s{constructor(i,n,t){this.plugin=i,this.event=n,this.channelId=t}async unregister(){return u(`plugin:${this.plugin}|remove_listener`,{event:this.event,channelId:this.channelId})}}async function l(i,n,t){const e=new c;return e.onmessage=t,u(`plugin:${i}|registerListener`,{event:n,handler:e}).then((()=>new s(i,n,e.id)))}async function u(i,n={},t){return window.__TAURI_INTERNALS__.invoke(i,n,t)}var f,h,d;i.ScheduleEvery=void 0,(f=i.ScheduleEvery||(i.ScheduleEvery={})).Year="year",f.Month="month",f.TwoWeeks="twoWeeks",f.Week="week",f.Day="day",f.Hour="hour",f.Minute="minute",f.Second="second";return i.Importance=void 0,(h=i.Importance||(i.Importance={}))[h.None=0]="None",h[h.Min=1]="Min",h[h.Low=2]="Low",h[h.Default=3]="Default",h[h.High=4]="High",i.Visibility=void 0,(d=i.Visibility||(i.Visibility={}))[d.Secret=-1]="Secret",d[d.Private=0]="Private",d[d.Public=1]="Public",i.Schedule=class{static at(i,n=!1,t=!1){return{at:{date:i,repeating:n,allowWhileIdle:t},interval:void 0,every:void 0}}static interval(i,n=!1){return{at:void 0,interval:{interval:i,allowWhileIdle:n},every:void 0}}static every(i,n,t=!1){return{at:void 0,interval:void 0,every:{interval:i,count:n,allowWhileIdle:t}}}},i.active=async function(){return await u("plugin:notification|get_active")},i.cancel=async function(i){await u("plugin:notification|cancel",{notifications:i})},i.cancelAll=async function(){await u("plugin:notification|cancel")},i.channels=async function(){return await u("plugin:notification|listChannels")},i.createChannel=async function(i){await u("plugin:notification|create_channel",{...i})},i.isPermissionGranted=async function(){return"default"!==window.Notification.permission?await Promise.resolve("granted"===window.Notification.permission):await u("plugin:notification|is_permission_granted")},i.onAction=async function(i){return await l("notification","actionPerformed",i)},i.onNotificationReceived=async function(i){return await l("notification","notification",i)},i.pending=async function(){return await u("plugin:notification|get_pending")},i.registerActionTypes=async function(i){await u("plugin:notification|register_action_types",{types:i})},i.removeActive=async function(i){await u("plugin:notification|remove_active",{notifications:i})},i.removeAllActive=async function(){await u("plugin:notification|remove_active")},i.removeChannel=async function(i){await u("plugin:notification|delete_channel",{id:i})},i.requestPermission=async function(){return await window.Notification.requestPermission()},i.sendNotification=function(i){"string"==typeof i?new window.Notification(i):new window.Notification(i.title,i)},i}({});Object.defineProperty(window.__TAURI__,"notification",{value:__TAURI_PLUGIN_NOTIFICATION__})}
diff --git a/plugins/notification/package.json b/plugins/notification/package.json
index 37bb5f97..07c04d5c 100644
--- a/plugins/notification/package.json
+++ b/plugins/notification/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-notification",
- "version": "2.0.0",
+ "version": "2.2.2",
"license": "MIT OR Apache-2.0",
"authors": [
"Tauri Programme within The Commons Conservancy"
diff --git a/plugins/notification/src/desktop.rs b/plugins/notification/src/desktop.rs
index 092b8892..47279225 100644
--- a/plugins/notification/src/desktop.rs
+++ b/plugins/notification/src/desktop.rs
@@ -18,6 +18,8 @@ pub fn init(
}
/// Access to the notification APIs.
+///
+/// You can get an instance of this type via [`NotificationExt`](crate::NotificationExt)
pub struct Notification(AppHandle);
impl crate::NotificationBuilder {
diff --git a/plugins/notification/src/lib.rs b/plugins/notification/src/lib.rs
index 5cc30319..9ca33d63 100644
--- a/plugins/notification/src/lib.rs
+++ b/plugins/notification/src/lib.rs
@@ -34,9 +34,9 @@ mod models;
pub use error::{Error, Result};
#[cfg(desktop)]
-use desktop::Notification;
+pub use desktop::Notification;
#[cfg(mobile)]
-use mobile::Notification;
+pub use mobile::Notification;
/// The notification builder.
#[derive(Debug)]
@@ -120,7 +120,7 @@ impl NotificationBuilder {
/// Identifier used to group multiple notifications.
///
- /// https://developer.apple.com/documentation/usernotifications/unmutablenotificationcontent/1649872-threadidentifier
+ ///
pub fn group(mut self, group: impl Into) -> Self {
self.data.group.replace(group.into());
self
diff --git a/plugins/notification/src/mobile.rs b/plugins/notification/src/mobile.rs
index 9167dcc1..edfef728 100644
--- a/plugins/notification/src/mobile.rs
+++ b/plugins/notification/src/mobile.rs
@@ -40,6 +40,8 @@ impl crate::NotificationBuilder {
}
/// Access to the notification APIs.
+///
+/// You can get an instance of this type via [`NotificationExt`](crate::NotificationExt)
pub struct Notification(PluginHandle);
impl Notification {
diff --git a/plugins/opener/CHANGELOG.md b/plugins/opener/CHANGELOG.md
index ab348e4f..67fa0a65 100644
--- a/plugins/opener/CHANGELOG.md
+++ b/plugins/opener/CHANGELOG.md
@@ -1,5 +1,34 @@
# Changelog
+## \[2.2.6]
+
+- [`1a984659`](https://github.com/tauri-apps/plugins-workspace/commit/1a9846599b6a71faf330845847a30f6bf9735898) ([#2469](https://github.com/tauri-apps/plugins-workspace/pull/2469) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Update `objc2` crate to 0.6. No user facing changes.
+- [`71f95c9f`](https://github.com/tauri-apps/plugins-workspace/commit/71f95c9f05b29cf1be586849614c0b007757c15d) ([#2445](https://github.com/tauri-apps/plugins-workspace/pull/2445) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated `windows` crate to 0.60 to match Tauri 2.3.0. No user facing changes.
+
+## \[2.2.5]
+
+- [`5b821181`](https://github.com/tauri-apps/plugins-workspace/commit/5b8211815825ddae2dcc0c00520e0cfdff002763) ([#2332](https://github.com/tauri-apps/plugins-workspace/pull/2332) by [@betamos](https://github.com/tauri-apps/plugins-workspace/../../betamos)) Fix broken JS commands `opener.openPath` and `opener.openUrl` on mobile.
+
+## \[2.2.4]
+
+- [`da5c59e2`](https://github.com/tauri-apps/plugins-workspace/commit/da5c59e2fe879d177e3cfd52fcacce85440423cb) ([#2271](https://github.com/tauri-apps/plugins-workspace/pull/2271) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated `zbus` dependency to version 5. No API changes.
+
+## \[2.2.3]
+
+- [`a9ac1e3c`](https://github.com/tauri-apps/plugins-workspace/commit/a9ac1e3c939cec4338a9422ef02323c1d4dde6cd) ([#2253](https://github.com/tauri-apps/plugins-workspace/pull/2253) by [@betamos](https://github.com/tauri-apps/plugins-workspace/../../betamos)) Return an error in `open_path` if the file does not exist when opening with default application.
+
+## \[2.2.2]
+
+- [`ee0f65de`](https://github.com/tauri-apps/plugins-workspace/commit/ee0f65de5c645c244c5f0b638e0e0aab687cb9bf) ([#2207](https://github.com/tauri-apps/plugins-workspace/pull/2207) by [@universalappfactory](https://github.com/tauri-apps/plugins-workspace/../../universalappfactory)) Fixed OpenerPlugin packagename for android
+
+## \[2.2.1]
+
+- [`18dffc9d`](https://github.com/tauri-apps/plugins-workspace/commit/18dffc9dfecaf0c900e233e041d9ca36c92834b5) ([#2189](https://github.com/tauri-apps/plugins-workspace/pull/2189) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Fix usage on iOS.
+
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.0.0]
- [`383e636a`](https://github.com/tauri-apps/plugins-workspace/commit/383e636a8e595aec1300999a8aeb7d9bf8c14632) ([#2019](https://github.com/tauri-apps/plugins-workspace/pull/2019) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) Initial Release
diff --git a/plugins/opener/Cargo.toml b/plugins/opener/Cargo.toml
index ab690df6..a8a847d1 100644
--- a/plugins/opener/Cargo.toml
+++ b/plugins/opener/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-opener"
-version = "2.0.0"
+version = "2.2.6"
description = "Open files and URLs using their default application."
edition = { workspace = true }
authors = { workspace = true }
@@ -15,7 +15,7 @@ rustdoc-args = ["--cfg", "docsrs"]
# Platforms supported by the plugin
# Support levels are "full", "partial", "none", "unknown"
# Details of the support level are left to plugin maintainer
-[package.metadata.platforms]
+[package.metadata.platforms.support]
windows = { level = "full", notes = "" }
linux = { level = "full", notes = "" }
macos = { level = "full", notes = "" }
@@ -40,7 +40,7 @@ glob = { workspace = true }
dunce = { workspace = true }
[target."cfg(windows)".dependencies.windows]
-version = "0.58"
+version = "0.60"
features = [
"Win32_Foundation",
"Win32_UI_Shell_Common",
@@ -54,12 +54,14 @@ zbus = { workspace = true }
url = { workspace = true }
[target."cfg(target_os = \"macos\")".dependencies.objc2-app-kit]
-version = "0.2"
-features = ["NSWorkspace"]
+version = "0.3"
+default-features = false
+features = ["std", "NSWorkspace"]
[target."cfg(target_os = \"macos\")".dependencies.objc2-foundation]
-version = "0.2"
-features = ["NSURL", "NSArray", "NSString"]
+version = "0.3"
+default-features = false
+features = ["std", "NSURL", "NSArray", "NSString"]
[target.'cfg(target_os = "ios")'.dependencies]
tauri = { workspace = true, features = ["wry"] }
diff --git a/plugins/opener/README.md b/plugins/opener/README.md
index 82d0fea1..71509eaa 100644
--- a/plugins/opener/README.md
+++ b/plugins/opener/README.md
@@ -70,7 +70,52 @@ fn main() {
Afterwards all the plugin's APIs are available through the JavaScript guest bindings:
```javascript
+import { openUrl, openPath, revealItemInDir } from '@tauri-apps/plugin-opener'
+// Opens the URL in the default browser
+await openUrl('https://example.com')
+// Or with a specific browser/app
+await openUrl('https://example.com', 'firefox')
+
+// Opens the path with the system's default app
+await openPath('/path/to/file')
+// Or with a specific app
+await openPath('/path/to/file', 'firefox')
+
+// Reveal a path with the system's default explorer
+await revealItemInDir('/path/to/file')
+```
+
+### Usage from Rust
+
+You can also use those APIs from Rust:
+
+```rust
+use tauri_plugin_opener::OpenerExt;
+
+fn main() {
+ tauri::Builder::default()
+ .plugin(tauri_plugin_opener::init())
+ .setup(|app| {
+ let opener = app.opener();
+
+ // Opens the URL in the default browser
+ opener.open_url("https://example.com", None::<&str>)?;
+ // Or with a specific browser/app
+ opener.open_url("https://example.com", Some("firefox"))?;
+
+ // Opens the path with the system's default app
+ opener.open_path("/path/to/file", None::<&str>)?;
+ // Or with a specific app
+ opener.open_path("/path/to/file", Some("firefox"))?;
+
+ // Reveal a path with the system's default explorer
+ opener.reveal_item_in_dir("/path/to/file")?;
+ Ok(())
+ })
+ .run(tauri::generate_context!())
+ .expect("error while running tauri application");
+}
```
## Contributing
diff --git a/plugins/opener/android/src/main/java/OpenerPlugin.kt b/plugins/opener/android/src/main/java/OpenerPlugin.kt
index 0beeb977..16b76032 100644
--- a/plugins/opener/android/src/main/java/OpenerPlugin.kt
+++ b/plugins/opener/android/src/main/java/OpenerPlugin.kt
@@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT
-package app.tauri.shell
+package app.tauri.opener
import android.app.Activity
import android.content.Intent
@@ -27,4 +27,4 @@ class OpenerPlugin(private val activity: Activity) : Plugin(activity) {
invoke.reject(ex.message)
}
}
-}
\ No newline at end of file
+}
diff --git a/plugins/opener/guest-js/index.ts b/plugins/opener/guest-js/index.ts
index 0d92596b..ade956a6 100644
--- a/plugins/opener/guest-js/index.ts
+++ b/plugins/opener/guest-js/index.ts
@@ -71,7 +71,7 @@ export async function openPath(path: string, openWith?: string): Promise {
}
/**
- * Reveal a path the system's default explorer.
+ * Reveal a path with the system's default explorer.
*
* #### Platform-specific:
*
diff --git a/plugins/opener/guest-js/init.ts b/plugins/opener/guest-js/init.ts
index 046db99c..6f81141a 100644
--- a/plugins/opener/guest-js/init.ts
+++ b/plugins/opener/guest-js/init.ts
@@ -9,13 +9,13 @@ window.addEventListener('click', function (evt) {
// return early if
if (
// event was prevented
- evt.defaultPrevented ||
+ evt.defaultPrevented
// or not a left click
- evt.button !== 0 ||
+ || evt.button !== 0
// or meta key pressed
- evt.metaKey ||
+ || evt.metaKey
// or al key pressed
- evt.altKey
+ || evt.altKey
)
return
@@ -28,16 +28,16 @@ window.addEventListener('click', function (evt) {
// return early if
if (
// not tirggered from element
- !a ||
+ !a
// or doesn't have a href
- !a.href ||
+ || !a.href
// or not supposed to be open in a new tab
- !(
- a.target === '_blank' ||
+ || !(
+ a.target === '_blank'
// or ctrl key pressed
- evt.ctrlKey ||
+ || evt.ctrlKey
// or shift key pressed
- evt.shiftKey
+ || evt.shiftKey
)
)
return
@@ -47,9 +47,9 @@ window.addEventListener('click', function (evt) {
// return early if
if (
// same origin (internal navigation)
- url.origin === window.location.origin ||
+ url.origin === window.location.origin
// not default protocols
- ['http:', 'https:', 'mailto:', 'tel:'].every((p) => url.protocol !== p)
+ || ['http:', 'https:', 'mailto:', 'tel:'].every((p) => url.protocol !== p)
)
return
diff --git a/plugins/opener/ios/Sources/OpenerPlugin.swift b/plugins/opener/ios/Sources/OpenerPlugin.swift
index 39bc5725..81ff76b4 100644
--- a/plugins/opener/ios/Sources/OpenerPlugin.swift
+++ b/plugins/opener/ios/Sources/OpenerPlugin.swift
@@ -3,32 +3,30 @@
// SPDX-License-Identifier: MIT
import Foundation
-
import SwiftRs
import Tauri
import UIKit
import WebKit
class OpenerPlugin: Plugin {
-
- @objc public func open(_ invoke: Invoke) throws {
- do {
- let urlString = try invoke.parseArgs(String.self)
- if let url = URL(string: urlString) {
- if #available(iOS 10, *) {
- UIApplication.shared.open(url, options: [:])
- } else {
- UIApplication.shared.openURL(url)
- }
- }
- invoke.resolve()
- } catch {
- invoke.reject(error.localizedDescription)
+ @objc public func open(_ invoke: Invoke) throws {
+ do {
+ let urlString = try invoke.parseArgs(String.self)
+ if let url = URL(string: urlString) {
+ if #available(iOS 10, *) {
+ UIApplication.shared.open(url, options: [:])
+ } else {
+ UIApplication.shared.openURL(url)
}
+ }
+ invoke.resolve()
+ } catch {
+ invoke.reject(error.localizedDescription)
}
+ }
}
-@_cdecl("init_plugin_shell")
+@_cdecl("init_plugin_opener")
func initPlugin() -> Plugin {
return OpenerPlugin()
}
diff --git a/plugins/opener/package.json b/plugins/opener/package.json
index cacdb03e..9d828d44 100644
--- a/plugins/opener/package.json
+++ b/plugins/opener/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-opener",
- "version": "2.0.0",
+ "version": "2.2.6",
"description": "Open files and URLs using their default application.",
"license": "MIT OR Apache-2.0",
"authors": [
diff --git a/plugins/opener/src/commands.rs b/plugins/opener/src/commands.rs
index 1b46141b..b00d5306 100644
--- a/plugins/opener/src/commands.rs
+++ b/plugins/opener/src/commands.rs
@@ -9,7 +9,7 @@ use tauri::{
AppHandle, Runtime,
};
-use crate::{scope::Scope, Error};
+use crate::{scope::Scope, Error, OpenerExt};
#[tauri::command]
pub async fn open_url(
@@ -34,7 +34,7 @@ pub async fn open_url(
);
if scope.is_url_allowed(&url, with.as_deref()) {
- crate::open_url(url, with)
+ app.opener().open_url(url, with)
} else {
Err(Error::ForbiddenUrl { url, with })
}
@@ -63,7 +63,7 @@ pub async fn open_path(
);
if scope.is_path_allowed(Path::new(&path), with.as_deref())? {
- crate::open_path(path, with)
+ app.opener().open_path(path, with)
} else {
Err(Error::ForbiddenPath { path, with })
}
diff --git a/plugins/opener/src/lib.rs b/plugins/opener/src/lib.rs
index 0b6c6007..9934b0fc 100644
--- a/plugins/opener/src/lib.rs
+++ b/plugins/opener/src/lib.rs
@@ -38,16 +38,42 @@ pub struct Opener {
impl Opener {
/// Open a url with a default or specific program.
///
+ /// # Examples
+ ///
+ /// ```rust,no_run
+ /// use tauri_plugin_opener::OpenerExt;
+ ///
+ /// tauri::Builder::default()
+ /// .setup(|app| {
+ /// // open the given URL on the system default browser
+ /// app.opener().open_url("https://github.com/tauri-apps/tauri", None::<&str>)?;
+ /// Ok(())
+ /// });
+ /// ```
+ ///
/// ## Platform-specific:
///
/// - **Android / iOS**: Always opens using default program.
#[cfg(desktop)]
pub fn open_url(&self, url: impl Into, with: Option>) -> Result<()> {
- crate::open::open(url.into(), with.map(Into::into)).map_err(Into::into)
+ crate::open::open(url.into(), with.map(Into::into))
}
/// Open a url with a default or specific program.
///
+ /// # Examples
+ ///
+ /// ```rust,no_run
+ /// use tauri_plugin_opener::OpenerExt;
+ ///
+ /// tauri::Builder::default()
+ /// .setup(|app| {
+ /// // open the given URL on the system default browser
+ /// app.opener().open_url("https://github.com/tauri-apps/tauri", None::<&str>)?;
+ /// Ok(())
+ /// });
+ /// ```
+ ///
/// ## Platform-specific:
///
/// - **Android / iOS**: Always opens using default program.
@@ -60,6 +86,19 @@ impl Opener {
/// Open a path with a default or specific program.
///
+ /// # Examples
+ ///
+ /// ```rust,no_run
+ /// use tauri_plugin_opener::OpenerExt;
+ ///
+ /// tauri::Builder::default()
+ /// .setup(|app| {
+ /// // open the given path on the system default explorer
+ /// app.opener().open_path("/path/to/file", None::<&str>)?;
+ /// Ok(())
+ /// });
+ /// ```
+ ///
/// ## Platform-specific:
///
/// - **Android / iOS**: Always opens using default program.
@@ -69,11 +108,24 @@ impl Opener {
path: impl Into,
with: Option>,
) -> Result<()> {
- crate::open::open(path.into(), with.map(Into::into)).map_err(Into::into)
+ crate::open::open(path.into(), with.map(Into::into))
}
/// Open a path with a default or specific program.
///
+ /// # Examples
+ ///
+ /// ```rust,no_run
+ /// use tauri_plugin_opener::OpenerExt;
+ ///
+ /// tauri::Builder::default()
+ /// .setup(|app| {
+ /// // open the given path on the system default explorer
+ /// app.opener().open_path("/path/to/file", None::<&str>)?;
+ /// Ok(())
+ /// });
+ /// ```
+ ///
/// ## Platform-specific:
///
/// - **Android / iOS**: Always opens using default program.
@@ -98,7 +150,7 @@ pub trait OpenerExt {
fn opener(&self) -> &Opener;
}
-impl> crate::OpenerExt for T {
+impl> OpenerExt for T {
fn opener(&self) -> &Opener {
self.state::>().inner()
}
diff --git a/plugins/opener/src/open.rs b/plugins/opener/src/open.rs
index bbd836e3..a3d46c50 100644
--- a/plugins/opener/src/open.rs
+++ b/plugins/opener/src/open.rs
@@ -26,7 +26,7 @@ pub(crate) fn open, S: AsRef>(path: P, with: Option) ->
/// tauri::Builder::default()
/// .setup(|app| {
/// // open the given URL on the system default browser
-/// tauri_plugin_opener::open_url("https://github.com/tauri-apps/tauri", None)?;
+/// tauri_plugin_opener::open_url("https://github.com/tauri-apps/tauri", None::<&str>)?;
/// Ok(())
/// });
/// ```
@@ -46,12 +46,16 @@ pub fn open_url, S: AsRef>(url: P, with: Option) -> crate:
/// ```rust,no_run
/// tauri::Builder::default()
/// .setup(|app| {
-/// // open the given URL on the system default browser
-/// tauri_plugin_opener::open_path("/path/to/file", None)?;
+/// // open the given URL on the system default explorer
+/// tauri_plugin_opener::open_path("/path/to/file", None::<&str>)?;
/// Ok(())
/// });
/// ```
pub fn open_path, S: AsRef>(path: P, with: Option) -> crate::Result<()> {
let path = path.as_ref();
+ if with.is_none() {
+ // Returns an IO error if not exists, and besides `exists()` is a shorthand for `metadata()`
+ _ = path.metadata()?;
+ }
open(path, with)
}
diff --git a/plugins/opener/src/reveal_item_in_dir.rs b/plugins/opener/src/reveal_item_in_dir.rs
index 6d7b9268..6e3dfc2c 100644
--- a/plugins/opener/src/reveal_item_in_dir.rs
+++ b/plugins/opener/src/reveal_item_in_dir.rs
@@ -185,7 +185,7 @@ mod imp {
let path = path.to_string_lossy();
let path = NSString::from_str(&path);
let urls = vec![NSURL::fileURLWithPath(&path)];
- let urls = NSArray::from_vec(urls);
+ let urls = NSArray::from_retained_slice(&urls);
let workspace = NSWorkspace::new();
workspace.activateFileViewerSelectingURLs(&urls);
diff --git a/plugins/os/CHANGELOG.md b/plugins/os/CHANGELOG.md
index 42311804..415953e4 100644
--- a/plugins/os/CHANGELOG.md
+++ b/plugins/os/CHANGELOG.md
@@ -1,5 +1,13 @@
# Changelog
+## \[2.2.1]
+
+- [`a1b3fa27`](https://github.com/tauri-apps/plugins-workspace/commit/a1b3fa27f11022c9b6622b4fab12d93239eb05de) ([#2515](https://github.com/tauri-apps/plugins-workspace/pull/2515) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Re-exported the `Geolocation`, `Haptics`, `Notification`, and `Os` structs so that they show up on docs.rs.
+
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.0.1]
- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
@@ -98,11 +106,3 @@
## \[2.0.0-alpha.0]
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- te to alpha.11.
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- ae67\`]\(https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- om/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
diff --git a/plugins/os/Cargo.toml b/plugins/os/Cargo.toml
index 88cd5ceb..424b7581 100644
--- a/plugins/os/Cargo.toml
+++ b/plugins/os/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-os"
-version = "2.0.1"
+version = "2.2.1"
description = "Read information about the operating system."
edition = { workspace = true }
authors = { workspace = true }
@@ -31,5 +31,5 @@ log = { workspace = true }
thiserror = { workspace = true }
os_info = "3"
sys-locale = "0.3"
-gethostname = "0.5"
+gethostname = "1.0"
serialize-to-javascript = "=0.1.1"
diff --git a/plugins/os/package.json b/plugins/os/package.json
index f255299a..840f5352 100644
--- a/plugins/os/package.json
+++ b/plugins/os/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-os",
- "version": "2.0.0",
+ "version": "2.2.1",
"license": "MIT OR Apache-2.0",
"authors": [
"Tauri Programme within The Commons Conservancy"
diff --git a/plugins/os/src/lib.rs b/plugins/os/src/lib.rs
index c041c8ea..50ab89ee 100644
--- a/plugins/os/src/lib.rs
+++ b/plugins/os/src/lib.rs
@@ -88,7 +88,7 @@ pub fn exe_extension() -> &'static str {
std::env::consts::EXE_EXTENSION
}
-/// Returns the current operating system locale with the `BCP-47` language tag. If the locale couldn’t be obtained, `None` is returned instead.
+/// Returns the current operating system locale with the `BCP-47` language tag. If the locale couldn't be obtained, `None` is returned instead.
pub fn locale() -> Option {
sys_locale::get_locale()
}
diff --git a/plugins/persisted-scope/CHANGELOG.md b/plugins/persisted-scope/CHANGELOG.md
index 3a4fa4af..937db6c4 100644
--- a/plugins/persisted-scope/CHANGELOG.md
+++ b/plugins/persisted-scope/CHANGELOG.md
@@ -1,5 +1,19 @@
# Changelog
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
+### Dependencies
+
+- Upgraded to `fs@2.2.0`
+
+## \[2.1.1]
+
+### Dependencies
+
+- Upgraded to `fs@2.1.1`
+
## \[2.1.0]
- [`fecfd553`](https://github.com/tauri-apps/plugins-workspace/commit/fecfd5533a6452f054fbcd909021f12b0dce834f) ([#2070](https://github.com/tauri-apps/plugins-workspace/pull/2070) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) **Breaking Change:** Replaced the custom `tauri_plugin_fs::Scope` struct with `tauri::fs::Scope`.
diff --git a/plugins/persisted-scope/Cargo.toml b/plugins/persisted-scope/Cargo.toml
index 4ae7b61f..38585d38 100644
--- a/plugins/persisted-scope/Cargo.toml
+++ b/plugins/persisted-scope/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-persisted-scope"
-version = "2.1.0"
+version = "2.2.0"
description = "Save filesystem and asset scopes and restore them when the app is reopened."
authors = { workspace = true }
license = { workspace = true }
@@ -27,7 +27,7 @@ log = { workspace = true }
thiserror = { workspace = true }
aho-corasick = "1"
bincode = "1"
-tauri-plugin-fs = { path = "../fs", version = "2.1.0" }
+tauri-plugin-fs = { path = "../fs", version = "2.2.0" }
[features]
protocol-asset = ["tauri/protocol-asset"]
diff --git a/plugins/positioner/CHANGELOG.md b/plugins/positioner/CHANGELOG.md
index 98010f40..3070b168 100644
--- a/plugins/positioner/CHANGELOG.md
+++ b/plugins/positioner/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.1.0]
- [`4db62635`](https://github.com/tauri-apps/plugins-workspace/commit/4db626354c8e29e37bedcf94787a8dd36ce21c55) ([#2076](https://github.com/tauri-apps/plugins-workspace/pull/2076) by [@jakobwesthoff](https://github.com/tauri-apps/plugins-workspace/../../jakobwesthoff)) Add `moveWindowConstrained` function that is similar to `moveWindow` but constrains the window to the screen dimensions in case of tray icon positions.
@@ -157,20 +161,3 @@
## \[0.1.0]
- Update package/crate metadata
- - [119d9c4](https://www.github.com/JonasKruckenberg/tauri-plugin-positioner/commit/119d9c47639e1df16f5520a08f039bdb6f39532b) update metadata on 2021-11-19
- - [39e517c](https://www.github.com/JonasKruckenberg/tauri-plugin-positioner/commit/39e517c145a4a901839ae9b46e296370ce6ababf) Update update-metadata.md on 2021-11-19
- data on 2021-11-19
- - [39e517c](https://www.github.com/JonasKruckenberg/tauri-plugin-positioner/commit/39e517c145a4a901839ae9b46e296370ce6ababf) Update update-metadata.md on 2021-11-19
- nberg/tauri-plugin-positioner/commit/119d9c47639e1df16f5520a08f039bdb6f39532b) update metadata on 2021-11-19
- - [39e517c](https://www.github.com/JonasKruckenberg/tauri-plugin-positioner/commit/39e517c145a4a901839ae9b46e296370ce6ababf) Update update-metadata.md on 2021-11-19
- data on 2021-11-19
- - [39e517c](https://www.github.com/JonasKruckenberg/tauri-plugin-positioner/commit/39e517c145a4a901839ae9b46e296370ce6ababf) Update update-metadata.md on 2021-11-19
- [39e517c](https://www.github.com/JonasKruckenberg/tauri-plugin-positioner/commit/39e517c145a4a901839ae9b46e296370ce6ababf) Update update-metadata.md on 2021-11-19
- data on 2021-11-19
- - [39e517c](https://www.github.com/JonasKruckenberg/tauri-plugin-positioner/commit/39e517c145a4a901839ae9b46e296370ce6ababf) Update update-metadata.md on 2021-11-19
- \-19
- data on 2021-11-19
- - [39e517c](https://www.github.com/JonasKruckenberg/tauri-plugin-positioner/commit/39e517c145a4a901839ae9b46e296370ce6ababf) Update update-metadata.md on 2021-11-19
- m/JonasKruckenberg/tauri-plugin-positioner/commit/39e517c145a4a901839ae9b46e296370ce6ababf) Update update-metadata.md on 2021-11-19
- 01839ae9b46e296370ce6ababf) Update update-metadata.md on 2021-11-19
-adata.md on 2021-11-19
diff --git a/plugins/positioner/Cargo.toml b/plugins/positioner/Cargo.toml
index 08a68f30..3123f44c 100644
--- a/plugins/positioner/Cargo.toml
+++ b/plugins/positioner/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-positioner"
-version = "2.1.0"
+version = "2.2.0"
description = "Position your windows at well-known locations."
authors = { workspace = true }
license = { workspace = true }
diff --git a/plugins/positioner/package.json b/plugins/positioner/package.json
index e4559c9b..fd57b990 100644
--- a/plugins/positioner/package.json
+++ b/plugins/positioner/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-positioner",
- "version": "2.1.0",
+ "version": "2.2.0",
"description": "Position your windows at well-known locations.",
"license": "MIT OR Apache-2.0",
"authors": [
diff --git a/plugins/process/CHANGELOG.md b/plugins/process/CHANGELOG.md
index 8c69c695..7bcdab70 100644
--- a/plugins/process/CHANGELOG.md
+++ b/plugins/process/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.0.1]
- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
@@ -84,11 +88,3 @@
## \[2.0.0-alpha.0]
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- te to alpha.11.
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- ae67\`]\(https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- om/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
diff --git a/plugins/process/Cargo.toml b/plugins/process/Cargo.toml
index 4c679022..4577844f 100644
--- a/plugins/process/Cargo.toml
+++ b/plugins/process/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-process"
-version = "2.0.1"
+version = "2.2.0"
description = "Access the current process of your Tauri application."
edition = { workspace = true }
authors = { workspace = true }
diff --git a/plugins/process/package.json b/plugins/process/package.json
index bac14def..0eda3235 100644
--- a/plugins/process/package.json
+++ b/plugins/process/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-process",
- "version": "2.0.0",
+ "version": "2.2.0",
"license": "MIT OR Apache-2.0",
"authors": [
"Tauri Programme within The Commons Conservancy"
diff --git a/plugins/process/permissions/autogenerated/reference.md b/plugins/process/permissions/autogenerated/reference.md
index 10b6a82b..46137369 100644
--- a/plugins/process/permissions/autogenerated/reference.md
+++ b/plugins/process/permissions/autogenerated/reference.md
@@ -1,7 +1,7 @@
## Default Permission
This permission set configures which
-process feeatures are by default exposed.
+process features are by default exposed.
#### Granted Permissions
diff --git a/plugins/process/permissions/default.toml b/plugins/process/permissions/default.toml
index 619eb9d8..69a9b00d 100644
--- a/plugins/process/permissions/default.toml
+++ b/plugins/process/permissions/default.toml
@@ -3,7 +3,7 @@
[default]
description = """
This permission set configures which
-process feeatures are by default exposed.
+process features are by default exposed.
#### Granted Permissions
diff --git a/plugins/process/permissions/schemas/schema.json b/plugins/process/permissions/schemas/schema.json
index bb885bff..95f67149 100644
--- a/plugins/process/permissions/schemas/schema.json
+++ b/plugins/process/permissions/schemas/schema.json
@@ -315,7 +315,7 @@
"const": "deny-restart"
},
{
- "description": "This permission set configures which\nprocess feeatures are by default exposed.\n\n#### Granted Permissions\n\nThis enables to quit via `allow-exit` and restart via `allow-restart`\nthe application.\n",
+ "description": "This permission set configures which\nprocess features are by default exposed.\n\n#### Granted Permissions\n\nThis enables to quit via `allow-exit` and restart via `allow-restart`\nthe application.\n",
"type": "string",
"const": "default"
}
diff --git a/plugins/shell/CHANGELOG.md b/plugins/shell/CHANGELOG.md
index a1cfc195..cbeec3b4 100644
--- a/plugins/shell/CHANGELOG.md
+++ b/plugins/shell/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.0.1]
- [`51ddf6a7`](https://github.com/tauri-apps/plugins-workspace/commit/51ddf6a71544acfb261ffc9393dab1342da0a219) ([#1881](https://github.com/tauri-apps/plugins-workspace/pull/1881) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) On Windows, Fix `open` JS API hanging and freezing the app.
@@ -112,35 +116,3 @@
## \[2.0.0-alpha.0]
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- d `Command::arg`, `Command::env` and changed `Command::new` input type.
-- [`52ef0ad`](https://github.com/tauri-apps/plugins-workspace/commit/52ef0addd84a1737a4e1a4b07113a30d3d496fa1)([#463](https://github.com/tauri-apps/plugins-workspace/pull/463)) Ensure the launched process is detached so it can out-live your tauri app and does not shutdown with it.
-- [`d74fc0a`](https://github.com/tauri-apps/plugins-workspace/commit/d74fc0a097996e90a37be8f57d50b7d1f6ca616f)([#555](https://github.com/tauri-apps/plugins-workspace/pull/555)) Update to alpha.11.
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- .com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- ins-workspace/pull/555)) Update to alpha.11.
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- .com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- .com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- .com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- rkspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- .com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- .com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- !
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
diff --git a/plugins/shell/Cargo.toml b/plugins/shell/Cargo.toml
index d170cd46..14b98d45 100644
--- a/plugins/shell/Cargo.toml
+++ b/plugins/shell/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-shell"
-version = "2.0.2"
+version = "2.2.0"
description = "Access the system shell. Allows you to spawn child processes and manage files and URLs using their default application."
edition = { workspace = true }
authors = { workspace = true }
diff --git a/plugins/shell/api-iife.js b/plugins/shell/api-iife.js
index ca3cc423..66fb8d04 100644
--- a/plugins/shell/api-iife.js
+++ b/plugins/shell/api-iife.js
@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_SHELL__=function(e){"use strict";function t(e,t,s,n){if("a"===s&&!n)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof t?e!==t||!n:!t.has(e))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===s?n:"a"===s?n.call(e):n?n.value:t.get(e)}function s(e,t,s,n,i){if("function"==typeof t?e!==t||!i:!t.has(e))throw new TypeError("Cannot write private member to an object whose class did not declare it");return t.set(e,s),s}var n,i,r;"function"==typeof SuppressedError&&SuppressedError;const o="__TAURI_TO_IPC_KEY__";class a{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,n.set(this,(()=>{})),i.set(this,0),r.set(this,{}),this.id=function(e,t=!1){return window.__TAURI_INTERNALS__.transformCallback(e,t)}((({message:e,id:o})=>{if(o===t(this,i,"f")){s(this,i,o+1),t(this,n,"f").call(this,e);const a=Object.keys(t(this,r,"f"));if(a.length>0){let e=o+1;for(const s of a.sort()){if(parseInt(s)!==e)break;{const i=t(this,r,"f")[s];delete t(this,r,"f")[s],t(this,n,"f").call(this,i),e+=1}}s(this,i,e)}}else t(this,r,"f")[o.toString()]=e}))}set onmessage(e){s(this,n,e)}get onmessage(){return t(this,n,"f")}[(n=new WeakMap,i=new WeakMap,r=new WeakMap,o)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[o]()}}async function h(e,t={},s){return window.__TAURI_INTERNALS__.invoke(e,t,s)}class c{constructor(){this.eventListeners=Object.create(null)}addListener(e,t){return this.on(e,t)}removeListener(e,t){return this.off(e,t)}on(e,t){return e in this.eventListeners?this.eventListeners[e].push(t):this.eventListeners[e]=[t],this}once(e,t){const s=n=>{this.removeListener(e,s),t(n)};return this.addListener(e,s)}off(e,t){return e in this.eventListeners&&(this.eventListeners[e]=this.eventListeners[e].filter((e=>e!==t))),this}removeAllListeners(e){return e?delete this.eventListeners[e]:this.eventListeners=Object.create(null),this}emit(e,t){if(e in this.eventListeners){const s=this.eventListeners[e];for(const e of s)e(t);return!0}return!1}listenerCount(e){return e in this.eventListeners?this.eventListeners[e].length:0}prependListener(e,t){return e in this.eventListeners?this.eventListeners[e].unshift(t):this.eventListeners[e]=[t],this}prependOnceListener(e,t){const s=n=>{this.removeListener(e,s),t(n)};return this.prependListener(e,s)}}class l{constructor(e){this.pid=e}async write(e){await h("plugin:shell|stdin_write",{pid:this.pid,buffer:e})}async kill(){await h("plugin:shell|kill",{cmd:"killChild",pid:this.pid})}}class u extends c{constructor(e,t=[],s){super(),this.stdout=new c,this.stderr=new c,this.program=e,this.args="string"==typeof t?[t]:t,this.options=s??{}}static create(e,t=[],s){return new u(e,t,s)}static sidecar(e,t=[],s){const n=new u(e,t,s);return n.options.sidecar=!0,n}async spawn(){const e=this.program,t=this.args,s=this.options;"object"==typeof t&&Object.freeze(t);const n=new a;return n.onmessage=e=>{switch(e.event){case"Error":this.emit("error",e.payload);break;case"Terminated":this.emit("close",e.payload);break;case"Stdout":this.stdout.emit("data",e.payload);break;case"Stderr":this.stderr.emit("data",e.payload)}},await h("plugin:shell|spawn",{program:e,args:t,options:s,onEvent:n}).then((e=>new l(e)))}async execute(){const e=this.program,t=this.args,s=this.options;return"object"==typeof t&&Object.freeze(t),await h("plugin:shell|execute",{program:e,args:t,options:s})}}return e.Child=l,e.Command=u,e.EventEmitter=c,e.open=async function(e,t){await h("plugin:shell|open",{path:e,with:t})},e}({});Object.defineProperty(window.__TAURI__,"shell",{value:__TAURI_PLUGIN_SHELL__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_SHELL__=function(e){"use strict";function t(e,t,s,i){if("function"==typeof t||!t.has(e))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===s?i:"a"===s?i.call(e):i?i.value:t.get(e)}function s(e,t,s,i,n){if("function"==typeof t||!t.has(e))throw new TypeError("Cannot write private member to an object whose class did not declare it");return t.set(e,s),s}var i,n,r;"function"==typeof SuppressedError&&SuppressedError;const o="__TAURI_TO_IPC_KEY__";class a{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,i.set(this,(()=>{})),n.set(this,0),r.set(this,[]),this.id=function(e,t=!1){return window.__TAURI_INTERNALS__.transformCallback(e,t)}((({message:e,id:o})=>{if(o==t(this,n,"f"))for(t(this,i,"f").call(this,e),s(this,n,t(this,n,"f")+1);t(this,n,"f")in t(this,r,"f");){const e=t(this,r,"f")[t(this,n,"f")];t(this,i,"f").call(this,e),delete t(this,r,"f")[t(this,n,"f")],s(this,n,t(this,n,"f")+1)}else t(this,r,"f")[o]=e}))}set onmessage(e){s(this,i,e)}get onmessage(){return t(this,i,"f")}[(i=new WeakMap,n=new WeakMap,r=new WeakMap,o)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[o]()}}async function h(e,t={},s){return window.__TAURI_INTERNALS__.invoke(e,t,s)}class c{constructor(){this.eventListeners=Object.create(null)}addListener(e,t){return this.on(e,t)}removeListener(e,t){return this.off(e,t)}on(e,t){return e in this.eventListeners?this.eventListeners[e].push(t):this.eventListeners[e]=[t],this}once(e,t){const s=i=>{this.removeListener(e,s),t(i)};return this.addListener(e,s)}off(e,t){return e in this.eventListeners&&(this.eventListeners[e]=this.eventListeners[e].filter((e=>e!==t))),this}removeAllListeners(e){return e?delete this.eventListeners[e]:this.eventListeners=Object.create(null),this}emit(e,t){if(e in this.eventListeners){const s=this.eventListeners[e];for(const e of s)e(t);return!0}return!1}listenerCount(e){return e in this.eventListeners?this.eventListeners[e].length:0}prependListener(e,t){return e in this.eventListeners?this.eventListeners[e].unshift(t):this.eventListeners[e]=[t],this}prependOnceListener(e,t){const s=i=>{this.removeListener(e,s),t(i)};return this.prependListener(e,s)}}class l{constructor(e){this.pid=e}async write(e){await h("plugin:shell|stdin_write",{pid:this.pid,buffer:e})}async kill(){await h("plugin:shell|kill",{cmd:"killChild",pid:this.pid})}}class u extends c{constructor(e,t=[],s){super(),this.stdout=new c,this.stderr=new c,this.program=e,this.args="string"==typeof t?[t]:t,this.options=s??{}}static create(e,t=[],s){return new u(e,t,s)}static sidecar(e,t=[],s){const i=new u(e,t,s);return i.options.sidecar=!0,i}async spawn(){const e=this.program,t=this.args,s=this.options;"object"==typeof t&&Object.freeze(t);const i=new a;return i.onmessage=e=>{switch(e.event){case"Error":this.emit("error",e.payload);break;case"Terminated":this.emit("close",e.payload);break;case"Stdout":this.stdout.emit("data",e.payload);break;case"Stderr":this.stderr.emit("data",e.payload)}},await h("plugin:shell|spawn",{program:e,args:t,options:s,onEvent:i}).then((e=>new l(e)))}async execute(){const e=this.program,t=this.args,s=this.options;return"object"==typeof t&&Object.freeze(t),await h("plugin:shell|execute",{program:e,args:t,options:s})}}return e.Child=l,e.Command=u,e.EventEmitter=c,e.open=async function(e,t){await h("plugin:shell|open",{path:e,with:t})},e}({});Object.defineProperty(window.__TAURI__,"shell",{value:__TAURI_PLUGIN_SHELL__})}
diff --git a/plugins/shell/guest-js/init.ts b/plugins/shell/guest-js/init.ts
index 58d0001e..b7e68a15 100644
--- a/plugins/shell/guest-js/init.ts
+++ b/plugins/shell/guest-js/init.ts
@@ -12,11 +12,11 @@ function openLinks(): void {
if (target.matches('a')) {
const t = target as HTMLAnchorElement
if (
- t.href !== '' &&
- ['http://', 'https://', 'mailto:', 'tel:'].some((v) =>
+ t.href !== ''
+ && ['http://', 'https://', 'mailto:', 'tel:'].some((v) =>
t.href.startsWith(v)
- ) &&
- t.target === '_blank'
+ )
+ && t.target === '_blank'
) {
void invoke('plugin:shell|open', {
path: t.href
@@ -31,8 +31,8 @@ function openLinks(): void {
}
if (
- document.readyState === 'complete' ||
- document.readyState === 'interactive'
+ document.readyState === 'complete'
+ || document.readyState === 'interactive'
) {
openLinks()
} else {
diff --git a/plugins/shell/package.json b/plugins/shell/package.json
index abbc33ea..126e5b6f 100644
--- a/plugins/shell/package.json
+++ b/plugins/shell/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-shell",
- "version": "2.0.1",
+ "version": "2.2.0",
"license": "MIT OR Apache-2.0",
"authors": [
"Tauri Programme within The Commons Conservancy"
diff --git a/plugins/shell/src/lib.rs b/plugins/shell/src/lib.rs
index 64cc6122..3dffc50b 100644
--- a/plugins/shell/src/lib.rs
+++ b/plugins/shell/src/lib.rs
@@ -75,7 +75,7 @@ impl Shell {
#[deprecated(since = "2.1.0", note = "Use tauri-plugin-opener instead.")]
#[allow(deprecated)]
pub fn open(&self, path: impl Into, with: Option) -> Result<()> {
- open::open(&self.open_scope, path.into(), with).map_err(Into::into)
+ open::open(&self.open_scope, path.into(), with)
}
/// Open a (url) path with a default or specific browser opening program.
diff --git a/plugins/single-instance/CHANGELOG.md b/plugins/single-instance/CHANGELOG.md
index 1b1a4531..77de533a 100644
--- a/plugins/single-instance/CHANGELOG.md
+++ b/plugins/single-instance/CHANGELOG.md
@@ -1,5 +1,21 @@
# Changelog
+## \[2.2.2]
+
+- [`1ab5f157`](https://github.com/tauri-apps/plugins-workspace/commit/1ab5f1576333174095bc7dad4bef7a8576bb29ab) ([#2452](https://github.com/tauri-apps/plugins-workspace/pull/2452) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Fixed `null pointer dereference` panic on rust nightly on Windows.
+
+## \[2.2.1]
+
+- [`da5c59e2`](https://github.com/tauri-apps/plugins-workspace/commit/da5c59e2fe879d177e3cfd52fcacce85440423cb) ([#2271](https://github.com/tauri-apps/plugins-workspace/pull/2271) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated `zbus` dependency to version 5. No API changes.
+
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
+### Dependencies
+
+- Upgraded to `deep-link@2.1.0`
+
## \[2.0.2]
### Dependencies
diff --git a/plugins/single-instance/Cargo.toml b/plugins/single-instance/Cargo.toml
index 6311afff..574df414 100644
--- a/plugins/single-instance/Cargo.toml
+++ b/plugins/single-instance/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-single-instance"
-version = "2.0.2"
+version = "2.2.2"
description = "Ensure a single instance of your tauri app is running."
authors = { workspace = true }
license = { workspace = true }
@@ -26,7 +26,7 @@ serde_json = { workspace = true }
tauri = { workspace = true }
tracing = { workspace = true }
thiserror = { workspace = true }
-tauri-plugin-deep-link = { path = "../deep-link", version = "2.0.2", optional = true }
+tauri-plugin-deep-link = { path = "../deep-link", version = "2.2.0", optional = true }
semver = { version = "1", optional = true }
[target."cfg(target_os = \"windows\")".dependencies.windows-sys]
diff --git a/plugins/single-instance/examples/vanilla/package.json b/plugins/single-instance/examples/vanilla/package.json
index 790657d0..183cfa99 100644
--- a/plugins/single-instance/examples/vanilla/package.json
+++ b/plugins/single-instance/examples/vanilla/package.json
@@ -9,6 +9,6 @@
"author": "",
"license": "MIT",
"devDependencies": {
- "@tauri-apps/cli": "2.1.0"
+ "@tauri-apps/cli": "2.3.1"
}
}
diff --git a/plugins/single-instance/examples/vanilla/src-tauri/build.rs b/plugins/single-instance/examples/vanilla/src-tauri/build.rs
index b055ec37..5ebf8d2f 100644
--- a/plugins/single-instance/examples/vanilla/src-tauri/build.rs
+++ b/plugins/single-instance/examples/vanilla/src-tauri/build.rs
@@ -3,5 +3,5 @@
// SPDX-License-Identifier: MIT
fn main() {
- tauri_build::build()
+ tauri_build::build()
}
diff --git a/plugins/single-instance/examples/vanilla/src-tauri/rustfmt.toml b/plugins/single-instance/examples/vanilla/src-tauri/rustfmt.toml
deleted file mode 100644
index 550a0985..00000000
--- a/plugins/single-instance/examples/vanilla/src-tauri/rustfmt.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-max_width = 100
-hard_tabs = false
-tab_spaces = 2
-newline_style = "Auto"
-use_small_heuristics = "Default"
-reorder_imports = true
-reorder_modules = true
-remove_nested_parens = true
-edition = "2021"
-merge_derives = true
-use_try_shorthand = false
-use_field_init_shorthand = false
-force_explicit_abi = true
-imports_granularity = "Crate"
diff --git a/plugins/single-instance/examples/vanilla/src-tauri/src/main.rs b/plugins/single-instance/examples/vanilla/src-tauri/src/main.rs
index 49b1a5a6..e736c4f3 100644
--- a/plugins/single-instance/examples/vanilla/src-tauri/src/main.rs
+++ b/plugins/single-instance/examples/vanilla/src-tauri/src/main.rs
@@ -3,16 +3,15 @@
// SPDX-License-Identifier: MIT
#![cfg_attr(
- all(not(debug_assertions), target_os = "windows"),
- windows_subsystem = "windows"
+ all(not(debug_assertions), target_os = "windows"),
+ windows_subsystem = "windows"
)]
fn main() {
- tauri::Builder::default()
- .plugin(tauri_plugin_cli::init())
- .plugin(tauri_plugin_single_instance::init(|app, argv, cwd| {
- println!("{}, {argv:?}, {cwd}", app.package_info().name);
- }))
- .run(tauri::generate_context!())
- .expect("error while running tauri application");
+ tauri::Builder::default()
+ .plugin(tauri_plugin_single_instance::init(|app, argv, cwd| {
+ println!("{}, {argv:?}, {cwd}", app.package_info().name);
+ }))
+ .run(tauri::generate_context!())
+ .expect("error while running tauri application");
}
diff --git a/plugins/single-instance/src/platform_impl/windows.rs b/plugins/single-instance/src/platform_impl/windows.rs
index e99f405d..832d0803 100644
--- a/plugins/single-instance/src/platform_impl/windows.rs
+++ b/plugins/single-instance/src/platform_impl/windows.rs
@@ -20,18 +20,38 @@ use windows_sys::Win32::{
},
UI::WindowsAndMessaging::{
self as w32wm, CreateWindowExW, DefWindowProcW, DestroyWindow, FindWindowW,
- RegisterClassExW, SendMessageW, GWL_STYLE, GWL_USERDATA, WINDOW_LONG_PTR_INDEX,
- WM_COPYDATA, WM_DESTROY, WNDCLASSEXW, WS_EX_LAYERED, WS_EX_NOACTIVATE, WS_EX_TOOLWINDOW,
- WS_EX_TRANSPARENT, WS_OVERLAPPED, WS_POPUP, WS_VISIBLE,
+ RegisterClassExW, SendMessageW, CREATESTRUCTW, GWLP_USERDATA, GWL_STYLE,
+ WINDOW_LONG_PTR_INDEX, WM_COPYDATA, WM_CREATE, WM_DESTROY, WNDCLASSEXW, WS_EX_LAYERED,
+ WS_EX_NOACTIVATE, WS_EX_TOOLWINDOW, WS_EX_TRANSPARENT, WS_OVERLAPPED, WS_POPUP, WS_VISIBLE,
},
};
+const WMCOPYDATA_SINGLE_INSTANCE_DATA: usize = 1542;
+
struct MutexHandle(isize);
+
struct TargetWindowHandle(isize);
-const WMCOPYDATA_SINGLE_INSTANCE_DATA: usize = 1542;
+struct UserData {
+ app: AppHandle,
+ callback: Box>,
+}
+
+impl UserData {
+ unsafe fn from_hwnd_raw(hwnd: HWND) -> *mut Self {
+ GetWindowLongPtrW(hwnd, GWLP_USERDATA) as *mut Self
+ }
-pub fn init(f: Box>) -> TauriPlugin {
+ unsafe fn from_hwnd<'a>(hwnd: HWND) -> &'a mut Self {
+ &mut *Self::from_hwnd_raw(hwnd)
+ }
+
+ fn run_callback(&mut self, args: Vec, cwd: String) {
+ (self.callback)(&self.app, args, cwd)
+ }
+}
+
+pub fn init(callback: Box>) -> TauriPlugin {
plugin::Builder::new("single-instance")
.setup(|app, _api| {
#[allow(unused_mut)]
@@ -54,21 +74,22 @@ pub fn init(f: Box>) -> TauriPlugin {
let hwnd = FindWindowW(class_name.as_ptr(), window_name.as_ptr());
if !hwnd.is_null() {
- let data = format!(
- "{}|{}\0",
- std::env::current_dir()
- .unwrap_or_default()
- .to_str()
- .unwrap_or_default(),
- std::env::args().collect::>().join("|")
- );
+ let cwd = std::env::current_dir().unwrap_or_default();
+ let cwd = cwd.to_str().unwrap_or_default();
+
+ let args = std::env::args().collect::>().join("|");
+
+ let data = format!("{cwd}|{args}\0",);
+
let bytes = data.as_bytes();
let cds = COPYDATASTRUCT {
dwData: WMCOPYDATA_SINGLE_INSTANCE_DATA,
cbData: bytes.len() as _,
lpData: bytes.as_ptr() as _,
};
+
SendMessageW(hwnd, WM_COPYDATA, 0, &cds as *const _ as _);
+
app.cleanup_before_exit();
std::process::exit(0);
}
@@ -76,15 +97,12 @@ pub fn init(f: Box>) -> TauriPlugin {
} else {
app.manage(MutexHandle(hmutex as _));
- let hwnd = create_event_target_window::(&class_name, &window_name);
- unsafe {
- SetWindowLongPtrW(
- hwnd,
- GWL_USERDATA,
- Box::into_raw(Box::new((app.clone(), f))) as _,
- )
+ let userdata = UserData {
+ app: app.clone(),
+ callback,
};
-
+ let userdata = Box::into_raw(Box::new(userdata));
+ let hwnd = create_event_target_window::(&class_name, &window_name, userdata);
app.manage(TargetWindowHandle(hwnd as _));
}
@@ -116,32 +134,43 @@ unsafe extern "system" fn single_instance_window_proc(
wparam: WPARAM,
lparam: LPARAM,
) -> LRESULT {
- let data_ptr = GetWindowLongPtrW(hwnd, GWL_USERDATA)
- as *mut (AppHandle, Box>);
- let (app_handle, callback) = &mut *data_ptr;
-
match msg {
+ WM_CREATE => {
+ let create_struct = &*(lparam as *const CREATESTRUCTW);
+ let userdata = create_struct.lpCreateParams as *const UserData;
+ SetWindowLongPtrW(hwnd, GWLP_USERDATA, userdata as _);
+ 0
+ }
+
WM_COPYDATA => {
let cds_ptr = lparam as *const COPYDATASTRUCT;
if (*cds_ptr).dwData == WMCOPYDATA_SINGLE_INSTANCE_DATA {
+ let userdata = UserData::::from_hwnd(hwnd);
+
let data = CStr::from_ptr((*cds_ptr).lpData as _).to_string_lossy();
let mut s = data.split('|');
let cwd = s.next().unwrap();
let args = s.map(|s| s.to_string()).collect();
- callback(app_handle, args, cwd.to_string());
+
+ userdata.run_callback(args, cwd.to_string());
}
1
}
WM_DESTROY => {
- let _ = Box::from_raw(data_ptr);
+ let userdata = UserData::::from_hwnd_raw(hwnd);
+ drop(Box::from_raw(userdata));
0
}
_ => DefWindowProcW(hwnd, msg, wparam, lparam),
}
}
-fn create_event_target_window(class_name: &[u16], window_name: &[u16]) -> HWND {
+fn create_event_target_window(
+ class_name: &[u16],
+ window_name: &[u16],
+ userdata: *const UserData,
+) -> HWND {
unsafe {
let class = WNDCLASSEXW {
cbSize: std::mem::size_of::() as u32,
@@ -182,7 +211,7 @@ fn create_event_target_window(class_name: &[u16], window_name: &[u16
std::ptr::null_mut(),
std::ptr::null_mut(),
GetModuleHandleW(std::ptr::null()),
- std::ptr::null(),
+ userdata as _,
);
SetWindowLongPtrW(
hwnd,
diff --git a/plugins/sql/CHANGELOG.md b/plugins/sql/CHANGELOG.md
index 61b79f03..a80c3ff1 100644
--- a/plugins/sql/CHANGELOG.md
+++ b/plugins/sql/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.0.2]
- [`31956469`](https://github.com/tauri-apps/plugins-workspace/commit/319564699638c080b73d506bcaad186ecc4a8236) ([#1928](https://github.com/tauri-apps/plugins-workspace/pull/1928) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Fixed the QueryResult typing by marking `lastInsertId` as optional to reflect postgres-only changes made in the 2.0.0 release.
@@ -112,23 +116,3 @@
## \[2.0.0-alpha.0]
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- te to alpha.11.
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- to alpha.11.
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- te to alpha.11.
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- ae67\`]\(https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
diff --git a/plugins/sql/Cargo.toml b/plugins/sql/Cargo.toml
index ee73a3e7..0449a4be 100644
--- a/plugins/sql/Cargo.toml
+++ b/plugins/sql/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-sql"
-version = "2.0.3"
+version = "2.2.0"
description = "Interface with SQL databases."
authors = { workspace = true }
license = { workspace = true }
@@ -19,7 +19,7 @@ windows = { level = "full", notes = "" }
linux = { level = "full", notes = "" }
macos = { level = "full", notes = "" }
android = { level = "full", notes = "" }
-ios = { level = "none", notes = "" }
+ios = { level = "full", notes = "" }
[build-dependencies]
tauri-plugin = { workspace = true, features = ["build"] }
diff --git a/plugins/sql/package.json b/plugins/sql/package.json
index 3c973955..162df528 100644
--- a/plugins/sql/package.json
+++ b/plugins/sql/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-sql",
- "version": "2.0.2",
+ "version": "2.2.0",
"description": "Interface with SQL databases",
"license": "MIT OR Apache-2.0",
"authors": [
diff --git a/plugins/store/CHANGELOG.md b/plugins/store/CHANGELOG.md
index 51ac5ed2..fa4e13b1 100644
--- a/plugins/store/CHANGELOG.md
+++ b/plugins/store/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.1.0]
### feat
@@ -114,30 +118,3 @@
## \[2.0.0-alpha.0]
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- te to alpha.11.
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- ha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- ae67\`]\(https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- ps://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- eb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- ps://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- plugins-workspace/pull/371)) First v2 alpha release!
- com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
-) First v2 alpha release!
- com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- eb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- ps://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- plugins-workspace/pull/371)) First v2 alpha release!
- com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
diff --git a/plugins/store/Cargo.toml b/plugins/store/Cargo.toml
index 0ce6be9f..1ed19962 100644
--- a/plugins/store/Cargo.toml
+++ b/plugins/store/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-store"
-version = "2.1.0"
+version = "2.2.0"
description = "Simple, persistent key-value store."
authors = { workspace = true }
license = { workspace = true }
diff --git a/plugins/store/README.md b/plugins/store/README.md
index a285de3f..8a2fcbf7 100644
--- a/plugins/store/README.md
+++ b/plugins/store/README.md
@@ -128,6 +128,7 @@ fn main() {
// Note that values must be serde_json::Value instances,
// otherwise, they will not be compatible with the JavaScript bindings.
store.set("a".to_string(), json!("b"));
+ Ok(())
})
.run(tauri::generate_context!())
.expect("error while running tauri application");
diff --git a/plugins/store/api-iife.js b/plugins/store/api-iife.js
index fc04ff00..61dc5df4 100644
--- a/plugins/store/api-iife.js
+++ b/plugins/store/api-iife.js
@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_STORE__=function(t){"use strict";var e,a;function r(t,e=!1){return window.__TAURI_INTERNALS__.transformCallback(t,e)}async function s(t,e={},a){return window.__TAURI_INTERNALS__.invoke(t,e,a)}"function"==typeof SuppressedError&&SuppressedError;class i{get rid(){return function(t,e,a,r){if("a"===a&&!r)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof e?t!==e||!r:!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===a?r:"a"===a?r.call(t):r?r.value:e.get(t)}(this,e,"f")}constructor(t){e.set(this,void 0),function(t,e,a,r,s){if("function"==typeof e?t!==e||!s:!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");e.set(t,a)}(this,e,t)}async close(){return s("plugin:resources|close",{rid:this.rid})}}async function n(t,e,a){const i={kind:"Any"};return s("plugin:event|listen",{event:t,target:i,handler:r(e)}).then((e=>async()=>async function(t,e){await s("plugin:event|unlisten",{event:t,eventId:e})}(t,e)))}async function o(t,e){return await u.load(t,e)}e=new WeakMap,function(t){t.WINDOW_RESIZED="tauri://resize",t.WINDOW_MOVED="tauri://move",t.WINDOW_CLOSE_REQUESTED="tauri://close-requested",t.WINDOW_DESTROYED="tauri://destroyed",t.WINDOW_FOCUS="tauri://focus",t.WINDOW_BLUR="tauri://blur",t.WINDOW_SCALE_FACTOR_CHANGED="tauri://scale-change",t.WINDOW_THEME_CHANGED="tauri://theme-changed",t.WINDOW_CREATED="tauri://window-created",t.WEBVIEW_CREATED="tauri://webview-created",t.DRAG_ENTER="tauri://drag-enter",t.DRAG_OVER="tauri://drag-over",t.DRAG_DROP="tauri://drag-drop",t.DRAG_LEAVE="tauri://drag-leave"}(a||(a={}));class u extends i{constructor(t){super(t)}static async load(t,e){const a=await s("plugin:store|load",{path:t,...e});return new u(a)}static async get(t){return await s("plugin:store|get_store",{path:t}).then((t=>t?new u(t):null))}async set(t,e){await s("plugin:store|set",{rid:this.rid,key:t,value:e})}async get(t){const[e,a]=await s("plugin:store|get",{rid:this.rid,key:t});return a?e:void 0}async has(t){return await s("plugin:store|has",{rid:this.rid,key:t})}async delete(t){return await s("plugin:store|delete",{rid:this.rid,key:t})}async clear(){await s("plugin:store|clear",{rid:this.rid})}async reset(){await s("plugin:store|reset",{rid:this.rid})}async keys(){return await s("plugin:store|keys",{rid:this.rid})}async values(){return await s("plugin:store|values",{rid:this.rid})}async entries(){return await s("plugin:store|entries",{rid:this.rid})}async length(){return await s("plugin:store|length",{rid:this.rid})}async reload(){await s("plugin:store|reload",{rid:this.rid})}async save(){await s("plugin:store|save",{rid:this.rid})}async onKeyChange(t,e){return await n("store://change",(a=>{a.payload.resourceId===this.rid&&a.payload.key===t&&e(a.payload.exists?a.payload.value:void 0)}))}async onChange(t){return await n("store://change",(e=>{e.payload.resourceId===this.rid&&t(e.payload.key,e.payload.exists?e.payload.value:void 0)}))}}return t.LazyStore=class{get store(){return this._store||(this._store=o(this.path,this.options)),this._store}constructor(t,e){this.path=t,this.options=e}async init(){await this.store}async set(t,e){return(await this.store).set(t,e)}async get(t){return(await this.store).get(t)}async has(t){return(await this.store).has(t)}async delete(t){return(await this.store).delete(t)}async clear(){await(await this.store).clear()}async reset(){await(await this.store).reset()}async keys(){return(await this.store).keys()}async values(){return(await this.store).values()}async entries(){return(await this.store).entries()}async length(){return(await this.store).length()}async reload(){await(await this.store).reload()}async save(){await(await this.store).save()}async onKeyChange(t,e){return(await this.store).onKeyChange(t,e)}async onChange(t){return(await this.store).onChange(t)}async close(){this._store&&await(await this._store).close()}},t.Store=u,t.getStore=async function(t){return await u.get(t)},t.load=o,t}({});Object.defineProperty(window.__TAURI__,"store",{value:__TAURI_PLUGIN_STORE__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_STORE__=function(t){"use strict";var e,a;function r(t,e=!1){return window.__TAURI_INTERNALS__.transformCallback(t,e)}async function s(t,e={},a){return window.__TAURI_INTERNALS__.invoke(t,e,a)}"function"==typeof SuppressedError&&SuppressedError;class i{get rid(){return function(t,e,a,r){if("function"==typeof e||!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===a?r:"a"===a?r.call(t):r?r.value:e.get(t)}(this,e,"f")}constructor(t){e.set(this,void 0),function(t,e,a){if("function"==typeof e||!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");e.set(t,a)}(this,e,t)}async close(){return s("plugin:resources|close",{rid:this.rid})}}async function n(t,e,a){const i={kind:"Any"};return s("plugin:event|listen",{event:t,target:i,handler:r(e)}).then((e=>async()=>async function(t,e){await s("plugin:event|unlisten",{event:t,eventId:e})}(t,e)))}async function o(t,e){return await u.load(t,e)}e=new WeakMap,function(t){t.WINDOW_RESIZED="tauri://resize",t.WINDOW_MOVED="tauri://move",t.WINDOW_CLOSE_REQUESTED="tauri://close-requested",t.WINDOW_DESTROYED="tauri://destroyed",t.WINDOW_FOCUS="tauri://focus",t.WINDOW_BLUR="tauri://blur",t.WINDOW_SCALE_FACTOR_CHANGED="tauri://scale-change",t.WINDOW_THEME_CHANGED="tauri://theme-changed",t.WINDOW_CREATED="tauri://window-created",t.WEBVIEW_CREATED="tauri://webview-created",t.DRAG_ENTER="tauri://drag-enter",t.DRAG_OVER="tauri://drag-over",t.DRAG_DROP="tauri://drag-drop",t.DRAG_LEAVE="tauri://drag-leave"}(a||(a={}));class u extends i{constructor(t){super(t)}static async load(t,e){const a=await s("plugin:store|load",{path:t,...e});return new u(a)}static async get(t){return await s("plugin:store|get_store",{path:t}).then((t=>t?new u(t):null))}async set(t,e){await s("plugin:store|set",{rid:this.rid,key:t,value:e})}async get(t){const[e,a]=await s("plugin:store|get",{rid:this.rid,key:t});return a?e:void 0}async has(t){return await s("plugin:store|has",{rid:this.rid,key:t})}async delete(t){return await s("plugin:store|delete",{rid:this.rid,key:t})}async clear(){await s("plugin:store|clear",{rid:this.rid})}async reset(){await s("plugin:store|reset",{rid:this.rid})}async keys(){return await s("plugin:store|keys",{rid:this.rid})}async values(){return await s("plugin:store|values",{rid:this.rid})}async entries(){return await s("plugin:store|entries",{rid:this.rid})}async length(){return await s("plugin:store|length",{rid:this.rid})}async reload(){await s("plugin:store|reload",{rid:this.rid})}async save(){await s("plugin:store|save",{rid:this.rid})}async onKeyChange(t,e){return await n("store://change",(a=>{a.payload.resourceId===this.rid&&a.payload.key===t&&e(a.payload.exists?a.payload.value:void 0)}))}async onChange(t){return await n("store://change",(e=>{e.payload.resourceId===this.rid&&t(e.payload.key,e.payload.exists?e.payload.value:void 0)}))}}return t.LazyStore=class{get store(){return this._store||(this._store=o(this.path,this.options)),this._store}constructor(t,e){this.path=t,this.options=e}async init(){await this.store}async set(t,e){return(await this.store).set(t,e)}async get(t){return(await this.store).get(t)}async has(t){return(await this.store).has(t)}async delete(t){return(await this.store).delete(t)}async clear(){await(await this.store).clear()}async reset(){await(await this.store).reset()}async keys(){return(await this.store).keys()}async values(){return(await this.store).values()}async entries(){return(await this.store).entries()}async length(){return(await this.store).length()}async reload(){await(await this.store).reload()}async save(){await(await this.store).save()}async onKeyChange(t,e){return(await this.store).onKeyChange(t,e)}async onChange(t){return(await this.store).onChange(t)}async close(){this._store&&await(await this._store).close()}},t.Store=u,t.getStore=async function(t){return await u.get(t)},t.load=o,t}({});Object.defineProperty(window.__TAURI__,"store",{value:__TAURI_PLUGIN_STORE__})}
diff --git a/plugins/store/examples/AppSettingsManager/package.json b/plugins/store/examples/AppSettingsManager/package.json
index 0bd11a96..0bf0d66a 100644
--- a/plugins/store/examples/AppSettingsManager/package.json
+++ b/plugins/store/examples/AppSettingsManager/package.json
@@ -8,8 +8,8 @@
"tauri": "tauri"
},
"devDependencies": {
- "@tauri-apps/cli": "2.1.0",
- "vite": "^6.0.0",
- "typescript": "^5.4.7"
+ "@tauri-apps/cli": "2.3.1",
+ "typescript": "^5.7.3",
+ "vite": "^6.2.0"
}
}
diff --git a/plugins/store/package.json b/plugins/store/package.json
index e310463c..a3a28e66 100644
--- a/plugins/store/package.json
+++ b/plugins/store/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-store",
- "version": "2.1.0",
+ "version": "2.2.0",
"description": "Simple, persistent key-value store.",
"license": "MIT OR Apache-2.0",
"authors": [
diff --git a/plugins/stronghold/CHANGELOG.md b/plugins/stronghold/CHANGELOG.md
index 1b292461..5d7ea2d1 100644
--- a/plugins/stronghold/CHANGELOG.md
+++ b/plugins/stronghold/CHANGELOG.md
@@ -1,5 +1,9 @@
# Changelog
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.0.1]
- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
@@ -89,7 +93,3 @@
## \[2.0.0-alpha.0]
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- \`]\(https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- \`]\(https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- om/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
diff --git a/plugins/stronghold/Cargo.toml b/plugins/stronghold/Cargo.toml
index fbfdf47e..7d40957a 100644
--- a/plugins/stronghold/Cargo.toml
+++ b/plugins/stronghold/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-stronghold"
-version = "2.0.1"
+version = "2.2.0"
description = "Store secrets and keys using the IOTA Stronghold secret management engine."
authors = { workspace = true }
license = { workspace = true }
diff --git a/plugins/stronghold/package.json b/plugins/stronghold/package.json
index cbefad53..87611e2a 100644
--- a/plugins/stronghold/package.json
+++ b/plugins/stronghold/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-stronghold",
- "version": "2.0.0",
+ "version": "2.2.0",
"description": "Store secrets and keys using the IOTA Stronghold encrypted database.",
"license": "MIT OR Apache-2.0",
"authors": [
diff --git a/plugins/updater/CHANGELOG.md b/plugins/updater/CHANGELOG.md
index 471f60fb..84b4eb84 100644
--- a/plugins/updater/CHANGELOG.md
+++ b/plugins/updater/CHANGELOG.md
@@ -1,5 +1,35 @@
# Changelog
+## \[2.6.0]
+
+- [`faefcc9f`](https://github.com/tauri-apps/plugins-workspace/commit/faefcc9fd8c61f709d491649e255a7fcac82c09a) ([#2430](https://github.com/tauri-apps/plugins-workspace/pull/2430) by [@goenning](https://github.com/tauri-apps/plugins-workspace/../../goenning)) Add `UpdaterBuilder::configure_client` method on Rust side, to configure the `reqwest` client used to check and download the update.
+- [`ac60d589`](https://github.com/tauri-apps/plugins-workspace/commit/ac60d589eca2bbc4aed040feb18da148e66ec171) ([#2513](https://github.com/tauri-apps/plugins-workspace/pull/2513) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Enhance error logging.
+
+## \[2.5.1]
+
+- [`6f881293`](https://github.com/tauri-apps/plugins-workspace/commit/6f881293fcd67838f6f3f8063f536292431dd1f7) ([#2439](https://github.com/tauri-apps/plugins-workspace/pull/2439) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Fixed an issue that caused the plugin to emit a `ReleaseNotFound` error instead of a `Reqwest` error when the http request in `check()` failed.
+
+## \[2.5.0]
+
+- [`5369898d`](https://github.com/tauri-apps/plugins-workspace/commit/5369898db7a6098e3e2f43436100ea556d405628) ([#2067](https://github.com/tauri-apps/plugins-workspace/pull/2067) by [@jLynx](https://github.com/tauri-apps/plugins-workspace/../../jLynx)) Fix update installation on macOS when using an user without admin privileges.
+- [`5369898d`](https://github.com/tauri-apps/plugins-workspace/commit/5369898db7a6098e3e2f43436100ea556d405628) ([#2067](https://github.com/tauri-apps/plugins-workspace/pull/2067) by [@jLynx](https://github.com/tauri-apps/plugins-workspace/../../jLynx)) Remove the `UpdaterBuilder::new` function, use `UpdaterExt::updater_builder` instead.
+
+## \[2.4.0]
+
+- [`0afc9b6b`](https://github.com/tauri-apps/plugins-workspace/commit/0afc9b6be07bee1077f05a86285d977e57810ed9) ([#2325](https://github.com/tauri-apps/plugins-workspace/pull/2325) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) The `Update` struct/object will now contain a `raw_json`/`rawJson` property to be able to read parts of server's json response that are not handled by the plugin.
+
+## \[2.3.1]
+
+- [`57efb47c`](https://github.com/tauri-apps/plugins-workspace/commit/57efb47c116f880477f72f02a8e4239e88007d44) ([#2235](https://github.com/tauri-apps/plugins-workspace/pull/2235) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) Add `Builder::header` and `Builder::headers` method to configure default headers for updater.
+
+## \[2.3.0]
+
+- [`829b6326`](https://github.com/tauri-apps/plugins-workspace/commit/829b63265030bc9c61d1738c4eaca0ffb3178677) ([#1919](https://github.com/tauri-apps/plugins-workspace/pull/1919) by [@n1ght-hunter](https://github.com/tauri-apps/plugins-workspace/../../n1ght-hunter)) Add `tauri_plugin_updater::Builder::default_version_comparator` method to set the default version comparator for the updater.
+
+## \[2.2.0]
+
+- [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.
+
## \[2.1.0]
- [`f8f2eefe`](https://github.com/tauri-apps/plugins-workspace/commit/f8f2eefe03ab231beafbd6a88d61b53d77f0400d) ([#1991](https://github.com/tauri-apps/plugins-workspace/pull/1991) by [@jLynx](https://github.com/tauri-apps/plugins-workspace/../../jLynx)) Added support for `.deb` package updates on Linux systems.
@@ -137,65 +167,3 @@
## \[2.0.0-alpha.0]
- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- ater.
-- [`1cb8311`](https://github.com/tauri-apps/plugins-workspace/commit/1cb831183c63ba5bd3f72d8a482992f6467d950d)([#405](https://github.com/tauri-apps/plugins-workspace/pull/405)) Implement passive mode on NSIS and automatically restart after NSIS update.
-- [`4ab90f0`](https://github.com/tauri-apps/plugins-workspace/commit/4ab90f048eab2918344f97dc8e04413a404e392d)([#431](https://github.com/tauri-apps/plugins-workspace/pull/431)) The updater plugin is recieving a few changes to improve consistency and ergonomics of the Rust and JS APIs
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 0f048eab2918344f97dc8e04413a404e392d)([#431](https://github.com/tauri-apps/plugins-workspace/pull/431)) The updater plugin is recieving a few changes to improve consistency and ergonomics of the Rust and JS APIs
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 1]\(https://github.com/tauri-apps/plugins-workspace/pull/431)) The updater plugin is recieving a few changes to improve consistency and ergonomics of the Rust and JS APIs
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 0f048eab2918344f97dc8e04413a404e392d)([#431](https://github.com/tauri-apps/plugins-workspace/pull/431)) The updater plugin is recieving a few changes to improve consistency and ergonomics of the Rust and JS APIs
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 918344f97dc8e04413a404e392d)([#431](https://github.com/tauri-apps/plugins-workspace/pull/431)) The updater plugin is recieving a few changes to improve consistency and ergonomics of the Rust and JS APIs
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 0f048eab2918344f97dc8e04413a404e392d)([#431](https://github.com/tauri-apps/plugins-workspace/pull/431)) The updater plugin is recieving a few changes to improve consistency and ergonomics of the Rust and JS APIs
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 1]\(https://github.com/tauri-apps/plugins-workspace/pull/431)) The updater plugin is recieving a few changes to improve consistency and ergonomics of the Rust and JS APIs
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 0f048eab2918344f97dc8e04413a404e392d)([#431](https://github.com/tauri-apps/plugins-workspace/pull/431)) The updater plugin is recieving a few changes to improve consistency and ergonomics of the Rust and JS APIs
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 92fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- i-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 92fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- to improve consistency and ergonomics of the Rust and JS APIs
-
-## \[2.0.0-alpha.0]
-
-- [`717ae67`](https://github.com/tauri-apps/plugins-workspace/commit/717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 92fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- i-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 92fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
- com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release!
diff --git a/plugins/updater/Cargo.toml b/plugins/updater/Cargo.toml
index 6d6c90ab..c8799f59 100644
--- a/plugins/updater/Cargo.toml
+++ b/plugins/updater/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "tauri-plugin-updater"
-version = "2.1.0"
+version = "2.6.0"
description = "In-app updates for Tauri applications."
edition = { workspace = true }
authors = { workspace = true }
@@ -30,6 +30,7 @@ tauri = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
thiserror = { workspace = true }
+log = { workspace = true }
tokio = "1"
reqwest = { version = "0.12", default-features = false, features = [
"json",
@@ -43,7 +44,7 @@ base64 = "0.22"
semver = { version = "1", features = ["serde"] }
futures-util = "0.3"
tempfile = "3"
-infer = "0.16"
+infer = "0.19"
percent-encoding = "2.3"
[target."cfg(target_os = \"windows\")".dependencies]
@@ -55,13 +56,14 @@ windows-sys = { version = "0.59.0", features = [
] }
[target."cfg(target_os = \"linux\")".dependencies]
-dirs = "5"
+dirs = "6"
tar = { version = "0.4", optional = true }
flate2 = { version = "1", optional = true }
[target."cfg(target_os = \"macos\")".dependencies]
tar = "0.4"
flate2 = "1"
+osakit = { version = "0.3", features = ["full"] }
[features]
default = ["rustls-tls", "zip"]
diff --git a/plugins/updater/api-iife.js b/plugins/updater/api-iife.js
index 87294903..31c81b27 100644
--- a/plugins/updater/api-iife.js
+++ b/plugins/updater/api-iife.js
@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_UPDATER__=function(e){"use strict";function t(e,t,s,n){if("a"===s&&!n)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof t?e!==t||!n:!t.has(e))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===s?n:"a"===s?n.call(e):n?n.value:t.get(e)}function s(e,t,s,n,i){if("function"==typeof t?e!==t||!i:!t.has(e))throw new TypeError("Cannot write private member to an object whose class did not declare it");return t.set(e,s),s}var n,i,r,a;"function"==typeof SuppressedError&&SuppressedError;const o="__TAURI_TO_IPC_KEY__";class d{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,n.set(this,(()=>{})),i.set(this,0),r.set(this,{}),this.id=function(e,t=!1){return window.__TAURI_INTERNALS__.transformCallback(e,t)}((({message:e,id:a})=>{if(a===t(this,i,"f")){s(this,i,a+1),t(this,n,"f").call(this,e);const o=Object.keys(t(this,r,"f"));if(o.length>0){let e=a+1;for(const s of o.sort()){if(parseInt(s)!==e)break;{const i=t(this,r,"f")[s];delete t(this,r,"f")[s],t(this,n,"f").call(this,i),e+=1}}s(this,i,e)}}else t(this,r,"f")[a.toString()]=e}))}set onmessage(e){s(this,n,e)}get onmessage(){return t(this,n,"f")}[(n=new WeakMap,i=new WeakMap,r=new WeakMap,o)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[o]()}}async function l(e,t={},s){return window.__TAURI_INTERNALS__.invoke(e,t,s)}class c{get rid(){return t(this,a,"f")}constructor(e){a.set(this,void 0),s(this,a,e)}async close(){return l("plugin:resources|close",{rid:this.rid})}}a=new WeakMap;class h extends c{constructor(e){super(e.rid),this.available=e.available,this.currentVersion=e.currentVersion,this.version=e.version,this.date=e.date,this.body=e.body}async download(e,t){const s=new d;e&&(s.onmessage=e);const n=await l("plugin:updater|download",{onEvent:s,rid:this.rid,...t});this.downloadedBytes=new c(n)}async install(){if(!this.downloadedBytes)throw new Error("Update.install called before Update.download");await l("plugin:updater|install",{updateRid:this.rid,bytesRid:this.downloadedBytes.rid}),this.downloadedBytes=void 0}async downloadAndInstall(e,t){const s=new d;e&&(s.onmessage=e),await l("plugin:updater|download_and_install",{onEvent:s,rid:this.rid,...t})}async close(){await(this.downloadedBytes?.close()),await super.close()}}return e.Update=h,e.check=async function(e){return e?.headers&&(e.headers=Array.from(new Headers(e.headers).entries())),await l("plugin:updater|check",{...e}).then((e=>e.available?new h(e):null))},e}({});Object.defineProperty(window.__TAURI__,"updater",{value:__TAURI_PLUGIN_UPDATER__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_UPDATER__=function(e){"use strict";function t(e,t,s,n){if("function"==typeof t||!t.has(e))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===s?n:"a"===s?n.call(e):n?n.value:t.get(e)}function s(e,t,s,n,i){if("function"==typeof t||!t.has(e))throw new TypeError("Cannot write private member to an object whose class did not declare it");return t.set(e,s),s}var n,i,a,r;"function"==typeof SuppressedError&&SuppressedError;const o="__TAURI_TO_IPC_KEY__";class d{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,n.set(this,(()=>{})),i.set(this,0),a.set(this,[]),this.id=function(e,t=!1){return window.__TAURI_INTERNALS__.transformCallback(e,t)}((({message:e,id:r})=>{if(r==t(this,i,"f"))for(t(this,n,"f").call(this,e),s(this,i,t(this,i,"f")+1);t(this,i,"f")in t(this,a,"f");){const e=t(this,a,"f")[t(this,i,"f")];t(this,n,"f").call(this,e),delete t(this,a,"f")[t(this,i,"f")],s(this,i,t(this,i,"f")+1)}else t(this,a,"f")[r]=e}))}set onmessage(e){s(this,n,e)}get onmessage(){return t(this,n,"f")}[(n=new WeakMap,i=new WeakMap,a=new WeakMap,o)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[o]()}}async function l(e,t={},s){return window.__TAURI_INTERNALS__.invoke(e,t,s)}class h{get rid(){return t(this,r,"f")}constructor(e){r.set(this,void 0),s(this,r,e)}async close(){return l("plugin:resources|close",{rid:this.rid})}}r=new WeakMap;class c extends h{constructor(e){super(e.rid),this.available=e.available,this.currentVersion=e.currentVersion,this.version=e.version,this.date=e.date,this.body=e.body,this.rawJson=e.rawJson}async download(e,t){const s=new d;e&&(s.onmessage=e);const n=await l("plugin:updater|download",{onEvent:s,rid:this.rid,...t});this.downloadedBytes=new h(n)}async install(){if(!this.downloadedBytes)throw new Error("Update.install called before Update.download");await l("plugin:updater|install",{updateRid:this.rid,bytesRid:this.downloadedBytes.rid}),this.downloadedBytes=void 0}async downloadAndInstall(e,t){const s=new d;e&&(s.onmessage=e),await l("plugin:updater|download_and_install",{onEvent:s,rid:this.rid,...t})}async close(){await(this.downloadedBytes?.close()),await super.close()}}return e.Update=c,e.check=async function(e){return e?.headers&&(e.headers=Array.from(new Headers(e.headers).entries())),await l("plugin:updater|check",{...e}).then((e=>e.available?new c(e):null))},e}({});Object.defineProperty(window.__TAURI__,"updater",{value:__TAURI_PLUGIN_UPDATER__})}
diff --git a/plugins/updater/guest-js/index.ts b/plugins/updater/guest-js/index.ts
index 54d1d174..dfaaff24 100644
--- a/plugins/updater/guest-js/index.ts
+++ b/plugins/updater/guest-js/index.ts
@@ -43,6 +43,7 @@ interface UpdateMetadata {
version: string
date?: string
body?: string
+ rawJson: Record
}
/** Updater download event */
@@ -57,6 +58,7 @@ class Update extends Resource {
version: string
date?: string
body?: string
+ rawJson: Record
private downloadedBytes?: Resource
constructor(metadata: UpdateMetadata) {
@@ -66,6 +68,7 @@ class Update extends Resource {
this.version = metadata.version
this.date = metadata.date
this.body = metadata.body
+ this.rawJson = metadata.rawJson
}
/** Download the updater package */
diff --git a/plugins/updater/package.json b/plugins/updater/package.json
index 3afb2f4e..25e23039 100644
--- a/plugins/updater/package.json
+++ b/plugins/updater/package.json
@@ -1,6 +1,6 @@
{
"name": "@tauri-apps/plugin-updater",
- "version": "2.0.0",
+ "version": "2.6.0",
"license": "MIT OR Apache-2.0",
"authors": [
"Tauri Programme within The Commons Conservancy"
diff --git a/plugins/updater/src/commands.rs b/plugins/updater/src/commands.rs
index f36a591c..eed3cd77 100644
--- a/plugins/updater/src/commands.rs
+++ b/plugins/updater/src/commands.rs
@@ -34,6 +34,7 @@ pub(crate) struct Metadata {
version: String,
date: Option,
body: Option,
+ raw_json: serde_json::Value,
}
struct DownloadedBytes(pub Vec);
@@ -73,6 +74,7 @@ pub(crate) async fn check(
metadata.version.clone_from(&update.version);
metadata.date = update.date.map(|d| d.to_string());
metadata.body.clone_from(&update.body);
+ metadata.raw_json.clone_from(&update.raw_json);
metadata.rid = Some(webview.resources_table().add(update));
}
diff --git a/plugins/updater/src/lib.rs b/plugins/updater/src/lib.rs
index 4dbd26e1..75b014bc 100644
--- a/plugins/updater/src/lib.rs
+++ b/plugins/updater/src/lib.rs
@@ -11,8 +11,10 @@
html_favicon_url = "https://github.com/tauri-apps/tauri/raw/dev/app-icon.png"
)]
-use std::ffi::OsString;
+use std::{ffi::OsString, sync::Arc};
+use http::{HeaderMap, HeaderName, HeaderValue};
+use semver::Version;
use tauri::{
plugin::{Builder as PluginBuilder, TauriPlugin},
Manager, Runtime,
@@ -68,14 +70,14 @@ pub trait UpdaterExt {
impl> UpdaterExt for T {
fn updater_builder(&self) -> UpdaterBuilder {
let app = self.app_handle();
- let package_info = app.package_info();
- let UpdaterState { config, target } = self.state::().inner();
+ let UpdaterState {
+ config,
+ target,
+ version_comparator,
+ headers,
+ } = self.state::().inner();
- let mut builder = UpdaterBuilder::new(
- package_info.name.clone(),
- package_info.version.clone(),
- config.clone(),
- );
+ let mut builder = UpdaterBuilder::new(app, config.clone()).headers(headers.clone());
if let Some(target) = target {
builder = builder.target(target);
@@ -86,6 +88,8 @@ impl> UpdaterExt for T {
builder = builder.current_exe_args(args);
}
+ builder.version_comparator = version_comparator.clone();
+
#[cfg(any(
target_os = "linux",
target_os = "dragonfly",
@@ -116,6 +120,8 @@ impl> UpdaterExt for T {
struct UpdaterState {
target: Option,
config: Config,
+ version_comparator: Option,
+ headers: HeaderMap,
}
#[derive(Default)]
@@ -123,6 +129,8 @@ pub struct Builder {
target: Option,
pubkey: Option,
installer_args: Vec,
+ headers: HeaderMap,
+ default_version_comparator: Option,
}
impl Builder {
@@ -163,10 +171,42 @@ impl Builder {
self
}
+ pub fn header(mut self, key: K, value: V) -> Result
+ where
+ HeaderName: TryFrom,
+ >::Error: Into,
+ HeaderValue: TryFrom,
+ >::Error: Into,
+ {
+ let key: std::result::Result = key.try_into().map_err(Into::into);
+ let value: std::result::Result =
+ value.try_into().map_err(Into::into);
+ self.headers.insert(key?, value?);
+
+ Ok(self)
+ }
+
+ pub fn headers(mut self, headers: HeaderMap) -> Self {
+ self.headers = headers;
+ self
+ }
+
+ pub fn default_version_comparator<
+ F: Fn(Version, RemoteRelease) -> bool + Send + Sync + 'static,
+ >(
+ mut self,
+ f: F,
+ ) -> Self {
+ self.default_version_comparator.replace(Arc::new(f));
+ self
+ }
+
pub fn build(self) -> TauriPlugin {
let pubkey = self.pubkey;
let target = self.target;
+ let version_comparator = self.default_version_comparator;
let installer_args = self.installer_args;
+ let headers = self.headers;
PluginBuilder::::new("updater")
.setup(move |app, api| {
let mut config = api.config().clone();
@@ -176,7 +216,12 @@ impl Builder {
if let Some(windows) = &mut config.windows {
windows.installer_args.extend_from_slice(&installer_args);
}
- app.manage(UpdaterState { target, config });
+ app.manage(UpdaterState {
+ target,
+ config,
+ version_comparator,
+ headers,
+ });
Ok(())
})
.invoke_handler(tauri::generate_handler![
diff --git a/plugins/updater/src/updater.rs b/plugins/updater/src/updater.rs
index d66af3dc..65c91749 100644
--- a/plugins/updater/src/updater.rs
+++ b/plugins/updater/src/updater.rs
@@ -4,7 +4,7 @@
use std::{
collections::HashMap,
- ffi::{OsStr, OsString},
+ ffi::OsString,
io::Cursor,
path::{Path, PathBuf},
str::FromStr,
@@ -12,6 +12,9 @@ use std::{
time::Duration,
};
+#[cfg(not(target_os = "macos"))]
+use std::ffi::OsStr;
+
use base64::Engine;
use futures_util::StreamExt;
use http::HeaderName;
@@ -23,7 +26,7 @@ use reqwest::{
};
use semver::Version;
use serde::{de::Error as DeError, Deserialize, Deserializer, Serialize};
-use tauri::{utils::platform::current_exe, Resource};
+use tauri::{utils::platform::current_exe, AppHandle, Resource, Runtime};
use time::OffsetDateTime;
use url::Url;
@@ -93,12 +96,19 @@ impl RemoteRelease {
}
pub type OnBeforeExit = Arc;
+pub type OnBeforeRequest = Arc ClientBuilder + Send + Sync + 'static>;
+pub type VersionComparator = Arc bool + Send + Sync>;
+type MainThreadClosure = Box;
+type RunOnMainThread =
+ Box std::result::Result<(), tauri::Error> + Send + Sync + 'static>;
pub struct UpdaterBuilder {
+ #[allow(dead_code)]
+ run_on_main_thread: RunOnMainThread,
app_name: String,
current_version: Version,
config: Config,
- version_comparator: Option bool + Send + Sync>>,
+ pub(crate) version_comparator: Option,
executable_path: Option,
target: Option,
endpoints: Option>,
@@ -108,21 +118,24 @@ pub struct UpdaterBuilder {
installer_args: Vec,
current_exe_args: Vec,
on_before_exit: Option,
+ configure_client: Option,
}
impl UpdaterBuilder {
- /// It's prefered to use [`crate::UpdaterExt::updater_builder`] instead of
- /// constructing a [`UpdaterBuilder`] with this function yourself
- pub fn new(app_name: String, current_version: Version, config: crate::Config) -> Self {
+ pub(crate) fn new(app: &AppHandle, config: crate::Config) -> Self {
+ let app_ = app.clone();
+ let run_on_main_thread =
+ move |f: Box| app_.run_on_main_thread(f);
Self {
+ run_on_main_thread: Box::new(run_on_main_thread),
installer_args: config
.windows
.as_ref()
.map(|w| w.installer_args.clone())
.unwrap_or_default(),
current_exe_args: Vec::new(),
- app_name,
- current_version,
+ app_name: app.package_info().name.clone(),
+ current_version: app.package_info().version.clone(),
config,
version_comparator: None,
executable_path: None,
@@ -132,6 +145,7 @@ impl UpdaterBuilder {
timeout: None,
proxy: None,
on_before_exit: None,
+ configure_client: None,
}
}
@@ -139,7 +153,7 @@ impl UpdaterBuilder {
mut self,
f: F,
) -> Self {
- self.version_comparator = Some(Box::new(f));
+ self.version_comparator = Some(Arc::new(f));
self
}
@@ -178,6 +192,16 @@ impl UpdaterBuilder {
Ok(self)
}
+ pub fn headers(mut self, headers: HeaderMap) -> Self {
+ self.headers = headers;
+ self
+ }
+
+ pub fn clear_headers(mut self) -> Self {
+ self.headers.clear();
+ self
+ }
+
pub fn timeout(mut self, timeout: Duration) -> Self {
self.timeout = Some(timeout);
self
@@ -221,6 +245,19 @@ impl UpdaterBuilder {
self
}
+ /// Allows you to modify the `reqwest` client builder before the HTTP request is sent.
+ ///
+ /// Note that `reqwest` crate may be updated in minor releases of tauri-plugin-updater.
+ /// Therefore it's recommended to pin the plugin to at least a minor version when you're using `configure_client`.
+ ///
+ pub fn configure_client ClientBuilder + Send + Sync + 'static>(
+ mut self,
+ f: F,
+ ) -> Self {
+ self.configure_client.replace(Arc::new(f));
+ self
+ }
+
pub fn build(self) -> Result {
let endpoints = self
.endpoints
@@ -248,6 +285,7 @@ impl UpdaterBuilder {
};
Ok(Updater {
+ run_on_main_thread: Arc::new(self.run_on_main_thread),
config: self.config,
app_name: self.app_name,
current_version: self.current_version,
@@ -263,6 +301,7 @@ impl UpdaterBuilder {
headers: self.headers,
extract_path,
on_before_exit: self.on_before_exit,
+ configure_client: self.configure_client,
})
}
}
@@ -280,10 +319,12 @@ impl UpdaterBuilder {
}
pub struct Updater {
+ #[allow(dead_code)]
+ run_on_main_thread: Arc,
config: Config,
app_name: String,
current_version: Version,
- version_comparator: Option bool + Send + Sync>>,
+ version_comparator: Option,
timeout: Option,
proxy: Option,
endpoints: Vec,
@@ -295,6 +336,7 @@ pub struct Updater {
headers: HeaderMap,
extract_path: PathBuf,
on_before_exit: Option