chore(deps): update dependency typescript to v7

.cargo/audit.toml

@@ -1,17 +1,7 @@
 [advisories]
 ignore = [
-  # rsa Marvin Attack
-  "RUSTSEC-2023-0071",
   # time crate can't be updated in the repo because of MSRV, users are unaffected
   "RUSTSEC-2026-0009",
   # libflate crates can't be updated in the repo because of MSRV, users are unaffected
   "RUSTSEC-2026-0105",
-  # quick-xml, need an update in plist, can't be updated in the repo because of MSRV, users are unaffected
-  # Also needs on update in wayland-scanner > arboard > tauri-plugin-clipboard-manager
-  "RUSTSEC-2026-0194",
-  # quick-xml, need an update in plist, can't be updated in the repo because of MSRV, users are unaffected
-  # Also needs on update in wayland-scanner > arboard > tauri-plugin-clipboard-manager
-  "RUSTSEC-2026-0195",
-  # quinn-proto, can't be updated in the repo because of MSRV, users are unaffected
-  "RUSTSEC-2026-0185",
 ]

.changes/deep-link-platform.md

@@ -1,6 +0,0 @@
----
-"deep-link": patch
-"deep-link-js": patch
----
-
-adds proper Platform-specific sections to the docs for `register`, `unregister`, `isRegistered`, and `onOpenUrl`

.changes/fix-yield-single-instance-macos.md

@@ -0,0 +1,4 @@
+---
+"single-instance": patch
+---
+Fix blocked thread on the single-instance plugin for MacOS: replace standard `UnixListener` with `tokio::net::UnixListener`, so the task can yield.

.changes/fs-deny-scope.md

@@ -1,6 +0,0 @@
----
-"fs": patch
-"fs-js": patch
----
-
-Fixed `deny-webview-data` has no effect

.changes/log-file-open-strategy.md

@@ -0,0 +1,6 @@
+---
+"log": minor:feat
+"log-js": minor
+---
+
+Added the `FileOpenStrategy` for log rotation. It defaults to append into existing file if any (previous behaviour), and brings a new feature to create a new file per session: `FileOpenStrategy::Rotate`. 

.changes/nfc.md

@@ -1,6 +0,0 @@
----
-nfc: patch
-nfc-js: patch
----
-
-Expect a `NFCTag` as input and return a `ScanResponse` in the `scan` function.

.changes/positioner-current-monitor-panic.md

@@ -0,0 +1,6 @@
+---
+positioner: patch
+positioner-js: patch
+---
+
+Replaced a panic in `calculate_position` with an error return when the window has no associated monitor (e.g. during display sleep or monitor reconfiguration).

.changes/rmdep.md

@@ -0,0 +1,6 @@
+---
+"log": patch
+"log-js": patch
+---
+
+Removed an unused dependency `byte-unit`.

.changes/updater-install-no-restart.md

@@ -1,6 +0,0 @@
----
-"updater": minor
-"updater-js": minor
----
-
-On Windows, add a new option `restartAfterInstall`/`restart_after_install` to install an update without the installer re-launching the app

.github/workflows/audit-javascript.yml

@@ -33,19 +33,20 @@ jobs:
   audit-js:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
       - name: Cache pnpm modules
-        uses: actions/cache@v6
+        uses: actions/cache@v4
         with:
           path: ~/.pnpm-store
           key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-
-      - uses: actions/setup-node@v7
+      - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
-      - uses: pnpm/action-setup@v6
+      - uses: pnpm/action-setup@v4
         with:
+          version: 10.x.x
           run_install: true
       - name: audit
         run: pnpm audit

.github/workflows/audit-rust.yml

@@ -33,7 +33,7 @@ jobs:
   audit-rust:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
       - uses: rustsec/audit-check@v2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/check-change-files.yml

@@ -17,7 +17,7 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
 
       - name: check change files end with .md
         run: |

.github/workflows/check-generated-files.yml

@@ -21,7 +21,7 @@ jobs:
     outputs:
       packages: ${{ steps.filter.outputs.changes }}
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
       - uses: dorny/paths-filter@v2
         id: filter
         with:
@@ -153,20 +153,21 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
 
       - name: Cache pnpm modules
-        uses: actions/cache@v6
+        uses: actions/cache@v4
         with:
           path: ~/.pnpm-store
           key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-
-      - uses: actions/setup-node@v7
+      - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
-      - uses: pnpm/action-setup@v6
+      - uses: pnpm/action-setup@v4
         with:
+          version: 10.x.x
           run_install: true
 
       - name: build api

.github/workflows/check-license-header.yml

@@ -15,7 +15,7 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
       - uses: dorny/paths-filter@v2
         id: filter
         with:

.github/workflows/covector-status.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # required for use of git history
       - name: covector status

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

@@ -28,17 +28,18 @@ jobs:
       successfulPublish: ${{ steps.covector.outputs.successfulPublish }}
 
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0 # required for use of git history
 
-      - uses: actions/setup-node@v7
+      - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
           registry-url: 'https://registry.npmjs.org'
 
-      - uses: pnpm/action-setup@v6
+      - uses: pnpm/action-setup@v4
         with:
+          version: 10.x.x
           run_install: true
 
       - name: cargo login
@@ -73,7 +74,7 @@ jobs:
 
       - name: Create Pull Request With Versions Bumped
         id: cpr
-        uses: peter-evans/create-pull-request@v8.1.1
+        uses: peter-evans/create-pull-request@dd2324fc52d5d43c699a5636bcf19fceaa70c284 # 7.0.7
         if: steps.covector.outputs.commandRan == 'version'
         with:
           title: 'Publish New Versions (${{ github.ref_name }})'

.github/workflows/fmt.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
 
       - name: install Rust stable and rustfmt
         uses: dtolnay/rust-toolchain@stable
@@ -25,19 +25,20 @@ jobs:
   prettier:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
       - name: Cache pnpm modules
-        uses: actions/cache@v6
+        uses: actions/cache@v4
         with:
           path: ~/.pnpm-store
           key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-
-      - uses: actions/setup-node@v7
+      - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
-      - uses: pnpm/action-setup@v6
+      - uses: pnpm/action-setup@v4
         with:
+          version: 10.x.x
           run_install: true
       - run: pnpm format:check
 
@@ -45,7 +46,7 @@ jobs:
     name: taplo (.toml files)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
 
       - name: install Rust stable
         uses: dtolnay/rust-toolchain@stable

.github/workflows/integration-tests.yml

@@ -31,7 +31,7 @@ jobs:
         platform: [ubuntu-22.04, macos-latest, windows-latest]
 
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

.github/workflows/lint-javascript.yml

@@ -36,19 +36,20 @@ jobs:
   eslint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
       - name: Cache pnpm modules
-        uses: actions/cache@v6
+        uses: actions/cache@v4
         with:
           path: ~/.pnpm-store
           key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-
-      - uses: actions/setup-node@v7
+      - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
-      - uses: pnpm/action-setup@v6
+      - uses: pnpm/action-setup@v4
         with:
+          version: 10.x.x
           run_install: true
       - name: eslint
         run: pnpm lint

.github/workflows/lint-rust.yml

@@ -36,7 +36,7 @@ jobs:
     outputs:
       packages: ${{ steps.filter.outputs.changes }}
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
       - uses: dorny/paths-filter@v2
         id: filter
         with:
@@ -136,7 +136,7 @@ jobs:
         package: ${{ fromJSON(needs.changes.outputs.packages) }}
 
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
 
       - name: install webkit2gtk
         run: |

.github/workflows/sync.yml

@@ -19,25 +19,26 @@ jobs:
   sync-to-mirrors:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
 
       - name: Fetch git tags
         run: git fetch origin 'refs/tags/*:refs/tags/*'
 
       - name: Cache pnpm modules
-        uses: actions/cache@v6
+        uses: actions/cache@v4
         with:
           path: ~/.pnpm-store
           key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-
 
-      - uses: actions/setup-node@v7
+      - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
 
-      - uses: pnpm/action-setup@v6
+      - uses: pnpm/action-setup@v4
         with:
+          version: 10.x.x
           run_install: true
 
       - name: Build packages

.github/workflows/test-rust.yml

@@ -38,7 +38,7 @@ jobs:
     outputs:
       packages: ${{ steps.filter.outputs.changes }}
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
       - uses: dorny/paths-filter@v2
         id: filter
         with:
@@ -225,7 +225,7 @@ jobs:
     runs-on: ${{ matrix.platform.os }}
 
     steps:
-      - uses: actions/checkout@v7
+      - uses: actions/checkout@v4
 
       - name: install webkit2gtk
         if: contains(matrix.platform.target, 'unknown-linux')

Cargo.lock

@@ -201,13 +201,13 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.103"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
 [[package]]
 name = "api"
-version = "2.0.46"
+version = "2.0.44"
 dependencies = [
  "log",
  "serde",
@@ -300,7 +300,7 @@ dependencies = [
  "objc2-foundation 0.3.0",
  "parking_lot",
  "percent-encoding",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
  "wl-clipboard-rs",
  "x11rb",
 ]
@@ -1041,7 +1041,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -1862,7 +1862,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3463,6 +3463,9 @@ name = "log"
 version = "0.4.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+dependencies = [
+ "value-bag",
+]
 
 [[package]]
 name = "lru-slab"
