update tauri

autogenerated commands format changed, needed FS plugin small change

.cargo/audit.toml

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

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

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

.changes/nfc.md

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

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

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

.changes/rmdep.md

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

.github/workflows/audit-javascript.yml

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

.github/workflows/audit-rust.yml

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

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

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

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

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

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

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

.github/workflows/covector-status.yml

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

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

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

.github/workflows/fmt.yml

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

.github/workflows/integration-tests.yml

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

.github/workflows/lint-javascript.yml

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

.github/workflows/lint-rust.yml

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

.github/workflows/sync.yml

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

.github/workflows/test-rust.yml

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

Cargo.toml

@@ -11,7 +11,7 @@ resolver = "2"
 [workspace.dependencies]
 serde = { version = "1", features = ["derive"] }
 tracing = "0.1"
-log = "0.4.21"
+log = "0.4"
 tauri = { version = "2.10", default-features = false }
 tauri-build = "2.5"
 tauri-plugin = "2.5"
@@ -19,7 +19,7 @@ tauri-utils = "2.8"
 serde_json = "1"
 thiserror = "2"
 url = "2"
-schemars = "0.8"
+schemars = "1"
 dunce = "1"
 specta = "^2.0.0-rc.16"
 glob = "0.3"
@@ -39,3 +39,9 @@ codegen-units = 1
 lto = true
 incremental = false
 opt-level = "s"
+
+[patch.crates-io]
+tauri = { git = "https://github.com/tauri-apps/tauri.git", tag = "tauri-cef-v3.0.0-alpha.13" }
+tauri-utils = { git = "https://github.com/tauri-apps/tauri.git", tag = "tauri-cef-v3.0.0-alpha.13" }
+tauri-plugin = { git = "https://github.com/tauri-apps/tauri.git", tag = "tauri-cef-v3.0.0-alpha.13" }
+tauri-build = { git = "https://github.com/tauri-apps/tauri.git", tag = "tauri-cef-v3.0.0-alpha.13" }

examples/api/CHANGELOG.md

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

examples/api/index.html

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

examples/api/package.json

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

examples/api/src-tauri/CHANGELOG.md

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

examples/api/src-tauri/Cargo.toml

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

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

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

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

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

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

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

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

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

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

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

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

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

examples/api/src/App.svelte

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

examples/api/src/app.css

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

examples/api/src/lib/TitleBar.svelte

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

examples/api/src/views/Clipboard.svelte

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

examples/api/src/views/Dialog.svelte

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

examples/api/src/views/FileSystem.svelte

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

package.json

@@ -25,5 +25,15 @@
     "typescript-eslint": "8.58.2"
   },
   "minimumReleaseAge": 4320,
-  "packageManager": "pnpm@11.13.0"
+  "pnpm": {
+    "overrides": {
+      "esbuild@<0.25.0": ">=0.25.0"
+    },
+    "onlyBuiltDependencies": [
+      "esbuild"
+    ]
+  },
+  "engines": {
+    "pnpm": "^10.16.0"
+  }
 }

plugins/autostart/permissions/autogenerated/commands/disable.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-disable"
-description = "Enables the disable command without any pre-configured scope."
-commands.allow = ["disable"]
-
-[[permission]]
-identifier = "deny-disable"
-description = "Denies the disable command without any pre-configured scope."
-commands.deny = ["disable"]

plugins/autostart/permissions/autogenerated/commands/enable.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-enable"
-description = "Enables the enable command without any pre-configured scope."
-commands.allow = ["enable"]
-
-[[permission]]
-identifier = "deny-enable"
-description = "Denies the enable command without any pre-configured scope."
-commands.deny = ["enable"]

plugins/autostart/permissions/autogenerated/commands/is_enabled.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-is-enabled"
-description = "Enables the is_enabled command without any pre-configured scope."
-commands.allow = ["is_enabled"]
-
-[[permission]]
-identifier = "deny-is-enabled"
-description = "Denies the is_enabled command without any pre-configured scope."
-commands.deny = ["is_enabled"]

plugins/autostart/permissions/schemas/schema.json

@@ -24,10 +24,17 @@
     },
     "permission": {
       "description": "A list of inlined permissions",
-      "default": [],
       "type": "array",
       "items": {
         "$ref": "#/definitions/Permission"
+      },
+      "default": []
+    },
+    "commands": {
+      "description": "A list of command names that get `allow-$command` and `deny-$command` permissions\nautogenerated on demand instead of being stored as explicit permissions.\n\nSee [`Manifest::command_permission`] and the ACL resolver for how these are expanded.",
+      "type": "array",
+      "items": {
+        "type": "string"
       }
     }
   },
@@ -35,9 +42,6 @@
     "DefaultPermission": {
       "description": "The default permission set of the plugin.\n\nWorks similarly to a permission with the \"default\" identifier.",
       "type": "object",
-      "required": [
-        "permissions"
-      ],
       "properties": {
         "version": {
           "description": "The version of the permission.",
@@ -46,10 +50,10 @@
             "null"
           ],
           "format": "uint64",
-          "minimum": 1.0
+          "minimum": 1
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does.\nTauri convention is to use `<h4>` headings in markdown content\nfor Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -62,16 +66,14 @@
             "type": "string"
           }
         }
-      }
+      },
+      "required": [
+        "permissions"
+      ]
     },
     "PermissionSet": {
       "description": "A set of direct permissions grouped together under a new name.",
       "type": "object",
-      "required": [
-        "description",
-        "identifier",
-        "permissions"
-      ],
       "properties": {
         "identifier": {
           "description": "A unique identifier for the permission.",
@@ -85,17 +87,19 @@
           "description": "All permissions this set contains.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/PermissionKind"
+            "type": "string"
           }
         }
-      }
+      },
+      "required": [
+        "identifier",
+        "description",
+        "permissions"
+      ]
     },
     "Permission": {
       "description": "Descriptions of explicit privileges of commands.\n\nIt can enable commands to be accessible in the frontend of the application.\n\nIf the scope is defined it can be used to fine grain control the access of individual or multiple commands.",
       "type": "object",
-      "required": [
-        "identifier"
-      ],
       "properties": {
         "version": {
           "description": "The version of the permission.",
@@ -104,14 +108,14 @@
             "null"
           ],
           "format": "uint64",
-          "minimum": 1.0
+          "minimum": 1
         },
         "identifier": {
           "description": "A unique identifier for the permission.",
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does.\nTauri internal convention is to use `<h4>` headings in markdown content\nfor Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -147,7 +151,10 @@
             "$ref": "#/definitions/Target"
           }
         }
