Merge branch 'v2' into feat/setup-single-instance-manually

feat(single-instance): add setup() function to run flow separately
2026-07-22 17:10:53 +02:00 · 2026-02-05 10:29:41 -03:00 · 2026-02-05 10:28:15 -03:00
232 changed files with 4765 additions and 5706 deletions
@@ -1,17 +1,11 @@
 [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",
+  # time 0.1
+  "RUSTSEC-2020-0071",
+  # needs sqlx 0.7 (still in alpha)
+  "RUSTSEC-2022-0090",
+  # wry needs kuchiki on Android
+  "RUSTSEC-2023-0019",
+  # atty is only used when the `colored` feature is enabled on tauri-plugin-log
+  "RUSTSEC-2021-0145",
 ]
@@ -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`
@@ -0,0 +1,9 @@
+---
+"single-instance": minor:fix
+---
+
+**Breaking Change:** On Linux, the DBus ID/name will now be `<bundle-id>.SingleInstance` instead of `org.<bundle_id_underscores>.SingleInstance` to follow DBus specifications.
+
+This will break the single-instance mechanism across different app versions if the app was installed multiple times.
+
+Added `dbus_id` builder method, which can be used to restore previous behavior. For a bundle identifier of `com.tauri.my-example` this would be `dbus_id("org.com_tauri_my_example")`.
@@ -1,6 +0,0 @@
---
-"fs": patch
-"fs-js": patch
---
-
-Fixed `deny-webview-data` has no effect
@@ -1,6 +0,0 @@
---
-nfc: patch
-nfc-js: patch
---
-
-Expect a `NFCTag` as input and return a `ScanResponse` in the `scan` function.
@@ -0,0 +1,5 @@
+---
+"single-instance": patch
+---
+
+Add `setup` function to run the single instance initialization manually, without waiting for the tauri setup hook to run.
@@ -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
@@ -5,7 +5,6 @@ Hi! We, the maintainers, are really excited that you are interested in contribut
 - [Issue Reporting Guidelines](#issue-reporting-guidelines)
 - [Pull Request Guidelines](#pull-request-guidelines)
 - [Development Guide](#development-guide)
- [AI Tool Policy](#ai-tool-policy)

 ## Issue Reporting Guidelines

@@ -61,13 +60,3 @@ The easiest way to test your changes is to use the [example app](https://github.
 To test local changes against your own application simply point the plugin create to your local repository, for example:

 `tauri-plugin-sample = { path = "path/to/local/tauri-plugin-sample/" }`
-
-## AI Tool Policy
-
-It takes a lot of time to review a Pull Request while it's very easy to make a nonsensical but plausible looking one using AI tools.
-It is unfair for other contributors and the reviewers to spend much of the time dealing with this, hence these rules:
-
-1. Review and test all LLM-generated content before submitting, you're the one responsible for it, not the AI.
-2. Don't use AI to respond to review comments (except for translations).
-
-We will close the Pull Request with a `ai-slop` tag if you failed to do so.
@@ -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
@@ -33,8 +33,8 @@ jobs:
  audit-rust:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v7
-      - uses: rustsec/audit-check@v2
+      - uses: actions/checkout@v4
+      - uses: rustsec/audit-check@v1
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
          # https://github.com/tauri-apps/plugins-workspace/issues/774
@@ -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: |
@@ -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
@@ -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:
@@ -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
@@ -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 }})'
@@ -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
@@ -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

@@ -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
@@ -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: |
@@ -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
@@ -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')
@@ -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"
@@ -22,7 +22,7 @@ This repo and all plugins require a Rust version of at least **1.77.2**
 | [log](plugins/log)                             | Configurable logging.                                                                                                                                          | ✅  | ✅  | ✅  | ✅  | ✅  |
 | [nfc](plugins/nfc)                             | Read and write NFC tags on Android and iOS.                                                                                                                    | ?   | ?   | ?   | ✅  | ✅  |
 | [notification](plugins/notification)           | Send message notifications (brief auto-expiring OS window element) to your user. Can also be used with the Notification Web API.                               | ✅  | ✅  | ✅  | ✅  | ✅  |
-| [opener](plugins/opener)                       | Open files and URLs using their default application.                                                                                                           | ✅  | ✅  | ✅  | ✅  | ✅  |
+| [opener](plugins/opener)                       | Open files and URLs using their default application.                                                                                                           | ✅  | ✅  | ✅  | ?   | ?   |
 | [os](plugins/os)                               | Read information about the operating system.                                                                                                                   | ✅  | ✅  | ✅  | ✅  | ✅  |
 | [persisted-scope](plugins/persisted-scope)     | Persist runtime scope changes on the filesystem.                                                                                                               | ✅  | ✅  | ✅  | ?   | ?   |
 | [positioner](plugins/positioner)               | Move windows to common locations.                                                                                                                              | ✅  | ✅  | ✅  | ❌  | ❌  |
@@ -1,45 +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
-
- Upgraded to `barcode-scanner-js@2.4.5`
- Upgraded to `global-shortcut-js@2.3.2`
-
-## \[2.0.39]
-
-### Dependencies
-
- Upgraded to `fs-js@2.5.1`
- Upgraded to `opener-js@2.5.4`
- Upgraded to `store-js@2.4.3`
- Upgraded to `dialog-js@2.7.1`
- Upgraded to `http-js@2.5.9`
-
-## \[2.0.38]
-
-### Dependencies
-
- Upgraded to `fs-js@2.5.0`
- Upgraded to `http-js@2.5.8`
- Upgraded to `updater-js@2.10.1`
- Upgraded to `nfc-js@2.3.5`
- Upgraded to `dialog-js@2.7.0`
-
 ## \[2.0.37]

 ### Dependencies
@@ -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>
@@ -1,7 +1,7 @@
 {
  "name": "api",
  "private": true,
-  "version": "2.0.42",
+  "version": "2.0.37",
  "type": "module",
  "scripts": {
    "dev": "vite --clearScreen false",
@@ -10,36 +10,36 @@
    "tauri": "tauri"
  },
  "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/api": "^2.10.1",
+    "@tauri-apps/plugin-barcode-scanner": "^2.4.4",
+    "@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.6.0",
+    "@tauri-apps/plugin-fs": "^2.4.5",
+    "@tauri-apps/plugin-geolocation": "^2.2.0",
+    "@tauri-apps/plugin-global-shortcut": "^2.3.1",
+    "@tauri-apps/plugin-haptics": "^2.2.0",
+    "@tauri-apps/plugin-http": "^2.5.7",
+    "@tauri-apps/plugin-nfc": "^2.3.4",
+    "@tauri-apps/plugin-notification": "^2.3.3",
+    "@tauri-apps/plugin-opener": "^2.5.3",
+    "@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.2",
+    "@tauri-apps/plugin-updater": "^2.10.0",
+    "@tauri-apps/plugin-upload": "^2.3.0",
    "@zerodevx/svelte-json-view": "1.0.11"
  },
  "devDependencies": {
-    "@iconify-json/codicon": "^1.2.49",
+    "@iconify-json/codicon": "^1.2.12",
    "@iconify-json/ph": "^1.2.2",
-    "@sveltejs/vite-plugin-svelte": "^7.0.0",
-    "@tauri-apps/cli": "2.11.4",
-    "@unocss/extractor-svelte": "^66.6.7",
-    "svelte": "^5.54.0",
-    "unocss": "^66.6.7",
-    "vite": "^8.0.1"
+    "@sveltejs/vite-plugin-svelte": "^6.0.0",
+    "@tauri-apps/cli": "2.10.0",
+    "@unocss/extractor-svelte": "^66.3.3",
+    "svelte": "^5.20.4",
+    "unocss": "^66.3.3",
+    "vite": "^7.0.7"
  }
 }
@@ -1,45 +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
-
- Upgraded to `barcode-scanner@2.4.5`
- Upgraded to `global-shortcut@2.3.2`
-
-## \[2.0.43]
-
-### Dependencies
-
- Upgraded to `fs@2.5.1`
- Upgraded to `opener@2.5.4`
- Upgraded to `store@2.4.3`
- Upgraded to `dialog@2.7.1`
- Upgraded to `http@2.5.9`
-
-## \[2.0.42]
-
-### Dependencies
-
- Upgraded to `fs@2.5.0`
- Upgraded to `http@2.5.8`
- Upgraded to `updater@2.10.1`
- Upgraded to `nfc@2.3.5`
- Upgraded to `dialog@2.7.0`
-
 ## \[2.0.41]

 ### Dependencies
@@ -1,7 +1,7 @@
 [package]
 name = "api"
 publish = false
-version = "2.0.46"
+version = "2.0.41"
 description = "An example Tauri Application showcasing the api"
 edition = "2021"
 rust-version = { workspace = true }
@@ -20,24 +20,24 @@ 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-fs = { path = "../../../plugins/fs", version = "2.5.1", features = [
+tauri-plugin-log = { path = "../../../plugins/log", version = "2.8.0" }
+tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.4.5", 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.6.0" }
 tauri-plugin-http = { path = "../../../plugins/http", features = [
  "multipart",
  "cookies",
-], version = "2.5.9" }
+], version = "2.5.7" }
 tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.3.3", features = [
  "windows7-compat",
 ] }
 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-opener = { path = "../../../plugins/opener", version = "2.5.3" }
 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.2" }
 tauri-plugin-upload = { path = "../../../plugins/upload", version = "2.3.0" }

 [dependencies.tauri]
@@ -56,13 +56,13 @@ features = [

 [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
 tauri-plugin-cli = { path = "../../../plugins/cli", version = "2.4.1" }
-tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.3.2" }
-tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.10.1" }
+tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.3.1" }
+tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.10.0" }
 tauri-plugin-window-state = { path = "../../../plugins/window-state", version = "2.2.0" }

 [target."cfg(any(target_os = \"android\", target_os = \"ios\"))".dependencies]
-tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.4.5" }
-tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "2.3.5" }
+tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.4.4" }
+tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "2.3.4" }
 tauri-plugin-biometric = { path = "../../../plugins/biometric/", version = "2.3.2" }
 tauri-plugin-geolocation = { path = "../../../plugins/geolocation/", version = "2.3.2" }
 tauri-plugin-haptics = { path = "../../../plugins/haptics/", version = "2.3.2" }
@@ -15,15 +15,19 @@
      ]
    },
    "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",
    "os:allow-platform",
-    "dialog:default",
+    "dialog:allow-open",
+    "dialog:allow-ask",
+    "dialog:allow-save",
+    "dialog:allow-confirm",
+    "dialog:allow-message",
    {
      "identifier": "shell:allow-spawn",
      "allow": [
@@ -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()
@@ -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>
@@ -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>
@@ -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;
            }
@@ -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
@@ -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": {
@@ -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>
@@ -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 {
@@ -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>
@@ -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 (_) {}
@@ -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!");
  }

-  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>
@@ -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(() => {
@@ -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>
@@ -1,5 +0,0 @@
-*
-
-!.gitignore
-!README.md
-!updater.json
@@ -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`
@@ -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"
-    }
-  }
-}
@@ -27,7 +27,7 @@ export default defineConfig(async () => {
      port: 5173,
      strictPort: true,
      fs: {
-        allow: ['.']
+        allow: ['.', '../../tooling/api/dist']
      }
    }
  }