@@ -4717,7 +4720,7 @@ dependencies = [
  "once_cell",
  "socket2",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5167,7 +5170,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.4.15",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5180,7 +5183,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys 0.11.0",
- "windows-sys 0.60.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -5237,7 +5240,7 @@ dependencies = [
  "security-framework 3.5.1",
  "security-framework-sys",
  "webpki-root-certs",
- "windows-sys 0.60.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -6309,9 +6312,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tauri"
-version = "2.11.5"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "667b20e2726d572dea2de7370da16e188eb06008faf9a92fab7cdc46791190b5"
+checksum = "b93bd86d231f0a8138f11a02a584769fe4b703dc36ae133d783228dbc4801405"
 dependencies = [
  "anyhow",
  "bytes",
@@ -6364,9 +6367,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-build"
-version = "2.6.3"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc9ce40b16101cb6ea63d3e221567affd1c3a9205f95d7bc574941a10636b632"
+checksum = "3a318b234cc2dea65f575467bafcfb76286bce228ebc3778e337d61d03213007"
 dependencies = [
  "anyhow",
  "cargo_toml",
@@ -6387,9 +6390,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-codegen"
-version = "2.6.3"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08279169ff42f8fc45a1dbc9dcae888893ba95288142e5880c59b93a26d2cfc5"
+checksum = "6bd11644962add2549a60b7e7c6800f17d7020156e02f516021d8103e80cc528"
 dependencies = [
  "base64 0.22.1",
  "ico",
@@ -6413,9 +6416,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-macros"
-version = "2.6.3"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8b394794f399a421811d06966343e7933fcae92d59f5180b9388d1174497a45"
+checksum = "fed9d3742a37a355d2e47c9af924e9fbc112abb76f9835d35d4780e318419502"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -6525,7 +6528,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-dialog"
-version = "2.7.2"
+version = "2.7.1"
 dependencies = [
  "log",
  "raw-window-handle",
@@ -6640,7 +6643,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-log"
-version = "2.9.0"
+version = "2.8.0"
 dependencies = [
  "android_logger",
  "fern",
@@ -6742,7 +6745,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-positioner"
-version = "2.3.3"
+version = "2.3.2"
 dependencies = [
  "log",
  "serde",
@@ -6782,7 +6785,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-single-instance"
-version = "2.4.3"
+version = "2.4.2"
 dependencies = [
  "semver",
  "serde",
@@ -6817,7 +6820,7 @@ dependencies = [
 
 [[package]]
 name = "tauri-plugin-store"
-version = "2.4.4"
+version = "2.4.3"
 dependencies = [
  "dunce",
  "serde",
@@ -6932,9 +6935,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime"
-version = "2.11.3"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0b4bc95aed361b0019067d189a1174a603d460d0f6c72606512d59fc9c12ec8"
+checksum = "8fef478ba1d2ac21c2d528740b24d0cb315e1e8b1111aae53fafac34804371fc"
 dependencies = [
  "cookie",
  "dpi",
@@ -6957,9 +6960,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-runtime-wry"
-version = "2.11.4"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e6fac707727b7a2f48e4ded90976324267371073edbb415ffb73bb0458d203f"
+checksum = "a3989df2ae1c476404fe0a2e8ffc4cfbde97e51efd613c2bb5355fbc9ab52cf0"
 dependencies = [
  "gtk",
  "http",
@@ -6983,9 +6986,9 @@ dependencies = [
 
 [[package]]
 name = "tauri-utils"
-version = "2.9.3"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e176a18e67764923c4f1ce66f25ae4abe5f688384d5eb1a0fa6c77f3d90f887"
+checksum = "d57200389a2f82b4b0a40ae29ca19b6978116e8f4d4e974c3234ce40c0ffbdec"
 dependencies = [
  "aes-gcm",
  "anyhow",
@@ -7033,10 +7036,11 @@ dependencies = [
 
 [[package]]
 name = "tauri-winrt-notification"
-version = "0.7.3"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed071c670382e85fc2f48ae706492d8c338f4f89bf72520d32f8abfe880aade"
+checksum = "0b1e66e07de489fe43a46678dd0b8df65e0c973909df1b60ba33874e297ba9b9"
 dependencies = [
+ "quick-xml 0.37.4",
  "thiserror 2.0.12",
  "windows 0.61.1",
  "windows-version",
@@ -7052,7 +7056,7 @@ dependencies = [
  "getrandom 0.3.2",
  "once_cell",
  "rustix 1.1.3",
- "windows-sys 0.60.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -7467,9 +7471,9 @@ dependencies = [
 
 [[package]]
 name = "tray-icon"
-version = "0.24.1"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65ba1e5f6b9ef9fd87e21b9c6f351554dbd717960089168fcfdef854686961dc"
+checksum = "15edbb0d80583e85ee8df283410038e17314df5cba30da2087a54a85216c0773"
 dependencies = [
  "crossbeam-channel",
  "dirs 6.0.0",
@@ -7741,6 +7745,12 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "value-bag"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
+
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
@@ -8186,7 +8196,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]

Cargo.toml

@@ -11,7 +11,7 @@ resolver = "2"
 [workspace.dependencies]
 serde = { version = "1", features = ["derive"] }
 tracing = "0.1"
-log = "0.4.21"
+log = "0.4"
 tauri = { version = "2.10", default-features = false }
 tauri-build = "2.5"
 tauri-plugin = "2.5"

examples/api/CHANGELOG.md

@@ -1,18 +1,5 @@
 # Changelog
 
-## \[2.0.42]
-
-### Dependencies
-
-- Upgraded to `dialog-js@2.7.2`
-- Upgraded to `store-js@2.4.4`
-
-## \[2.0.41]
-
-### Dependencies
-
-- Upgraded to `log-js@2.9.0`
-
 ## \[2.0.40]
 
 ### Dependencies

examples/api/index.html

@@ -1,13 +1,12 @@
 <!doctype html>
-<html lang="en">
+<html lang="en" theme="dark">
   <head>
     <meta charset="UTF-8" />
     <meta
       name="viewport"
       content="width=device-width, initial-scale=1.0, viewport-fit=cover, user-scalable=0"
     />
-    <meta name="color-scheme" content="dark light" />
-    <title>API Example App</title>
+    <title>Svelte + Vite App</title>
   </head>
 
   <body>

examples/api/package.json

@@ -1,7 +1,7 @@
 {
   "name": "api",
   "private": true,
-  "version": "2.0.42",
+  "version": "2.0.40",
   "type": "module",
   "scripts": {
     "dev": "vite --clearScreen false",
@@ -11,32 +11,32 @@
   },
   "dependencies": {
     "@tauri-apps/api": "^2.11.0",
-    "@tauri-apps/plugin-barcode-scanner": "workspace:*",
-    "@tauri-apps/plugin-biometric": "workspace:*",
-    "@tauri-apps/plugin-cli": "workspace:*",
-    "@tauri-apps/plugin-clipboard-manager": "workspace:*",
-    "@tauri-apps/plugin-dialog": "2",
-    "@tauri-apps/plugin-fs": "workspace:*",
-    "@tauri-apps/plugin-geolocation": "workspace:*",
-    "@tauri-apps/plugin-global-shortcut": "workspace:*",
-    "@tauri-apps/plugin-haptics": "workspace:*",
-    "@tauri-apps/plugin-http": "workspace:*",
-    "@tauri-apps/plugin-nfc": "workspace:*",
-    "@tauri-apps/plugin-notification": "workspace:*",
-    "@tauri-apps/plugin-opener": "workspace:*",
-    "@tauri-apps/plugin-os": "workspace:*",
-    "@tauri-apps/plugin-process": "workspace:*",
-    "@tauri-apps/plugin-shell": "workspace:*",
-    "@tauri-apps/plugin-store": "2",
-    "@tauri-apps/plugin-updater": "workspace:*",
-    "@tauri-apps/plugin-upload": "workspace:*",
+    "@tauri-apps/plugin-barcode-scanner": "^2.4.5",
+    "@tauri-apps/plugin-biometric": "^2.3.2",
+    "@tauri-apps/plugin-cli": "^2.4.1",
+    "@tauri-apps/plugin-clipboard-manager": "^2.3.2",
+    "@tauri-apps/plugin-dialog": "^2.7.1",
+    "@tauri-apps/plugin-fs": "^2.5.1",
+    "@tauri-apps/plugin-geolocation": "^2.3.2",
+    "@tauri-apps/plugin-global-shortcut": "^2.3.2",
+    "@tauri-apps/plugin-haptics": "^2.3.2",
+    "@tauri-apps/plugin-http": "^2.5.9",
+    "@tauri-apps/plugin-nfc": "^2.3.5",
+    "@tauri-apps/plugin-notification": "^2.3.3",
+    "@tauri-apps/plugin-opener": "^2.5.4",
+    "@tauri-apps/plugin-os": "^2.3.2",
+    "@tauri-apps/plugin-process": "^2.3.1",
+    "@tauri-apps/plugin-shell": "^2.3.5",
+    "@tauri-apps/plugin-store": "^2.4.3",
+    "@tauri-apps/plugin-updater": "^2.10.1",
+    "@tauri-apps/plugin-upload": "^2.4.0",
     "@zerodevx/svelte-json-view": "1.0.11"
   },
   "devDependencies": {
     "@iconify-json/codicon": "^1.2.49",
     "@iconify-json/ph": "^1.2.2",
     "@sveltejs/vite-plugin-svelte": "^7.0.0",
-    "@tauri-apps/cli": "2.11.4",
+    "@tauri-apps/cli": "2.11.2",
     "@unocss/extractor-svelte": "^66.6.7",
     "svelte": "^5.54.0",
     "unocss": "^66.6.7",

examples/api/src-tauri/CHANGELOG.md

@@ -1,18 +1,5 @@
 # Changelog
 
-## \[2.0.46]
-
-### Dependencies
-
-- Upgraded to `dialog@2.7.2`
-- Upgraded to `store@2.4.4`
-
-## \[2.0.45]
-
-### Dependencies
-
-- Upgraded to `log@2.9.0`
-
 ## \[2.0.44]
 
 ### Dependencies

examples/api/src-tauri/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "api"
 publish = false
-version = "2.0.46"
+version = "2.0.44"
 description = "An example Tauri Application showcasing the api"
 edition = "2021"
 rust-version = { workspace = true }
@@ -20,12 +20,12 @@ serde = { workspace = true }
 tiny_http = "0.12"
 time = "0.3"
 log = { workspace = true }
-tauri-plugin-log = { path = "../../../plugins/log", version = "2.9.0" }
+tauri-plugin-log = { path = "../../../plugins/log", version = "2.8.0" }
 tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.5.1", features = [
   "watch",
 ] }
 tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.3.2" }
-tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.7.2" }
+tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.7.1" }
 tauri-plugin-http = { path = "../../../plugins/http", features = [
   "multipart",
   "cookies",
@@ -37,7 +37,7 @@ tauri-plugin-os = { path = "../../../plugins/os", version = "2.3.2" }
 tauri-plugin-process = { path = "../../../plugins/process", version = "2.3.1" }
 tauri-plugin-opener = { path = "../../../plugins/opener", version = "2.5.4" }
 tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.3.5" }
-tauri-plugin-store = { path = "../../../plugins/store", version = "2.4.4" }
+tauri-plugin-store = { path = "../../../plugins/store", version = "2.4.3" }
 tauri-plugin-upload = { path = "../../../plugins/upload", version = "2.3.0" }
 
 [dependencies.tauri]

examples/api/src-tauri/capabilities/base.json

@@ -15,10 +15,10 @@
       ]
     },
     "core:default",
-    "core:app:allow-set-app-theme",
     "fs:default",
     "core:window:allow-minimize",
-    "core:window:allow-toggle-maximize",
+    "core:window:allow-maximize",
+    "core:window:allow-unmaximize",
     "core:window:allow-close",
     "core:window:allow-start-dragging",
     "notification:default",

examples/api/src-tauri/gen/android/app/src/main/java/com/tauri/api/MainActivity.kt

@@ -1,11 +1,3 @@
 package com.tauri.api
 
-import android.os.Bundle
-import androidx.activity.enableEdgeToEdge
-
-class MainActivity : TauriActivity() {
-  override fun onCreate(savedInstanceState: Bundle?) {
-    enableEdgeToEdge()
-    super.onCreate(savedInstanceState)
-  }
-}
+class MainActivity : TauriActivity()

examples/api/src-tauri/gen/android/app/src/main/res/values-night/themes.xml

@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.api" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.api" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
     </style>
 </resources>

examples/api/src-tauri/gen/android/app/src/main/res/values/themes.xml

@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.api" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.api" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
     </style>
 </resources>

examples/api/src-tauri/gen/android/buildSrc/src/main/java/com/tauri/api/kotlin/BuildTask.kt

@@ -21,23 +21,7 @@ open class BuildTask : DefaultTask() {
             runTauriCli(executable)
         } catch (e: Exception) {
             if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-                // Try different Windows-specific extensions
-                val fallbacks = listOf(
-                    "$executable.exe",
-                    "$executable.cmd",
-                    "$executable.bat",
-                )
-                
-                var lastException: Exception = e
-                for (fallback in fallbacks) {
-                    try {
-                        runTauriCli(fallback)
-                        return
-                    } catch (fallbackException: Exception) {
-                        lastException = fallbackException
-                    }
-                }
-                throw lastException
+                runTauriCli("$executable.cmd")
             } else {
                 throw e;
             }

examples/api/src-tauri/gen/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Tue May 10 19:22:52 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

examples/api/src-tauri/tauri.conf.json

@@ -77,9 +77,7 @@
     },
     "updater": {
       "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDE5QzMxNjYwNTM5OEUwNTgKUldSWTRKaFRZQmJER1h4d1ZMYVA3dnluSjdpN2RmMldJR09hUFFlZDY0SlFqckkvRUJhZDJVZXAK",
-      "dangerousInsecureTransportProtocol": true,
       "endpoints": [
-        "http://localhost:5173/updater-test/updater.json",
         "https://tauri-update-server.vercel.app/update/{{target}}/{{current_version}}"
       ]
     }
@@ -101,9 +99,6 @@
             "localePath": "locales/pt-BR.wxl"
           }
         }
-      },
-      "nsis": {
-        "compression": "none"
       }
     },
     "iOS": {

examples/api/src/App.svelte

@@ -1,16 +1,7 @@
-<script module lang="ts">
-  export type ViewProps = {
-    onMessage: (value: unknown) => void
-  }
-</script>
-
-<script lang="ts">
-  import { onMount, tick } from 'svelte'
+<script>
   import { writable } from 'svelte/store'
-  import { MediaQuery } from 'svelte/reactivity'
-  import { getCurrentWindow, type Theme } from '@tauri-apps/api/window'
+  import { getCurrentWindow } from '@tauri-apps/api/window'
   import { getCurrentWebview } from '@tauri-apps/api/webview'
-  import { setTheme } from '@tauri-apps/api/app'
   import * as os from '@tauri-apps/plugin-os'
 
   import Welcome from './views/Welcome.svelte'
@@ -32,9 +23,10 @@
   import Biometric from './views/Biometric.svelte'
   import Geolocation from './views/Geolocation.svelte'
   import Haptics from './views/Haptics.svelte'
-  import Nfc from './views/Nfc.svelte'
 
-  import TitleBar from './lib/TitleBar.svelte'
+  import { onMount, tick } from 'svelte'
+  import { ask } from '@tauri-apps/plugin-dialog'
+  import Nfc from './views/Nfc.svelte'
 
   const appWindow = getCurrentWindow()
 
@@ -156,98 +148,114 @@
       component: Haptics,
       icon: 'i-ph-vibrate'
     }
-  ].filter(Boolean) as {
-    label: string
-    component: typeof Haptics
-    icon: string
-  }[]
-  let selected = $state.raw(views[0])
+  ]
 
-  // dark/light themes
-  const preferDark = new MediaQuery('prefers-color-scheme: dark')
-  let theme = $state<Theme | 'auto'>(
-    (localStorage.getItem('theme') as Theme | null) || 'auto'
-  )
-
-  async function switchTheme() {
-    switch (theme) {
-      case 'dark':
-        theme = 'light'
-        break
-      case 'light':
-        theme = 'auto'
-        break
-      case 'auto':
-        theme = 'dark'
-        break
-    }
-    applyTheme()
+  let selected = views[0]
+  function select(view) {
+    selected = view
   }
 
-  function applyTheme() {
-    const isDark = theme === 'auto' ? preferDark.current : theme === 'dark'
-    if (isDark) {
-      document.documentElement.classList.add('dark')
-      document.documentElement.classList.remove('light')
-    } else {
-      document.documentElement.classList.remove('dark')
-      document.documentElement.classList.add('light')
-    }
-    setTheme(theme === 'auto' ? null : theme)
-    localStorage.setItem('theme', theme)
-  }
-
-  $effect(() => {
-    applyTheme()
+  // Window controls
+  let isWindowMaximized
+  onMount(async () => {
+    isWindowMaximized = await appWindow.isMaximized()
+    appWindow.onResized(async () => {
+      isWindowMaximized = await appWindow.isMaximized()
+    })
   })
 
-  // Console
-  const messages = writable<string[]>([])
-  let consoleTextEl: HTMLDivElement
-
-  // this function is renders HTML without sanitizing it so it's insecure
-  // we only use it with our own input data
-  async function insecureRenderHtml(html: string) {
-    messages.update((r) => [
-      ...r,
-      `<pre><strong class="text-accent dark:text-darkAccent">[${new Date().toLocaleTimeString()}]:</strong> ${html}</pre>`
-    ])
-    await tick()
-    consoleTextEl.scrollTop = consoleTextEl.scrollHeight
+  function minimize() {
+    appWindow.minimize()
   }
 
-  async function onMessage(value: unknown) {
-    const valueStr =
-      typeof value === 'string'
-        ? value
-        : JSON.stringify(
-            value instanceof ArrayBuffer
-              ? Array.from(new Uint8Array(value))
-              : value,
-            null,
-            1
-          )
-    insecureRenderHtml(valueStr)
+  async function toggleMaximize() {
+    ;(await appWindow.isMaximized())
+      ? appWindow.unmaximize()
+      : appWindow.maximize()
+  }
+
+  let confirmed_close = false
+  async function close() {
+    if (!confirmed_close) {
+      confirmed_close = await ask(
+        'Are you sure that you want to close this window?',
+        {
+          title: 'Tauri API'
+        }
+      )
+      if (confirmed_close) {
+        appWindow.close()
+      }
+    }
+  }
+
+  // dark/light
+  let isDark
+  onMount(() => {
+    isDark = localStorage && localStorage.getItem('theme') == 'dark'
+    applyTheme(isDark)
+  })
+  function applyTheme(isDark) {
+    const html = document.querySelector('html')
+    isDark ? html.classList.add('dark') : html.classList.remove('dark')
+    localStorage && localStorage.setItem('theme', isDark ? 'dark' : '')
+  }
+  function toggleDark() {
+    isDark = !isDark
+    applyTheme(isDark)
+  }
+
+  // Console
+  let messages = writable([])
+  let consoleTextEl
+  async function onMessage(value) {
+    messages.update((r) => [
+      ...r,
+      {
+        html:
+          `<pre><strong class="text-accent dark:text-darkAccent">[${new Date().toLocaleTimeString()}]:</strong> ` +
+          (typeof value === 'string' ? value : JSON.stringify(value, null, 1)) +
+          '</pre>'
+      }
+    ])
+    await tick()
+    if (consoleTextEl) consoleTextEl.scrollTop = consoleTextEl.scrollHeight
+  }
+
+  // this function renders HTML without sanitizing it so it's insecure
+  // we only use it with our own input data
+  async function insecureRenderHtml(html) {
+    messages.update((r) => [
+      ...r,
+      {
+        html:
+          `<pre><strong class="text-accent dark:text-darkAccent">[${new Date().toLocaleTimeString()}]:</strong> ` +
+          html +
+          '</pre>'
+      }
+    ])
+    await tick()
+    if (consoleTextEl) consoleTextEl.scrollTop = consoleTextEl.scrollHeight
   }
 
   function clear() {
     messages.update(() => [])
   }
 
-  let consoleEl: HTMLDivElement
-  let consoleH = 0
-  let cStartY = 0
-  const minConsoleHeight = 50
-  function startResizingConsole(e: MouseEvent) {
+  let consoleEl, consoleH, cStartY
+  let minConsoleHeight = 50
+  function startResizingConsole(e) {
     cStartY = e.clientY
 
     const styles = window.getComputedStyle(consoleEl)
     consoleH = parseInt(styles.height, 10)
 
-    const moveHandler = (e: MouseEvent) => {
+    const moveHandler = (e) => {
       const dy = e.clientY - cStartY
       const newH = consoleH - dy
-      consoleEl.style.height = `${newH < minConsoleHeight ? minConsoleHeight : newH}px`
+      consoleEl.style.height = `${
+        newH < minConsoleHeight ? minConsoleHeight : newH
+      }px`
     }
     const upHandler = () => {
       document.removeEventListener('mouseup', upHandler)
@@ -257,19 +265,21 @@
     document.addEventListener('mousemove', moveHandler)
   }
 
-  let isWindows = os.platform() === 'windows'
+  let isWindows
+  onMount(async () => {
+    isWindows = (await os.platform()) === 'windows'
+  })
 
   // mobile
-  let isSideBarOpen = $state(false)
-  let sidebar: HTMLElement
-  let sidebarToggle: HTMLElement
+  let isSideBarOpen = false
+  let sidebar
+  let sidebarToggle
   let isDraggingSideBar = false
   let draggingStartPosX = 0
   let draggingEndPosX = 0
-  const clamp = (min: number, num: number, max: number) =>
-    Math.min(Math.max(num, min), max)
+  const clamp = (min, num, max) => Math.min(Math.max(num, min), max)
 
-  function toggleSidebar() {
+  function toggleSidebar(sidebar, isSideBarOpen) {
     sidebar.style.setProperty(
       '--translate-x',
       `${isSideBarOpen ? '0' : '-18.75'}rem`
@@ -277,9 +287,10 @@
   }
 
   onMount(() => {
-    document.addEventListener('click', (e) => {
-      if (!(e.target instanceof Node)) return
+    sidebar = document.querySelector('#sidebar')
+    sidebarToggle = document.querySelector('#sidebarToggle')
 
+    document.addEventListener('click', (e) => {
       if (sidebarToggle.contains(e.target)) {
         isSideBarOpen = !isSideBarOpen
       } else if (isSideBarOpen && !sidebar.contains(e.target)) {
@@ -288,7 +299,6 @@
     })
 
     document.addEventListener('touchstart', (e) => {
-      if (!(e.target instanceof Node)) return
       if (sidebarToggle.contains(e.target)) return
 
       const x = e.touches[0].clientX
@@ -320,22 +330,76 @@
     })
   })
 
-  $effect(() => {
-    toggleSidebar()
-  })
+  $: {
+    const sidebar = document.querySelector('#sidebar')
+    if (sidebar) {
+      toggleSidebar(sidebar, isSideBarOpen)
+    }
+  }
 </script>
 
 <!-- custom titlebar for Windows -->
 {#if isWindows}
-  <TitleBar {appWindow} {theme} {switchTheme} />
+  <div
+    class="w-screen select-none h-8 pl-2 flex justify-between items-center absolute text-primaryText dark:text-darkPrimaryText"
+    data-tauri-drag-region
+  >
+    <span class="lt-sm:pl-10 text-darkPrimaryText">Tauri API Validation</span>
+    <span
+      class="
+      h-100%
+      children:h-100% children:w-12 children:inline-flex
+      children:items-center children:justify-center"
+    >
+      <button
+        aria-label="Toggle dark mode"
+        title={isDark ? 'Switch to Light mode' : 'Switch to Dark mode'}
+        class="bg-inherit border-none hover:bg-hoverOverlay active:bg-hoverOverlayDarker dark:hover:bg-darkHoverOverlay dark:active:bg-darkHoverOverlayDarker"
+        on:click={toggleDark}
+      >
+        {#if isDark}
+          <div class="i-ph-sun"></div>
+        {:else}
+          <div class="i-ph-moon"></div>
+        {/if}
+      </button>
+      <button
+        aria-label="Minimize window"
+        title="Minimize"
+        class="bg-inherit border-none hover:bg-hoverOverlay active:bg-hoverOverlayDarker dark:hover:bg-darkHoverOverlay dark:active:bg-darkHoverOverlayDarker"
+        on:click={minimize}
+      >
+        <div class="i-codicon-chrome-minimize"></div>
+      </button>
+      <button
+        aria-label="Maximize window"
+        title={isWindowMaximized ? 'Restore' : 'Maximize'}
+        class="bg-inherit border-none hover:bg-hoverOverlay active:bg-hoverOverlayDarker dark:hover:bg-darkHoverOverlay dark:active:bg-darkHoverOverlayDarker"
+        on:click={toggleMaximize}
+      >
+        {#if isWindowMaximized}
+          <div class="i-codicon-chrome-restore"></div>
+        {:else}
+          <div class="i-codicon-chrome-maximize"></div>
+        {/if}
+      </button>
+      <button
+        aria-label="Close window"
+        title="Close"
+        class="bg-inherit border-none hover:bg-red-700 dark:hover:bg-red-700 hover:text-darkPrimaryText active:bg-red-700/90 dark:active:bg-red-700/90 active:text-darkPrimaryText"
+        on:click={close}
+      >
+        <div class="i-codicon-chrome-close"></div>
+      </button>
+    </span>
+  </div>
 {/if}
 
 <!-- Sidebar toggle, only visible on small screens -->
 <div
   id="sidebarToggle"
-  bind:this={sidebarToggle}
-  class="z-2000 hidden lt-sm:flex justify-center absolute items-center w-8 h-8 rd-8
-            bg-accent dark:bg-darkAccent active:bg-accentDark dark:active:bg-darkAccentDark text-accentText dark:text-darkAccentText"
+  class="z-2000 sidebar-toggle hidden lt-sm:flex justify-center absolute items-center w-8 h-8 rd-8
+            bg-accent dark:bg-darkAccent active:bg-accentDark dark:active:bg-darkAccentDark"
 >
   {#if isSideBarOpen}
     <span class="i-codicon-close animate-duration-300ms animate-fade-in"></span>
@@ -345,11 +409,10 @@
 </div>
 
 <div
-  class="flex h-screen w-screen overflow-hidden text-primaryText dark:text-darkPrimaryText"
+  class="flex h-screen w-screen overflow-hidden children-pt8 children-pb-2 text-primaryText dark:text-darkPrimaryText"
 >
   <aside
     id="sidebar"
-    bind:this={sidebar}
     class="lt-sm:h-screen lt-sm:shadow-lg lt-sm:shadow lt-sm:transition-transform lt-sm:absolute lt-sm:z-1999
       bg-darkPrimaryLighter transition-colors-250 overflow-hidden grid select-none px-2"
   >
@@ -357,16 +420,13 @@
       <img class="p-7" src="tauri_logo.png" alt="Tauri logo" />
     </a>
     {#if !isWindows}
-      <a href="##" class="nv justify-between" onclick={switchTheme}>
-        {#if theme === 'auto'}
-          Switch to Dark mode
-          <div class="i-ph-circle-half-fill"></div>
-        {:else if theme === 'dark'}
+      <a href="##" class="nv justify-between h-8" on:click={toggleDark}>
+        {#if isDark}
           Switch to Light mode
-          <div class="i-ph-moon"></div>
-        {:else if theme === 'light'}
-          Switch to Auto mode
           <div class="i-ph-sun"></div>
+        {:else}
+          Switch to Dark mode
+          <div class="i-ph-moon"></div>
         {/if}
       </a>
       <br />
@@ -375,7 +435,7 @@
     {/if}
 
     <a
-      class="nv justify-between"
+      class="nv justify-between h-8"
       target="_blank"
       href="https://tauri.app/v1/guides/"
     >
@@ -383,7 +443,7 @@
       <span class="i-codicon-link-external"></span>
     </a>
     <a
-      class="nv justify-between"
+      class="nv justify-between h-8"
       target="_blank"
       href="https://github.com/tauri-apps/tauri"
     >
@@ -391,7 +451,7 @@
       <span class="i-codicon-link-external"></span>
     </a>
     <a
-      class="nv justify-between"
+      class="nv justify-between h-8"
       target="_blank"
       href="https://github.com/tauri-apps/tauri/tree/dev/examples/api"
     >
@@ -401,19 +461,23 @@
     <br />
     <div class="bg-white/5 h-2px"></div>
     <br />
-    <div class="flex flex-col overflow-y-auto children-flex-none gap-1">
+    <div
+      class="flex flex-col overflow-y-auto children-h-10 children-flex-none gap-1"
+    >
       {#each views as view}
-        <a
-          href="##"
-          class="nv {selected === view ? 'nv_selected' : ''}"
-          onclick={() => {
-            selected = view
-            isSideBarOpen = false
-          }}
-        >
-          <div class="{view.icon} mr-2"></div>
-          <p>{view.label}</p></a
-        >
+        {#if view}
+          <a
+            href="##"
+            class="nv {selected === view ? 'nv_selected' : ''}"
+            on:click={() => {
+              select(view)
+              isSideBarOpen = false
+            }}
+          >
+            <div class="{view.icon} mr-2"></div>
+            <p>{view.label}</p></a
+          >
+        {/if}
       {/each}
     </div>
   </aside>
@@ -425,7 +489,11 @@
       <h1>{selected.label}</h1>
       <div class="overflow-y-auto">
         <div class="mr-2">
-          <selected.component {onMessage} />
+          <svelte:component
+            this={selected.component}
+            {onMessage}
+            {insecureRenderHtml}
+          />
         </div>
       </div>
     </div>
@@ -435,21 +503,20 @@
       id="console"
       class="select-none h-15rem grid grid-rows-[2px_2rem_1fr] gap-1 overflow-hidden"
     >
+      <!-- svelte-ignore a11y_no_static_element_interactions -->
       <div
-        role="button"
-        tabindex="0"
-        onmousedown={startResizingConsole}
+        on:mousedown={startResizingConsole}
         class="bg-black/20 h-2px cursor-ns-resize"
       ></div>
       <div class="flex justify-between items-center px-2">
         <p class="font-semibold">Console</p>
         <button
           aria-label="Clear Console"
-          class="cursor-pointer h-85% rd-1 p-1 flex justify-center items-center border-none
+          class="cursor-pointer h-85% rd-1 p-1 flex justify-center items-center border-none bg-inherit
                 hover:bg-hoverOverlay dark:hover:bg-darkHoverOverlay
                 active:bg-hoverOverlay/25 dark:active:bg-darkHoverOverlay/25
           "
-          onclick={clear}
+          on:click={clear}
         >
           <div class="i-codicon-clear-all"></div>
         </button>
@@ -458,8 +525,8 @@
         bind:this={consoleTextEl}
         class="px-2 overflow-y-auto all:font-mono code-block all:text-xs select-text mr-2"
       >
-        {#each $messages as messageHtml}
-          {@html messageHtml}
+        {#each $messages as r}
+          {@html r.html}
         {/each}
       </div>
     </div>

examples/api/src/app.css

@@ -1,14 +1,3 @@
-:root {
-  line-height: 1.5;
-}
-
-:root.dark {
-  color-scheme: dark;
-}
-:root.light {
-  color-scheme: light;
-}
-
 *:not(h1, h2, h3, h4, h5, h6) {
   margin: 0;
   padding: 0;
@@ -19,11 +8,6 @@
   font-family: 'Rubik', sans-serif;
 }
 
-button {
-  color: inherit;
-  background-color: inherit;
-}
-
 ::-webkit-scrollbar {
   width: 0.25rem;
   height: 3px;
@@ -49,34 +33,27 @@ code.code-block {
   width: 18.75rem;
 }
 
-@media screen and (width < 640px) {
+@media screen and (max-width: 640px) {
   #sidebar {
     --translate-x: -18.75rem;
     transform: translateX(var(--translate-x));
   }
 }
 
-#sidebar,
-main {
-  padding-top: calc(env(safe-area-inset-top) + 2rem);
+.sidebar-toggle {
+  margin-top: 0.5rem;
+  margin-left: 0.5rem;
 }
 
-#sidebar {
-  padding-left: calc(env(safe-area-inset-left) + 0.5rem);
-}
-
-main {
-  padding-right: env(safe-area-inset-right);
-}
-
-#sidebarToggle {
-  margin-top: calc(env(safe-area-inset-top) + 0.5rem);
-  margin-left: calc(env(safe-area-inset-left) + 0.5rem);
+body {
+  overflow: hidden;
+  padding: env(safe-area-inset-top) env(safe-area-inset-right)
+    env(safe-area-inset-bottom) env(safe-area-inset-left);
 }
 
 #sidebar,
 #console {
-  padding-bottom: calc(env(safe-area-inset-bottom) + 1.5rem);
+  padding-bottom: calc(env(safe-area-inset-bottom) + 24px);
 }
 
 .transparent {

examples/api/src/lib/TitleBar.svelte

@@ -1,103 +0,0 @@
-<script lang="ts">
-  import type { Theme, Window } from '@tauri-apps/api/window'
-  import { ask } from '@tauri-apps/plugin-dialog'
-  import { onMount } from 'svelte'
-
-  let {
-    appWindow,
-    switchTheme,
-    theme
-  }: { appWindow: Window; switchTheme: () => void; theme: Theme | 'auto' } =
-    $props()
-
-  // Window controls
-  let isWindowMaximized = $state(false)
-  onMount(async () => {
-    isWindowMaximized = await appWindow.isMaximized()
-    appWindow.onResized(async () => {
-      isWindowMaximized = await appWindow.isMaximized()
-    })
-  })
-
-  async function minimize() {
-    await appWindow.minimize()
-  }
-
-  async function toggleMaximize() {
-    await appWindow.toggleMaximize()
-  }
-
-  let confirmedClose = false
-  async function close() {
-    if (!confirmedClose) {
-      confirmedClose = await ask(
-        'Are you sure that you want to close this window?',
-        {
-          title: 'Tauri API'
-        }
-      )
-      if (confirmedClose) {
-        appWindow.close()
-      }
-    }
-  }
-</script>
-
-<div
-  class="w-screen select-none h-8 flex justify-between items-center absolute text-primaryText dark:text-darkPrimaryText"
-  data-tauri-drag-region
->
-  <span
-    class="h-100% pl-2 flex-1 flex items-center lt-sm:pl-10 lt-lg:text-darkPrimaryText [app-region:drag]"
-    >Tauri API Validation</span
-  >
-  <span
-    class="
-      h-100%
-      children:h-100% children:w-12 children:inline-flex
-      children:items-center children:justify-center"
-  >
-    <button
-      aria-label="Toggle dark mode"
-      title={theme ? 'Switch to Light mode' : 'Switch to Dark mode'}
-      class="border-none hover:bg-hoverOverlay active:bg-hoverOverlayDarker dark:hover:bg-darkHoverOverlay dark:active:bg-darkHoverOverlayDarker"
-      onclick={switchTheme}
-    >
-      {#if theme === 'auto'}
-        <div title="Switch to Dark mode" class="i-ph-circle-half-fill"></div>
-      {:else if theme === 'dark'}
-        <div title="Switch to Light mode" class="i-ph-moon"></div>
-      {:else if theme === 'light'}
-        <div title="Switch to Auto mode" class="i-ph-sun"></div>
-      {/if}
-    </button>
-    <button
-      aria-label="Minimize window"
-      title="Minimize"
-      class="border-none hover:bg-hoverOverlay active:bg-hoverOverlayDarker dark:hover:bg-darkHoverOverlay dark:active:bg-darkHoverOverlayDarker"
-      onclick={minimize}
-    >
-      <div class="i-codicon-chrome-minimize"></div>
-    </button>
-    <button
-      aria-label="Maximize window"
-      title={isWindowMaximized ? 'Restore' : 'Maximize'}
-      class="border-none hover:bg-hoverOverlay active:bg-hoverOverlayDarker dark:hover:bg-darkHoverOverlay dark:active:bg-darkHoverOverlayDarker"
-      onclick={toggleMaximize}
-    >
-      {#if isWindowMaximized}
-        <div class="i-codicon-chrome-restore"></div>
-      {:else}
-        <div class="i-codicon-chrome-maximize"></div>
-      {/if}
-    </button>
-    <button
-      aria-label="Close window"
-      title="Close"
-      class="border-none hover:bg-red-700 dark:hover:bg-red-700 hover:text-darkPrimaryText active:bg-red-700/90 dark:active:bg-red-700/90 active:text-darkPrimaryText"
-      onclick={close}
-    >
-      <div class="i-codicon-chrome-close"></div>
-    </button>
-  </span>
-</div>

examples/api/src/views/Clipboard.svelte

@@ -5,6 +5,7 @@
   import { readFile } from '@tauri-apps/plugin-fs'
 
   export let onMessage
+  export let insecureRenderHtml
   let text = 'clipboard message'
 
   function writeText() {
@@ -40,7 +41,7 @@
       const image = await clipboard.readImage()
       arrayBufferToBase64(await image.rgba(), function (base64) {
         const src = 'data:image/png;base64,' + base64
-        onMessage('<img src="' + src + '"></img>')
+        insecureRenderHtml('<img src="' + src + '"></img>')
       })
       return
     } catch (_) {}

examples/api/src/views/Dialog.svelte

@@ -1,138 +1,129 @@
-<script lang="ts">
-  import {
-    open,
-    save,
-    confirm,
-    message,
-    type PickerMode,
-    type FileAccessMode
-  } from '@tauri-apps/plugin-dialog'
-  import { readFile } from '@tauri-apps/plugin-fs'
-  import type { ViewProps } from '../App.svelte'
+<script>
+  import { open, save, confirm, message } from "@tauri-apps/plugin-dialog";
+  import { readFile } from "@tauri-apps/plugin-fs";
 
-  let { onMessage }: ViewProps = $props()
+  export let onMessage;
+  export let insecureRenderHtml;
+  let defaultPath = null;
+  let filter = null;
+  let multiple = false;
+  let directory = false;
+  let pickerMode = "document";
+  let fileAccessMode = "scoped";
 
-  let defaultPath: string | undefined = $state()
-  let filter = $state('')
-  let multiple = $state(false)
-  let directory = $state(false)
-  let pickerMode: PickerMode = $state('document')
-  let fileAccessMode: FileAccessMode = $state('scoped')
-
-  function arrayBufferToBase64(
-    buffer: ArrayBuffer,
-    callback: (base64: string) => void
-  ) {
+  function arrayBufferToBase64(buffer, callback) {
     var blob = new Blob([buffer], {
-      type: 'application/octet-binary'
-    })
-    var reader = new FileReader()
+      type: "application/octet-binary",
+    });
+    var reader = new FileReader();
     reader.onload = function (evt) {
-      var dataurl = evt.target!.result as string
-      callback(dataurl.split(',')[1])
-    }
-    reader.readAsDataURL(blob)
+      var dataurl = evt.target.result;
+      callback(dataurl.substr(dataurl.indexOf(",") + 1));
+    };
+    reader.readAsDataURL(blob);
   }
 
   async function prompt() {
-    confirm('Do you want to do something?')
-      .then((res) => onMessage(res ? 'Yes' : 'No'))
-      .catch(onMessage)
+    confirm("Do you want to do something?")
+      .then((res) => onMessage(res ? "Yes" : "No"))
+      .catch(onMessage);
   }
 
   async function promptCustom() {
-    confirm('Is Tauri awesome?', {
-      okLabel: 'Absolutely',
-      cancelLabel: 'Totally'
+    confirm("Is Tauri awesome?", {
+      okLabel: "Absolutely",
+      cancelLabel: "Totally",
     })
       .then((res) =>
         onMessage(
-          res ? 'Tauri is absolutely awesome' : 'Tauri is totally awesome'
+          res ? "Tauri is absolutely awesome" : "Tauri is totally awesome"
         )
       )
-      .catch(onMessage)
+      .catch(onMessage);
   }
 
   async function msg() {
-    await message('Tauri is awesome!').then((res) => onMessage(res))
+    await message("Tauri is awesome!").then((res) => onMessage(res));
   }
 
-  async function msgCustom() {
-    const buttons = { yes: 'awesome', no: 'amazing', cancel: 'stunning' }
+  async function msgCustom(result) {
+    const buttons = { yes: "awesome", no: "amazing", cancel: "stunning" };
     await message(`Tauri is: `, { buttons })
       .then((res) => onMessage(`Tauri is ${res}`))
-      .catch(onMessage)
+      .catch(onMessage);
   }
 
   async function openDialog() {
     try {
-      const result = await open({
-        title: 'My wonderful open dialog',
+      var result = await open({
+        title: "My wonderful open dialog",
         defaultPath,
         filters: filter
           ? [
               {
-                name: 'Tauri Example',
-                extensions: filter.split(',').map((f) => f.trim())
-              }
+                name: "Tauri Example",
+                extensions: filter.split(",").map((f) => f.trim()),
+              },
             ]
           : [],
         multiple,
         directory,
         pickerMode,
-        fileAccessMode
+        fileAccessMode,
       })
 
       if (Array.isArray(result)) {
-        onMessage(result)
-      } else if (result === null) {
-        onMessage('user cancelled the selection')
+        onMessage(result);
       } else {
-        const pathToRead = result
-        const isFile = pathToRead.match(/\S+\.\S+$/g)
+        var pathToRead = result;
+        var isFile = pathToRead.match(/\S+\.\S+$/g);
 
-        await readFile(pathToRead).then(function (res) {
-          if (isFile) {
-            if (
-              pathToRead.includes('.png')
-              || pathToRead.includes('.jpg')
-              || pathToRead.includes('.jpeg')
-            ) {
-              arrayBufferToBase64(res.buffer, function (base64) {
-                const src = 'data:image/png;base64,' + base64
-                onMessage('<img src="' + src + '"></img>')
-              })
+        await readFile(pathToRead)
+          .then(function (res) {
+            if (isFile) {
+              if (
+                pathToRead.includes(".png") ||
+                pathToRead.includes(".jpg") ||
+                pathToRead.includes(".jpeg")
+              ) {
+                arrayBufferToBase64(
+                  new Uint8Array(res),
+                  function (base64) {
+                    var src = "data:image/png;base64," + base64;
+                    insecureRenderHtml('<img src="' + src + '"></img>');
+                  }
+                );
+              } else {
+                // Convert byte array to UTF-8 string
+                const decoder = new TextDecoder('utf-8');
+                const text = decoder.decode(new Uint8Array(res));
+                onMessage(text);
+              }
             } else {
-              // Convert byte array to UTF-8 string
-              const decoder = new TextDecoder('utf-8')
-              const text = decoder.decode(res)
-              onMessage(text)
-            }
-          } else {
-            onMessage(res)
+              onMessage(res);
           }
         })
       }
-    } catch (exception) {
+    } catch(exception) {
       onMessage(exception)
     }
   }
 
   function saveDialog() {
     save({
-      title: 'My wonderful save dialog',
+      title: "My wonderful save dialog",
       defaultPath,
       filters: filter
         ? [
             {
-              name: 'Tauri Example',
-              extensions: filter.split(',').map((f) => f.trim())
-            }
+              name: "Tauri Example",
+              extensions: filter.split(",").map((f) => f.trim()),
+            },
           ]
-        : []
-    })
+        : [],
+      })
       .then(onMessage)
-      .catch(onMessage)
+      .catch(onMessage);
   }
 </script>
 
@@ -180,16 +171,15 @@
 <br />
 
 <div class="flex flex-wrap flex-col md:flex-row gap-2 children:flex-shrink-0">
-  <button class="btn" id="open-dialog" onclick={openDialog}>Open dialog</button>
-  <button class="btn" id="save-dialog" onclick={saveDialog}
+  <button class="btn" id="open-dialog" on:click={openDialog}>Open dialog</button>
+  <button class="btn" id="save-dialog" on:click={saveDialog}
     >Open save dialog</button
   >
-  <button class="btn" id="prompt-dialog" onclick={prompt}>Prompt</button>
-  <button class="btn" id="custom-prompt-dialog" onclick={promptCustom}
+  <button class="btn" id="prompt-dialog" on:click={prompt}>Prompt</button>
+  <button class="btn" id="custom-prompt-dialog" on:click={promptCustom}
     >Prompt (custom)</button
   >
-  <button class="btn" id="message-dialog" onclick={msg}>Message</button>
-  <button class="btn" id="message-dialog" onclick={msgCustom}
-    >Message (custom)</button
-  >
+  <button class="btn" id="message-dialog" on:click={msg}>Message</button>
+  <button class="btn" id="message-dialog" on:click={msgCustom}>Message (custom)</button>
+
 </div>

examples/api/src/views/FileSystem.svelte

@@ -5,7 +5,7 @@
   import { arrayBufferToBase64 } from '../lib/utils'
   import { onDestroy, onMount } from 'svelte'
 
-  const { onMessage } = $props()
+  const { onMessage, insecureRenderHtml } = $props()
 
   let path = $state('')
   let img
@@ -118,12 +118,12 @@
                   new Uint8Array(response),
                   function (base64) {
                     const src = 'data:image/png;base64,' + base64
-                    onMessage('<img src="' + src + '"></img>')
+                    insecureRenderHtml('<img src="' + src + '"></img>')
                   }
                 )
               } else {
                 const value = String.fromCharCode.apply(null, response)
-                onMessage(
+                insecureRenderHtml(
                   '<textarea id="file-response"></textarea><button id="file-save">Save</button>'
                 )
                 setTimeout(() => {

examples/api/src/views/Updater.svelte

@@ -1,18 +1,12 @@
-<script lang="ts">
-  import { check, Update } from '@tauri-apps/plugin-updater'
+<script>
+  import { check } from '@tauri-apps/plugin-updater'
   import { relaunch } from '@tauri-apps/plugin-process'
-  import { onDestroy } from 'svelte'
 
-  let { onMessage } = $props()
+  export let onMessage
 
-  let isChecking = $state(false)
-  let isInstalling = $state(false)
-  let newUpdate = $state<Update | undefined>()
-  let totalSize = $state(0)
-  let downloadedSize = $state(0)
-  let progress = $derived(
-    totalSize ? Math.round((downloadedSize / totalSize) * 100) : 0
-  )
+  let isChecking, isInstalling, newUpdate
+  let totalSize = 0,
+    downloadedSize = 0
 
   async function checkUpdate() {
     isChecking = true
@@ -37,10 +31,10 @@
     isInstalling = true
     downloadedSize = 0
     try {
-      await newUpdate!.downloadAndInstall((downloadProgress) => {
+      await newUpdate.downloadAndInstall((downloadProgress) => {
         switch (downloadProgress.event) {
           case 'Started':
-            totalSize = downloadProgress.data.contentLength!
+            totalSize = downloadProgress.data.contentLength
             break
           case 'Progress':
             downloadedSize += downloadProgress.data.chunkLength
@@ -60,16 +54,14 @@
     }
   }
 
-  onDestroy(() => {
-    newUpdate?.close()
-  })
+  $: progress = totalSize ? Math.round((downloadedSize / totalSize) * 100) : 0
 </script>
 
 <div class="flex children:grow children:h10">
   {#if !isChecking && !newUpdate}
-    <button class="btn" onclick={checkUpdate}>Check update</button>
+    <button class="btn" on:click={checkUpdate}>Check update</button>
   {:else if !isInstalling && newUpdate}
-    <button class="btn" onclick={install}>Install update</button>
+    <button class="btn" on:click={install}>Install update</button>
   {:else}
     <div class="progress">
       <span>{progress}%</span>

examples/api/updater-test/.gitignore

@@ -1,5 +0,0 @@
-*
-
-!.gitignore
-!README.md
-!updater.json

examples/api/updater-test/README.md

@@ -1,10 +0,0 @@
-To test the updater:
-
-1. Comment out `verify_signature` inside `plugins/updater/src/updater.rs`
-2. Run `pnpm tauri build --debug` to build the bundles
-3. Copy the bundle you want to test to this folder (`examples/api/updater-test/`)
-4. Run `pnpm tauri dev` and open the Updater tab to check
-
-If the bundle you're testing doesn't exist in the `updater.json` yet, add it manually and welcome to open an PR
-
-> The `updater.json` and debug bundles will be served by `vite`

examples/api/updater-test/updater.json

@@ -1,11 +0,0 @@
-{
-  "version": "2.1.0",
-  "notes": "Test update!",
-  "pub_date": "2026-03-01T14:04:20+00:00",
-  "platforms": {
-    "windows-x86_64": {
-      "signature": "",
-      "url": "http://localhost:5173/updater-test/Tauri API_2.0.0_x64_en-US.msi"
-    }
-  }
-}

examples/api/vite.config.js

@@ -27,7 +27,7 @@ export default defineConfig(async () => {
       port: 5173,
       strictPort: true,
       fs: {
-        allow: ['.']
+        allow: ['.', '../../tooling/api/dist']
       }
     }
   }

package.json

@@ -19,11 +19,21 @@
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-security": "4.0.1",
     "prettier": "3.8.3",
-    "rollup": "4.62.2",
+    "rollup": "4.60.3",
     "tslib": "2.8.1",
-    "typescript": "6.0.3",
+    "typescript": "7.0.2",
     "typescript-eslint": "8.58.2"
   },
   "minimumReleaseAge": 4320,
-  "packageManager": "pnpm@11.13.0"
+  "pnpm": {
+    "overrides": {
+      "esbuild@<0.25.0": ">=0.25.0"
+    },
+    "onlyBuiltDependencies": [
+      "esbuild"
+    ]
+  },
+  "engines": {
+    "pnpm": "^10.16.0"
+  }
 }

plugins/deep-link/examples/app/package.json

@@ -11,11 +11,11 @@
   },
   "dependencies": {
     "@tauri-apps/api": "^2.11.0",
-    "@tauri-apps/plugin-deep-link": "workspace:*"
+    "@tauri-apps/plugin-deep-link": "2.4.9"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.11.4",
-    "typescript": "^6.0.0",
+    "@tauri-apps/cli": "2.11.2",
+    "typescript": "^7.0.0",
     "vite": "^8.0.1"
   }
 }

plugins/deep-link/examples/app/src-tauri/gen/android/app/src/main/res/values-night/themes.xml

@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.deep_link_example" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.deep_link_example" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
     </style>
 </resources>

plugins/deep-link/examples/app/src-tauri/gen/android/app/src/main/res/values/themes.xml

@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.deep_link_example" parent="Theme.Material3.DayNight.NoActionBar">
+    <style name="Theme.deep_link_example" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Customize your theme here. -->
     </style>
 </resources>

plugins/deep-link/guest-js/index.ts

@@ -14,11 +14,9 @@ import { type UnlistenFn, listen } from '@tauri-apps/api/event'
  * const urls = await getCurrent();
  * ```
  *
- * #### Platform-specific
- *
- * - **Windows / Linux:** This function reads the command line arguments and checks if there's only one value, which must be an URL with scheme matching one of the configured values.
- *   Note that you must manually check the arguments when registering deep link schemes dynamically with [`Self::register`].
- *   Additionally, the deep link might have been provided as a CLI argument so you should check if its format matches what you expect.
+ * #### - **Windows / Linux**: This function reads the command line arguments and checks if there's only one value, which must be an URL with scheme matching one of the configured values.
+ * Note that you must manually check the arguments when registering deep link schemes dynamically with [`Self::register`].
+ * Additionally, the deep link might have been provided as a CLI argument so you should check if its format matches what you expect..
  *
  * @since 2.0.0
  */
@@ -37,9 +35,7 @@ export async function getCurrent(): Promise<string[] | null> {
  * await register("my-scheme");
  * ```
  *
- * #### Platform-specific
- *
- * - **macOS / Android / iOS:** Unsupported.
+ * #### - **macOS / Android / iOS**: Unsupported.
  *
  * @since 2.0.0
  */
@@ -58,9 +54,7 @@ export async function register(protocol: string): Promise<null> {
  * await unregister("my-scheme");
  * ```
  *
- * #### Platform-specific
- *
- * - **macOS / Linux / Android / iOS:** Unsupported.
+ * #### - **macOS / Linux / Android / iOS**: Unsupported.
  *
  * @since 2.0.0
  */
@@ -79,9 +73,7 @@ export async function unregister(protocol: string): Promise<null> {
  * await isRegistered("my-scheme");
  * ```
  *
- * #### Platform-specific
- *
- * - **macOS / Android / iOS:** Unsupported.
+ * #### - **macOS / Android / iOS**: Unsupported.
  *
  * @since 2.0.0
  */
@@ -100,9 +92,7 @@ export async function isRegistered(protocol: string): Promise<boolean> {
  * await onOpenUrl((urls) => { console.log(urls) });
  * ```
  *
- * #### Platform-specific
- *
- * - **Windows / Linux:** Unsupported without the single-instance plugin. The OS will spawn a new app instance passing the URL as a CLI argument.
+ * #### - **Windows / Linux**: Unsupported without the single-instance plugin. The OS will spawn a new app instance passing the URL as a CLI argument.
  *
  * @since 2.0.0
  */

plugins/deep-link/package.json

@@ -28,6 +28,6 @@
     "@tauri-apps/api": "^2.11.0"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.11.4"
+    "@tauri-apps/cli": "2.11.2"
   }
 }

plugins/dialog/CHANGELOG.md

@@ -1,9 +1,5 @@
 # Changelog
 
-## \[2.7.2]
-
-- [`40ae0a7f`](https://github.com/tauri-apps/plugins-workspace/commit/40ae0a7fa0ecc9b0cdbd952297f7a17f37308229) ([#3491](https://github.com/tauri-apps/plugins-workspace/pull/3491) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Use `com.google.android.material.dialog.MaterialAlertDialogBuilder` instead of `AlertDialog` so the dialog follows the app's theme
-
 ## \[2.7.1]
 
 ### Dependencies

plugins/dialog/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-dialog"
-version = "2.7.2"
+version = "2.7.1"
 description = "Native system dialogs for opening and saving files along with message dialogs on your Tauri application."
 edition = { workspace = true }
 authors = { workspace = true }

plugins/dialog/android/build.gradle.kts

@@ -35,8 +35,8 @@ android {
 dependencies {
 
     implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.7.1")
-    implementation("com.google.android.material:material:1.13.0")
+    implementation("androidx.appcompat:appcompat:1.6.0")
+    implementation("com.google.android.material:material:1.7.0")
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")

plugins/dialog/android/src/main/java/DialogPlugin.kt

@@ -5,6 +5,7 @@
 package app.tauri.dialog
 
 import android.app.Activity
+import android.app.AlertDialog
 import android.content.Intent
 import android.net.Uri
 import android.os.Handler
@@ -20,7 +21,6 @@ import app.tauri.plugin.Invoke
 import app.tauri.plugin.JSArray
 import app.tauri.plugin.JSObject
 import app.tauri.plugin.Plugin
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 @InvokeArg
 class Filter {
@@ -158,7 +158,7 @@ class DialogPlugin(private val activity: Activity): Plugin(activity) {
 
     Handler(Looper.getMainLooper())
       .post {
-        val builder = MaterialAlertDialogBuilder(activity)
+        val builder = AlertDialog.Builder(activity)
 
         if (args.title != null) {
           builder.setTitle(args.title)
@@ -191,7 +191,8 @@ class DialogPlugin(private val activity: Activity): Plugin(activity) {
           }
         }
 
-        builder.show()
+        val dialog = builder.create()
+        dialog.show()
       }
   }
 

plugins/dialog/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-dialog",
-  "version": "2.7.2",
+  "version": "2.7.1",
   "license": "MIT OR Apache-2.0",
   "authors": [
     "Tauri Programme within The Commons Conservancy"

plugins/fs/permissions/deny-webview-data.toml

@@ -6,7 +6,7 @@ description = """This denies read access to the
 `$APPLOCALDATA` folder on linux as the webview data and configuration values are stored here.
 Allowing access can lead to sensitive information disclosure and should be well considered."""
 
-[[permission.scope.deny]]
+[[scope.deny]]
 path = "$APPLOCALDATA/**"
 
 [[permission]]
@@ -15,5 +15,5 @@ description = """This denies read access to the
 `$APPLOCALDATA/EBWebView` folder on windows as the webview data and configuration values are stored here.
 Allowing access can lead to sensitive information disclosure and should be well considered."""
 
-[[permission.scope.deny]]
+[[scope.deny]]
 path = "$APPLOCALDATA/EBWebView/**"

plugins/fs/src/commands.rs

@@ -74,7 +74,7 @@ pub type CommandResult<T> = std::result::Result<T, CommandError>;
 /// Represents either a plain PathBuf or a PathHandle that manages security-scoped resources.
 pub enum PathKind<R: Runtime> {
     /// A plain path that doesn't manage security-scoped resources.
-    #[cfg(mobile)] // only used on mobile
+    #[allow(dead_code)] // only used on mobile
     Path(PathBuf),
     /// A path handle that manages security-scoped resources and will clean them up on drop.
     Handle(PathHandle<R>),
@@ -84,7 +84,6 @@ impl<R: Runtime> PathKind<R> {
     /// Get a reference to the underlying path.
     pub fn as_path(&self) -> &Path {
         match self {
-            #[cfg(mobile)]
             PathKind::Path(p) => p.as_ref(),
             PathKind::Handle(h) => h.as_ref(),
         }
@@ -93,7 +92,6 @@ impl<R: Runtime> PathKind<R> {
     /// Get a reference to the underlying PathBuf.
     pub fn as_path_buf(&self) -> &PathBuf {
         match self {
-            #[cfg(mobile)]
             PathKind::Path(p) => p,
             PathKind::Handle(h) => h,
         }
@@ -116,13 +114,27 @@ impl<R: Runtime> AsRef<PathBuf> for PathKind<R> {
 pub struct FileHandle<R: Runtime> {
     file: File,
     path: PathKind<R>,
-    #[cfg(target_os = "ios")]
+    #[allow(dead_code)] // Used in Drop implementation
     path_: SafeFilePath,
-    #[cfg(target_os = "ios")]
+    #[allow(dead_code)] // Used in Drop implementation
     app_handle: tauri::AppHandle<R>,
 }
 
 impl<R: Runtime> FileHandle<R> {
+    fn new(
+        file: File,
+        path: PathKind<R>,
+        path_: SafeFilePath,
+        app_handle: tauri::AppHandle<R>,
+    ) -> Self {
+        Self {
+            file,
+            path,
+            path_,
+            app_handle,
+        }
+    }
+
     /// Get the resolved path.
     pub fn path(&self) -> &Path {
         self.path.as_path()
@@ -143,39 +155,41 @@ impl<R: Runtime> DerefMut for FileHandle<R> {
     }
 }
 
-#[cfg(target_os = "ios")]
 impl<R: Runtime> Drop for FileHandle<R> {
     fn drop(&mut self) {
-        // Only clean up if we have a plain PathBuf, not a PathHandle
-        // PathHandle will handle its own cleanup when it's dropped
-        if let PathKind::Path(_) = &self.path {
-            use crate::{FilePath, FsExt};
-            // Convert SafeFilePath to FilePath
-            let file_path: FilePath = match &self.path_ {
-                SafeFilePath::Url(url) => FilePath::Url(url.clone()),
-                SafeFilePath::Path(safe_path) => FilePath::Path(safe_path.as_ref().to_owned()),
-            };
+        #[cfg(target_os = "ios")]
+        {
+            // Only clean up if we have a plain PathBuf, not a PathHandle
+            // PathHandle will handle its own cleanup when it's dropped
+            if let PathKind::Path(_) = &self.path {
+                use crate::{FilePath, FsExt};
+                // Convert SafeFilePath to FilePath
+                let file_path: FilePath = match &self.path_ {
+                    SafeFilePath::Url(url) => FilePath::Url(url.clone()),
+                    SafeFilePath::Path(safe_path) => FilePath::Path(safe_path.as_ref().to_owned()),
+                };
 
-            // Only clean up if we're tracking this resource
-            // If start_accessing_security_scoped_resource was used, it won't be in our tracking
-            // and we shouldn't interfere
-            if let FilePath::Url(url) = file_path {
-                if url.scheme() == "file" {
-                    let security_scoped_resources =
-                        self.app_handle.state::<crate::SecurityScopedResources>();
+                // Only clean up if we're tracking this resource
+                // If start_accessing_security_scoped_resource was used, it won't be in our tracking
+                // and we shouldn't interfere
+                if let FilePath::Url(url) = file_path {
+                    if url.scheme() == "file" {
+                        let security_scoped_resources =
+                            self.app_handle.state::<crate::SecurityScopedResources>();
 
-                    // Only clean up if it's not tracked manually
-                    if !security_scoped_resources.is_tracked_manually(url.as_str()) {
-                        log::debug!(
-                            "Stopping accessing security-scoped resource for URL: {url} on drop"
-                        );
-                        let _ = self
-                            .app_handle
-                            .fs()
-                            .stop_accessing_security_scoped_resource(FilePath::Url(url.clone()));
-                        security_scoped_resources.remove(url.as_str());
-                    } else {
-                        log::debug!("Not cleaning up security-scoped resource for URL: {url} on drop (manually tracked via start_accessing_security_scoped_resource)");
+                        // Only clean up if it's not tracked manually
+                        if !security_scoped_resources.is_tracked_manually(url.as_str()) {
+                            log::debug!("Stopping accessing security-scoped resource for URL: {url} on drop");
+                            let _ = self
+                                .app_handle
+                                .fs()
+                                .stop_accessing_security_scoped_resource(FilePath::Url(
+                                    url.clone(),
+                                ));
+                            security_scoped_resources.remove(url.as_str());
+                        } else {
+                            log::debug!("Not cleaning up security-scoped resource for URL: {url} on drop (manually tracked via start_accessing_security_scoped_resource)");
+                        }
                     }
                 }
             }
@@ -222,36 +236,38 @@ impl<R: Runtime> AsRef<PathBuf> for PathHandle<R> {
     }
 }
 
-#[cfg(target_os = "ios")]
 impl<R: Runtime> Drop for PathHandle<R> {
     fn drop(&mut self) {
-        use crate::{FilePath, FsExt};
-        // Convert SafeFilePath to FilePath
-        let file_path: FilePath = match &self.path_ {
-            SafeFilePath::Url(url) => FilePath::Url(url.clone()),
-            SafeFilePath::Path(safe_path) => FilePath::Path(safe_path.as_ref().to_owned()),
-        };
+        #[cfg(target_os = "ios")]
+        {
+            use crate::{FilePath, FsExt};
+            // Convert SafeFilePath to FilePath
+            let file_path: FilePath = match &self.path_ {
+                SafeFilePath::Url(url) => FilePath::Url(url.clone()),
+                SafeFilePath::Path(safe_path) => FilePath::Path(safe_path.as_ref().to_owned()),
+            };
 
-        // Only clean up if we're tracking this resource (i.e., resolve_path started it)
-        // If start_accessing_security_scoped_resource was used, it won't be in our tracking
-        // and we shouldn't interfere
-        if let FilePath::Url(url) = file_path {
-            if url.scheme() == "file" {
-                let security_scoped_resources =
-                    self.app_handle.state::<crate::SecurityScopedResources>();
+            // Only clean up if we're tracking this resource (i.e., resolve_path started it)
+            // If start_accessing_security_scoped_resource was used, it won't be in our tracking
+            // and we shouldn't interfere
+            if let FilePath::Url(url) = file_path {
+                if url.scheme() == "file" {
+                    let security_scoped_resources =
+                        self.app_handle.state::<crate::SecurityScopedResources>();
 
-                // Only clean up if it's not tracked manually
-                if !security_scoped_resources.is_tracked_manually(url.as_str()) {
-                    log::debug!(
-                        "Stopping accessing security-scoped resource for URL: {url} on drop"
-                    );
-                    let _ = self
-                        .app_handle
-                        .fs()
-                        .stop_accessing_security_scoped_resource(FilePath::Url(url.clone()));
-                    security_scoped_resources.remove(url.as_str());
-                } else {
-                    log::debug!("Not cleaning up security-scoped resource for URL: {url} on drop (manually tracked via start_accessing_security_scoped_resource)");
+                    // Only clean up if it's not tracked manually
+                    if !security_scoped_resources.is_tracked_manually(url.as_str()) {
+                        log::debug!(
+                            "Stopping accessing security-scoped resource for URL: {url} on drop"
+                        );
+                        let _ = self
+                            .app_handle
+                            .fs()
+                            .stop_accessing_security_scoped_resource(FilePath::Url(url.clone()));
+                        security_scoped_resources.remove(url.as_str());
+                    } else {
+                        log::debug!("Not cleaning up security-scoped resource for URL: {url} on drop (manually tracked via start_accessing_security_scoped_resource)");
+                    }
                 }
             }
         }
@@ -272,7 +288,6 @@ pub fn create<R: Runtime>(
     path: SafeFilePath,
     options: Option<BaseOptions>,
 ) -> CommandResult<ResourceId> {
-    #[cfg(target_os = "ios")]
     let path_ = path.clone();
     let resolved_path_handle = resolve_path(
         "create",
@@ -288,16 +303,13 @@ pub fn create<R: Runtime>(
             resolved_path_handle.display()
         )
     })?;
-    #[cfg(target_os = "ios")]
     let app_handle = webview.app_handle().clone();
-    let file_handle = FileHandle {
+    let file_handle = FileHandle::new(
         file,
-        path: PathKind::Handle(resolved_path_handle),
-        #[cfg(target_os = "ios")]
+        PathKind::Handle(resolved_path_handle),
         path_,
-        #[cfg(target_os = "ios")]
         app_handle,
-    };
+    );
     let rid = webview
         .resources_table()
         .add(StdFileResource::new(file_handle));
@@ -1405,7 +1417,6 @@ fn resolve_file_in_fs<R: Runtime>(
     path: SafeFilePath,
     open_options: OpenOptions,
 ) -> CommandResult<FileHandle<R>> {
-    #[cfg(target_os = "ios")]
     let path_ = path.clone();
     let resolved_path_handle = resolve_path(
         permission,
@@ -1425,16 +1436,13 @@ fn resolve_file_in_fs<R: Runtime>(
             )
         })?;
 
-    #[cfg(target_os = "ios")]
     let app_handle = webview.app_handle().clone();
-    Ok(FileHandle {
+    Ok(FileHandle::new(
         file,
-        path: PathKind::Handle(resolved_path_handle),
-        #[cfg(target_os = "ios")]
+        PathKind::Handle(resolved_path_handle),
         path_,
-        #[cfg(target_os = "ios")]
         app_handle,
-    })
+    ))
 }
 
 #[cfg(mobile)]
@@ -1448,7 +1456,6 @@ pub fn resolve_file<R: Runtime>(
 ) -> CommandResult<FileHandle<R>> {
     use crate::FsExt;
 
-    #[cfg(target_os = "ios")]
     let path_ = path.clone();
     match path {
         SafeFilePath::Url(url) => {
@@ -1456,16 +1463,13 @@ pub fn resolve_file<R: Runtime>(
             let file = webview
                 .fs()
                 .open(SafeFilePath::Url(url.clone()), open_options.options)?;
-            #[cfg(target_os = "ios")]
             let app_handle = webview.app_handle().clone();
-            Ok(FileHandle {
+            Ok(FileHandle::new(
                 file,
-                path: PathKind::Path(resolved_path),
-                #[cfg(target_os = "ios")]
+                PathKind::Path(resolved_path),
                 path_,
-                #[cfg(target_os = "ios")]
                 app_handle,
-            })
+            ))
         }
         SafeFilePath::Path(path) => resolve_file_in_fs(
             permission,
@@ -1490,37 +1494,36 @@ pub fn resolve_path<R: Runtime>(
     // On iOS, start accessing security-scoped resource if the path is a file URL
     // Only if it hasn't been started already via start_accessing_security_scoped_resource
     #[cfg(target_os = "ios")]
-    if let SafeFilePath::Url(url) = &path {
-        if url.scheme() == "file" {
-            use objc2_foundation::{NSString, NSURL};
+    {
+        if let SafeFilePath::Url(url) = &path {
+            if url.scheme() == "file" {
+                use objc2_foundation::{NSString, NSURL};
 
-            let security_scoped_resources = webview.state::<crate::SecurityScopedResources>();
+                let security_scoped_resources = webview.state::<crate::SecurityScopedResources>();
 
-            // Check if already active (started via start_accessing_security_scoped_resource)
-            if !security_scoped_resources.is_tracked_manually(url.as_str()) {
-                let url_nsstring = NSString::from_str(url.as_str());
-                let ns_url = unsafe { NSURL::URLWithString(&url_nsstring) };
-                if let Some(ns_url) = ns_url {
-                    // Start accessing the security-scoped resource
-                    // This is required for files outside the app's sandbox (e.g., from file picker)
-                    unsafe {
-                        let success = ns_url.startAccessingSecurityScopedResource();
-                        if success {
-                            log::debug!("Started accessing security-scoped resource for URL: {} (via resolve_path)", url.as_str());
-                            // Track it so we know to clean it up
-                            security_scoped_resources.track_manually(url.as_str().to_string());
-                        } else {
-                            log::warn!(
-                                "Failed to start accessing security-scoped resource for URL: {}",
-                                url.as_str()
-                            );
+                // Check if already active (started via start_accessing_security_scoped_resource)
+                if !security_scoped_resources.is_tracked_manually(url.as_str()) {
+                    let url_nsstring = NSString::from_str(url.as_str());
+                    let ns_url = unsafe { NSURL::URLWithString(&url_nsstring) };
+                    if let Some(ns_url) = ns_url {
+                        // Start accessing the security-scoped resource
+                        // This is required for files outside the app's sandbox (e.g., from file picker)
+                        unsafe {
+                            let success = ns_url.startAccessingSecurityScopedResource();
+                            if success {
+                                log::debug!("Started accessing security-scoped resource for URL: {} (via resolve_path)", url.as_str());
+                                // Track it so we know to clean it up
+                                security_scoped_resources.track_manually(url.as_str().to_string());
+                            } else {
+                                log::warn!("Failed to start accessing security-scoped resource for URL: {}", url.as_str());
+                            }
                         }
+                    } else {
+                        log::debug!("Failed to create NSURL from URL: {}, ignoring security-scoped resource access request", url.as_str());
                     }
                 } else {
-                    log::debug!("Failed to create NSURL from URL: {}, ignoring security-scoped resource access request", url.as_str());
+                    log::debug!("Security-scoped resource already active for URL: {} (started via start_accessing_security_scoped_resource), skipping", url.as_str());
                 }
-            } else {
-                log::debug!("Security-scoped resource already active for URL: {} (started via start_accessing_security_scoped_resource), skipping", url.as_str());
             }
         }
     }

plugins/log/CHANGELOG.md

@@ -1,11 +1,5 @@
 # Changelog
 
-## \[2.9.0]
-
-- [`f08980f1`](https://github.com/tauri-apps/plugins-workspace/commit/f08980f123f191b9505bd290acd8fff0fdefeed9) ([#3445](https://github.com/tauri-apps/plugins-workspace/pull/3445) by [@bajoca05](https://github.com/tauri-apps/plugins-workspace/../../bajoca05)) Added the `FileOpenStrategy` for log rotation. It defaults to append into existing file if any (previous behaviour), and brings a new feature to create a new file per session: `FileOpenStrategy::Rotate`.
-- [`254f222e`](https://github.com/tauri-apps/plugins-workspace/commit/254f222e0e2bc79370f977855b6b39d956d3b568) ([#3477](https://github.com/tauri-apps/plugins-workspace/pull/3477) by [@bajoca05](https://github.com/tauri-apps/plugins-workspace/../../bajoca05)) Migrated from the `log` crate's `kv_unstable` feature flag to the `kv` feature flag stabilized in `0.4.21`.
-- [`0c23b8ec`](https://github.com/tauri-apps/plugins-workspace/commit/0c23b8ecfe7c2aca582a81ab7339b11e350b3cac) ([#3446](https://github.com/tauri-apps/plugins-workspace/pull/3446) by [@fee1-dead](https://github.com/tauri-apps/plugins-workspace/../../fee1-dead)) Removed an unused dependency `byte-unit`.
-
 ## \[2.8.0]
 
 - [`2a625adf`](https://github.com/tauri-apps/plugins-workspace/commit/2a625adff30238904035b86b6e2db7595597e857) ([#3065](https://github.com/tauri-apps/plugins-workspace/pull/3065) by [@BinaryMuse](https://github.com/tauri-apps/plugins-workspace/../../BinaryMuse)) Allow specifying a log formatter per target using the `format` method on `Target`.

plugins/log/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-log"
-version = "2.9.0"
+version = "2.8.0"
 description = "Configurable logging for your Tauri app."
 authors = { workspace = true }
 license = { workspace = true }
@@ -25,7 +25,7 @@ serde_json = { workspace = true }
 tauri = { workspace = true }
 thiserror = { workspace = true }
 serde_repr = "0.1"
-log = { workspace = true, features = ["kv"] }
+log = { workspace = true, features = ["kv_unstable"] }
 time = { version = "0.3", features = [
   "formatting",
   "local-offset",

plugins/log/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-log",
-  "version": "2.9.0",
+  "version": "2.8.0",
   "description": "Configurable logging for your Tauri app.",
   "license": "MIT OR Apache-2.0",
   "authors": [

plugins/nfc/src/lib.rs

@@ -47,7 +47,6 @@ impl<R: Runtime> Nfc<R> {
     pub fn scan(&self, payload: ScanRequest) -> crate::Result<ScanResponse> {
         self.0
             .run_mobile_plugin("scan", payload)
-            .map(|v| ScanResponse { tag: v })
             .map_err(Into::into)
     }
 

plugins/persisted-scope/src/lib.rs

@@ -232,9 +232,10 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
                 let app_dir_ = app_dir.clone();
 
                 if let Some(fs_scope) = &fs_scope {
+                    let app_ = app.clone();
                     fs_scope.listen(move |event| {
                         if let tauri::fs::Event::PathAllowed(_) = event {
-                            save_scopes(&app.fs_scope(), &app_dir, &fs_scope_state_path);
+                            save_scopes(&app_.fs_scope(), &app_dir, &fs_scope_state_path);
                         }
                     });
                 }

plugins/positioner/CHANGELOG.md

@@ -1,9 +1,5 @@
 # Changelog
 
-## \[2.3.3]
-
-- [`4be76900`](https://github.com/tauri-apps/plugins-workspace/commit/4be76900854cae3dc91363dea71b54505896e928) ([#3449](https://github.com/tauri-apps/plugins-workspace/pull/3449) by [@skkap](https://github.com/tauri-apps/plugins-workspace/../../skkap)) Replaced a panic in `calculate_position` with an error return when the window has no associated monitor (e.g. during display sleep or monitor reconfiguration).
-
 ## \[2.3.2]
 
 - [`c0d64bf7`](https://github.com/tauri-apps/plugins-workspace/commit/c0d64bf7d9c0f2c8ed1d2614745e15bbb3cde6a7) ([#3420](https://github.com/tauri-apps/plugins-workspace/pull/3420) by [@UrsDeSwardt](https://github.com/tauri-apps/plugins-workspace/../../UrsDeSwardt)) Removed panics and replaced them with error handling.

plugins/positioner/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-positioner"
-version = "2.3.3"
+version = "2.3.2"
 description = "Position your windows at well-known locations."
 authors = { workspace = true }
 license = { workspace = true }

plugins/positioner/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-positioner",
-  "version": "2.3.3",
+  "version": "2.3.2",
   "description": "Position your windows at well-known locations.",
   "license": "MIT OR Apache-2.0",
   "authors": [

plugins/shell/src/process/mod.rs

@@ -479,8 +479,10 @@ fn read_line<F: Fn(Vec<u8>) -> CommandEvent + Send + Copy + 'static>(
                 let _ = block_on_task(async move { tx_.send(wrapper(buf)).await });
             }
             Err(e) => {
-                let _ =
-                    block_on_task(async move { tx.send(CommandEvent::Error(e.to_string())).await });
+                let tx_ = tx.clone();
+                let _ = block_on_task(
+                    async move { tx_.send(CommandEvent::Error(e.to_string())).await },
+                );
                 break;
             }
         }

plugins/single-instance/CHANGELOG.md

@@ -1,9 +1,5 @@
 # Changelog
 
-## \[2.4.3]
-
-- [`d1573877`](https://github.com/tauri-apps/plugins-workspace/commit/d1573877226e609461761aa538cd0ca4f24d22be) ([#3466](https://github.com/tauri-apps/plugins-workspace/pull/3466) by [@bajoca05](https://github.com/tauri-apps/plugins-workspace/../../bajoca05)) Fix blocked thread on the single-instance plugin for MacOS: replace standard `UnixListener` with `tokio::net::UnixListener`, so the task can yield.
-
 ## \[2.4.2]
 
 ### Dependencies

plugins/single-instance/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-single-instance"
-version = "2.4.3"
+version = "2.4.2"
 description = "Ensure a single instance of your tauri app is running."
 authors = { workspace = true }
 license = { workspace = true }

plugins/single-instance/examples/vanilla/package.json

@@ -9,6 +9,6 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "@tauri-apps/cli": "2.11.4"
+    "@tauri-apps/cli": "2.11.2"
   }
 }

plugins/store/CHANGELOG.md

@@ -1,9 +1,5 @@
 # Changelog
 
-## \[2.4.4]
-
-- [`2ed6d6c1`](https://github.com/tauri-apps/plugins-workspace/commit/2ed6d6c1de4f5051b87cb6a2c5ac45320c444989) ([#3499](https://github.com/tauri-apps/plugins-workspace/pull/3499) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Fix `StoreOptions` requires `defaults` field
-
 ## \[2.4.3]
 
 - [`964e13f1`](https://github.com/tauri-apps/plugins-workspace/commit/964e13f124ad1feeb93c10168b265dc4936f738c) ([#3395](https://github.com/tauri-apps/plugins-workspace/pull/3395) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Fix a deadlock when calling `Store::set` while exiting (on `RunEvent::Exit`)

plugins/store/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-store"
-version = "2.4.4"
+version = "2.4.3"
 description = "Simple, persistent key-value store."
 authors = { workspace = true }
 license = { workspace = true }

plugins/store/examples/AppSettingsManager/package.json

@@ -8,8 +8,8 @@
     "tauri": "tauri"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.11.4",
-    "typescript": "^6.0.0",
+    "@tauri-apps/cli": "2.11.2",
+    "typescript": "^7.0.0",
     "vite": "^8.0.1"
   }
 }

plugins/store/guest-js/index.ts

@@ -21,7 +21,7 @@ export type StoreOptions = {
   /**
    * Default value of the store
    */
-  defaults?: { [key: string]: unknown }
+  defaults: { [key: string]: unknown }
   /**
    * Auto save on modification with debounce duration in milliseconds, it's 100ms by default, pass in `false` to disable it
    */

plugins/store/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-store",
-  "version": "2.4.4",
+  "version": "2.4.3",
   "description": "Simple, persistent key-value store.",
   "license": "MIT OR Apache-2.0",
   "authors": [

plugins/updater/api-iife.js

@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_UPDATER__=function(t){"use strict";function e(t,e,s,n){if("function"==typeof e?t!==e||!n:!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===s?n:"a"===s?n.call(t):n?n.value:e.get(t)}function s(t,e,s,n,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,s),s}var n,i,a,r,o;"function"==typeof SuppressedError&&SuppressedError;const d="__TAURI_TO_IPC_KEY__";class c{constructor(t){n.set(this,void 0),i.set(this,0),a.set(this,[]),r.set(this,void 0),s(this,n,t||(()=>{})),this.id=function(t,e=!1){return window.__TAURI_INTERNALS__.transformCallback(t,e)}(t=>{const o=t.index;if("end"in t)return void(o==e(this,i,"f")?this.cleanupCallback():s(this,r,o));const d=t.message;if(o==e(this,i,"f")){for(e(this,n,"f").call(this,d),s(this,i,e(this,i,"f")+1);e(this,i,"f")in e(this,a,"f");){const t=e(this,a,"f")[e(this,i,"f")];e(this,n,"f").call(this,t),delete e(this,a,"f")[e(this,i,"f")],s(this,i,e(this,i,"f")+1)}e(this,i,"f")===e(this,r,"f")&&this.cleanupCallback()}else e(this,a,"f")[o]=d})}cleanupCallback(){window.__TAURI_INTERNALS__.unregisterCallback(this.id)}set onmessage(t){s(this,n,t)}get onmessage(){return e(this,n,"f")}[(n=new WeakMap,i=new WeakMap,a=new WeakMap,r=new WeakMap,d)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[d]()}}async function l(t,e={},s){return window.__TAURI_INTERNALS__.invoke(t,e,s)}class h{get rid(){return e(this,o,"f")}constructor(t){o.set(this,void 0),s(this,o,t)}async close(){return l("plugin:resources|close",{rid:this.rid})}}o=new WeakMap;class u extends h{constructor(t){super(t.rid),this.available=!0,this.currentVersion=t.currentVersion,this.version=t.version,this.date=t.date,this.body=t.body,this.rawJson=t.rawJson}async download(t,e){_(e);const s=new c;t&&(s.onmessage=t);const n=await l("plugin:updater|download",{onEvent:s,rid:this.rid,...e});this.downloadedBytes=new h(n)}async install(t){if(!this.downloadedBytes)throw new Error("Update.install called before Update.download");await l("plugin:updater|install",{updateRid:this.rid,bytesRid:this.downloadedBytes.rid,...t}),this.downloadedBytes=void 0}async downloadAndInstall(t,e){_(e);const s=new c;t&&(s.onmessage=t),await l("plugin:updater|download_and_install",{onEvent:s,rid:this.rid,...e})}async close(){await(this.downloadedBytes?.close()),await super.close()}}function _(t){t?.headers&&(t.headers=Array.from(new Headers(t.headers).entries()))}return t.Update=u,t.check=async function(t){_(t);const e=await l("plugin:updater|check",{...t});return e?new u(e):null},t}({});Object.defineProperty(window.__TAURI__,"updater",{value:__TAURI_PLUGIN_UPDATER__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_UPDATER__=function(t){"use strict";function e(t,e,s,n){if("function"==typeof e?t!==e||!n:!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===s?n:"a"===s?n.call(t):n?n.value:e.get(t)}function s(t,e,s,n,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,s),s}var n,i,a,r,o;"function"==typeof SuppressedError&&SuppressedError;const d="__TAURI_TO_IPC_KEY__";class c{constructor(t){n.set(this,void 0),i.set(this,0),a.set(this,[]),r.set(this,void 0),s(this,n,t||(()=>{})),this.id=function(t,e=!1){return window.__TAURI_INTERNALS__.transformCallback(t,e)}(t=>{const o=t.index;if("end"in t)return void(o==e(this,i,"f")?this.cleanupCallback():s(this,r,o));const d=t.message;if(o==e(this,i,"f")){for(e(this,n,"f").call(this,d),s(this,i,e(this,i,"f")+1);e(this,i,"f")in e(this,a,"f");){const t=e(this,a,"f")[e(this,i,"f")];e(this,n,"f").call(this,t),delete e(this,a,"f")[e(this,i,"f")],s(this,i,e(this,i,"f")+1)}e(this,i,"f")===e(this,r,"f")&&this.cleanupCallback()}else e(this,a,"f")[o]=d})}cleanupCallback(){window.__TAURI_INTERNALS__.unregisterCallback(this.id)}set onmessage(t){s(this,n,t)}get onmessage(){return e(this,n,"f")}[(n=new WeakMap,i=new WeakMap,a=new WeakMap,r=new WeakMap,d)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[d]()}}async function l(t,e={},s){return window.__TAURI_INTERNALS__.invoke(t,e,s)}class h{get rid(){return e(this,o,"f")}constructor(t){o.set(this,void 0),s(this,o,t)}async close(){return l("plugin:resources|close",{rid:this.rid})}}o=new WeakMap;class u extends h{constructor(t){super(t.rid),this.available=!0,this.currentVersion=t.currentVersion,this.version=t.version,this.date=t.date,this.body=t.body,this.rawJson=t.rawJson}async download(t,e){_(e);const s=new c;t&&(s.onmessage=t);const n=await l("plugin:updater|download",{onEvent:s,rid:this.rid,...e});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(t,e){_(e);const s=new c;t&&(s.onmessage=t),await l("plugin:updater|download_and_install",{onEvent:s,rid:this.rid,...e})}async close(){await(this.downloadedBytes?.close()),await super.close()}}function _(t){t?.headers&&(t.headers=Array.from(new Headers(t.headers).entries()))}return t.Update=u,t.check=async function(t){_(t);const e=await l("plugin:updater|check",{...t});return e?new u(e):null},t}({});Object.defineProperty(window.__TAURI__,"updater",{value:__TAURI_PLUGIN_UPDATER__})}

plugins/updater/guest-js/index.ts

@@ -40,14 +40,6 @@ interface DownloadOptions {
   timeout?: number
 }
 
-/** Options used when installing an update */
-interface InstallOptions {
-  /**
-   * If the Windows installer should restart the app after installed, default is `true`
-   */
-  restartAfterInstall?: boolean
-}
-
 interface UpdateMetadata {
   rid: number
   currentVersion: string
@@ -103,15 +95,14 @@ class Update extends Resource {
   }
 
   /** Install downloaded updater package */
-  async install(options?: InstallOptions): Promise<void> {
+  async install(): Promise<void> {
     if (!this.downloadedBytes) {
       throw new Error('Update.install called before Update.download')
     }
 
     await invoke('plugin:updater|install', {
       updateRid: this.rid,
-      bytesRid: this.downloadedBytes.rid,
-      ...options
+      bytesRid: this.downloadedBytes.rid
     })
 
     // Don't need to call close, we did it in rust side already
@@ -121,7 +112,7 @@ class Update extends Resource {
   /** Downloads the updater package and installs it */
   async downloadAndInstall(
     onEvent?: (progress: DownloadEvent) => void,
-    options?: DownloadOptions & InstallOptions
+    options?: DownloadOptions
   ): Promise<void> {
     convertToRustHeaders(options)
     const channel = new Channel<DownloadEvent>()

plugins/updater/src/commands.rs

@@ -142,22 +142,12 @@ pub(crate) async fn install<R: Runtime>(
     webview: Webview<R>,
     update_rid: ResourceId,
     bytes_rid: ResourceId,
-    restart_after_install: Option<bool>,
 ) -> Result<()> {
     let update = webview.resources_table().get::<Update>(update_rid)?;
     let bytes = webview
         .resources_table()
         .get::<DownloadedBytes>(bytes_rid)?;
-
-    if let Some(restart_after_install) = restart_after_install {
-        let update = (*update).clone();
-        update
-            .restart_after_install(restart_after_install)
-            .install(&bytes.0)?;
-    } else {
-        update.install(&bytes.0)?;
-    }
-
+    update.install(&bytes.0)?;
     let _ = webview.resources_table().close(bytes_rid);
     Ok(())
 }
@@ -169,7 +159,6 @@ pub(crate) async fn download_and_install<R: Runtime>(
     on_event: Channel<DownloadEvent>,
     headers: Option<Vec<(String, String)>>,
     timeout: Option<u64>,
-    restart_after_install: Option<bool>,
 ) -> Result<()> {
     let update = webview.resources_table().get::<Update>(rid)?;
 
@@ -187,10 +176,6 @@ pub(crate) async fn download_and_install<R: Runtime>(
         update.timeout = Some(Duration::from_millis(timeout));
     }
 
-    if let Some(restart_after_install) = restart_after_install {
-        update = update.restart_after_install(restart_after_install);
-    }
-
     let mut first_chunk = true;
 
     update

plugins/updater/src/config.rs

@@ -32,30 +32,17 @@ impl WindowsUpdateInstallMode {
         }
     }
 
-    #[cfg(windows)]
-    pub(crate) fn msi_restart_after_install_args(&self) -> &'static [&'static str] {
-        &["AUTOLAUNCHAPP=True"]
-    }
-
     /// Returns the associated nsis arguments.
     pub fn nsis_args(&self) -> &'static [&'static str] {
         // `/P`: Passive
         // `/S`: Silent
         // `/R`: Restart
         match self {
-            Self::Passive => &["/P"],
-            Self::Quiet => &["/S"],
+            Self::Passive => &["/P", "/R"],
+            Self::Quiet => &["/S", "/R"],
             _ => &[],
         }
     }
-
-    #[cfg(windows)]
-    pub(crate) fn nsis_restart_after_install_args(&self) -> &'static [&'static str] {
-        match self {
-            Self::BasicUi => &[],
-            _ => &["/R"],
-        }
-    }
 }
 
 impl Display for WindowsUpdateInstallMode {
@@ -76,8 +63,6 @@ impl Display for WindowsUpdateInstallMode {
 #[serde(rename_all = "camelCase")]
 pub struct WindowsConfig {
     /// Additional arguments given to the NSIS or WiX installer.
-    ///
-    /// Note: this applies to both WiX and NSIS installers
     #[serde(
         default,
         alias = "installer-args",

plugins/updater/src/lib.rs

@@ -83,9 +83,9 @@ impl<R: Runtime, T: Manager<R>> UpdaterExt<R> for T {
             builder = builder.target(target);
         }
 
-        #[cfg(windows)]
-        {
-            builder = builder.current_exe_args(self.env().args_os);
+        let args = self.env().args_os;
+        if !args.is_empty() {
+            builder = builder.current_exe_args(args);
         }
 
         builder.version_comparator = version_comparator.clone();

plugins/updater/src/updater.rs

@@ -129,34 +129,16 @@ impl RemoteRelease {
 pub type OnBeforeExit = Arc<dyn Fn() + Send + Sync + 'static>;
 pub type OnBeforeRequest = Arc<dyn Fn(ClientBuilder) -> ClientBuilder + Send + Sync + 'static>;
 pub type VersionComparator = Arc<dyn Fn(Version, RemoteRelease) -> bool + Send + Sync>;
-#[cfg(target_os = "macos")]
 type MainThreadClosure = Box<dyn FnOnce() + Send + Sync + 'static>;
-#[cfg(target_os = "macos")]
-type RunOnMainThread = Arc<dyn Fn(MainThreadClosure) -> tauri::Result<()> + Send + Sync + 'static>;
-
-// TODO: Move more fields to this in v3 if we can mark those fields non `pub`
-/// Updater context shared between [`UpdaterBuilder`], [`Updater`] and [`Update`]
-#[derive(Clone)]
-struct UpdaterContext {
-    config: Config,
-    configure_client: Option<OnBeforeRequest>,
-    #[cfg(target_os = "macos")]
-    run_on_main_thread: RunOnMainThread,
-    /// App name, used for creating named tempfiles
-    #[cfg(windows)]
-    app_name: String,
-    #[cfg(windows)]
-    installer_args: Vec<OsString>,
-    #[cfg(windows)]
-    current_exe_args: Vec<OsString>,
-    #[cfg(windows)]
-    on_before_exit: Option<OnBeforeExit>,
-    #[cfg(windows)]
-    restart_after_install: bool,
-}
+type RunOnMainThread =
+    Box<dyn Fn(MainThreadClosure) -> 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,
     pub(crate) version_comparator: Option<VersionComparator>,
     executable_path: Option<PathBuf>,
     target: Option<String>,
@@ -165,38 +147,27 @@ pub struct UpdaterBuilder {
     timeout: Option<Duration>,
     proxy: Option<Url>,
     no_proxy: bool,
-    context: UpdaterContext,
+    installer_args: Vec<OsString>,
+    current_exe_args: Vec<OsString>,
+    on_before_exit: Option<OnBeforeExit>,
+    configure_client: Option<OnBeforeRequest>,
 }
 
 impl UpdaterBuilder {
     pub(crate) fn new<R: Runtime>(app: &AppHandle<R>, config: crate::Config) -> Self {
-        #[cfg(target_os = "macos")]
-        let run_on_main_thread = {
-            let app_ = app.clone();
-            Arc::new(move |f| app_.run_on_main_thread(f))
-        };
+        let app_ = app.clone();
+        let run_on_main_thread = move |f| app_.run_on_main_thread(f);
         Self {
-            context: UpdaterContext {
-                #[cfg(windows)]
-                installer_args: config
-                    .windows
-                    .as_ref()
-                    .map(|w| w.installer_args.clone())
-                    .unwrap_or_default(),
-                config,
-                configure_client: None,
-                #[cfg(target_os = "macos")]
-                run_on_main_thread,
-                #[cfg(windows)]
-                app_name: app.package_info().name.clone(),
-                #[cfg(windows)]
-                current_exe_args: Vec::new(),
-                #[cfg(windows)]
-                on_before_exit: None,
-                #[cfg(windows)]
-                restart_after_install: true,
-            },
+            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: app.package_info().name.clone(),
             current_version: app.package_info().version.clone(),
+            config,
             version_comparator: None,
             executable_path: None,
             target: None,
@@ -205,6 +176,8 @@ impl UpdaterBuilder {
             timeout: None,
             proxy: None,
             no_proxy: false,
+            on_before_exit: None,
+            configure_client: None,
         }
     }
 
@@ -224,7 +197,7 @@ impl UpdaterBuilder {
     pub fn endpoints(mut self, endpoints: Vec<Url>) -> Result<Self> {
         crate::config::validate_endpoints(
             &endpoints,
-            self.context.config.dangerous_insecure_transport_protocol,
+            self.config.dangerous_insecure_transport_protocol,
         )?;
 
         self.endpoints.replace(endpoints);
@@ -278,40 +251,26 @@ impl UpdaterBuilder {
     }
 
     pub fn pubkey<S: Into<String>>(mut self, pubkey: S) -> Self {
-        self.context.config.pubkey = pubkey.into();
+        self.config.pubkey = pubkey.into();
         self
     }
 
     /// Adds an argument to pass to the Windows installer.
-    ///
-    /// Note: this applies to both WiX and NSIS installers
-    #[cfg_attr(not(windows), allow(unused))]
     pub fn installer_arg<S>(mut self, arg: S) -> Self
     where
         S: Into<OsString>,
     {
-        #[cfg(windows)]
-        {
-            self.context.installer_args.push(arg.into());
-        }
+        self.installer_args.push(arg.into());
         self
     }
 
     /// Adds multiple arguments to pass to the Windows installer.
-    ///
-    /// Note: this applies to both WiX and NSIS installers
-    #[cfg_attr(not(windows), allow(unused))]
     pub fn installer_args<I, S>(mut self, args: I) -> Self
     where
         I: IntoIterator<Item = S>,
         S: Into<OsString>,
     {
-        #[cfg(windows)]
-        {
-            self.context
-                .installer_args
-                .extend(args.into_iter().map(Into::into));
-        }
+        self.installer_args.extend(args.into_iter().map(Into::into));
         self
     }
 
@@ -321,32 +280,14 @@ impl UpdaterBuilder {
     /// [`Self::installer_arg`], [`crate::Builder::installer_arg`]
     /// and the `plugins > updater > windows > installerArgs` config,
     /// not the ones managed by us (e.g. `/UPDATER` flag passed to the NSIS installer)
-    #[cfg_attr(not(windows), allow(unused))]
     pub fn clear_installer_args(mut self) -> Self {
-        #[cfg(windows)]
-        {
-            self.context.installer_args.clear();
-        }
+        self.installer_args.clear();
         self
     }
 
     /// Function to run before we run the installer and exit the app through `std::process::exit(0)` on Windows
-    #[cfg_attr(not(windows), allow(unused))]
     pub fn on_before_exit<F: Fn() + Send + Sync + 'static>(mut self, f: F) -> Self {
-        #[cfg(windows)]
-        {
-            self.context.on_before_exit.replace(Arc::new(f));
-        }
-        self
-    }
-
-    /// If the Windows installer should restart the app after installed, default is `true`
-    #[cfg_attr(not(windows), allow(unused))]
-    pub fn restart_after_install(mut self, restart_after_install: bool) -> Self {
-        #[cfg(windows)]
-        {
-            self.context.restart_after_install = restart_after_install;
-        }
+        self.on_before_exit.replace(Arc::new(f));
         self
     }
 
@@ -358,14 +299,14 @@ impl UpdaterBuilder {
         mut self,
         f: F,
     ) -> Self {
-        self.context.configure_client.replace(Arc::new(f));
+        self.configure_client.replace(Arc::new(f));
         self
     }
 
     pub fn build(self) -> Result<Updater> {
         let endpoints = self
             .endpoints
-            .unwrap_or_else(|| self.context.config.endpoints.clone());
+            .unwrap_or_else(|| self.config.endpoints.clone());
 
         if endpoints.is_empty() {
             return Err(Error::EmptyEndpoints);
@@ -383,36 +324,44 @@ 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,
             version_comparator: self.version_comparator,
             timeout: self.timeout,
             proxy: self.proxy,
             no_proxy: self.no_proxy,
             endpoints,
+            installer_args: self.installer_args,
+            current_exe_args: self.current_exe_args,
             arch,
             target: self.target,
             headers: self.headers,
             extract_path,
-            context: self.context.clone(),
+            on_before_exit: self.on_before_exit,
+            configure_client: self.configure_client,
         })
     }
 }
 
-#[cfg(windows)]
 impl UpdaterBuilder {
     pub(crate) fn current_exe_args<I, S>(mut self, args: I) -> Self
     where
         I: IntoIterator<Item = S>,
         S: Into<OsString>,
     {
-        self.context
-            .current_exe_args
+        self.current_exe_args
             .extend(args.into_iter().map(Into::into));
         self
     }
 }
 
 pub struct Updater {
+    #[allow(dead_code)]
+    run_on_main_thread: Arc<RunOnMainThread>,
+    config: Config,
+    app_name: String,
     current_version: Version,
     version_comparator: Option<VersionComparator>,
     timeout: Option<Duration>,
@@ -425,7 +374,12 @@ pub struct Updater {
     target: Option<String>,
     headers: HeaderMap,
     extract_path: PathBuf,
-    context: UpdaterContext,
+    on_before_exit: Option<OnBeforeExit>,
+    configure_client: Option<OnBeforeRequest>,
+    #[allow(unused)]
+    installer_args: Vec<OsString>,
+    #[allow(unused)]
+    current_exe_args: Vec<OsString>,
 }
 
 impl Updater {
@@ -495,10 +449,10 @@ impl Updater {
             }
 
             let mut request = ClientBuilder::new().user_agent(UPDATER_USER_AGENT);
-            if self.context.config.dangerous_accept_invalid_certs {
+            if self.config.dangerous_accept_invalid_certs {
                 request = request.danger_accept_invalid_certs(true);
             }
-            if self.context.config.dangerous_accept_invalid_hostnames {
+            if self.config.dangerous_accept_invalid_hostnames {
                 request = request.danger_accept_invalid_hostnames(true);
             }
             if let Some(timeout) = self.timeout {
@@ -513,7 +467,7 @@ impl Updater {
                 request = request.proxy(proxy);
             }
 
-            if let Some(ref configure_client) = self.context.configure_client {
+            if let Some(ref configure_client) = self.configure_client {
                 request = configure_client(request);
             }
 
@@ -583,6 +537,10 @@ impl Updater {
 
         let update = if should_update {
             Some(Update {
+                run_on_main_thread: self.run_on_main_thread.clone(),
+                config: self.config.clone(),
+                on_before_exit: self.on_before_exit.clone(),
+                app_name: self.app_name.clone(),
                 current_version: self.current_version.to_string(),
                 target: target.to_owned(),
                 extract_path: self.extract_path.clone(),
@@ -596,7 +554,9 @@ impl Updater {
                 proxy: self.proxy.clone(),
                 no_proxy: self.no_proxy,
                 headers: self.headers.clone(),
-                context: self.context.clone(),
+                installer_args: self.installer_args.clone(),
+                current_exe_args: self.current_exe_args.clone(),
+                configure_client: self.configure_client.clone(),
             })
         } else {
             None
@@ -640,6 +600,11 @@ impl Updater {
 
 #[derive(Clone)]
 pub struct Update {
+    #[allow(dead_code)]
+    run_on_main_thread: Arc<RunOnMainThread>,
+    config: Config,
+    #[allow(unused)]
+    on_before_exit: Option<OnBeforeExit>,
     /// Update description
     pub body: Option<String>,
     /// Version used to check for update
@@ -668,7 +633,14 @@ pub struct Update {
     /// Extract path
     #[allow(unused)]
     extract_path: PathBuf,
-    context: UpdaterContext,
+    /// App name, used for creating named tempfiles on Windows
+    #[allow(unused)]
+    app_name: String,
+    #[allow(unused)]
+    installer_args: Vec<OsString>,
+    #[allow(unused)]
+    current_exe_args: Vec<OsString>,
+    configure_client: Option<OnBeforeRequest>,
 }
 
 impl Resource for Update {}
@@ -689,10 +661,10 @@ impl Update {
         }
 
         let mut request = ClientBuilder::new().user_agent(UPDATER_USER_AGENT);
-        if self.context.config.dangerous_accept_invalid_certs {
+        if self.config.dangerous_accept_invalid_certs {
             request = request.danger_accept_invalid_certs(true);
         }
-        if self.context.config.dangerous_accept_invalid_hostnames {
+        if self.config.dangerous_accept_invalid_hostnames {
             request = request.danger_accept_invalid_hostnames(true);
         }
         if let Some(timeout) = self.timeout {
@@ -704,7 +676,7 @@ impl Update {
             let proxy = reqwest::Proxy::all(proxy.as_str())?;
             request = request.proxy(proxy);
         }
-        if let Some(ref configure_client) = self.context.configure_client {
+        if let Some(ref configure_client) = self.configure_client {
             request = configure_client(request);
         }
         let response = request
@@ -737,7 +709,7 @@ impl Update {
         }
         on_download_finish();
 
-        verify_signature(&buffer, &self.signature, &self.context.config.pubkey)?;
+        verify_signature(&buffer, &self.signature, &self.config.pubkey)?;
 
         Ok(buffer)
     }
@@ -761,16 +733,6 @@ impl Update {
     fn install_inner(&self, _bytes: &[u8]) -> Result<()> {
         Ok(())
     }
-
-    /// Whether the Windows installer should restart the app after installed, default is `true`
-    #[cfg_attr(not(windows), allow(unused))]
-    pub fn restart_after_install(mut self, restart_after_install: bool) -> Self {
-        #[cfg(windows)]
-        {
-            self.context.restart_after_install = restart_after_install;
-        }
-        self
-    }
 }
 
 #[cfg(windows)]
@@ -823,6 +785,7 @@ impl Update {
     /// │   └──[AppName]_[version]_x64-setup.exe           # NSIS installer
     /// └── ...
     fn install_inner(&self, bytes: &[u8]) -> Result<()> {
+        use std::iter::once;
         use windows_sys::{
             w,
             Win32::UI::{Shell::ShellExecuteW, WindowsAndMessaging::SW_SHOW},
@@ -830,7 +793,48 @@ impl Update {
 
         let updater_type = self.extract(bytes)?;
 
-        if let Some(on_before_exit) = self.context.on_before_exit.as_ref() {
+        let install_mode = self.config.install_mode();
+        let current_args = &self.current_exe_args()[1..];
+        let msi_args;
+        let nsis_args;
+
+        let installer_args: Vec<&OsStr> = match &updater_type {
+            WindowsUpdaterType::Nsis { .. } => {
+                nsis_args = current_args
+                    .iter()
+                    .map(escape_nsis_current_exe_arg)
+                    .collect::<Vec<_>>();
+
+                install_mode
+                    .nsis_args()
+                    .iter()
+                    .map(OsStr::new)
+                    .chain(once(OsStr::new("/UPDATE")))
+                    .chain(once(OsStr::new("/ARGS")))
+                    .chain(nsis_args.iter().map(OsStr::new))
+                    .chain(self.installer_args())
+                    .collect()
+            }
+            WindowsUpdaterType::Msi { path, .. } => {
+                let escaped_args = current_args
+                    .iter()
+                    .map(escape_msi_property_arg)
+                    .collect::<Vec<_>>()
+                    .join(" ");
+                msi_args = OsString::from(format!("LAUNCHAPPARGS=\"{escaped_args}\""));
+
+                [OsStr::new("/i"), path.as_os_str()]
+                    .into_iter()
+                    .chain(install_mode.msiexec_args().iter().map(OsStr::new))
+                    .chain(once(OsStr::new("/promptrestart")))
+                    .chain(self.installer_args())
+                    .chain(once(OsStr::new("AUTOLAUNCHAPP=True")))
+                    .chain(once(msi_args.as_os_str()))
+                    .collect()
+            }
+        };
+
+        if let Some(on_before_exit) = self.on_before_exit.as_ref() {
             log::debug!("running on_before_exit hook");
             on_before_exit();
         }
@@ -842,11 +846,9 @@ impl Update {
                 |p| OsString::from(format!("{p}\\System32\\msiexec.exe")),
             ),
         };
-        let parameters = self.updater_parameters(&updater_type);
-
-        log::debug!("Executing updater {file:?} with parameters: {parameters:?}");
-
         let file = encode_wide(file);
+
+        let parameters = installer_args.join(OsStr::new(" "));
         let parameters = encode_wide(parameters);
 
         unsafe {
@@ -863,72 +865,18 @@ impl Update {
         std::process::exit(0);
     }
 
-    fn updater_parameters(&self, updater_type: &WindowsUpdaterType) -> OsString {
-        let install_mode = self.context.config.install_mode();
-        let current_args = &self.context.current_exe_args[1..];
-
-        match updater_type {
-            WindowsUpdaterType::Nsis { .. } => {
-                let mut installer_args: Vec<&OsStr> = Vec::new();
-                installer_args.extend(install_mode.nsis_args().iter().map(OsStr::new));
-                installer_args.push(OsStr::new("/UPDATE"));
-
-                let nsis_current_exe_arg;
-                if self.context.restart_after_install {
-                    nsis_current_exe_arg = current_args
-                        .iter()
-                        .map(escape_nsis_current_exe_arg)
-                        .collect::<Vec<_>>();
-
-                    installer_args.extend(
-                        install_mode
-                            .nsis_restart_after_install_args()
-                            .iter()
-                            .map(OsStr::new),
-                    );
-                    installer_args.push(OsStr::new("/ARGS"));
-                    installer_args.extend(nsis_current_exe_arg.iter().map(OsStr::new));
-                }
-
-                installer_args.extend(self.installer_args());
-
-                installer_args.join(OsStr::new(" "))
-            }
-            WindowsUpdaterType::Msi { path, .. } => {
-                let mut installer_args: Vec<&OsStr> = vec![OsStr::new("/i"), path.as_os_str()];
-                installer_args.extend(install_mode.msiexec_args().iter().map(OsStr::new));
-                installer_args.push(OsStr::new("/promptrestart"));
-                installer_args.extend(self.installer_args());
-
-                let msi_current_exe_arg;
-                if self.context.restart_after_install {
-                    msi_current_exe_arg = format!(
-                        "LAUNCHAPPARGS=\"{}\"",
-                        current_args
-                            .iter()
-                            .map(escape_msi_property_arg)
-                            .collect::<Vec<_>>()
-                            .join(" ")
-                    );
-
-                    installer_args.extend(
-                        install_mode
-                            .msi_restart_after_install_args()
-                            .iter()
-                            .map(OsStr::new),
-                    );
-                    installer_args.push(OsStr::new(&msi_current_exe_arg));
-                }
-
-                installer_args.join(OsStr::new(" "))
-            }
-        }
+    fn installer_args(&self) -> Vec<&OsStr> {
+        self.installer_args
+            .iter()
+            .map(OsStr::new)
+            .collect::<Vec<_>>()
     }
 
-    fn installer_args(
-        &self,
-    ) -> std::iter::Map<std::slice::Iter<'_, OsString>, fn(&OsString) -> &OsStr> {
-        self.context.installer_args.iter().map(OsStr::new)
+    fn current_exe_args(&self) -> Vec<&OsStr> {
+        self.current_exe_args
+            .iter()
+            .map(OsStr::new)
+            .collect::<Vec<_>>()
     }
 
     fn extract(&self, bytes: &[u8]) -> Result<WindowsUpdaterType> {
@@ -942,10 +890,7 @@ impl Update {
 
     fn make_temp_dir(&self) -> Result<PathBuf> {
         Ok(tempfile::Builder::new()
-            .prefix(&format!(
-                "{}-{}-updater-",
-                self.context.app_name, self.version
-            ))
+            .prefix(&format!("{}-{}-updater-", self.app_name, self.version))
             .tempdir()?
             .keep())
     }
@@ -993,10 +938,7 @@ impl Update {
 
         let temp_dir = self.make_temp_dir()?;
         let mut temp_file = tempfile::Builder::new()
-            .prefix(&format!(
-                "{}-{}-installer",
-                self.context.app_name, self.version
-            ))
+            .prefix(&format!("{}-{}-installer", self.app_name, self.version))
             .suffix(ext)
             .rand_bytes(0)
             .tempfile_in(temp_dir)?;
@@ -1335,7 +1277,7 @@ impl Update {
             );
 
             let (tx, rx) = std::sync::mpsc::channel();
-            let res = (self.context.run_on_main_thread)(Box::new(move || {
+            let res = (self.run_on_main_thread)(Box::new(move || {
                 let mut script =
                     osakit::Script::new_from_source(osakit::Language::AppleScript, &apple_script);
                 script.compile().expect("invalid AppleScript");
@@ -1508,7 +1450,7 @@ where
 }
 
 // Validate signature
-fn verify_signature(data: &[u8], release_signature: &str, pub_key: &str) -> Result<()> {
+fn verify_signature(data: &[u8], release_signature: &str, pub_key: &str) -> Result<bool> {
     // we need to convert the pub key
     let pub_key_decoded = base64_to_string(pub_key)?;
     let public_key = PublicKey::decode(&pub_key_decoded)?;
@@ -1517,7 +1459,7 @@ fn verify_signature(data: &[u8], release_signature: &str, pub_key: &str) -> Resu
 
     // Validate signature or bail out
     public_key.verify(data, &signature, true)?;
-    Ok(())
+    Ok(true)
 }
 
 fn base64_to_string(base64_string: &str) -> Result<String> {
@@ -1556,31 +1498,25 @@ impl PathExt for PathBuf {
 
 // adapted from https://github.com/rust-lang/rust/blob/1c047506f94cd2d05228eb992b0a6bbed1942349/library/std/src/sys/args/windows.rs#L174
 #[cfg(windows)]
-fn escape_nsis_current_exe_arg(arg: impl AsRef<OsStr>) -> OsString {
-    use std::os::windows::ffi::{OsStrExt, OsStringExt};
-
-    let arg = arg.as_ref();
-    let mut cmd: Vec<u16> = Vec::new();
+fn escape_nsis_current_exe_arg(arg: &&OsStr) -> String {
+    let arg = arg.to_string_lossy();
+    let mut cmd: Vec<char> = Vec::new();
 
     // compared to std we additionally escape `/` so that nsis won't interpret them as a beginning of an nsis argument.
-    let quote = arg
-        .as_encoded_bytes()
-        .iter()
-        .any(|c| *c == b' ' || *c == b'\t' || *c == b'/')
-        || arg.is_empty();
+    let quote = arg.chars().any(|c| c == ' ' || c == '\t' || c == '/') || arg.is_empty();
     let escape = true;
     if quote {
-        cmd.push('"' as u16);
+        cmd.push('"');
     }
     let mut backslashes: usize = 0;
-    for x in arg.encode_wide() {
+    for x in arg.chars() {
         if escape {
-            if x == '\\' as u16 {
+            if x == '\\' {
                 backslashes += 1;
             } else {
-                if x == '"' as u16 {
+                if x == '"' {
                     // Add n+1 backslashes to total 2n+1 before internal '"'.
-                    cmd.extend((0..=backslashes).map(|_| '\\' as u16));
+                    cmd.extend((0..=backslashes).map(|_| '\\'));
                 }
                 backslashes = 0;
             }
@@ -1589,10 +1525,10 @@ fn escape_nsis_current_exe_arg(arg: impl AsRef<OsStr>) -> OsString {
     }
     if quote {
         // Add n backslashes to total 2n before ending '"'.
-        cmd.extend((0..backslashes).map(|_| '\\' as u16));
-        cmd.push('"' as u16);
+        cmd.extend((0..backslashes).map(|_| '\\'));
+        cmd.push('"');
     }
-    OsString::from_wide(&cmd)
+    cmd.into_iter().collect()
 }
 
 #[cfg(windows)]

plugins/updater/tests/app-updater/tauri.conf.json

@@ -6,7 +6,8 @@
       "endpoints": ["http://localhost:3007"],
       "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEUwNDRGMjkwRjg2MDhCRDAKUldUUWkyRDRrUEpFNEQ4SmdwcU5PaXl6R2ZRUUNvUnhIaVkwVUltV0NMaEx6VTkrWVhpT0ZqeEEK",
       "windows": {
-        "installMode": "quiet"
+        "installMode": "quiet",
+        "installerArgs": ["/NS"]
       }
     }
   },

plugins/updater/tests/app-updater/tests/update.rs

@@ -46,7 +46,7 @@ struct Update {
     platforms: HashMap<String, PlatformUpdate>,
 }
 
-fn build_app(cwd: &Path, config: &Config, target: Option<BundleTarget>) {
+fn build_app(cwd: &Path, config: &Config, bundle_updater: bool, target: BundleTarget) {
     let mut command = Command::new("cargo");
     command
         .args(["tauri", "build", "--verbose"])
@@ -56,10 +56,17 @@ fn build_app(cwd: &Path, config: &Config, target: Option<BundleTarget>) {
         .env("TAURI_SIGNING_PRIVATE_KEY_PASSWORD", "")
         .current_dir(cwd);
 
-    if let Some(target) = target {
-        command.arg("--bundles").arg(target.name());
+    #[cfg(target_os = "linux")]
+    command.args(["--bundles", target.name()]);
+    #[cfg(target_os = "macos")]
+    command.args(["--bundles", target.name()]);
+
+    if bundle_updater {
+        #[cfg(windows)]
+        command.args(["--bundles", "msi", "nsis"]);
     } else {
-        command.arg("--no-bundle");
+        #[cfg(windows)]
+        command.args(["--bundles", target.name()]);
     }
 
     let status = command
@@ -311,7 +318,7 @@ fn update_app() {
         {
             // bundle app update
             config.version = "1.0.0";
-            build_app(&manifest_dir, &config, Some(bundle_target));
+            build_app(&manifest_dir, &config, true, BundleTarget::default());
 
             let bundle_updater_ext = if v1_compatible {
                 out_bundle_path
@@ -394,7 +401,7 @@ fn update_app() {
             config.version = "0.1.0";
 
             // bundle initial app version
-            build_app(&manifest_dir, &config, None);
+            build_app(&manifest_dir, &config, false, bundle_target);
 
             for expected_exit_code in status_checks {
                 let mut binary_cmd = if cfg!(windows) {

plugins/updater/tests/updater-migration/v1-app/Cargo.lock

@@ -3794,7 +3794,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.48.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -4137,9 +4137,9 @@ dependencies = [
 
 [[package]]
 name = "wry"
-version = "0.24.12"
+version = "0.24.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a2a144c3ab5e83e04724bc8e67cea552ffae413185fda459fafdae173fd985d"
+checksum = "00711278ed357350d44c749c286786ecac644e044e4da410d466212152383b45"
 dependencies = [
  "base64 0.13.1",
  "block",

plugins/websocket/examples/tauri-app/package.json

@@ -9,8 +9,8 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.11.4",
-    "typescript": "^6.0.0",
+    "@tauri-apps/cli": "2.11.2",
+    "typescript": "^7.0.0",
     "vite": "^8.0.1"
   },
   "dependencies": {

plugins/window-state/src/lib.rs

@@ -452,47 +452,47 @@ impl Builder {
                         }
                     }
 
-                    WindowEvent::Moved(position)
-                        if state_flags.contains(StateFlags::POSITION)
-                            && window_clone
-                                .state::<RestoringWindowState>()
-                                .0
-                                .try_lock()
-                                .is_ok()
-                            && !window_clone.is_minimized().unwrap_or_default() =>
-                    {
-                        let mut c = cache.lock().unwrap();
-                        if let Some(state) = c.get_mut(&label) {
-                            state.prev_x = state.x;
-                            state.prev_y = state.y;
-
-                            state.x = position.x;
-                            state.y = position.y;
-                        }
-                    }
-                    WindowEvent::Resized(size)
-                        if state_flags.contains(StateFlags::SIZE)
-                            && window_clone
-                                .state::<RestoringWindowState>()
-                                .0
-                                .try_lock()
-                                .is_ok() =>
-                    {
-                        // TODO: Remove once https://github.com/tauri-apps/tauri/issues/5812 is resolved.
-                        let is_maximized = if cfg!(target_os = "macos")
-                            && (!window_clone.is_decorated().unwrap_or_default()
-                                || !window_clone.is_resizable().unwrap_or_default())
+                    WindowEvent::Moved(position) if state_flags.contains(StateFlags::POSITION) => {
+                        if window_clone
+                            .state::<RestoringWindowState>()
+                            .0
+                            .try_lock()
+                            .is_ok()
+                            && !window_clone.is_minimized().unwrap_or_default()
                         {
-                            false
-                        } else {
-                            window_clone.is_maximized().unwrap_or_default()
-                        };
-
-                        if !window_clone.is_minimized().unwrap_or_default() && !is_maximized {
                             let mut c = cache.lock().unwrap();
                             if let Some(state) = c.get_mut(&label) {
-                                state.width = size.width;
-                                state.height = size.height;
+                                state.prev_x = state.x;
+                                state.prev_y = state.y;
+
+                                state.x = position.x;
+                                state.y = position.y;
+                            }
+                        }
+                    }
+                    WindowEvent::Resized(size) if state_flags.contains(StateFlags::SIZE) => {
+                        if window_clone
+                            .state::<RestoringWindowState>()
+                            .0
+                            .try_lock()
+                            .is_ok()
+                        {
+                            // TODO: Remove once https://github.com/tauri-apps/tauri/issues/5812 is resolved.
+                            let is_maximized = if cfg!(target_os = "macos")
+                                && (!window_clone.is_decorated().unwrap_or_default()
+                                    || !window_clone.is_resizable().unwrap_or_default())
+                            {
+                                false
+                            } else {
+                                window_clone.is_maximized().unwrap_or_default()
+                            };
+
+                            if !window_clone.is_minimized().unwrap_or_default() && !is_maximized {
+                                let mut c = cache.lock().unwrap();
+                                if let Some(state) = c.get_mut(&label) {
+                                    state.width = size.width;
+                                    state.height = size.height;
+                                }
                             }
                         }
                     }

pnpm-workspace.yaml

@@ -2,6 +2,3 @@ packages:
   - plugins/*
   - plugins/*/examples/*
   - examples/*
-
-allowBuilds:
-  esbuild: true