-      }
+      },
+      "required": [
+        "identifier"
+      ]
     },
     "Commands": {
       "description": "Allowed and denied commands inside a permission.\n\nIf two commands clash inside of `allow` and `deny`, it should be denied by default.",
@@ -155,24 +162,24 @@
       "properties": {
         "allow": {
           "description": "Allowed command.",
-          "default": [],
           "type": "array",
           "items": {
             "type": "string"
-          }
+          },
+          "default": []
         },
         "deny": {
           "description": "Denied command, which takes priority.",
-          "default": [],
           "type": "array",
           "items": {
             "type": "string"
-          }
+          },
+          "default": []
         }
       }
     },
     "Scopes": {
-      "description": "An argument for fine grained behavior control of Tauri commands.\n\nIt can be of any serde serializable type and is used to allow or prevent certain actions inside a Tauri command. The configured scope is passed to the command and will be enforced by the command implementation.\n\n## Example\n\n```json { \"allow\": [{ \"path\": \"$HOME/**\" }], \"deny\": [{ \"path\": \"$HOME/secret.txt\" }] } ```",
+      "description": "An argument for fine grained behavior control of Tauri commands.\n\nIt can be of any serde serializable type and is used to allow or prevent certain actions inside a Tauri command.\nThe configured scope is passed to the command and will be enforced by the command implementation.\n\n## Example\n\n```json\n{\n  \"allow\": [{ \"path\": \"$HOME/**\" }],\n  \"deny\": [{ \"path\": \"$HOME/secret.txt\" }]\n}\n```",
       "type": "object",
       "properties": {
         "allow": {
@@ -257,84 +264,27 @@
         {
           "description": "MacOS.",
           "type": "string",
-          "enum": [
-            "macOS"
-          ]
+          "const": "macOS"
         },
         {
           "description": "Windows.",
           "type": "string",
-          "enum": [
-            "windows"
-          ]
+          "const": "windows"
         },
         {
           "description": "Linux.",
           "type": "string",
-          "enum": [
-            "linux"
-          ]
+          "const": "linux"
         },
         {
           "description": "Android.",
           "type": "string",
-          "enum": [
-            "android"
-          ]
+          "const": "android"
         },
         {
           "description": "iOS.",
           "type": "string",
-          "enum": [
-            "iOS"
-          ]
-        }
-      ]
-    },
-    "PermissionKind": {
-      "type": "string",
-      "oneOf": [
-        {
-          "description": "Enables the disable command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-disable",
-          "markdownDescription": "Enables the disable command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the disable command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-disable",
-          "markdownDescription": "Denies the disable command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the enable command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-enable",
-          "markdownDescription": "Enables the enable command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the enable command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-enable",
-          "markdownDescription": "Denies the enable command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the is_enabled command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-is-enabled",
-          "markdownDescription": "Enables the is_enabled command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the is_enabled command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-is-enabled",
-          "markdownDescription": "Denies the is_enabled command without any pre-configured scope."
-        },
-        {
-          "description": "This permission set configures if your\napplication can enable or disable auto\nstarting the application on boot.\n\n#### Granted Permissions\n\nIt allows all to check, enable and\ndisable the automatic start on boot.\n\n\n#### This default permission set includes:\n\n- `allow-enable`\n- `allow-disable`\n- `allow-is-enabled`",
-          "type": "string",
-          "const": "default",
-          "markdownDescription": "This permission set configures if your\napplication can enable or disable auto\nstarting the application on boot.\n\n#### Granted Permissions\n\nIt allows all to check, enable and\ndisable the automatic start on boot.\n\n\n#### This default permission set includes:\n\n- `allow-enable`\n- `allow-disable`\n- `allow-is-enabled`"
+          "const": "iOS"
         }
       ]
     }

plugins/barcode-scanner/permissions/autogenerated/commands/cancel.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-cancel"
-description = "Enables the cancel command without any pre-configured scope."
-commands.allow = ["cancel"]
-
-[[permission]]
-identifier = "deny-cancel"
-description = "Denies the cancel command without any pre-configured scope."
-commands.deny = ["cancel"]

plugins/barcode-scanner/permissions/autogenerated/commands/check_permissions.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-check-permissions"
-description = "Enables the check_permissions command without any pre-configured scope."
-commands.allow = ["check_permissions"]
-
-[[permission]]
-identifier = "deny-check-permissions"
-description = "Denies the check_permissions command without any pre-configured scope."
-commands.deny = ["check_permissions"]

plugins/barcode-scanner/permissions/autogenerated/commands/open_app_settings.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-open-app-settings"
-description = "Enables the open_app_settings command without any pre-configured scope."
-commands.allow = ["open_app_settings"]
-
-[[permission]]
-identifier = "deny-open-app-settings"
-description = "Denies the open_app_settings command without any pre-configured scope."
-commands.deny = ["open_app_settings"]

plugins/barcode-scanner/permissions/autogenerated/commands/request_permissions.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-request-permissions"
-description = "Enables the request_permissions command without any pre-configured scope."
-commands.allow = ["request_permissions"]
-
-[[permission]]
-identifier = "deny-request-permissions"
-description = "Denies the request_permissions command without any pre-configured scope."
-commands.deny = ["request_permissions"]

plugins/barcode-scanner/permissions/autogenerated/commands/scan.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-scan"
-description = "Enables the scan command without any pre-configured scope."
-commands.allow = ["scan"]
-
-[[permission]]
-identifier = "deny-scan"
-description = "Denies the scan command without any pre-configured scope."
-commands.deny = ["scan"]

plugins/barcode-scanner/permissions/autogenerated/commands/vibrate.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-vibrate"
-description = "Enables the vibrate command without any pre-configured scope."
-commands.allow = ["vibrate"]
-
-[[permission]]
-identifier = "deny-vibrate"
-description = "Denies the vibrate command without any pre-configured scope."
-commands.deny = ["vibrate"]

plugins/barcode-scanner/permissions/schemas/schema.json

@@ -24,10 +24,17 @@
     },
     "permission": {
       "description": "A list of inlined permissions",
-      "default": [],
       "type": "array",
       "items": {
         "$ref": "#/definitions/Permission"
+      },
+      "default": []
+    },
+    "commands": {
+      "description": "A list of command names that get `allow-$command` and `deny-$command` permissions\nautogenerated on demand instead of being stored as explicit permissions.\n\nSee [`Manifest::command_permission`] and the ACL resolver for how these are expanded.",
+      "type": "array",
+      "items": {
+        "type": "string"
       }
     }
   },
@@ -35,9 +42,6 @@
     "DefaultPermission": {
       "description": "The default permission set of the plugin.\n\nWorks similarly to a permission with the \"default\" identifier.",
       "type": "object",
-      "required": [
-        "permissions"
-      ],
       "properties": {
         "version": {
           "description": "The version of the permission.",
@@ -46,10 +50,10 @@
             "null"
           ],
           "format": "uint64",
-          "minimum": 1.0
+          "minimum": 1
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does.\nTauri convention is to use `<h4>` headings in markdown content\nfor Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -62,16 +66,14 @@
             "type": "string"
           }
         }
-      }
+      },
+      "required": [
+        "permissions"
+      ]
     },
     "PermissionSet": {
       "description": "A set of direct permissions grouped together under a new name.",
       "type": "object",
-      "required": [
-        "description",
-        "identifier",
-        "permissions"
-      ],
       "properties": {
         "identifier": {
           "description": "A unique identifier for the permission.",
@@ -85,17 +87,19 @@
           "description": "All permissions this set contains.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/PermissionKind"
+            "type": "string"
           }
         }
-      }
+      },
+      "required": [
+        "identifier",
+        "description",
+        "permissions"
+      ]
     },
     "Permission": {
       "description": "Descriptions of explicit privileges of commands.\n\nIt can enable commands to be accessible in the frontend of the application.\n\nIf the scope is defined it can be used to fine grain control the access of individual or multiple commands.",
       "type": "object",
-      "required": [
-        "identifier"
-      ],
       "properties": {
         "version": {
           "description": "The version of the permission.",
@@ -104,14 +108,14 @@
             "null"
           ],
           "format": "uint64",
-          "minimum": 1.0
+          "minimum": 1
         },
         "identifier": {
           "description": "A unique identifier for the permission.",
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does.\nTauri internal convention is to use `<h4>` headings in markdown content\nfor Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -147,7 +151,10 @@
             "$ref": "#/definitions/Target"
           }
         }