@@ -11,19 +11,31 @@
    "example:api:dev": "pnpm run --filter \"api\" tauri dev"
  },
  "devDependencies": {
-    "@eslint/js": "10.0.1",
+    "@eslint/js": "9.39.2",
    "@rollup/plugin-node-resolve": "16.0.3",
-    "@rollup/plugin-terser": "1.0.0",
+    "@rollup/plugin-terser": "0.4.4",
    "@rollup/plugin-typescript": "12.3.0",
-    "eslint": "10.4.0",
+    "covector": "^0.12.4",
+    "eslint": "9.39.2",
    "eslint-config-prettier": "10.1.8",
-    "eslint-plugin-security": "4.0.1",
-    "prettier": "3.8.3",
-    "rollup": "4.60.3",
+    "eslint-plugin-security": "3.0.1",
+    "prettier": "3.8.1",
+    "rollup": "4.57.1",
    "tslib": "2.8.1",
-    "typescript": "6.0.3",
-    "typescript-eslint": "8.58.2"
+    "typescript": "5.9.3",
+    "typescript-eslint": "8.54.0"
  },
  "minimumReleaseAge": 4320,
-  "packageManager": "pnpm@11.13.0"
+  "pnpm": {
+    "overrides": {
+      "esbuild@<0.25.0": ">=0.25.0",
+      "lodash@>=4.0.0 <=4.17.22": ">=4.17.23"
+    },
+    "onlyBuiltDependencies": [
+      "esbuild"
+    ]
+  },
+  "engines": {
+    "pnpm": "^10.16.0"
+  }
 }
@@ -24,6 +24,6 @@
    "LICENSE"
  ],
  "dependencies": {
-    "@tauri-apps/api": "^2.11.0"
+    "@tauri-apps/api": "^2.10.1"
  }
 }
@@ -1,7 +1,4 @@
 {
  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "rootDir": "guest-js"
-  },
  "include": ["guest-js/*.ts"]
 }
@@ -1,9 +1,5 @@
 # Changelog

-## \[2.4.5]
-
- [`d8645ab3`](https://github.com/tauri-apps/plugins-workspace/commit/d8645ab3e5b508456681eb53275c0837db25aeee) ([#3393](https://github.com/tauri-apps/plugins-workspace/pull/3393) by [@AlexisZankowitch](https://github.com/tauri-apps/plugins-workspace/../../AlexisZankowitch)) Fixed a crash on iOS when `cancel()` is invoked by running the cancel handler on the main thread.
-
 ## \[2.4.4]

 - [`82fbb0c7`](https://github.com/tauri-apps/plugins-workspace/commit/82fbb0c790288eca72af9ade13828ded7700ff90) ([#3221](https://github.com/tauri-apps/plugins-workspace/pull/3221)) On iOS, fixed an application crash happening when the scanner was started when user denied permission before.
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-barcode-scanner"
-version = "2.4.5"
+version = "2.4.4"
 description = "Scan QR codes, EAN-13 and other kinds of barcodes on Android and iOS"
 edition = { workspace = true }
 authors = { workspace = true }
@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_BARCODE_SCANNER__=function(n){"use strict";async function a(n,a={},e){return window.__TAURI_INTERNALS__.invoke(n,a,e)}var e;return"function"==typeof SuppressedError&&SuppressedError,n.Format=void 0,(e=n.Format||(n.Format={})).QRCode="QR_CODE",e.UPC_A="UPC_A",e.UPC_E="UPC_E",e.EAN8="EAN_8",e.EAN13="EAN_13",e.Code39="CODE_39",e.Code93="CODE_93",e.Code128="CODE_128",e.Codabar="CODABAR",e.ITF="ITF",e.Aztec="AZTEC",e.DataMatrix="DATA_MATRIX",e.PDF417="PDF_417",e.GS1DataBar="GS1_DATA_BAR",e.GS1DataBarLimited="GS1_DATA_BAR_LIMITED",e.GS1DataBarExpanded="GS1_DATA_BAR_EXPANDED",n.cancel=async function(){await a("plugin:barcode-scanner|cancel")},n.checkPermissions=async function(){return await async function(n){return a(`plugin:${n}|check_permissions`)}("barcode-scanner").then(n=>n.camera)},n.openAppSettings=async function(){await a("plugin:barcode-scanner|open_app_settings")},n.requestPermissions=async function(){return await async function(n){return a(`plugin:${n}|request_permissions`)}("barcode-scanner").then(n=>n.camera)},n.scan=async function(n){return await a("plugin:barcode-scanner|scan",{...n})},n}({});Object.defineProperty(window.__TAURI__,"barcodeScanner",{value:__TAURI_PLUGIN_BARCODE_SCANNER__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_BARCODE_SCANNER__=function(n){"use strict";async function a(n,a={},e){return window.__TAURI_INTERNALS__.invoke(n,a,e)}var e;return"function"==typeof SuppressedError&&SuppressedError,n.Format=void 0,(e=n.Format||(n.Format={})).QRCode="QR_CODE",e.UPC_A="UPC_A",e.UPC_E="UPC_E",e.EAN8="EAN_8",e.EAN13="EAN_13",e.Code39="CODE_39",e.Code93="CODE_93",e.Code128="CODE_128",e.Codabar="CODABAR",e.ITF="ITF",e.Aztec="AZTEC",e.DataMatrix="DATA_MATRIX",e.PDF417="PDF_417",e.GS1DataBar="GS1_DATA_BAR",e.GS1DataBarLimited="GS1_DATA_BAR_LIMITED",e.GS1DataBarExpanded="GS1_DATA_BAR_EXPANDED",n.cancel=async function(){await a("plugin:barcode-scanner|cancel")},n.checkPermissions=async function(){return await async function(n){return a(`plugin:${n}|check_permissions`)}("barcode-scanner").then((n=>n.camera))},n.openAppSettings=async function(){await a("plugin:barcode-scanner|open_app_settings")},n.requestPermissions=async function(){return await async function(n){return a(`plugin:${n}|request_permissions`)}("barcode-scanner").then((n=>n.camera))},n.scan=async function(n){return await a("plugin:barcode-scanner|scan",{...n})},n}({});Object.defineProperty(window.__TAURI__,"barcodeScanner",{value:__TAURI_PLUGIN_BARCODE_SCANNER__})}
@@ -337,11 +337,10 @@ class BarcodeScannerPlugin: Plugin, AVCaptureMetadataOutputObjectsDelegate {
  }

  @objc private func cancel(_ invoke: Invoke) {
-    DispatchQueue.main.async { [self] in
-      self.invoke?.reject("cancelled")
-      self.destroy()
-      invoke.resolve()
-    }
+    self.invoke?.reject("cancelled")
+
+    destroy()
+    invoke.resolve()
  }
 }

@@ -1,6 +1,6 @@
 {
  "name": "@tauri-apps/plugin-barcode-scanner",
-  "version": "2.4.5",
+  "version": "2.4.4",
  "description": "Scan QR codes, EAN-13 and other kinds of barcodes on Android and iOS",
  "license": "MIT OR Apache-2.0",
  "authors": [
@@ -25,6 +25,6 @@
    "LICENSE"
  ],
  "dependencies": {
-    "@tauri-apps/api": "^2.11.0"
+    "@tauri-apps/api": "^2.10.1"
  }
 }
@@ -1,7 +1,4 @@
 {
  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "rootDir": "guest-js"
-  },
  "include": ["guest-js/*.ts"]
 }
@@ -25,6 +25,6 @@
    "LICENSE"
  ],
  "dependencies": {
-    "@tauri-apps/api": "^2.11.0"
+    "@tauri-apps/api": "^2.10.1"
  }
 }