-      }
+      },
+      "required": [
+        "identifier"
+      ]
     },
     "Commands": {
       "description": "Allowed and denied commands inside a permission.\n\nIf two commands clash inside of `allow` and `deny`, it should be denied by default.",
@@ -155,24 +162,24 @@
       "properties": {
         "allow": {
           "description": "Allowed command.",
-          "default": [],
           "type": "array",
           "items": {
             "type": "string"
-          }
+          },
+          "default": []
         },
         "deny": {
           "description": "Denied command, which takes priority.",
-          "default": [],
           "type": "array",
           "items": {
             "type": "string"
-          }
+          },
+          "default": []
         }
       }
     },
     "Scopes": {
-      "description": "An argument for fine grained behavior control of Tauri commands.\n\nIt can be of any serde serializable type and is used to allow or prevent certain actions inside a Tauri command. The configured scope is passed to the command and will be enforced by the command implementation.\n\n## Example\n\n```json { \"allow\": [{ \"path\": \"$HOME/**\" }], \"deny\": [{ \"path\": \"$HOME/secret.txt\" }] } ```",
+      "description": "An argument for fine grained behavior control of Tauri commands.\n\nIt can be of any serde serializable type and is used to allow or prevent certain actions inside a Tauri command.\nThe configured scope is passed to the command and will be enforced by the command implementation.\n\n## Example\n\n```json\n{\n  \"allow\": [{ \"path\": \"$HOME/**\" }],\n  \"deny\": [{ \"path\": \"$HOME/secret.txt\" }]\n}\n```",
       "type": "object",
       "properties": {
         "allow": {
@@ -257,120 +264,27 @@
         {
           "description": "MacOS.",
           "type": "string",
-          "enum": [
-            "macOS"
-          ]
+          "const": "macOS"
         },
         {
           "description": "Windows.",
           "type": "string",
-          "enum": [
-            "windows"
-          ]
+          "const": "windows"
         },
         {
           "description": "Linux.",
           "type": "string",
-          "enum": [
-            "linux"
-          ]
+          "const": "linux"
         },
         {
           "description": "Android.",
           "type": "string",
-          "enum": [
-            "android"
-          ]
+          "const": "android"
         },
         {
           "description": "iOS.",
           "type": "string",
-          "enum": [
-            "iOS"
-          ]
-        }
-      ]
-    },
-    "PermissionKind": {
-      "type": "string",
-      "oneOf": [
-        {
-          "description": "Enables the cancel command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-cancel",
-          "markdownDescription": "Enables the cancel command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the cancel command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-cancel",
-          "markdownDescription": "Denies the cancel command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the check_permissions command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-check-permissions",
-          "markdownDescription": "Enables the check_permissions command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the check_permissions command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-check-permissions",
-          "markdownDescription": "Denies the check_permissions command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the open_app_settings command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-open-app-settings",
-          "markdownDescription": "Enables the open_app_settings command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the open_app_settings command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-open-app-settings",
-          "markdownDescription": "Denies the open_app_settings command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the request_permissions command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-request-permissions",
-          "markdownDescription": "Enables the request_permissions command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the request_permissions command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-request-permissions",
-          "markdownDescription": "Denies the request_permissions command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the scan command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-scan",
-          "markdownDescription": "Enables the scan command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the scan command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-scan",
-          "markdownDescription": "Denies the scan command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the vibrate command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-vibrate",
-          "markdownDescription": "Enables the vibrate command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the vibrate command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-vibrate",
-          "markdownDescription": "Denies the vibrate command without any pre-configured scope."
-        },
-        {
-          "description": "This permission set configures which\nbarcode scanning features are by default exposed.\n\n#### Granted Permissions\n\nIt allows all barcode related features.\n\n\n#### This default permission set includes:\n\n- `allow-cancel`\n- `allow-check-permissions`\n- `allow-open-app-settings`\n- `allow-request-permissions`\n- `allow-scan`\n- `allow-vibrate`",
-          "type": "string",
-          "const": "default",
-          "markdownDescription": "This permission set configures which\nbarcode scanning features are by default exposed.\n\n#### Granted Permissions\n\nIt allows all barcode related features.\n\n\n#### This default permission set includes:\n\n- `allow-cancel`\n- `allow-check-permissions`\n- `allow-open-app-settings`\n- `allow-request-permissions`\n- `allow-scan`\n- `allow-vibrate`"
+          "const": "iOS"
         }
       ]
     }

plugins/biometric/permissions/autogenerated/commands/authenticate.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-authenticate"
-description = "Enables the authenticate command without any pre-configured scope."
-commands.allow = ["authenticate"]
-
-[[permission]]
-identifier = "deny-authenticate"
-description = "Denies the authenticate command without any pre-configured scope."
-commands.deny = ["authenticate"]

plugins/biometric/permissions/autogenerated/commands/status.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-status"
-description = "Enables the status command without any pre-configured scope."
-commands.allow = ["status"]
-
-[[permission]]
-identifier = "deny-status"
-description = "Denies the status command without any pre-configured scope."
-commands.deny = ["status"]

plugins/biometric/permissions/schemas/schema.json

@@ -24,10 +24,17 @@
     },
     "permission": {
       "description": "A list of inlined permissions",
-      "default": [],
       "type": "array",
       "items": {
         "$ref": "#/definitions/Permission"
+      },
+      "default": []
+    },
+    "commands": {
+      "description": "A list of command names that get `allow-$command` and `deny-$command` permissions\nautogenerated on demand instead of being stored as explicit permissions.\n\nSee [`Manifest::command_permission`] and the ACL resolver for how these are expanded.",
+      "type": "array",
+      "items": {
+        "type": "string"
       }
     }
   },
@@ -35,9 +42,6 @@
     "DefaultPermission": {
       "description": "The default permission set of the plugin.\n\nWorks similarly to a permission with the \"default\" identifier.",
       "type": "object",
-      "required": [
-        "permissions"
-      ],
       "properties": {
         "version": {
           "description": "The version of the permission.",
@@ -46,10 +50,10 @@
             "null"
           ],
           "format": "uint64",
-          "minimum": 1.0
+          "minimum": 1
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does.\nTauri convention is to use `<h4>` headings in markdown content\nfor Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -62,16 +66,14 @@
             "type": "string"
           }
         }
-      }
+      },
+      "required": [
+        "permissions"
+      ]
     },
     "PermissionSet": {
       "description": "A set of direct permissions grouped together under a new name.",
       "type": "object",
-      "required": [
-        "description",
-        "identifier",
-        "permissions"
-      ],
       "properties": {
         "identifier": {
           "description": "A unique identifier for the permission.",
@@ -85,17 +87,19 @@
           "description": "All permissions this set contains.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/PermissionKind"
+            "type": "string"
           }
         }
-      }
+      },
+      "required": [
+        "identifier",
+        "description",
+        "permissions"
+      ]
     },
     "Permission": {
       "description": "Descriptions of explicit privileges of commands.\n\nIt can enable commands to be accessible in the frontend of the application.\n\nIf the scope is defined it can be used to fine grain control the access of individual or multiple commands.",
       "type": "object",
-      "required": [
-        "identifier"
-      ],
       "properties": {
         "version": {
           "description": "The version of the permission.",
@@ -104,14 +108,14 @@
             "null"
           ],
           "format": "uint64",
-          "minimum": 1.0
+          "minimum": 1
         },
         "identifier": {
           "description": "A unique identifier for the permission.",
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does.\nTauri internal convention is to use `<h4>` headings in markdown content\nfor Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -147,7 +151,10 @@
             "$ref": "#/definitions/Target"
           }
         }
-      }
+      },
+      "required": [
+        "identifier"
+      ]
     },
     "Commands": {
       "description": "Allowed and denied commands inside a permission.\n\nIf two commands clash inside of `allow` and `deny`, it should be denied by default.",
@@ -155,24 +162,24 @@
       "properties": {
         "allow": {
           "description": "Allowed command.",
-          "default": [],
           "type": "array",
           "items": {
             "type": "string"
-          }
+          },
+          "default": []
         },
         "deny": {
           "description": "Denied command, which takes priority.",
-          "default": [],
           "type": "array",
           "items": {
             "type": "string"
-          }
+          },
+          "default": []
         }
       }
     },
     "Scopes": {
-      "description": "An argument for fine grained behavior control of Tauri commands.\n\nIt can be of any serde serializable type and is used to allow or prevent certain actions inside a Tauri command. The configured scope is passed to the command and will be enforced by the command implementation.\n\n## Example\n\n```json { \"allow\": [{ \"path\": \"$HOME/**\" }], \"deny\": [{ \"path\": \"$HOME/secret.txt\" }] } ```",
+      "description": "An argument for fine grained behavior control of Tauri commands.\n\nIt can be of any serde serializable type and is used to allow or prevent certain actions inside a Tauri command.\nThe configured scope is passed to the command and will be enforced by the command implementation.\n\n## Example\n\n```json\n{\n  \"allow\": [{ \"path\": \"$HOME/**\" }],\n  \"deny\": [{ \"path\": \"$HOME/secret.txt\" }]\n}\n```",
       "type": "object",
       "properties": {
         "allow": {
@@ -257,72 +264,27 @@
         {
           "description": "MacOS.",
           "type": "string",
-          "enum": [
-            "macOS"
-          ]
+          "const": "macOS"
         },
         {
           "description": "Windows.",
           "type": "string",
-          "enum": [
-            "windows"
-          ]
+          "const": "windows"
         },
         {
           "description": "Linux.",
           "type": "string",
-          "enum": [
-            "linux"
-          ]
+          "const": "linux"
         },
         {
           "description": "Android.",
           "type": "string",
-          "enum": [
-            "android"
-          ]
+          "const": "android"
         },
         {
           "description": "iOS.",
           "type": "string",
-          "enum": [
-            "iOS"
-          ]
-        }
-      ]
-    },
-    "PermissionKind": {
-      "type": "string",
-      "oneOf": [
-        {
-          "description": "Enables the authenticate command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-authenticate",
-          "markdownDescription": "Enables the authenticate command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the authenticate command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-authenticate",
-          "markdownDescription": "Denies the authenticate command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the status command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-status",
-          "markdownDescription": "Enables the status command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the status command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-status",
-          "markdownDescription": "Denies the status command without any pre-configured scope."
-        },
-        {
-          "description": "This permission set configures which\nbiometric features are by default exposed.\n\n#### Granted Permissions\n\nIt allows acccess to all biometric commands.\n\n\n#### This default permission set includes:\n\n- `allow-authenticate`\n- `allow-status`",
-          "type": "string",
-          "const": "default",
-          "markdownDescription": "This permission set configures which\nbiometric features are by default exposed.\n\n#### Granted Permissions\n\nIt allows acccess to all biometric commands.\n\n\n#### This default permission set includes:\n\n- `allow-authenticate`\n- `allow-status`"
+          "const": "iOS"
         }
       ]
     }

plugins/cli/permissions/autogenerated/commands/cli_matches.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-cli-matches"
-description = "Enables the cli_matches command without any pre-configured scope."
-commands.allow = ["cli_matches"]
-
-[[permission]]
-identifier = "deny-cli-matches"
-description = "Denies the cli_matches command without any pre-configured scope."
-commands.deny = ["cli_matches"]

plugins/cli/permissions/schemas/schema.json

@@ -24,10 +24,17 @@
     },
     "permission": {
       "description": "A list of inlined permissions",
-      "default": [],
       "type": "array",
       "items": {
         "$ref": "#/definitions/Permission"
+      },
+      "default": []
+    },
+    "commands": {
+      "description": "A list of command names that get `allow-$command` and `deny-$command` permissions\nautogenerated on demand instead of being stored as explicit permissions.\n\nSee [`Manifest::command_permission`] and the ACL resolver for how these are expanded.",
+      "type": "array",
+      "items": {
+        "type": "string"
       }
     }
   },
@@ -35,9 +42,6 @@
     "DefaultPermission": {
       "description": "The default permission set of the plugin.\n\nWorks similarly to a permission with the \"default\" identifier.",
       "type": "object",
-      "required": [
-        "permissions"
-      ],
       "properties": {
         "version": {
           "description": "The version of the permission.",
@@ -46,10 +50,10 @@
             "null"
           ],
           "format": "uint64",
-          "minimum": 1.0
+          "minimum": 1
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does.\nTauri convention is to use `<h4>` headings in markdown content\nfor Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -62,16 +66,14 @@
             "type": "string"
           }
         }
-      }
+      },
+      "required": [
+        "permissions"
+      ]
     },
     "PermissionSet": {
       "description": "A set of direct permissions grouped together under a new name.",
       "type": "object",
-      "required": [
-        "description",
-        "identifier",
-        "permissions"
-      ],
       "properties": {
         "identifier": {
           "description": "A unique identifier for the permission.",
@@ -85,17 +87,19 @@
           "description": "All permissions this set contains.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/PermissionKind"
+            "type": "string"
           }
         }
-      }
+      },
+      "required": [
+        "identifier",
+        "description",
+        "permissions"
+      ]
     },
     "Permission": {
       "description": "Descriptions of explicit privileges of commands.\n\nIt can enable commands to be accessible in the frontend of the application.\n\nIf the scope is defined it can be used to fine grain control the access of individual or multiple commands.",
       "type": "object",
-      "required": [
-        "identifier"
-      ],
       "properties": {
         "version": {
           "description": "The version of the permission.",
@@ -104,14 +108,14 @@
             "null"
           ],
           "format": "uint64",
-          "minimum": 1.0
+          "minimum": 1
         },
         "identifier": {
           "description": "A unique identifier for the permission.",
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does.\nTauri internal convention is to use `<h4>` headings in markdown content\nfor Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -147,7 +151,10 @@
             "$ref": "#/definitions/Target"
           }
         }
-      }
+      },
+      "required": [
+        "identifier"
+      ]
     },
     "Commands": {
       "description": "Allowed and denied commands inside a permission.\n\nIf two commands clash inside of `allow` and `deny`, it should be denied by default.",
@@ -155,24 +162,24 @@
       "properties": {
         "allow": {
           "description": "Allowed command.",
-          "default": [],
           "type": "array",
           "items": {
             "type": "string"
-          }
+          },
+          "default": []
         },
         "deny": {
           "description": "Denied command, which takes priority.",
-          "default": [],
           "type": "array",
           "items": {
             "type": "string"
-          }
+          },
+          "default": []
         }
       }
     },
     "Scopes": {
-      "description": "An argument for fine grained behavior control of Tauri commands.\n\nIt can be of any serde serializable type and is used to allow or prevent certain actions inside a Tauri command. The configured scope is passed to the command and will be enforced by the command implementation.\n\n## Example\n\n```json { \"allow\": [{ \"path\": \"$HOME/**\" }], \"deny\": [{ \"path\": \"$HOME/secret.txt\" }] } ```",
+      "description": "An argument for fine grained behavior control of Tauri commands.\n\nIt can be of any serde serializable type and is used to allow or prevent certain actions inside a Tauri command.\nThe configured scope is passed to the command and will be enforced by the command implementation.\n\n## Example\n\n```json\n{\n  \"allow\": [{ \"path\": \"$HOME/**\" }],\n  \"deny\": [{ \"path\": \"$HOME/secret.txt\" }]\n}\n```",
       "type": "object",
       "properties": {
         "allow": {
@@ -257,60 +264,27 @@
         {
           "description": "MacOS.",
           "type": "string",
-          "enum": [
-            "macOS"
-          ]
+          "const": "macOS"
         },
         {
           "description": "Windows.",
           "type": "string",
-          "enum": [
-            "windows"
-          ]
+          "const": "windows"
         },
         {
           "description": "Linux.",
           "type": "string",
-          "enum": [
-            "linux"
-          ]
+          "const": "linux"
         },
         {
           "description": "Android.",
           "type": "string",
-          "enum": [
-            "android"
-          ]
+          "const": "android"
         },
         {
           "description": "iOS.",
           "type": "string",
-          "enum": [
-            "iOS"
-          ]
-        }
-      ]
-    },
-    "PermissionKind": {
-      "type": "string",
-      "oneOf": [
-        {
-          "description": "Enables the cli_matches command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-cli-matches",
-          "markdownDescription": "Enables the cli_matches command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the cli_matches command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-cli-matches",
-          "markdownDescription": "Denies the cli_matches command without any pre-configured scope."
-        },
-        {
-          "description": "Allows reading the CLI matches\n#### This default permission set includes:\n\n- `allow-cli-matches`",
-          "type": "string",
-          "const": "default",
-          "markdownDescription": "Allows reading the CLI matches\n#### This default permission set includes:\n\n- `allow-cli-matches`"
+          "const": "iOS"
         }
       ]
     }

plugins/clipboard-manager/permissions/autogenerated/commands/clear.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-clear"
-description = "Enables the clear command without any pre-configured scope."
-commands.allow = ["clear"]
-
-[[permission]]
-identifier = "deny-clear"
-description = "Denies the clear command without any pre-configured scope."
-commands.deny = ["clear"]

plugins/clipboard-manager/permissions/autogenerated/commands/read_image.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-read-image"
-description = "Enables the read_image command without any pre-configured scope."
-commands.allow = ["read_image"]
-
-[[permission]]
-identifier = "deny-read-image"
-description = "Denies the read_image command without any pre-configured scope."
-commands.deny = ["read_image"]

plugins/clipboard-manager/permissions/autogenerated/commands/read_text.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-read-text"
-description = "Enables the read_text command without any pre-configured scope."
-commands.allow = ["read_text"]
-
-[[permission]]
-identifier = "deny-read-text"
-description = "Denies the read_text command without any pre-configured scope."
-commands.deny = ["read_text"]

plugins/clipboard-manager/permissions/autogenerated/commands/write_html.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-write-html"
-description = "Enables the write_html command without any pre-configured scope."
-commands.allow = ["write_html"]
-
-[[permission]]
-identifier = "deny-write-html"
-description = "Denies the write_html command without any pre-configured scope."
-commands.deny = ["write_html"]

plugins/clipboard-manager/permissions/autogenerated/commands/write_image.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-write-image"
-description = "Enables the write_image command without any pre-configured scope."
-commands.allow = ["write_image"]
-
-[[permission]]
-identifier = "deny-write-image"
-description = "Denies the write_image command without any pre-configured scope."
-commands.deny = ["write_image"]

plugins/clipboard-manager/permissions/autogenerated/commands/write_text.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-write-text"
-description = "Enables the write_text command without any pre-configured scope."
-commands.allow = ["write_text"]
-
-[[permission]]
-identifier = "deny-write-text"
-description = "Denies the write_text command without any pre-configured scope."
-commands.deny = ["write_text"]

plugins/clipboard-manager/permissions/schemas/schema.json

@@ -24,10 +24,17 @@
     },
     "permission": {
       "description": "A list of inlined permissions",
-      "default": [],
       "type": "array",
       "items": {
         "$ref": "#/definitions/Permission"
+      },
+      "default": []
+    },
+    "commands": {
+      "description": "A list of command names that get `allow-$command` and `deny-$command` permissions\nautogenerated on demand instead of being stored as explicit permissions.\n\nSee [`Manifest::command_permission`] and the ACL resolver for how these are expanded.",
+      "type": "array",
+      "items": {
+        "type": "string"
       }
     }
   },