@@ -1,7 +1,4 @@
 {
  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "rootDir": "guest-js"
-  },
  "include": ["guest-js/*.ts"]
 }
@@ -24,6 +24,6 @@
    "LICENSE"
  ],
  "dependencies": {
-    "@tauri-apps/api": "^2.11.0"
+    "@tauri-apps/api": "^2.10.1"
  }
 }
@@ -1,7 +1,4 @@
 {
  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "rootDir": "guest-js"
-  },
  "include": ["guest-js/*.ts"]
 }
@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_CLIPBOARD_MANAGER__=function(e){"use strict";var n;async function t(e,n={},t){return window.__TAURI_INTERNALS__.invoke(e,n,t)}"function"==typeof SuppressedError&&SuppressedError;class r{get rid(){return function(e,n,t,r){if("function"==typeof n?e!==n||!r:!n.has(e))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===t?r:"a"===t?r.call(e):r?r.value:n.get(e)}(this,n,"f")}constructor(e){n.set(this,void 0),function(e,n,t){if("function"==typeof n||!n.has(e))throw new TypeError("Cannot write private member to an object whose class did not declare it");n.set(e,t)}(this,n,e)}async close(){return t("plugin:resources|close",{rid:this.rid})}}n=new WeakMap;class a extends r{constructor(e){super(e)}static async new(e,n,r){return t("plugin:image|new",{rgba:i(e),width:n,height:r}).then(e=>new a(e))}static async fromBytes(e){return t("plugin:image|from_bytes",{bytes:i(e)}).then(e=>new a(e))}static async fromPath(e){return t("plugin:image|from_path",{path:e}).then(e=>new a(e))}async rgba(){return t("plugin:image|rgba",{rid:this.rid}).then(e=>new Uint8Array(e))}async size(){return t("plugin:image|size",{rid:this.rid})}}function i(e){return null==e?null:"string"==typeof e?e:e instanceof a?e.rid:e}return e.clear=async function(){await t("plugin:clipboard-manager|clear")},e.readImage=async function(){return await t("plugin:clipboard-manager|read_image").then(e=>new a(e))},e.readText=async function(){return await t("plugin:clipboard-manager|read_text")},e.writeHtml=async function(e,n){await t("plugin:clipboard-manager|write_html",{html:e,altText:n})},e.writeImage=async function(e){await t("plugin:clipboard-manager|write_image",{image:i(e)})},e.writeText=async function(e,n){await t("plugin:clipboard-manager|write_text",{label:n?.label,text:e})},e}({});Object.defineProperty(window.__TAURI__,"clipboardManager",{value:__TAURI_PLUGIN_CLIPBOARD_MANAGER__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_CLIPBOARD_MANAGER__=function(e){"use strict";var n;async function t(e,n={},t){return window.__TAURI_INTERNALS__.invoke(e,n,t)}"function"==typeof SuppressedError&&SuppressedError;class r{get rid(){return function(e,n,t,r){if("function"==typeof n?e!==n||!r:!n.has(e))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===t?r:"a"===t?r.call(e):r?r.value:n.get(e)}(this,n,"f")}constructor(e){n.set(this,void 0),function(e,n,t){if("function"==typeof n||!n.has(e))throw new TypeError("Cannot write private member to an object whose class did not declare it");n.set(e,t)}(this,n,e)}async close(){return t("plugin:resources|close",{rid:this.rid})}}n=new WeakMap;class a extends r{constructor(e){super(e)}static async new(e,n,r){return t("plugin:image|new",{rgba:i(e),width:n,height:r}).then((e=>new a(e)))}static async fromBytes(e){return t("plugin:image|from_bytes",{bytes:i(e)}).then((e=>new a(e)))}static async fromPath(e){return t("plugin:image|from_path",{path:e}).then((e=>new a(e)))}async rgba(){return t("plugin:image|rgba",{rid:this.rid}).then((e=>new Uint8Array(e)))}async size(){return t("plugin:image|size",{rid:this.rid})}}function i(e){return null==e?null:"string"==typeof e?e:e instanceof a?e.rid:e}return e.clear=async function(){await t("plugin:clipboard-manager|clear")},e.readImage=async function(){return await t("plugin:clipboard-manager|read_image").then((e=>new a(e)))},e.readText=async function(){return await t("plugin:clipboard-manager|read_text")},e.writeHtml=async function(e,n){await t("plugin:clipboard-manager|write_html",{html:e,altText:n})},e.writeImage=async function(e){await t("plugin:clipboard-manager|write_image",{image:i(e)})},e.writeText=async function(e,n){await t("plugin:clipboard-manager|write_text",{label:n?.label,text:e})},e}({});Object.defineProperty(window.__TAURI__,"clipboardManager",{value:__TAURI_PLUGIN_CLIPBOARD_MANAGER__})}
@@ -24,6 +24,6 @@
    "LICENSE"
  ],
  "dependencies": {
-    "@tauri-apps/api": "^2.11.0"
+    "@tauri-apps/api": "^2.10.1"
  }
 }
@@ -1,7 +1,4 @@
 {
  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "rootDir": "guest-js"
-  },
  "include": ["guest-js/*.ts"]
 }
@@ -1,18 +1,5 @@
 # Changelog