@@ -35,9 +42,6 @@
     "DefaultPermission": {
       "description": "The default permission set of the plugin.\n\nWorks similarly to a permission with the \"default\" identifier.",
       "type": "object",
-      "required": [
-        "permissions"
-      ],
       "properties": {
         "version": {
           "description": "The version of the permission.",
@@ -46,10 +50,10 @@
             "null"
           ],
           "format": "uint64",
-          "minimum": 1.0
+          "minimum": 1
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does.\nTauri convention is to use `<h4>` headings in markdown content\nfor Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -62,16 +66,14 @@
             "type": "string"
           }
         }
-      }
+      },
+      "required": [
+        "permissions"
+      ]
     },
     "PermissionSet": {
       "description": "A set of direct permissions grouped together under a new name.",
       "type": "object",
-      "required": [
-        "description",
-        "identifier",
-        "permissions"
-      ],
       "properties": {
         "identifier": {
           "description": "A unique identifier for the permission.",
@@ -85,17 +87,19 @@
           "description": "All permissions this set contains.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/PermissionKind"
+            "type": "string"
           }
         }
-      }
+      },
+      "required": [
+        "identifier",
+        "description",
+        "permissions"
+      ]
     },
     "Permission": {
       "description": "Descriptions of explicit privileges of commands.\n\nIt can enable commands to be accessible in the frontend of the application.\n\nIf the scope is defined it can be used to fine grain control the access of individual or multiple commands.",
       "type": "object",
-      "required": [
-        "identifier"
-      ],
       "properties": {
         "version": {
           "description": "The version of the permission.",
@@ -104,14 +108,14 @@
             "null"
           ],
           "format": "uint64",
-          "minimum": 1.0
+          "minimum": 1
         },
         "identifier": {
           "description": "A unique identifier for the permission.",
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does.\nTauri internal convention is to use `<h4>` headings in markdown content\nfor Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -147,7 +151,10 @@
             "$ref": "#/definitions/Target"
           }
         }
-      }
+      },
+      "required": [
+        "identifier"
+      ]
     },
     "Commands": {
       "description": "Allowed and denied commands inside a permission.\n\nIf two commands clash inside of `allow` and `deny`, it should be denied by default.",
@@ -155,24 +162,24 @@
       "properties": {
         "allow": {
           "description": "Allowed command.",
-          "default": [],
           "type": "array",
           "items": {
             "type": "string"
-          }
+          },
+          "default": []
         },
         "deny": {
           "description": "Denied command, which takes priority.",
-          "default": [],
           "type": "array",
           "items": {
             "type": "string"
-          }
+          },
+          "default": []
         }
       }
     },
     "Scopes": {
-      "description": "An argument for fine grained behavior control of Tauri commands.\n\nIt can be of any serde serializable type and is used to allow or prevent certain actions inside a Tauri command. The configured scope is passed to the command and will be enforced by the command implementation.\n\n## Example\n\n```json { \"allow\": [{ \"path\": \"$HOME/**\" }], \"deny\": [{ \"path\": \"$HOME/secret.txt\" }] } ```",
+      "description": "An argument for fine grained behavior control of Tauri commands.\n\nIt can be of any serde serializable type and is used to allow or prevent certain actions inside a Tauri command.\nThe configured scope is passed to the command and will be enforced by the command implementation.\n\n## Example\n\n```json\n{\n  \"allow\": [{ \"path\": \"$HOME/**\" }],\n  \"deny\": [{ \"path\": \"$HOME/secret.txt\" }]\n}\n```",
       "type": "object",
       "properties": {
         "allow": {
@@ -257,120 +264,27 @@
         {
           "description": "MacOS.",
           "type": "string",
-          "enum": [
-            "macOS"
-          ]
+          "const": "macOS"
         },
         {
           "description": "Windows.",
           "type": "string",
-          "enum": [
-            "windows"
-          ]
+          "const": "windows"
         },
         {
           "description": "Linux.",
           "type": "string",
-          "enum": [
-            "linux"
-          ]
+          "const": "linux"
         },
         {
           "description": "Android.",
           "type": "string",
-          "enum": [
-            "android"
-          ]
+          "const": "android"
         },
         {
           "description": "iOS.",
           "type": "string",
-          "enum": [
-            "iOS"
-          ]
-        }
-      ]
-    },
-    "PermissionKind": {
-      "type": "string",
-      "oneOf": [
-        {
-          "description": "Enables the clear command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-clear",
-          "markdownDescription": "Enables the clear command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the clear command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-clear",
-          "markdownDescription": "Denies the clear command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the read_image command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-read-image",
-          "markdownDescription": "Enables the read_image command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the read_image command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-read-image",
-          "markdownDescription": "Denies the read_image command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the read_text command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-read-text",
-          "markdownDescription": "Enables the read_text command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the read_text command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-read-text",
-          "markdownDescription": "Denies the read_text command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the write_html command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-write-html",
-          "markdownDescription": "Enables the write_html command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the write_html command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-write-html",
-          "markdownDescription": "Denies the write_html command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the write_image command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-write-image",
-          "markdownDescription": "Enables the write_image command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the write_image command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-write-image",
-          "markdownDescription": "Denies the write_image command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the write_text command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-write-text",
-          "markdownDescription": "Enables the write_text command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the write_text command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-write-text",
-          "markdownDescription": "Denies the write_text command without any pre-configured scope."
-        },
-        {
-          "description": "No features are enabled by default, as we believe\nthe clipboard can be inherently dangerous and it is \napplication specific if read and/or write access is needed.\n\nClipboard interaction needs to be explicitly enabled.\n",
-          "type": "string",
-          "const": "default",
-          "markdownDescription": "No features are enabled by default, as we believe\nthe clipboard can be inherently dangerous and it is \napplication specific if read and/or write access is needed.\n\nClipboard interaction needs to be explicitly enabled.\n"
+          "const": "iOS"
         }
       ]
     }

plugins/deep-link/Cargo.toml

@@ -39,8 +39,8 @@ url = { workspace = true }
 
 [target."cfg(windows)".dependencies]
 dunce = "1"
-windows-registry = "0.6"
-windows-result = "0.4"
+windows-registry = "0.5"
+windows-result = "0.3"
 
 [target."cfg(target_os = \"linux\")".dependencies]
 rust-ini = "0.21"

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

@@ -11,10 +11,10 @@
   },
   "dependencies": {
     "@tauri-apps/api": "^2.11.0",
-    "@tauri-apps/plugin-deep-link": "workspace:*"
+    "@tauri-apps/plugin-deep-link": "2.4.9"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.11.4",
+    "@tauri-apps/cli-cef": "3.0.0-alpha.6",
     "typescript": "^6.0.0",
     "vite": "^8.0.1"
   }

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

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

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

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

plugins/deep-link/package.json

@@ -28,6 +28,6 @@
     "@tauri-apps/api": "^2.11.0"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.11.4"
+    "@tauri-apps/cli-cef": "3.0.0-alpha.6"
   }
 }

plugins/deep-link/permissions/autogenerated/commands/get_current.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-get-current"
-description = "Enables the get_current command without any pre-configured scope."
-commands.allow = ["get_current"]
-
-[[permission]]
-identifier = "deny-get-current"
-description = "Denies the get_current command without any pre-configured scope."
-commands.deny = ["get_current"]

plugins/deep-link/permissions/autogenerated/commands/is_registered.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-is-registered"
-description = "Enables the is_registered command without any pre-configured scope."
-commands.allow = ["is_registered"]
-
-[[permission]]
-identifier = "deny-is-registered"
-description = "Denies the is_registered command without any pre-configured scope."
-commands.deny = ["is_registered"]

plugins/deep-link/permissions/autogenerated/commands/register.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-register"
-description = "Enables the register command without any pre-configured scope."
-commands.allow = ["register"]
-
-[[permission]]
-identifier = "deny-register"
-description = "Denies the register command without any pre-configured scope."
-commands.deny = ["register"]

plugins/deep-link/permissions/autogenerated/commands/unregister.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-unregister"
-description = "Enables the unregister command without any pre-configured scope."
-commands.allow = ["unregister"]
-
-[[permission]]
-identifier = "deny-unregister"
-description = "Denies the unregister command without any pre-configured scope."
-commands.deny = ["unregister"]

plugins/deep-link/permissions/schemas/schema.json

@@ -24,10 +24,17 @@
     },
     "permission": {
       "description": "A list of inlined permissions",
-      "default": [],
       "type": "array",
       "items": {
         "$ref": "#/definitions/Permission"
+      },
+      "default": []
+    },
+    "commands": {
+      "description": "A list of command names that get `allow-$command` and `deny-$command` permissions\nautogenerated on demand instead of being stored as explicit permissions.\n\nSee [`Manifest::command_permission`] and the ACL resolver for how these are expanded.",
+      "type": "array",
+      "items": {
+        "type": "string"
       }
     }
   },
@@ -35,9 +42,6 @@
     "DefaultPermission": {
       "description": "The default permission set of the plugin.\n\nWorks similarly to a permission with the \"default\" identifier.",
       "type": "object",
-      "required": [
-        "permissions"
-      ],
       "properties": {
         "version": {
           "description": "The version of the permission.",
@@ -46,10 +50,10 @@
             "null"
           ],
           "format": "uint64",
-          "minimum": 1.0
+          "minimum": 1
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does.\nTauri convention is to use `<h4>` headings in markdown content\nfor Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -62,16 +66,14 @@
             "type": "string"
           }
         }
-      }
+      },
+      "required": [
+        "permissions"
+      ]
     },
     "PermissionSet": {
       "description": "A set of direct permissions grouped together under a new name.",
       "type": "object",
-      "required": [
-        "description",
-        "identifier",
-        "permissions"
-      ],
       "properties": {
         "identifier": {
           "description": "A unique identifier for the permission.",
@@ -85,17 +87,19 @@
           "description": "All permissions this set contains.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/PermissionKind"
+            "type": "string"
           }
         }
-      }
+      },
+      "required": [
+        "identifier",
+        "description",
+        "permissions"
+      ]
     },
     "Permission": {
       "description": "Descriptions of explicit privileges of commands.\n\nIt can enable commands to be accessible in the frontend of the application.\n\nIf the scope is defined it can be used to fine grain control the access of individual or multiple commands.",
       "type": "object",
-      "required": [
-        "identifier"
-      ],
       "properties": {
         "version": {
           "description": "The version of the permission.",
@@ -104,14 +108,14 @@
             "null"
           ],
           "format": "uint64",
-          "minimum": 1.0
+          "minimum": 1
         },
         "identifier": {
           "description": "A unique identifier for the permission.",
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does.\nTauri internal convention is to use `<h4>` headings in markdown content\nfor Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -147,7 +151,10 @@
             "$ref": "#/definitions/Target"
           }
         }
-      }
+      },
+      "required": [
+        "identifier"
+      ]
     },
     "Commands": {
       "description": "Allowed and denied commands inside a permission.\n\nIf two commands clash inside of `allow` and `deny`, it should be denied by default.",
@@ -155,24 +162,24 @@
       "properties": {
         "allow": {
           "description": "Allowed command.",
-          "default": [],
           "type": "array",
           "items": {
             "type": "string"
-          }
+          },
+          "default": []
         },
         "deny": {
           "description": "Denied command, which takes priority.",
-          "default": [],
           "type": "array",
           "items": {
             "type": "string"
-          }
+          },
+          "default": []
         }
       }
     },
     "Scopes": {
-      "description": "An argument for fine grained behavior control of Tauri commands.\n\nIt can be of any serde serializable type and is used to allow or prevent certain actions inside a Tauri command. The configured scope is passed to the command and will be enforced by the command implementation.\n\n## Example\n\n```json { \"allow\": [{ \"path\": \"$HOME/**\" }], \"deny\": [{ \"path\": \"$HOME/secret.txt\" }] } ```",
+      "description": "An argument for fine grained behavior control of Tauri commands.\n\nIt can be of any serde serializable type and is used to allow or prevent certain actions inside a Tauri command.\nThe configured scope is passed to the command and will be enforced by the command implementation.\n\n## Example\n\n```json\n{\n  \"allow\": [{ \"path\": \"$HOME/**\" }],\n  \"deny\": [{ \"path\": \"$HOME/secret.txt\" }]\n}\n```",
       "type": "object",
       "properties": {
         "allow": {
@@ -257,96 +264,27 @@
         {
           "description": "MacOS.",
           "type": "string",
-          "enum": [
-            "macOS"
-          ]
+          "const": "macOS"
         },
         {
           "description": "Windows.",
           "type": "string",
-          "enum": [
-            "windows"
-          ]
+          "const": "windows"
         },
         {
           "description": "Linux.",
           "type": "string",
-          "enum": [
-            "linux"
-          ]
+          "const": "linux"
         },
         {
           "description": "Android.",
           "type": "string",
-          "enum": [
-            "android"
-          ]
+          "const": "android"
         },
         {
           "description": "iOS.",
           "type": "string",
-          "enum": [
-            "iOS"
-          ]
-        }
-      ]
-    },
-    "PermissionKind": {
-      "type": "string",
-      "oneOf": [
-        {
-          "description": "Enables the get_current command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-get-current",
-          "markdownDescription": "Enables the get_current command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the get_current command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-get-current",
-          "markdownDescription": "Denies the get_current command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the is_registered command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-is-registered",
-          "markdownDescription": "Enables the is_registered command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the is_registered command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-is-registered",
-          "markdownDescription": "Denies the is_registered command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the register command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-register",
-          "markdownDescription": "Enables the register command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the register command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-register",
-          "markdownDescription": "Denies the register command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the unregister command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-unregister",
-          "markdownDescription": "Enables the unregister command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the unregister command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-unregister",
-          "markdownDescription": "Denies the unregister command without any pre-configured scope."
-        },
-        {
-          "description": "Allows reading the opened deep link via the get_current command\n#### This default permission set includes:\n\n- `allow-get-current`",
-          "type": "string",
-          "const": "default",
-          "markdownDescription": "Allows reading the opened deep link via the get_current command\n#### This default permission set includes:\n\n- `allow-get-current`"
+          "const": "iOS"
         }
       ]
     }

plugins/deep-link/src/lib.rs

@@ -540,7 +540,7 @@ pub fn init<R: Runtime>() -> TauriPlugin<R, Option<config::Config>> {
             Ok(())
         })
         .on_event(|_app, _event| {
-            #[cfg(any(target_os = "macos", target_os = "ios"))]
+            #[cfg(desktop)]
             if let tauri::RunEvent::Opened { urls } = _event {
                 use tauri::Emitter;
 

plugins/dialog/CHANGELOG.md

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

plugins/dialog/Cargo.toml

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

plugins/dialog/android/build.gradle.kts

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

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

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

plugins/dialog/package.json

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

plugins/dialog/permissions/autogenerated/commands/message.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-message"
-description = "Enables the message command without any pre-configured scope."
-commands.allow = ["message"]
-
-[[permission]]
-identifier = "deny-message"
-description = "Denies the message command without any pre-configured scope."
-commands.deny = ["message"]

plugins/dialog/permissions/autogenerated/commands/open.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-open"
-description = "Enables the open command without any pre-configured scope."
-commands.allow = ["open"]
-
-[[permission]]
-identifier = "deny-open"
-description = "Denies the open command without any pre-configured scope."
-commands.deny = ["open"]

plugins/dialog/permissions/autogenerated/commands/save.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-save"
-description = "Enables the save command without any pre-configured scope."
-commands.allow = ["save"]
-
-[[permission]]
-identifier = "deny-save"
-description = "Denies the save command without any pre-configured scope."
-commands.deny = ["save"]

plugins/dialog/permissions/autogenerated/reference.md

@@ -22,32 +22,6 @@ All dialog types are enabled.
 </tr>
 
 
-<tr>
-<td>
-
-`dialog:allow-ask`
-
-</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)
-
-</td>
-</tr>
-
-<tr>
-<td>
-
-`dialog:deny-ask`
-
-</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)
-
-</td>
-</tr>
-
 <tr>
 <td>
 
@@ -129,6 +103,32 @@ Denies the save command without any pre-configured scope.
 <tr>
 <td>
 
+`dialog:allow-ask`
+
+</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)
+
+</td>
+</tr>
+
+<tr>
+<td>
+
+`dialog:deny-ask`
+
+</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)
+
+</td>
+</tr>
+
+<tr>
+<td>
+
 `dialog:allow-confirm`
 
 </td>