-## \[2.4.9]
-
- [`e6cdc9f5`](https://github.com/tauri-apps/plugins-workspace/commit/e6cdc9f52e2cd975b11b8e4c12879d597f1f76c3) ([#3396](https://github.com/tauri-apps/plugins-workspace/pull/3396) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Fix broken iOS custom URL schemes
-
-## \[2.4.8]
-
- [`024ec0c2`](https://github.com/tauri-apps/plugins-workspace/commit/024ec0c29c20cf94579dab9b79d6be0da61a8daa) ([#3214](https://github.com/tauri-apps/plugins-workspace/pull/3214) by [@joshIsCoding](https://github.com/tauri-apps/plugins-workspace/../../joshIsCoding)) Account for differing Android VIEW intent in ChromeOS, fixing deep-link behaviour on Chromium platforms.
- [`015e817c`](https://github.com/tauri-apps/plugins-workspace/commit/015e817cf2d7f66c1b9268606af8318dfe0bc4ee) ([#3186](https://github.com/tauri-apps/plugins-workspace/pull/3186) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Validate Android new intent is actually a deep link before triggering the onOpenUrl event.
-
-## \[2.4.7]
-
- [`8374e997`](https://github.com/tauri-apps/plugins-workspace/commit/8374e997b82c95516fc0c1f6d665d9fc3b52edf8) ([#3258](https://github.com/tauri-apps/plugins-workspace/pull/3258) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Fix runtime deep link registration failing on Linux when the app path has spaces.
-
 ## \[2.4.6]

 - [`28048039`](https://github.com/tauri-apps/plugins-workspace/commit/28048039496e84b46847c008416d341f1349e30e) ([#3143](https://github.com/tauri-apps/plugins-workspace/pull/3143) by [@Tunglies](https://github.com/tauri-apps/plugins-workspace/../../Tunglies)) Fix clippy warnings. No user facing changes.
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-deep-link"
-version = "2.4.9"
+version = "2.4.6"
 description = "Set your Tauri application as the default handler for an URL"
 authors = { workspace = true }
 license = { workspace = true }
@@ -6,8 +6,9 @@ package app.tauri.deep_link

 import android.app.Activity
 import android.content.Intent
-import android.os.PatternMatcher
+import android.os.Bundle
 import android.webkit.WebView
+import app.tauri.Logger
 import app.tauri.annotation.InvokeArg
 import app.tauri.annotation.Command
 import app.tauri.annotation.TauriPlugin
@@ -15,43 +16,23 @@ import app.tauri.plugin.Channel
 import app.tauri.plugin.JSObject
 import app.tauri.plugin.Plugin
 import app.tauri.plugin.Invoke
-import androidx.core.net.toUri

@InvokeArg
 class SetEventHandlerArgs {
    lateinit var handler: Channel
 }

-@InvokeArg
-class AssociatedDomain {
-    var scheme: List<String> = listOf("https", "http")
-    var host: String? = null
-    var path: List<String> = listOf()
-    var pathPattern: List<String> = listOf()
-    var pathPrefix: List<String> = listOf()
-    var pathSuffix: List<String> = listOf()
-}
-
-@InvokeArg
-class PluginConfig {
-    var mobile: List<AssociatedDomain> = listOf()
-}
-
@TauriPlugin
 class DeepLinkPlugin(private val activity: Activity): Plugin(activity) {
    //private val implementation = Example()
    private var webView: WebView? = null
    private var currentUrl: String? = null
    private var channel: Channel? = null
-    private var config: PluginConfig? = null
+
    companion object {
        var instance: DeepLinkPlugin? = null
    }

-    private fun isViewIntent(action: String?): Boolean {
-        return action == Intent.ACTION_VIEW || action == "org.chromium.arc.intent.action.VIEW"
-    }
-
    @Command
    fun getCurrent(invoke: Invoke) {
        val ret = JSObject()
@@ -70,105 +51,27 @@ class DeepLinkPlugin(private val activity: Activity): Plugin(activity) {

    override fun load(webView: WebView) {
        instance = this
-        config = getConfig(PluginConfig::class.java)
-
-        super.load(webView)
-        this.webView = webView

        val intent = activity.intent

-        if (isViewIntent(intent.action) && intent.data != null) {
-            val url = intent.data.toString()
-            if (isDeepLink(url)) {
-                // TODO: check if it makes sense to split up init url and last url
-                this.currentUrl = url
-                val event = JSObject()
-                event.put("url", this.currentUrl)
-                this.channel?.send(event)
-            }
+        if (intent.action == Intent.ACTION_VIEW) {
+            // TODO: check if it makes sense to split up init url and last url
+            this.currentUrl = intent.data.toString()
+            val event = JSObject()
+            event.put("url", this.currentUrl)
+            this.channel?.send(event)
        }
+
+        super.load(webView)
+        this.webView = webView
    }

    override fun onNewIntent(intent: Intent) {
-        if (isViewIntent(intent.action) && intent.data != null) {
-            val url = intent.data.toString()
-            if (isDeepLink(url)) {
-                this.currentUrl = url
-                val event = JSObject()
-                event.put("url", this.currentUrl)
-                this.channel?.send(event)
-            }
+        if (intent.action == Intent.ACTION_VIEW) {
+            this.currentUrl = intent.data.toString()
+            val event = JSObject()
+            event.put("url", this.currentUrl)
+            this.channel?.send(event)
        }
    }
-
-    private fun isDeepLink(url: String): Boolean {
-        val config = this.config ?: return false
-        
-        if (config.mobile.isEmpty()) {
-            return false
-        }
-
-        val uri = try {
-            url.toUri()
-        } catch (_: Exception) {
-            // not a URL
-            return false
-        }
-
-        val scheme = uri.scheme ?: return false
-        val host = uri.host
-        val path = uri.path ?: ""
-
-        // Check if URL matches any configured mobile deep link
-        for (domain in config.mobile) {
-            // Check scheme
-            if (!domain.scheme.any { it.equals(scheme, ignoreCase = true) }) {
-                continue
-            }
-
-            // Check host (if configured)
-            if (domain.host != null) {
-                if (!host.equals(domain.host, ignoreCase = true)) {
-                    continue
-                }
-            }
-
-            // Check path constraints
-            // According to Android docs:
-            // - path: exact match, must begin with /
-            // - pathPrefix: matches initial part of path
-            // - pathSuffix: matches ending part, doesn't need to begin with /
-            // - pathPattern: simple glob pattern (., *, .*)
-            val pathMatches = when {
-                // Exact path match (must begin with /)
-                domain.path.isNotEmpty() && domain.path.any { it == path } -> true
-                // Path pattern match (simple glob: ., *, .*)
-                domain.pathPattern.isNotEmpty() && domain.pathPattern.any { pattern ->
-                    try {
-                        PatternMatcher(pattern, PatternMatcher.PATTERN_SIMPLE_GLOB).match(path)
-                    } catch (e: Exception) {
-                        false
-                    }
-                } -> true
-                // Path prefix match
-                domain.pathPrefix.isNotEmpty() && domain.pathPrefix.any { prefix ->
-                    path.startsWith(prefix)
-                } -> true
-                // Path suffix match
-                domain.pathSuffix.isNotEmpty() && domain.pathSuffix.any { suffix ->
-                    path.endsWith(suffix)
-                } -> true
-                // If no path constraints, any path is allowed
-                domain.path.isEmpty() && domain.pathPattern.isEmpty() && 
-                domain.pathPrefix.isEmpty() && domain.pathSuffix.isEmpty() -> true
-                else -> false
-            }
-
-            if (pathMatches) {
-                return true
-            }
-        }
-
-        return false
-    }
 }
@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_DEEP_LINK__=function(e){"use strict";function n(e,n=!1){return window.__TAURI_INTERNALS__.transformCallback(e,n)}async function r(e,n={},r){return window.__TAURI_INTERNALS__.invoke(e,n,r)}var t;async function i(e,t,i){const _={kind:"Any"};return r("plugin:event|listen",{event:e,target:_,handler:n(t)}).then(n=>async()=>async function(e,n){window.__TAURI_EVENT_PLUGIN_INTERNALS__.unregisterListener(e,n),await r("plugin:event|unlisten",{event:e,eventId:n})}(e,n))}return"function"==typeof SuppressedError&&SuppressedError,function(e){e.WINDOW_RESIZED="tauri://resize",e.WINDOW_MOVED="tauri://move",e.WINDOW_CLOSE_REQUESTED="tauri://close-requested",e.WINDOW_DESTROYED="tauri://destroyed",e.WINDOW_FOCUS="tauri://focus",e.WINDOW_BLUR="tauri://blur",e.WINDOW_SCALE_FACTOR_CHANGED="tauri://scale-change",e.WINDOW_THEME_CHANGED="tauri://theme-changed",e.WINDOW_CREATED="tauri://window-created",e.WINDOW_SUSPENDED="tauri://suspended",e.WINDOW_RESUMED="tauri://resumed",e.WEBVIEW_CREATED="tauri://webview-created",e.DRAG_ENTER="tauri://drag-enter",e.DRAG_OVER="tauri://drag-over",e.DRAG_DROP="tauri://drag-drop",e.DRAG_LEAVE="tauri://drag-leave"}(t||(t={})),e.getCurrent=async function(){return await r("plugin:deep-link|get_current")},e.isRegistered=async function(e){return await r("plugin:deep-link|is_registered",{protocol:e})},e.onOpenUrl=async function(e){return await i("deep-link://new-url",n=>{e(n.payload)})},e.register=async function(e){return await r("plugin:deep-link|register",{protocol:e})},e.unregister=async function(e){return await r("plugin:deep-link|unregister",{protocol:e})},e}({});Object.defineProperty(window.__TAURI__,"deepLink",{value:__TAURI_PLUGIN_DEEP_LINK__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_DEEP_LINK__=function(e){"use strict";function n(e,n=!1){return window.__TAURI_INTERNALS__.transformCallback(e,n)}async function r(e,n={},r){return window.__TAURI_INTERNALS__.invoke(e,n,r)}var t;async function i(e,t,i){const _={kind:"Any"};return r("plugin:event|listen",{event:e,target:_,handler:n(t)}).then((n=>async()=>async function(e,n){window.__TAURI_EVENT_PLUGIN_INTERNALS__.unregisterListener(e,n),await r("plugin:event|unlisten",{event:e,eventId:n})}(e,n)))}return"function"==typeof SuppressedError&&SuppressedError,function(e){e.WINDOW_RESIZED="tauri://resize",e.WINDOW_MOVED="tauri://move",e.WINDOW_CLOSE_REQUESTED="tauri://close-requested",e.WINDOW_DESTROYED="tauri://destroyed",e.WINDOW_FOCUS="tauri://focus",e.WINDOW_BLUR="tauri://blur",e.WINDOW_SCALE_FACTOR_CHANGED="tauri://scale-change",e.WINDOW_THEME_CHANGED="tauri://theme-changed",e.WINDOW_CREATED="tauri://window-created",e.WEBVIEW_CREATED="tauri://webview-created",e.DRAG_ENTER="tauri://drag-enter",e.DRAG_OVER="tauri://drag-over",e.DRAG_DROP="tauri://drag-drop",e.DRAG_LEAVE="tauri://drag-leave"}(t||(t={})),e.getCurrent=async function(){return await r("plugin:deep-link|get_current")},e.isRegistered=async function(e){return await r("plugin:deep-link|is_registered",{protocol:e})},e.onOpenUrl=async function(e){return await i("deep-link://new-url",(n=>{e(n.payload)}))},e.register=async function(e){return await r("plugin:deep-link|register",{protocol:e})},e.unregister=async function(e){return await r("plugin:deep-link|unregister",{protocol:e})},e}({});Object.defineProperty(window.__TAURI__,"deepLink",{value:__TAURI_PLUGIN_DEEP_LINK__})}
@@ -25,8 +25,6 @@ fn intent_filter(domain: &AssociatedDomain) -> String {
    format!(
        r#"<intent-filter {auto_verify}>
    <action android:name="android.intent.action.VIEW" />
-    <!-- ChromeOS ARC++ uses a different action for deep links -->
-    <action android:name="org.chromium.arc.intent.action.VIEW" />
    <category android:name="android.intent.category.DEFAULT" />
    <category android:name="android.intent.category.BROWSABLE" />
    {schemes}
@@ -139,7 +137,7 @@ fn main() {
            let deep_link_domains = config
                .mobile
                .iter()
-                .filter(|domain| !domain.is_app_link())
+                .filter(|domain| domain.is_app_link())
                .collect::<Vec<_>>();

            if deep_link_domains.is_empty() {
@@ -1,23 +1,5 @@
 # Changelog

-## \[2.2.12]
-
-### Dependencies
-
- Upgraded to `deep-link-js@2.4.9`
-
-## \[2.2.11]
-
-### Dependencies
-
- Upgraded to `deep-link-js@2.4.8`
-
-## \[2.2.10]
-
-### Dependencies
-
- Upgraded to `deep-link-js@2.4.7`
-
 ## \[2.2.9]

 ### Dependencies
@@ -1,7 +1,7 @@
 {
  "name": "deep-link-example",
  "private": true,
-  "version": "2.2.12",
+  "version": "2.2.9",
  "type": "module",
  "scripts": {
    "dev": "vite",
@@ -10,12 +10,12 @@
    "tauri": "tauri"
  },
  "dependencies": {
-    "@tauri-apps/api": "^2.11.0",
-    "@tauri-apps/plugin-deep-link": "workspace:*"
+    "@tauri-apps/api": "^2.10.1",
+    "@tauri-apps/plugin-deep-link": "2.4.6"
  },
  "devDependencies": {
-    "@tauri-apps/cli": "2.11.4",
-    "typescript": "^6.0.0",
-    "vite": "^8.0.1"
+    "@tauri-apps/cli": "2.10.0",
+    "typescript": "^5.7.3",
+    "vite": "^7.3.1"
  }
 }
@@ -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>
@@ -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>
@@ -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
 */
@@ -1,6 +1,6 @@
 {
  "name": "@tauri-apps/plugin-deep-link",
-  "version": "2.4.9",
+  "version": "2.4.6",
  "description": "Set your Tauri application as the default handler for an URL",
  "license": "MIT OR Apache-2.0",
  "authors": [
@@ -25,9 +25,9 @@
    "LICENSE"
  ],
  "dependencies": {
-    "@tauri-apps/api": "^2.11.0"
+    "@tauri-apps/api": "^2.10.1"
  },
  "devDependencies": {
-    "@tauri-apps/cli": "2.11.4"
+    "@tauri-apps/cli": "2.10.0"
  }
 }
@@ -293,7 +293,7 @@ mod imp {
                    .unwrap_or_else(|| bin.into_os_string())
                    .to_string_lossy()
                    .to_string();
-                let qualified_exec = format!("\"{}\" %u", exec);
+                let qualified_exec = format!("{} %u", exec);

                let target = self.app.path().data_dir()?.join("applications");

@@ -1,7 +1,4 @@
 {
  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "rootDir": "guest-js"
-  },
  "include": ["guest-js/*.ts"]
 }
@@ -1,23 +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
-
- Upgraded to `fs-js@2.5.1`
-
-## \[2.7.0]
-
- [`24154472`](https://github.com/tauri-apps/plugins-workspace/commit/24154472a6710a690173df0a121125d1f1b871e8) ([#3287](https://github.com/tauri-apps/plugins-workspace/pull/3287) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Re-use `message` command in Rust side for `ask` and `confirm` commands, `allow-ask` and `allow-confirm` permissions are now aliases to `allow-message`
-
-### Dependencies
-
- Upgraded to `fs-js@2.5.0`
-
 ## \[2.6.0]

 - [`d7a0bb32`](https://github.com/tauri-apps/plugins-workspace/commit/d7a0bb325dad919d6cc132eb3898c33540de77c4) ([#3136](https://github.com/tauri-apps/plugins-workspace/pull/3136) by [@onehumandev](https://github.com/tauri-apps/plugins-workspace/../../onehumandev)) Add `fileAccessMode` option to file picker.
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-dialog"
-version = "2.7.2"
+version = "2.6.0"
 description = "Native system dialogs for opening and saving files along with message dialogs on your Tauri application."
 edition = { workspace = true }
 authors = { workspace = true }
@@ -37,7 +37,7 @@ tauri = { workspace = true }
 log = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
-tauri-plugin-fs = { path = "../fs", version = "2.5.1" }
+tauri-plugin-fs = { path = "../fs", version = "2.4.5" }

 [target.'cfg(target_os = "ios")'.dependencies]
 tauri = { workspace = true, features = ["wry"] }
@@ -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")
@@ -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()
      }
  }

@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_DIALOG__=function(n){"use strict";async function e(n,e={},t){return window.__TAURI_INTERNALS__.invoke(n,e,t)}function t(n){if(void 0!==n)return"string"==typeof n?n:"ok"in n&&"cancel"in n?{OkCancelCustom:[n.ok,n.cancel]}:"yes"in n&&"no"in n&&"cancel"in n?{YesNoCancelCustom:[n.yes,n.no,n.cancel]}:"ok"in n?{OkCustom:n.ok}:void 0}async function o(n,o){return await e("plugin:dialog|message",{message:n,title:o?.title,kind:o?.kind,buttons:t(o?.buttons)})}return"function"==typeof SuppressedError&&SuppressedError,n.ask=async function(n,e){const t="string"==typeof e?{title:e}:e,i=t?.okLabel||t?.cancelLabel,a=t?.okLabel??"Yes";return await o(n,{title:t?.title,kind:t?.kind,buttons:i?{ok:a,cancel:t.cancelLabel??"No"}:"YesNo"})===a},n.confirm=async function(n,e){const t="string"==typeof e?{title:e}:e,i=t?.okLabel||t?.cancelLabel,a=t?.okLabel??"Ok";return await o(n,{title:t?.title,kind:t?.kind,buttons:i?{ok:a,cancel:t.cancelLabel??"Cancel"}:"OkCancel"})===a},n.message=async function(n,e){const t="string"==typeof e?{title:e}:e;return t&&!t.buttons&&t.okLabel&&(t.buttons={ok:t.okLabel}),o(n,t)},n.open=async function(n={}){return"object"==typeof n&&Object.freeze(n),await e("plugin:dialog|open",{options:n})},n.save=async function(n={}){return"object"==typeof n&&Object.freeze(n),await e("plugin:dialog|save",{options:n})},n}({});Object.defineProperty(window.__TAURI__,"dialog",{value:__TAURI_PLUGIN_DIALOG__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_DIALOG__=function(t){"use strict";async function n(t,n={},e){return window.__TAURI_INTERNALS__.invoke(t,n,e)}function e(t){if(void 0!==t)return"string"==typeof t?t:"ok"in t&&"cancel"in t?{OkCancelCustom:[t.ok,t.cancel]}:"yes"in t&&"no"in t&&"cancel"in t?{YesNoCancelCustom:[t.yes,t.no,t.cancel]}:"ok"in t?{OkCustom:t.ok}:void 0}return"function"==typeof SuppressedError&&SuppressedError,t.ask=async function(t,e){const o="string"==typeof e?{title:e}:e;return await n("plugin:dialog|ask",{message:t.toString(),title:o?.title?.toString(),kind:o?.kind,yesButtonLabel:o?.okLabel?.toString(),noButtonLabel:o?.cancelLabel?.toString()})},t.confirm=async function(t,e){const o="string"==typeof e?{title:e}:e;return await n("plugin:dialog|confirm",{message:t.toString(),title:o?.title?.toString(),kind:o?.kind,okButtonLabel:o?.okLabel?.toString(),cancelButtonLabel:o?.cancelLabel?.toString()})},t.message=async function(t,o){const i="string"==typeof o?{title:o}:o;return n("plugin:dialog|message",{message:t.toString(),title:i?.title?.toString(),kind:i?.kind,okButtonLabel:i?.okLabel?.toString(),buttons:e(i?.buttons)})},t.open=async function(t={}){return"object"==typeof t&&Object.freeze(t),await n("plugin:dialog|open",{options:t})},t.save=async function(t={}){return"object"==typeof t&&Object.freeze(t),await n("plugin:dialog|save",{options:t})},t}({});Object.defineProperty(window.__TAURI__,"dialog",{value:__TAURI_PLUGIN_DIALOG__})}
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT

-const COMMANDS: &[&str] = &["open", "save", "message"];
+const COMMANDS: &[&str] = &["open", "save", "message", "ask", "confirm"];

 fn main() {
    let result = tauri_plugin::Builder::new(COMMANDS)
@@ -405,18 +405,6 @@ async function save(options: SaveDialogOptions = {}): Promise<string | null> {
 */
 export type MessageDialogResult = 'Yes' | 'No' | 'Ok' | 'Cancel' | (string & {})

-async function messageCommand(
-  message: string,
-  options?: Omit<MessageDialogOptions, 'okLabel'>
-) {
-  return await invoke<MessageDialogResult>('plugin:dialog|message', {
-    message,
-    title: options?.title,
-    kind: options?.kind,
-    buttons: buttonsToRust(options?.buttons)
-  })
-}
-
 /**
 * Shows a message dialog with an `Ok` button.
 * @example
@@ -439,17 +427,18 @@ async function message(
  options?: string | MessageDialogOptions
 ): Promise<MessageDialogResult> {
  const opts = typeof options === 'string' ? { title: options } : options
-  if (opts && !opts.buttons && opts.okLabel) {
-    opts.buttons = { ok: opts.okLabel }
-  }
-  return messageCommand(message, opts)
+
+  return invoke<MessageDialogResult>('plugin:dialog|message', {
+    message: message.toString(),
+    title: opts?.title?.toString(),
+    kind: opts?.kind,
+    okButtonLabel: opts?.okLabel?.toString(),
+    buttons: buttonsToRust(opts?.buttons)
+  })
 }

 /**
 * Shows a question dialog with `Yes` and `No` buttons.
- *
- * Convenient wrapper for `await message('msg', { buttons: 'YesNo' }) === 'Yes'`
- *
 * @example
 * ```typescript
 * import { ask } from '@tauri-apps/plugin-dialog';
@@ -469,24 +458,17 @@ async function ask(
  options?: string | ConfirmDialogOptions
 ): Promise<boolean> {
  const opts = typeof options === 'string' ? { title: options } : options
-  const customButtons = opts?.okLabel || opts?.cancelLabel
-  const okLabel = opts?.okLabel ?? 'Yes'
-  return (
-    (await messageCommand(message, {
-      title: opts?.title,
-      kind: opts?.kind,
-      buttons: customButtons
-        ? { ok: okLabel, cancel: opts.cancelLabel ?? 'No' }
-        : 'YesNo'
-    })) === okLabel
-  )
+  return await invoke('plugin:dialog|ask', {
+    message: message.toString(),
+    title: opts?.title?.toString(),
+    kind: opts?.kind,
+    yesButtonLabel: opts?.okLabel?.toString(),
+    noButtonLabel: opts?.cancelLabel?.toString()
+  })
 }

 /**
 * Shows a question dialog with `Ok` and `Cancel` buttons.
- *
- * Convenient wrapper for `await message('msg', { buttons: 'OkCancel' }) === 'Ok'`
- *
 * @example
 * ```typescript
 * import { confirm } from '@tauri-apps/plugin-dialog';
@@ -506,17 +488,13 @@ async function confirm(
  options?: string | ConfirmDialogOptions
 ): Promise<boolean> {
  const opts = typeof options === 'string' ? { title: options } : options
-  const customButtons = opts?.okLabel || opts?.cancelLabel
-  const okLabel = opts?.okLabel ?? 'Ok'
-  return (
-    (await messageCommand(message, {
-      title: opts?.title,
-      kind: opts?.kind,
-      buttons: customButtons
-        ? { ok: okLabel, cancel: opts.cancelLabel ?? 'Cancel' }
-        : 'OkCancel'
-    })) === okLabel
-  )
+  return await invoke('plugin:dialog|confirm', {
+    message: message.toString(),
+    title: opts?.title?.toString(),
+    kind: opts?.kind,
+    okButtonLabel: opts?.okLabel?.toString(),
+    cancelButtonLabel: opts?.cancelLabel?.toString()
+  })
 }

 export type {
@@ -1,6 +1,6 @@
 {
  "name": "@tauri-apps/plugin-dialog",
-  "version": "2.7.2",
+  "version": "2.6.0",
  "license": "MIT OR Apache-2.0",
  "authors": [
    "Tauri Programme within The Commons Conservancy"
@@ -24,6 +24,6 @@
    "LICENSE"
  ],
  "dependencies": {
-    "@tauri-apps/api": "^2.11.0"
+    "@tauri-apps/api": "^2.10.1"
  }
 }
@@ -1,11 +0,0 @@
-"$schema" = "schemas/schema.json"
-
-[[permission]]
-identifier = "allow-ask"
-description = "Enables the ask command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `allow-message` and will be removed in v3)"
-commands.allow = ["message"]
-
-[[permission]]
-identifier = "deny-ask"
-description = "Denies the ask command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `deny-message` and will be removed in v3)"
-commands.deny = ["message"]
@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-ask"
+description = "Enables the ask command without any pre-configured scope."
+commands.allow = ["ask"]
+
+[[permission]]
+identifier = "deny-ask"
+description = "Denies the ask command without any pre-configured scope."
+commands.deny = ["ask"]
@@ -0,0 +1,13 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+[[permission]]
+identifier = "allow-confirm"
+description = "Enables the confirm command without any pre-configured scope."
+commands.allow = ["confirm"]
+
+[[permission]]
+identifier = "deny-confirm"
+description = "Denies the confirm command without any pre-configured scope."
+commands.deny = ["confirm"]
@@ -9,6 +9,8 @@ All dialog types are enabled.

 #### This default permission set includes the following:

+- `allow-ask`
+- `allow-confirm`
 - `allow-message`
 - `allow-save`
 - `allow-open`
@@ -30,7 +32,7 @@ All dialog types are enabled.
 </td>
 <td>

-Enables the ask command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `allow-message` and will be removed in v3)
+Enables the ask command without any pre-configured scope.

 </td>
 </tr>
@@ -43,7 +45,33 @@ Enables the ask command without any pre-configured scope. (**DEPRECATED**: This
 </td>
 <td>

-Denies the ask command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `deny-message` and will be removed in v3)
+Denies the ask command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`dialog:allow-confirm`
+
+</td>
+<td>
+
+Enables the confirm command without any pre-configured scope.
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`dialog:deny-confirm`
+
+</td>
+<td>
+
+Denies the confirm command without any pre-configured scope.

 </td>
 </tr>
@@ -123,32 +151,6 @@ Enables the save command without any pre-configured scope.

 Denies the save command without any pre-configured scope.

-</td>
-</tr>
-
-<tr>
-<td>
-
-`dialog:allow-confirm`
-
-</td>
-<td>
-
-Enables the confirm command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `allow-message` and will be removed in v3)
-
-</td>
-</tr>
-
-<tr>
-<td>
-
-`dialog:deny-confirm`
-
-</td>
-<td>
-
-Denies the confirm command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `deny-message` and will be removed in v3)
-
 </td>
 </tr>
 </table>
@@ -1,11 +0,0 @@
-"$schema" = "schemas/schema.json"
-
-[[permission]]
-identifier = "allow-confirm"
-description = "Enables the confirm command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `allow-message` and will be removed in v3)"
-commands.allow = ["message"]
-
-[[permission]]
-identifier = "deny-confirm"
-description = "Denies the confirm command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `deny-message` and will be removed in v3)"
-commands.deny = ["message"]
@@ -11,4 +11,10 @@ All dialog types are enabled.


 """
-permissions = ["allow-message", "allow-save", "allow-open"]
+permissions = [
+  "allow-ask",
+  "allow-confirm",
+  "allow-message",
+  "allow-save",
+  "allow-open",
+]
@@ -295,16 +295,28 @@
      "type": "string",
      "oneOf": [
        {
-          "description": "Enables the ask command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `allow-message` and will be removed in v3)",
+          "description": "Enables the ask command without any pre-configured scope.",
          "type": "string",
          "const": "allow-ask",
-          "markdownDescription": "Enables the ask command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `allow-message` and will be removed in v3)"
+          "markdownDescription": "Enables the ask command without any pre-configured scope."
        },
        {
-          "description": "Denies the ask command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `deny-message` and will be removed in v3)",
+          "description": "Denies the ask command without any pre-configured scope.",
          "type": "string",
          "const": "deny-ask",
-          "markdownDescription": "Denies the ask command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `deny-message` and will be removed in v3)"
+          "markdownDescription": "Denies the ask command without any pre-configured scope."
+        },
+        {
+          "description": "Enables the confirm command without any pre-configured scope.",
+          "type": "string",
+          "const": "allow-confirm",
+          "markdownDescription": "Enables the confirm command without any pre-configured scope."
+        },
+        {
+          "description": "Denies the confirm command without any pre-configured scope.",
+          "type": "string",
+          "const": "deny-confirm",
+          "markdownDescription": "Denies the confirm command without any pre-configured scope."
        },
        {
          "description": "Enables the message command without any pre-configured scope.",
@@ -343,22 +355,10 @@
          "markdownDescription": "Denies the save command without any pre-configured scope."
        },
        {
-          "description": "Enables the confirm command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `allow-message` and will be removed in v3)",
-          "type": "string",
-          "const": "allow-confirm",
-          "markdownDescription": "Enables the confirm command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `allow-message` and will be removed in v3)"
-        },
-        {
-          "description": "Denies the confirm command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `deny-message` and will be removed in v3)",
-          "type": "string",
-          "const": "deny-confirm",
-          "markdownDescription": "Denies the confirm command without any pre-configured scope. (**DEPRECATED**: This is now an alias to `deny-message` and will be removed in v3)"
-        },
-        {
-          "description": "This permission set configures the types of dialogs\navailable from the dialog plugin.\n\n#### Granted Permissions\n\nAll dialog types are enabled.\n\n\n\n#### This default permission set includes:\n\n- `allow-message`\n- `allow-save`\n- `allow-open`",
+          "description": "This permission set configures the types of dialogs\navailable from the dialog plugin.\n\n#### Granted Permissions\n\nAll dialog types are enabled.\n\n\n\n#### This default permission set includes:\n\n- `allow-ask`\n- `allow-confirm`\n- `allow-message`\n- `allow-save`\n- `allow-open`",
          "type": "string",
          "const": "default",
-          "markdownDescription": "This permission set configures the types of dialogs\navailable from the dialog plugin.\n\n#### Granted Permissions\n\nAll dialog types are enabled.\n\n\n\n#### This default permission set includes:\n\n- `allow-message`\n- `allow-save`\n- `allow-open`"
+          "markdownDescription": "This permission set configures the types of dialogs\navailable from the dialog plugin.\n\n#### Granted Permissions\n\nAll dialog types are enabled.\n\n\n\n#### This default permission set includes:\n\n- `allow-ask`\n- `allow-confirm`\n- `allow-message`\n- `allow-save`\n- `allow-open`"
        }
      ]
    }
@@ -9,8 +9,9 @@ use tauri::{command, Manager, Runtime, State, Window};
 use tauri_plugin_fs::FsExt;

 use crate::{
-    Dialog, FileAccessMode, FileDialogBuilder, FilePath, MessageDialogButtons, MessageDialogKind,
-    MessageDialogResult, PickerMode, Result,
+    Dialog, FileAccessMode, FileDialogBuilder, FilePath, MessageDialogBuilder,
+    MessageDialogButtons, MessageDialogKind, MessageDialogResult, PickerMode, Result, CANCEL, NO,
+    OK, YES,
 };

 #[derive(Serialize)]
@@ -258,20 +259,17 @@ pub(crate) async fn save<R: Runtime>(
    Ok(path.map(|p| p.simplified()))
 }

-#[command]
-pub(crate) async fn message<R: Runtime>(
-    #[allow(unused)] window: Window<R>,
+fn message_dialog<R: Runtime>(
+    #[allow(unused_variables)] window: Window<R>,
    dialog: State<'_, Dialog<R>>,
    title: Option<String>,
    message: String,
    kind: Option<MessageDialogKind>,
-    buttons: Option<MessageDialogButtons>,
-) -> Result<MessageDialogResult> {
+    buttons: MessageDialogButtons,
+) -> MessageDialogBuilder<R> {
    let mut builder = dialog.message(message);

-    if let Some(buttons) = buttons {
-        builder = builder.buttons(buttons);
-    }
+    builder = builder.buttons(buttons);

    if let Some(title) = title {
        builder = builder.title(title);
@@ -286,5 +284,86 @@ pub(crate) async fn message<R: Runtime>(
        builder = builder.kind(kind);
    }

-    Ok(builder.blocking_show_with_result())
+    builder
+}
+
+#[command]
+pub(crate) async fn message<R: Runtime>(
+    window: Window<R>,
+    dialog: State<'_, Dialog<R>>,
+    title: Option<String>,
+    message: String,
+    kind: Option<MessageDialogKind>,
+    ok_button_label: Option<String>,
+    buttons: Option<MessageDialogButtons>,
+) -> Result<MessageDialogResult> {
+    let buttons = buttons.unwrap_or(if let Some(ok_button_label) = ok_button_label {
+        MessageDialogButtons::OkCustom(ok_button_label)
+    } else {
+        MessageDialogButtons::Ok
+    });
+
+    Ok(message_dialog(window, dialog, title, message, kind, buttons).blocking_show_with_result())
+}
+
+#[command]
+pub(crate) async fn ask<R: Runtime>(
+    window: Window<R>,
+    dialog: State<'_, Dialog<R>>,
+    title: Option<String>,
+    message: String,
+    kind: Option<MessageDialogKind>,
+    yes_button_label: Option<String>,
+    no_button_label: Option<String>,
+) -> Result<bool> {
+    let dialog = message_dialog(
+        window,
+        dialog,
+        title,
+        message,
+        kind,
+        if let Some(yes_button_label) = yes_button_label {
+            MessageDialogButtons::OkCancelCustom(
+                yes_button_label,
+                no_button_label.unwrap_or(NO.to_string()),
+            )
+        } else if let Some(no_button_label) = no_button_label {
+            MessageDialogButtons::OkCancelCustom(YES.to_string(), no_button_label)
+        } else {
+            MessageDialogButtons::YesNo
+        },
+    );
+
+    Ok(dialog.blocking_show())
+}
+
+#[command]
+pub(crate) async fn confirm<R: Runtime>(
+    window: Window<R>,
+    dialog: State<'_, Dialog<R>>,
+    title: Option<String>,
+    message: String,
+    kind: Option<MessageDialogKind>,
+    ok_button_label: Option<String>,
+    cancel_button_label: Option<String>,
+) -> Result<bool> {
+    let dialog = message_dialog(
+        window,
+        dialog,
+        title,
+        message,
+        kind,
+        if let Some(ok_button_label) = ok_button_label {
+            MessageDialogButtons::OkCancelCustom(
+                ok_button_label,
+                cancel_button_label.unwrap_or(CANCEL.to_string()),
+            )
+        } else if let Some(cancel_button_label) = cancel_button_label {
+            MessageDialogButtons::OkCancelCustom(OK.to_string(), cancel_button_label)
+        } else {
+            MessageDialogButtons::OkCancel
+        },
+    );
+
+    Ok(dialog.blocking_show())
 }
@@ -61,11 +61,8 @@ pub enum FileAccessMode {
 }

 pub(crate) const OK: &str = "Ok";
-#[cfg(mobile)]
 pub(crate) const CANCEL: &str = "Cancel";
-#[cfg(mobile)]
 pub(crate) const YES: &str = "Yes";
-#[cfg(mobile)]
 pub(crate) const NO: &str = "No";

 macro_rules! blocking_fn {
@@ -200,6 +197,8 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
            commands::open,
            commands::save,
            commands::message,
+            commands::ask,
+            commands::confirm,
        ])
        .setup(|app, api| {
            #[cfg(mobile)]
@@ -247,8 +246,8 @@ impl<R: Runtime> MessageDialogBuilder<R> {
            dialog,
            title: title.into(),
            message: message.into(),
-            kind: MessageDialogKind::default(),
-            buttons: MessageDialogButtons::default(),
+            kind: Default::default(),
+            buttons: Default::default(),
            #[cfg(desktop)]
            parent: None,
        }
@@ -1,7 +1,4 @@
 {
  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "rootDir": "guest-js"
-  },
  "include": ["guest-js/*.ts"]
 }
@@ -1,15 +1,5 @@
 # Changelog

-## \[2.5.1]
-
- [`ec054013`](https://github.com/tauri-apps/plugins-workspace/commit/ec0540138bece081e9a87982091947360e61987a) ([#3323](https://github.com/tauri-apps/plugins-workspace/pull/3323) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated dependency `toml` from 0.9 to 1
-
-## \[2.5.0]
-
- [`e97a4ded`](https://github.com/tauri-apps/plugins-workspace/commit/e97a4dedab8608d9d57029784ee8a2607ca3a996) ([#3244](https://github.com/tauri-apps/plugins-workspace/pull/3244) by [@SeijiOkuda](https://github.com/tauri-apps/plugins-workspace/../../SeijiOkuda)) Add `encoding` option for `readTextFile` and `readTextFileLines`
- [`f75d21db`](https://github.com/tauri-apps/plugins-workspace/commit/f75d21db3351d6f12adf585c2c797c20ece94f7f) ([#3360](https://github.com/tauri-apps/plugins-workspace/pull/3360) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Removed the dependency on `tauri-utils`'s `build` feature
- [`f5f68063`](https://github.com/tauri-apps/plugins-workspace/commit/f5f68063e459c33522f44a04df3120d9d039ec13) ([#3185](https://github.com/tauri-apps/plugins-workspace/pull/3185) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Enable access for security-scoped resources on iOS by automatically calling `NSURL::startAccessingSecurityScopedResource` on resource access and adding the `stopAccessingSecurityScopedResource` API.
-
 ## \[2.4.5]

 - [`521cd8b3`](https://github.com/tauri-apps/plugins-workspace/commit/521cd8b372c862d96b1637775710e4d7cf2443e2) ([#3155](https://github.com/tauri-apps/plugins-workspace/pull/3155) by [@EliasStar](https://github.com/tauri-apps/plugins-workspace/../../EliasStar)) Fix off by one error in the implementation of readTextFileLines causing all lines to end with an (additional) null byte.
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-fs"
-version = "2.5.1"
+version = "2.4.5"
 description = "Access the file system."
 authors = { workspace = true }
 license = { workspace = true }
@@ -20,8 +20,8 @@ ios = { level = "partial", notes = "Access is restricted to Application folder b
 tauri-plugin = { workspace = true, features = ["build"] }
 schemars = { workspace = true }
 serde = { workspace = true }
-toml = "1.0"
-tauri-utils = { workspace = true }
+toml = "0.9"
+tauri-utils = { workspace = true, features = ["build"] }

 [dependencies]
 serde = { workspace = true }
@@ -30,7 +30,6 @@ serde_repr = "0.1"
 tauri = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
-log = { workspace = true }
 anyhow = "1"
 glob = { workspace = true }
 # TODO: Remove `serialization-compat-6` in v3
@@ -42,8 +41,5 @@ notify-debouncer-full = { version = "0.6", optional = true }
 dunce = { workspace = true }
 percent-encoding = "2"

-[target.'cfg(target_os = "ios")'.dependencies]
-objc2-foundation = { version = "0.3", features = ["NSURL", "NSString"] }
-
 [features]
 watch = ["notify", "notify-debouncer-full"]
@@ -104,8 +104,6 @@ const COMMANDS: &[(&str, &[&str])] = &[
    // TODO: Remove this in v3
    ("unwatch", &[]),
    ("size", &[]),
-    ("start_accessing_security_scoped_resource", &[]),
-    ("stop_accessing_security_scoped_resource", &[]),
 ];

 fn main() {
@@ -5,19 +5,6 @@
 /**
 * Access the file system.
 *
- * ## iOS security-scoped resources
- *
- * On iOS, the `fs` plugin automatically manages access to security-scoped resources when a file URL is accessed.
- * This is required for files outside the app's sandbox (e.g., from file picker).
- *
- * @example
- * ```typescript
- * import { open } from '@tauri-apps/plugin-fs';
- *
- * const file = await open('file:///path/to/file.txt');
- * await file.close();
- * ```
- *
 * ## Security
 *
 * This module prevents path traversal, not allowing parent directory accessors to be used
@@ -736,8 +723,6 @@ async function readDir(
 interface ReadFileOptions {
  /** Base directory for `path` */
  baseDir?: BaseDirectory
-  /** Text encoding to use when reading a text file. Defaults to 'utf-8'. */
-  encoding?: string
 }

 /**
@@ -768,7 +753,7 @@ async function readFile(
 }

 /**
- * Reads and returns the entire contents of a file as a string using the specified encoding (default: UTF-8).
+ * Reads and returns the entire contents of a file as UTF-8 string.
 * @example
 * ```typescript
 * import { readTextFile, BaseDirectory } from '@tauri-apps/plugin-fs';
@@ -792,11 +777,11 @@ async function readTextFile(

  const bytes = arr instanceof ArrayBuffer ? arr : Uint8Array.from(arr)

-  return new TextDecoder(options?.encoding ?? 'utf-8').decode(bytes)
+  return new TextDecoder().decode(bytes)
 }

 /**
- * Returns an async {@linkcode AsyncIterableIterator} over the lines of a file, decoded using the specified encoding (default: UTF-8).
+ * Returns an async {@linkcode AsyncIterableIterator} over the lines of a file as UTF-8 string.
 * @example
 * ```typescript
 * import { readTextFileLines, BaseDirectory } from '@tauri-apps/plugin-fs';
@@ -825,15 +810,10 @@ async function readTextFileLines(
    rid: null as number | null,

    async next(): Promise<IteratorResult<string>> {
-      const decoder = new TextDecoder(options?.encoding ?? 'utf-8')
-
      if (this.rid === null) {
-        // Use the normalized encoding label for options.
-        const encoding = decoder.encoding
-
        this.rid = await invoke<number>('plugin:fs|read_text_file_lines', {
          path: pathStr,
-          options: options != null ? { ...options, encoding } : undefined
+          options
        })
      }

@@ -858,7 +838,9 @@ async function readTextFileLines(
        return { value: null, done }
      }

-      const line = decoder.decode(bytes.slice(0, bytes.byteLength - 1))
+      const line = new TextDecoder().decode(
+        bytes.slice(0, bytes.byteLength - 1)
+      )

      return {
        value: line,
@@ -1366,79 +1348,6 @@ async function size(path: string | URL): Promise<number> {
  })
 }

-/**
- * Starts accessing a security-scoped resource for the given file URL.
- * This should be called when you're accessing a file that was opened
- * using a security-scoped URL (e.g., from a file picker).
- *
- * Note that accessing security-scoped resources is automatically managed by the plugin on iOS, so you don't need to call this function
- * unless you want to manage the scope manually.
- *
- * You must call {@linkcode stopAccessingSecurityScopedResource} when you're done accessing the resource.
- *
- * #### Platform-specific
- *
- * - **iOS:** Starts accessing the security-scoped resource.
- * - **Other platforms:** does nothing.
- *
- * @example
- * ```typescript
- * import { startAccessingSecurityScopedResource } from '@tauri-apps/plugin-fs';
- *
- * const filePath = 'file:///path/to/file.txt';
- * await startAccessingSecurityScopedResource(filePath);
- * // ... use the resource ...
- * ```
- *
- * @since 2.5.0
- */
-async function startAccessingSecurityScopedResource(
-  path: string | URL
-): Promise<void> {
-  if (path instanceof URL && path.protocol !== 'file:') {
-    throw new TypeError('Must be a file URL.')
-  }
-
-  await invoke('plugin:fs|start_accessing_security_scoped_resource', {
-    path: path instanceof URL ? path.toString() : path
-  })
-}
-
-/**
- * Stops accessing a security-scoped resource for the given file URL.
- * This should be called when you're done accessing a file that was opened
- * using a security-scoped URL (e.g., from a file picker) when using manual tracking via {@linkcode startAccessingSecurityScopedResource}.
- *
- * #### Platform-specific
- *
- * - **iOS:** Stops accessing the security-scoped resource.
- * - **Other platforms:** does nothing.
- *
- * @example
- * ```typescript
- * import { stopAccessingSecurityScopedResource } from '@tauri-apps/plugin-fs';
- *
- * const filePath = 'file:///path/to/file.txt';
- * await startAccessingSecurityScopedResource(filePath);
- * // ... use the resource ...
- * // when you're done with the resource:
- * await stopAccessingSecurityScopedResource(filePath);
- * ```
- *
- * @since 2.5.0
- */
-async function stopAccessingSecurityScopedResource(
-  path: string | URL
-): Promise<void> {
-  if (path instanceof URL && path.protocol !== 'file:') {
-    throw new TypeError('Must be a file URL.')
-  }
-
-  await invoke('plugin:fs|stop_accessing_security_scoped_resource', {
-    path: path instanceof URL ? path.toString() : path
-  })
-}
-
 export type {
  CreateOptions,
  OpenOptions,
@@ -1487,7 +1396,5 @@ export {
  exists,
  watch,
  watchImmediate,
-  size,
-  startAccessingSecurityScopedResource,
-  stopAccessingSecurityScopedResource
+  size
 }
@@ -1,6 +1,6 @@
 {
  "name": "@tauri-apps/plugin-fs",
-  "version": "2.5.1",
+  "version": "2.4.5",
  "description": "Access the file system.",
  "license": "MIT OR Apache-2.0",
  "authors": [
@@ -25,6 +25,6 @@
    "LICENSE"
  ],
  "dependencies": {
-    "@tauri-apps/api": "^2.11.0"
+    "@tauri-apps/api": "^2.10.1"
  }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lucas Nogueira	57f6e45b27	Merge branch 'v2' into feat/setup-single-instance-manually	2026-02-05 10:29:41 -03:00
Lucas Nogueira	b65a193e6d	feat(single-instance): add setup() function to run flow separately	2026-02-05 10:28:15 -03:00