plugins/dialog/permissions/schemas/schema.json

@@ -24,10 +24,17 @@
     },
     "permission": {
       "description": "A list of inlined permissions",
-      "default": [],
       "type": "array",
       "items": {
         "$ref": "#/definitions/Permission"
+      },
+      "default": []
+    },
+    "commands": {
+      "description": "A list of command names that get `allow-$command` and `deny-$command` permissions\nautogenerated on demand instead of being stored as explicit permissions.\n\nSee [`Manifest::command_permission`] and the ACL resolver for how these are expanded.",
+      "type": "array",
+      "items": {
+        "type": "string"
       }
     }
   },
@@ -35,9 +42,6 @@
     "DefaultPermission": {
       "description": "The default permission set of the plugin.\n\nWorks similarly to a permission with the \"default\" identifier.",
       "type": "object",
-      "required": [
-        "permissions"
-      ],
       "properties": {
         "version": {
           "description": "The version of the permission.",
@@ -46,10 +50,10 @@
             "null"
           ],
           "format": "uint64",
-          "minimum": 1.0
+          "minimum": 1
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does.\nTauri convention is to use `<h4>` headings in markdown content\nfor Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -62,16 +66,14 @@
             "type": "string"
           }
         }
-      }
+      },
+      "required": [
+        "permissions"
+      ]
     },
     "PermissionSet": {
       "description": "A set of direct permissions grouped together under a new name.",
       "type": "object",
-      "required": [
-        "description",
-        "identifier",
-        "permissions"
-      ],
       "properties": {
         "identifier": {
           "description": "A unique identifier for the permission.",
@@ -85,17 +87,19 @@
           "description": "All permissions this set contains.",
           "type": "array",
           "items": {
-            "$ref": "#/definitions/PermissionKind"
+            "type": "string"
           }
         }
-      }
+      },
+      "required": [
+        "identifier",
+        "description",
+        "permissions"
+      ]
     },
     "Permission": {
       "description": "Descriptions of explicit privileges of commands.\n\nIt can enable commands to be accessible in the frontend of the application.\n\nIf the scope is defined it can be used to fine grain control the access of individual or multiple commands.",
       "type": "object",
-      "required": [
-        "identifier"
-      ],
       "properties": {
         "version": {
           "description": "The version of the permission.",
@@ -104,14 +108,14 @@
             "null"
           ],
           "format": "uint64",
-          "minimum": 1.0
+          "minimum": 1
         },
         "identifier": {
           "description": "A unique identifier for the permission.",
           "type": "string"
         },
         "description": {
-          "description": "Human-readable description of what the permission does. Tauri internal convention is to use `<h4>` headings in markdown content for Tauri documentation generation purposes.",
+          "description": "Human-readable description of what the permission does.\nTauri internal convention is to use `<h4>` headings in markdown content\nfor Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -147,7 +151,10 @@
             "$ref": "#/definitions/Target"
           }
         }
-      }
+      },
+      "required": [
+        "identifier"
+      ]
     },
     "Commands": {
       "description": "Allowed and denied commands inside a permission.\n\nIf two commands clash inside of `allow` and `deny`, it should be denied by default.",
@@ -155,24 +162,24 @@
       "properties": {
         "allow": {
           "description": "Allowed command.",
-          "default": [],
           "type": "array",
           "items": {
             "type": "string"
-          }
+          },
+          "default": []
         },
         "deny": {
           "description": "Denied command, which takes priority.",
-          "default": [],
           "type": "array",
           "items": {
             "type": "string"
-          }
+          },
+          "default": []
         }
       }
     },
     "Scopes": {
-      "description": "An argument for fine grained behavior control of Tauri commands.\n\nIt can be of any serde serializable type and is used to allow or prevent certain actions inside a Tauri command. The configured scope is passed to the command and will be enforced by the command implementation.\n\n## Example\n\n```json { \"allow\": [{ \"path\": \"$HOME/**\" }], \"deny\": [{ \"path\": \"$HOME/secret.txt\" }] } ```",
+      "description": "An argument for fine grained behavior control of Tauri commands.\n\nIt can be of any serde serializable type and is used to allow or prevent certain actions inside a Tauri command.\nThe configured scope is passed to the command and will be enforced by the command implementation.\n\n## Example\n\n```json\n{\n  \"allow\": [{ \"path\": \"$HOME/**\" }],\n  \"deny\": [{ \"path\": \"$HOME/secret.txt\" }]\n}\n```",
       "type": "object",
       "properties": {
         "allow": {
@@ -257,108 +264,27 @@
         {
           "description": "MacOS.",
           "type": "string",
-          "enum": [
-            "macOS"
-          ]
+          "const": "macOS"
         },
         {
           "description": "Windows.",
           "type": "string",
-          "enum": [
-            "windows"
-          ]
+          "const": "windows"
         },
         {
           "description": "Linux.",
           "type": "string",
-          "enum": [
-            "linux"
-          ]
+          "const": "linux"
         },
         {
           "description": "Android.",
           "type": "string",
-          "enum": [
-            "android"
-          ]
+          "const": "android"
         },
         {
           "description": "iOS.",
           "type": "string",
-          "enum": [
-            "iOS"
-          ]
-        }
-      ]
-    },
-    "PermissionKind": {
-      "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)",
-          "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)"
-        },
-        {
-          "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)",
-          "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)"
-        },
-        {
-          "description": "Enables the message command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-message",
-          "markdownDescription": "Enables the message command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the message command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-message",
-          "markdownDescription": "Denies the message command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the open command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-open",
-          "markdownDescription": "Enables the open command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the open command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-open",
-          "markdownDescription": "Denies the open command without any pre-configured scope."
-        },
-        {
-          "description": "Enables the save command without any pre-configured scope.",
-          "type": "string",
-          "const": "allow-save",
-          "markdownDescription": "Enables the save command without any pre-configured scope."
-        },
-        {
-          "description": "Denies the save command without any pre-configured scope.",
-          "type": "string",
-          "const": "deny-save",
-          "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`",
-          "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`"
+          "const": "iOS"
         }
       ]
     }

plugins/fs/Cargo.toml

@@ -20,8 +20,6 @@ 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 }
 
 [dependencies]
 serde = { workspace = true }

plugins/fs/build.rs

@@ -7,8 +7,6 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use tauri_utils::acl::manifest::PermissionFile;
-
 #[path = "src/scope.rs"]
 #[allow(dead_code)]
 mod scope;
@@ -77,35 +75,35 @@ const BASE_DIR_VARS: &[&str] = &[
     "APPCACHE",
     "APPLOG",
 ];
-const COMMANDS: &[(&str, &[&str])] = &[
-    ("mkdir", &[]),
-    ("create", &[]),
-    ("copy_file", &[]),
-    ("remove", &[]),
-    ("rename", &[]),
-    ("truncate", &[]),
-    ("ftruncate", &[]),
-    ("write", &[]),
-    ("write_file", &["open", "write"]),
-    ("write_text_file", &[]),
-    ("read_dir", &[]),
-    ("read_file", &[]),
-    ("read", &[]),
-    ("open", &[]),
-    ("read_text_file", &[]),
-    ("read_text_file_lines", &["read_text_file_lines_next"]),
-    ("read_text_file_lines_next", &[]),
-    ("seek", &[]),
-    ("stat", &[]),
-    ("lstat", &[]),
-    ("fstat", &[]),
-    ("exists", &[]),
-    ("watch", &[]),
+// `write_file` and `read_text_file_lines` allow nested commands, so their permissions are
+// manually authored in `permissions/commands/` instead of being autogenerated from this list.
+const COMMANDS: &[&str] = &[
+    "mkdir",
+    "create",
+    "copy_file",
+    "remove",
+    "rename",
+    "truncate",
+    "ftruncate",
+    "write",
+    "write_text_file",
+    "read_dir",
+    "read_file",
+    "read",
+    "open",
+    "read_text_file",
+    "read_text_file_lines_next",
+    "seek",
+    "stat",
+    "lstat",
+    "fstat",
+    "exists",
+    "watch",
     // TODO: Remove this in v3
-    ("unwatch", &[]),
-    ("size", &[]),
-    ("start_accessing_security_scoped_resource", &[]),
-    ("stop_accessing_security_scoped_resource", &[]),
+    "unwatch",
+    "size",
+    "start_accessing_security_scoped_resource",
+    "stop_accessing_security_scoped_resource",
 ];
 
 fn main() {
@@ -211,59 +209,12 @@ permissions = [
         }
     }
 
-    tauri_plugin::Builder::new(
-        &COMMANDS
-            .iter()
-            // FIXME: https://docs.rs/crate/tauri-plugin-fs/2.1.0/builds/1571296
-            .filter(|c| c.1.is_empty())
-            .map(|c| c.0)
-            .collect::<Vec<_>>(),
-    )
-    .global_api_script_path("./api-iife.js")
-    .global_scope_schema(schemars::schema_for!(FsScopeEntry))
-    .android_path("android")
-    .build();
-
-    // workaround to include nested permissions as `tauri_plugin` doesn't support it
-    let permissions_dir = autogenerated.join("commands");
-    for (command, nested_commands) in COMMANDS {
-        if nested_commands.is_empty() {
-            continue;
-        }
-
-        let permission_path = permissions_dir.join(format!("{command}.toml"));
-
-        let content = std::fs::read_to_string(&permission_path)
-            .unwrap_or_else(|_| panic!("failed to read {command}.toml"));
-
-        let mut permission_file = toml::from_str::<PermissionFile>(&content)
-            .unwrap_or_else(|_| panic!("failed to deserialize {command}.toml"));
-
-        for p in permission_file
-            .permission
-            .iter_mut()
-            .filter(|p| p.identifier.starts_with("allow"))
-        {
-            for c in nested_commands.iter().map(|s| s.to_string()) {
-                if !p.commands.allow.contains(&c) {
-                    p.commands.allow.push(c);
-                }
-            }
-        }
-
-        let out = toml::to_string_pretty(&permission_file)
-            .unwrap_or_else(|_| panic!("failed to serialize {command}.toml"));
-        let out = format!(
-            r#"# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-{out}"#
-        );
-
-        if content != out {
-            std::fs::write(permission_path, out)
-                .unwrap_or_else(|_| panic!("failed to write {command}.toml"));
-        }
-    }
+    tauri_plugin::Builder::new(COMMANDS)
+        .global_api_script_path("./api-iife.js")
+        .global_scope_schema(
+            schemars::SchemaGenerator::new(schemars::generate::SchemaSettings::draft07())
+                .into_root_schema_for::<FsScopeEntry>(),
+        )
+        .android_path("android")
+        .build();
 }

plugins/fs/permissions/autogenerated/commands/copy_file.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-copy-file"
-description = "Enables the copy_file command without any pre-configured scope."
-commands.allow = ["copy_file"]
-
-[[permission]]
-identifier = "deny-copy-file"
-description = "Denies the copy_file command without any pre-configured scope."
-commands.deny = ["copy_file"]

plugins/fs/permissions/autogenerated/commands/create.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-create"
-description = "Enables the create command without any pre-configured scope."
-commands.allow = ["create"]
-
-[[permission]]
-identifier = "deny-create"
-description = "Denies the create command without any pre-configured scope."
-commands.deny = ["create"]

plugins/fs/permissions/autogenerated/commands/exists.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-exists"
-description = "Enables the exists command without any pre-configured scope."
-commands.allow = ["exists"]
-
-[[permission]]
-identifier = "deny-exists"
-description = "Denies the exists command without any pre-configured scope."
-commands.deny = ["exists"]

plugins/fs/permissions/autogenerated/commands/fstat.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-fstat"
-description = "Enables the fstat command without any pre-configured scope."
-commands.allow = ["fstat"]
-
-[[permission]]
-identifier = "deny-fstat"
-description = "Denies the fstat command without any pre-configured scope."
-commands.deny = ["fstat"]

plugins/fs/permissions/autogenerated/commands/ftruncate.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-ftruncate"
-description = "Enables the ftruncate command without any pre-configured scope."
-commands.allow = ["ftruncate"]
-
-[[permission]]
-identifier = "deny-ftruncate"
-description = "Denies the ftruncate command without any pre-configured scope."
-commands.deny = ["ftruncate"]

plugins/fs/permissions/autogenerated/commands/lstat.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-lstat"
-description = "Enables the lstat command without any pre-configured scope."
-commands.allow = ["lstat"]
-
-[[permission]]
-identifier = "deny-lstat"
-description = "Denies the lstat command without any pre-configured scope."
-commands.deny = ["lstat"]

plugins/fs/permissions/autogenerated/commands/mkdir.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-mkdir"
-description = "Enables the mkdir command without any pre-configured scope."
-commands.allow = ["mkdir"]
-
-[[permission]]
-identifier = "deny-mkdir"
-description = "Denies the mkdir command without any pre-configured scope."
-commands.deny = ["mkdir"]

plugins/fs/permissions/autogenerated/commands/open.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-open"
-description = "Enables the open command without any pre-configured scope."
-commands.allow = ["open"]
-
-[[permission]]
-identifier = "deny-open"
-description = "Denies the open command without any pre-configured scope."
-commands.deny = ["open"]

plugins/fs/permissions/autogenerated/commands/read.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-read"
-description = "Enables the read command without any pre-configured scope."
-commands.allow = ["read"]
-
-[[permission]]
-identifier = "deny-read"
-description = "Denies the read command without any pre-configured scope."
-commands.deny = ["read"]

plugins/fs/permissions/autogenerated/commands/read_dir.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-read-dir"
-description = "Enables the read_dir command without any pre-configured scope."
-commands.allow = ["read_dir"]
-
-[[permission]]
-identifier = "deny-read-dir"
-description = "Denies the read_dir command without any pre-configured scope."
-commands.deny = ["read_dir"]

plugins/fs/permissions/autogenerated/commands/read_file.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-read-file"
-description = "Enables the read_file command without any pre-configured scope."
-commands.allow = ["read_file"]
-
-[[permission]]
-identifier = "deny-read-file"
-description = "Denies the read_file command without any pre-configured scope."
-commands.deny = ["read_file"]

plugins/fs/permissions/autogenerated/commands/read_text_file.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-read-text-file"
-description = "Enables the read_text_file command without any pre-configured scope."
-commands.allow = ["read_text_file"]
-
-[[permission]]
-identifier = "deny-read-text-file"
-description = "Denies the read_text_file command without any pre-configured scope."
-commands.deny = ["read_text_file"]

plugins/fs/permissions/autogenerated/commands/read_text_file_lines.toml

@@ -1,22 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-read-text-file-lines"
-description = "Enables the read_text_file_lines command without any pre-configured scope."
-
-[permission.commands]
-allow = [
-    "read_text_file_lines",
-    "read_text_file_lines_next",
-]
-deny = []
-
-[[permission]]
-identifier = "deny-read-text-file-lines"
-description = "Denies the read_text_file_lines command without any pre-configured scope."
-
-[permission.commands]
-allow = []
-deny = ["read_text_file_lines"]

plugins/fs/permissions/autogenerated/commands/read_text_file_lines_next.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-read-text-file-lines-next"
-description = "Enables the read_text_file_lines_next command without any pre-configured scope."
-commands.allow = ["read_text_file_lines_next"]
-
-[[permission]]
-identifier = "deny-read-text-file-lines-next"
-description = "Denies the read_text_file_lines_next command without any pre-configured scope."
-commands.deny = ["read_text_file_lines_next"]

plugins/fs/permissions/autogenerated/commands/remove.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-remove"
-description = "Enables the remove command without any pre-configured scope."
-commands.allow = ["remove"]
-
-[[permission]]
-identifier = "deny-remove"
-description = "Denies the remove command without any pre-configured scope."
-commands.deny = ["remove"]

plugins/fs/permissions/autogenerated/commands/rename.toml

@@ -1,13 +0,0 @@
-# Automatically generated - DO NOT EDIT!
-
-"$schema" = "../../schemas/schema.json"
-
-[[permission]]
-identifier = "allow-rename"
-description = "Enables the rename command without any pre-configured scope."
-commands.allow = ["rename"]
-
-[[permission]]
-identifier = "deny-rename"
-description = "Denies the rename command without any pre-configured scope."
-commands.deny = ["rename"]