Merge remote-tracking branch 'origin/v2' into feat/cef

autogenerated commands format changed, needed FS plugin small change

.cargo/audit.toml

@@ -2,4 +2,6 @@
 ignore = [
   # 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",
 ]

.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/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`.

Cargo.toml

@@ -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.9" }
+tauri-utils = { git = "https://github.com/tauri-apps/tauri.git", tag = "tauri-cef-v3.0.0-alpha.9" }
+tauri-plugin = { git = "https://github.com/tauri-apps/tauri.git", tag = "tauri-cef-v3.0.0-alpha.9" }
+tauri-build = { git = "https://github.com/tauri-apps/tauri.git", tag = "tauri-cef-v3.0.0-alpha.9" }

README.md

@@ -22,7 +22,7 @@ This repo and all plugins require a Rust version of at least **1.77.2**
 | [log](plugins/log)                             | Configurable logging.                                                                                                                                          | ✅  | ✅  | ✅  | ✅  | ✅  |
 | [nfc](plugins/nfc)                             | Read and write NFC tags on Android and iOS.                                                                                                                    | ?   | ?   | ?   | ✅  | ✅  |
 | [notification](plugins/notification)           | Send message notifications (brief auto-expiring OS window element) to your user. Can also be used with the Notification Web API.                               | ✅  | ✅  | ✅  | ✅  | ✅  |
-| [opener](plugins/opener)                       | Open files and URLs using their default application.                                                                                                           | ✅  | ✅  | ✅  | ?   | ?   |
+| [opener](plugins/opener)                       | Open files and URLs using their default application.                                                                                                           | ✅  | ✅  | ✅  | ✅  | ✅  |
 | [os](plugins/os)                               | Read information about the operating system.                                                                                                                   | ✅  | ✅  | ✅  | ✅  | ✅  |
 | [persisted-scope](plugins/persisted-scope)     | Persist runtime scope changes on the filesystem.                                                                                                               | ✅  | ✅  | ✅  | ?   | ?   |
 | [positioner](plugins/positioner)               | Move windows to common locations.                                                                                                                              | ✅  | ✅  | ✅  | ❌  | ❌  |

examples/api/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## \[2.0.40]
+
+### Dependencies
+
+- Upgraded to `barcode-scanner-js@2.4.5`
+- Upgraded to `global-shortcut-js@2.3.2`
+
+## \[2.0.39]
+
+### Dependencies
+
+- Upgraded to `fs-js@2.5.1`
+- Upgraded to `opener-js@2.5.4`
+- Upgraded to `store-js@2.4.3`
+- Upgraded to `dialog-js@2.7.1`
+- Upgraded to `http-js@2.5.9`
+
 ## \[2.0.38]
 
 ### Dependencies

examples/api/package.json

@@ -1,7 +1,7 @@
 {
   "name": "api",
   "private": true,
-  "version": "2.0.38",
+  "version": "2.0.40",
   "type": "module",
   "scripts": {
     "dev": "vite --clearScreen false",
@@ -10,24 +10,24 @@
     "tauri": "tauri"
   },
   "dependencies": {
-    "@tauri-apps/api": "^2.10.1",
+    "@tauri-apps/api": "^2.11.0",
-    "@tauri-apps/plugin-barcode-scanner": "^2.4.4",
+    "@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.0",
+    "@tauri-apps/plugin-dialog": "^2.7.1",
-    "@tauri-apps/plugin-fs": "^2.5.0",
+    "@tauri-apps/plugin-fs": "^2.5.1",
     "@tauri-apps/plugin-geolocation": "^2.3.2",
-    "@tauri-apps/plugin-global-shortcut": "^2.3.1",
+    "@tauri-apps/plugin-global-shortcut": "^2.3.2",
     "@tauri-apps/plugin-haptics": "^2.3.2",
-    "@tauri-apps/plugin-http": "^2.5.8",
+    "@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.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.2",
+    "@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"
@@ -36,7 +36,7 @@
     "@iconify-json/codicon": "^1.2.49",
     "@iconify-json/ph": "^1.2.2",
     "@sveltejs/vite-plugin-svelte": "^7.0.0",
-    "@tauri-apps/cli": "2.10.1",
+    "@tauri-apps/cli-cef": "3.0.0-alpha.5",
     "@unocss/extractor-svelte": "^66.6.7",
     "svelte": "^5.54.0",
     "unocss": "^66.6.7",

examples/api/src-tauri/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## \[2.0.44]
+
+### Dependencies
+
+- Upgraded to `barcode-scanner@2.4.5`
+- Upgraded to `global-shortcut@2.3.2`
+
+## \[2.0.43]
+
+### Dependencies
+
+- Upgraded to `fs@2.5.1`
+- Upgraded to `opener@2.5.4`
+- Upgraded to `store@2.4.3`
+- Upgraded to `dialog@2.7.1`
+- Upgraded to `http@2.5.9`
+
 ## \[2.0.42]
 
 ### Dependencies

examples/api/src-tauri/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "api"
 publish = false
-version = "2.0.42"
+version = "2.0.44"
 description = "An example Tauri Application showcasing the api"
 edition = "2021"
 rust-version = { workspace = true }
@@ -21,23 +21,23 @@ tiny_http = "0.12"
 time = "0.3"
 log = { workspace = true }
 tauri-plugin-log = { path = "../../../plugins/log", version = "2.8.0" }
-tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.5.0", features = [
+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.0" }
+tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.7.1" }
 tauri-plugin-http = { path = "../../../plugins/http", features = [
   "multipart",
   "cookies",
-], version = "2.5.8" }
+], version = "2.5.9" }
 tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.3.3", features = [
   "windows7-compat",
 ] }
 tauri-plugin-os = { path = "../../../plugins/os", version = "2.3.2" }
 tauri-plugin-process = { path = "../../../plugins/process", version = "2.3.1" }
-tauri-plugin-opener = { path = "../../../plugins/opener", version = "2.5.3" }
+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.2" }
+tauri-plugin-store = { path = "../../../plugins/store", version = "2.4.3" }
 tauri-plugin-upload = { path = "../../../plugins/upload", version = "2.3.0" }
 
 [dependencies.tauri]
@@ -56,12 +56,12 @@ features = [
 
 [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
 tauri-plugin-cli = { path = "../../../plugins/cli", version = "2.4.1" }
-tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.3.1" }
+tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.3.2" }
 tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.10.1" }
 tauri-plugin-window-state = { path = "../../../plugins/window-state", version = "2.2.0" }
 
 [target."cfg(any(target_os = \"android\", target_os = \"ios\"))".dependencies]
-tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.4.4" }
+tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.4.5" }
 tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "2.3.5" }
 tauri-plugin-biometric = { path = "../../../plugins/biometric/", version = "2.3.2" }
 tauri-plugin-geolocation = { path = "../../../plugins/geolocation/", version = "2.3.2" }

package.json

@@ -15,14 +15,14 @@
     "@rollup/plugin-node-resolve": "16.0.3",
     "@rollup/plugin-terser": "1.0.0",
     "@rollup/plugin-typescript": "12.3.0",
-    "eslint": "10.1.0",
+    "eslint": "10.4.0",
     "eslint-config-prettier": "10.1.8",
-    "eslint-plugin-security": "4.0.0",
+    "eslint-plugin-security": "4.0.1",
-    "prettier": "3.8.1",
+    "prettier": "3.8.3",
-    "rollup": "4.59.0",
+    "rollup": "4.60.3",
     "tslib": "2.8.1",
-    "typescript": "5.9.3",
+    "typescript": "6.0.3",
-    "typescript-eslint": "8.57.1"
+    "typescript-eslint": "8.58.2"
   },
   "minimumReleaseAge": 4320,
   "pnpm": {

plugins/autostart/package.json

@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.10.1"
+    "@tauri-apps/api": "^2.11.0"
   }
 }

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

@@ -0,0 +1,5 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+commands = ["enable","disable","is_enabled"]

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": [
+          "const": "macOS"
-            "macOS"
-          ]
         },
         {
           "description": "Windows.",
           "type": "string",
-          "enum": [
+          "const": "windows"
-            "windows"
-          ]
         },
         {
           "description": "Linux.",
           "type": "string",
-          "enum": [
+          "const": "linux"
-            "linux"
-          ]
         },
         {
           "description": "Android.",
           "type": "string",
-          "enum": [
+          "const": "android"
-            "android"
-          ]
         },
         {
           "description": "iOS.",
           "type": "string",
-          "enum": [
+          "const": "iOS"
-            "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`"
         }
       ]
     }

plugins/autostart/tsconfig.json

@@ -1,4 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "rootDir": "guest-js"
+  },
   "include": ["guest-js/*.ts"]
 }

plugins/barcode-scanner/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## \[2.4.5]
+
+- [`d8645ab3`](https://github.com/tauri-apps/plugins-workspace/commit/d8645ab3e5b508456681eb53275c0837db25aeee) ([#3393](https://github.com/tauri-apps/plugins-workspace/pull/3393) by [@AlexisZankowitch](https://github.com/tauri-apps/plugins-workspace/../../AlexisZankowitch)) Fixed a crash on iOS when `cancel()` is invoked by running the cancel handler on the main thread.
+
 ## \[2.4.4]
 
 - [`82fbb0c7`](https://github.com/tauri-apps/plugins-workspace/commit/82fbb0c790288eca72af9ade13828ded7700ff90) ([#3221](https://github.com/tauri-apps/plugins-workspace/pull/3221)) On iOS, fixed an application crash happening when the scanner was started when user denied permission before.

plugins/barcode-scanner/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-barcode-scanner"
-version = "2.4.4"
+version = "2.4.5"
 description = "Scan QR codes, EAN-13 and other kinds of barcodes on Android and iOS"
 edition = { workspace = true }
 authors = { workspace = true }

plugins/barcode-scanner/ios/Sources/BarcodeScannerPlugin.swift

@@ -337,10 +337,11 @@ class BarcodeScannerPlugin: Plugin, AVCaptureMetadataOutputObjectsDelegate {
   }
 
   @objc private func cancel(_ invoke: Invoke) {
-    self.invoke?.reject("cancelled")
+    DispatchQueue.main.async { [self] in
-
+      self.invoke?.reject("cancelled")
-    destroy()
+      self.destroy()
-    invoke.resolve()
+      invoke.resolve()
+    }
   }
 }
 

plugins/barcode-scanner/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-barcode-scanner",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "description": "Scan QR codes, EAN-13 and other kinds of barcodes on Android and iOS",
   "license": "MIT OR Apache-2.0",
   "authors": [
@@ -25,6 +25,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.10.1"
+    "@tauri-apps/api": "^2.11.0"
   }
 }

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/commands.toml

@@ -0,0 +1,5 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+commands = ["scan","cancel","request_permissions","check_permissions","open_app_settings","vibrate"]

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": [
+          "const": "macOS"
-            "macOS"
-          ]
         },
         {
           "description": "Windows.",
           "type": "string",
-          "enum": [
+          "const": "windows"
-            "windows"
-          ]
         },
         {
           "description": "Linux.",
           "type": "string",
-          "enum": [
+          "const": "linux"
-            "linux"
-          ]
         },
         {
           "description": "Android.",
           "type": "string",
-          "enum": [
+          "const": "android"
-            "android"
-          ]
         },
         {
           "description": "iOS.",
           "type": "string",
-          "enum": [
+          "const": "iOS"
-            "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`"
         }
       ]
     }

plugins/barcode-scanner/tsconfig.json

@@ -1,4 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "rootDir": "guest-js"
+  },
   "include": ["guest-js/*.ts"]
 }

plugins/biometric/package.json

@@ -25,6 +25,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.10.1"
+    "@tauri-apps/api": "^2.11.0"
   }
 }

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/commands.toml

@@ -0,0 +1,5 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+commands = ["authenticate","status"]

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": [
+          "const": "macOS"
-            "macOS"
-          ]
         },
         {
           "description": "Windows.",
           "type": "string",
-          "enum": [
+          "const": "windows"
-            "windows"
-          ]
         },
         {
           "description": "Linux.",
           "type": "string",
-          "enum": [
+          "const": "linux"
-            "linux"
-          ]
         },
         {
           "description": "Android.",
           "type": "string",
-          "enum": [
+          "const": "android"
-            "android"
-          ]
         },
         {
           "description": "iOS.",
           "type": "string",
-          "enum": [
+          "const": "iOS"
-            "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`"
         }
       ]
     }

plugins/biometric/tsconfig.json

@@ -1,4 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "rootDir": "guest-js"
+  },
   "include": ["guest-js/*.ts"]
 }

plugins/cli/package.json

@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.10.1"
+    "@tauri-apps/api": "^2.11.0"
   }
 }

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/autogenerated/commands/commands.toml

@@ -0,0 +1,5 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+commands = ["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": [
+          "const": "macOS"
-            "macOS"
-          ]
         },
         {
           "description": "Windows.",
           "type": "string",
-          "enum": [
+          "const": "windows"
-            "windows"
-          ]
         },
         {
           "description": "Linux.",
           "type": "string",
-          "enum": [
+          "const": "linux"
-            "linux"
-          ]
         },
         {
           "description": "Android.",
           "type": "string",
-          "enum": [
+          "const": "android"
-            "android"
-          ]
         },
         {
           "description": "iOS.",
           "type": "string",
-          "enum": [
+          "const": "iOS"
-            "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`"
         }
       ]
     }

plugins/cli/tsconfig.json

@@ -1,4 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "rootDir": "guest-js"
+  },
   "include": ["guest-js/*.ts"]
 }

plugins/clipboard-manager/package.json

@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.10.1"
+    "@tauri-apps/api": "^2.11.0"
   }
 }

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/commands.toml

@@ -0,0 +1,5 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+commands = ["write_text","read_text","write_image","read_image","write_html","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": [
+          "const": "macOS"
-            "macOS"
-          ]
         },
         {
           "description": "Windows.",
           "type": "string",
-          "enum": [
+          "const": "windows"
-            "windows"
-          ]
         },
         {
           "description": "Linux.",
           "type": "string",
-          "enum": [
+          "const": "linux"
-            "linux"
-          ]
         },
         {
           "description": "Android.",
           "type": "string",
-          "enum": [
+          "const": "android"
-            "android"
-          ]
         },
         {
           "description": "iOS.",
           "type": "string",
-          "enum": [
+          "const": "iOS"
-            "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"
         }
       ]
     }

plugins/clipboard-manager/tsconfig.json

@@ -1,4 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "rootDir": "guest-js"
+  },
   "include": ["guest-js/*.ts"]
 }

plugins/deep-link/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## \[2.4.9]
+
+- [`e6cdc9f5`](https://github.com/tauri-apps/plugins-workspace/commit/e6cdc9f52e2cd975b11b8e4c12879d597f1f76c3) ([#3396](https://github.com/tauri-apps/plugins-workspace/pull/3396) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Fix broken iOS custom URL schemes
+
 ## \[2.4.8]
 
 - [`024ec0c2`](https://github.com/tauri-apps/plugins-workspace/commit/024ec0c29c20cf94579dab9b79d6be0da61a8daa) ([#3214](https://github.com/tauri-apps/plugins-workspace/pull/3214) by [@joshIsCoding](https://github.com/tauri-apps/plugins-workspace/../../joshIsCoding)) Account for differing Android VIEW intent in ChromeOS, fixing deep-link behaviour on Chromium platforms.

plugins/deep-link/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-deep-link"
-version = "2.4.8"
+version = "2.4.9"
 description = "Set your Tauri application as the default handler for an URL"
 authors = { workspace = true }
 license = { workspace = true }

plugins/deep-link/api-iife.js

@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_DEEP_LINK__=function(e){"use strict";function n(e,n=!1){return window.__TAURI_INTERNALS__.transformCallback(e,n)}async function r(e,n={},r){return window.__TAURI_INTERNALS__.invoke(e,n,r)}var t;async function i(e,t,i){const _={kind:"Any"};return r("plugin:event|listen",{event:e,target:_,handler:n(t)}).then(n=>async()=>async function(e,n){window.__TAURI_EVENT_PLUGIN_INTERNALS__.unregisterListener(e,n),await r("plugin:event|unlisten",{event:e,eventId:n})}(e,n))}return"function"==typeof SuppressedError&&SuppressedError,function(e){e.WINDOW_RESIZED="tauri://resize",e.WINDOW_MOVED="tauri://move",e.WINDOW_CLOSE_REQUESTED="tauri://close-requested",e.WINDOW_DESTROYED="tauri://destroyed",e.WINDOW_FOCUS="tauri://focus",e.WINDOW_BLUR="tauri://blur",e.WINDOW_SCALE_FACTOR_CHANGED="tauri://scale-change",e.WINDOW_THEME_CHANGED="tauri://theme-changed",e.WINDOW_CREATED="tauri://window-created",e.WEBVIEW_CREATED="tauri://webview-created",e.DRAG_ENTER="tauri://drag-enter",e.DRAG_OVER="tauri://drag-over",e.DRAG_DROP="tauri://drag-drop",e.DRAG_LEAVE="tauri://drag-leave"}(t||(t={})),e.getCurrent=async function(){return await r("plugin:deep-link|get_current")},e.isRegistered=async function(e){return await r("plugin:deep-link|is_registered",{protocol:e})},e.onOpenUrl=async function(e){return await i("deep-link://new-url",n=>{e(n.payload)})},e.register=async function(e){return await r("plugin:deep-link|register",{protocol:e})},e.unregister=async function(e){return await r("plugin:deep-link|unregister",{protocol:e})},e}({});Object.defineProperty(window.__TAURI__,"deepLink",{value:__TAURI_PLUGIN_DEEP_LINK__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_DEEP_LINK__=function(e){"use strict";function n(e,n=!1){return window.__TAURI_INTERNALS__.transformCallback(e,n)}async function r(e,n={},r){return window.__TAURI_INTERNALS__.invoke(e,n,r)}var t;async function i(e,t,i){const _={kind:"Any"};return r("plugin:event|listen",{event:e,target:_,handler:n(t)}).then(n=>async()=>async function(e,n){window.__TAURI_EVENT_PLUGIN_INTERNALS__.unregisterListener(e,n),await r("plugin:event|unlisten",{event:e,eventId:n})}(e,n))}return"function"==typeof SuppressedError&&SuppressedError,function(e){e.WINDOW_RESIZED="tauri://resize",e.WINDOW_MOVED="tauri://move",e.WINDOW_CLOSE_REQUESTED="tauri://close-requested",e.WINDOW_DESTROYED="tauri://destroyed",e.WINDOW_FOCUS="tauri://focus",e.WINDOW_BLUR="tauri://blur",e.WINDOW_SCALE_FACTOR_CHANGED="tauri://scale-change",e.WINDOW_THEME_CHANGED="tauri://theme-changed",e.WINDOW_CREATED="tauri://window-created",e.WINDOW_SUSPENDED="tauri://suspended",e.WINDOW_RESUMED="tauri://resumed",e.WEBVIEW_CREATED="tauri://webview-created",e.DRAG_ENTER="tauri://drag-enter",e.DRAG_OVER="tauri://drag-over",e.DRAG_DROP="tauri://drag-drop",e.DRAG_LEAVE="tauri://drag-leave"}(t||(t={})),e.getCurrent=async function(){return await r("plugin:deep-link|get_current")},e.isRegistered=async function(e){return await r("plugin:deep-link|is_registered",{protocol:e})},e.onOpenUrl=async function(e){return await i("deep-link://new-url",n=>{e(n.payload)})},e.register=async function(e){return await r("plugin:deep-link|register",{protocol:e})},e.unregister=async function(e){return await r("plugin:deep-link|unregister",{protocol:e})},e}({});Object.defineProperty(window.__TAURI__,"deepLink",{value:__TAURI_PLUGIN_DEEP_LINK__})}

plugins/deep-link/build.rs

@@ -139,7 +139,7 @@ fn main() {
             let deep_link_domains = config
                 .mobile
                 .iter()
-                .filter(|domain| domain.is_app_link())
+                .filter(|domain| !domain.is_app_link())
                 .collect::<Vec<_>>();
 
             if deep_link_domains.is_empty() {

plugins/deep-link/examples/app/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.2.12]
+
+### Dependencies
+
+- Upgraded to `deep-link-js@2.4.9`
+
 ## \[2.2.11]
 
 ### Dependencies

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

@@ -1,7 +1,7 @@
 {
   "name": "deep-link-example",
   "private": true,
-  "version": "2.2.11",
+  "version": "2.2.12",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -10,12 +10,12 @@
     "tauri": "tauri"
   },
   "dependencies": {
-    "@tauri-apps/api": "^2.10.1",
+    "@tauri-apps/api": "^2.11.0",
-    "@tauri-apps/plugin-deep-link": "2.4.8"
+    "@tauri-apps/plugin-deep-link": "2.4.9"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.10.1",
+    "@tauri-apps/cli-cef": "3.0.0-alpha.5",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.0",
     "vite": "^8.0.1"
   }
 }

plugins/deep-link/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-deep-link",
-  "version": "2.4.8",
+  "version": "2.4.9",
   "description": "Set your Tauri application as the default handler for an URL",
   "license": "MIT OR Apache-2.0",
   "authors": [
@@ -25,9 +25,9 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.10.1"
+    "@tauri-apps/api": "^2.11.0"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.10.1"
+    "@tauri-apps/cli-cef": "3.0.0-alpha.5"
   }
 }

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

@@ -0,0 +1,5 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+commands = ["get_current","register","unregister","is_registered"]

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": [
+          "const": "macOS"
-            "macOS"
-          ]
         },
         {
           "description": "Windows.",
           "type": "string",
-          "enum": [
+          "const": "windows"
-            "windows"
-          ]
         },
         {
           "description": "Linux.",
           "type": "string",
-          "enum": [
+          "const": "linux"
-            "linux"
-          ]
         },
         {
           "description": "Android.",
           "type": "string",
-          "enum": [
+          "const": "android"
-            "android"
-          ]
         },
         {
           "description": "iOS.",
           "type": "string",
-          "enum": [
+          "const": "iOS"
-            "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`"
         }
       ]
     }

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/deep-link/tsconfig.json

@@ -1,4 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "rootDir": "guest-js"
+  },
   "include": ["guest-js/*.ts"]
 }

plugins/dialog/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.7.1]
+
+### Dependencies
+
+- Upgraded to `fs-js@2.5.1`
+
 ## \[2.7.0]
 
 - [`24154472`](https://github.com/tauri-apps/plugins-workspace/commit/24154472a6710a690173df0a121125d1f1b871e8) ([#3287](https://github.com/tauri-apps/plugins-workspace/pull/3287) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Re-use `message` command in Rust side for `ask` and `confirm` commands, `allow-ask` and `allow-confirm` permissions are now aliases to `allow-message`

plugins/dialog/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-dialog"
-version = "2.7.0"
+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 }
@@ -37,7 +37,7 @@ tauri = { workspace = true }
 log = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
-tauri-plugin-fs = { path = "../fs", version = "2.5.0" }
+tauri-plugin-fs = { path = "../fs", version = "2.5.1" }
 
 [target.'cfg(target_os = "ios")'.dependencies]
 tauri = { workspace = true, features = ["wry"] }

plugins/dialog/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-dialog",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "license": "MIT OR Apache-2.0",
   "authors": [
     "Tauri Programme within The Commons Conservancy"
@@ -24,6 +24,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.10.1"
+    "@tauri-apps/api": "^2.11.0"
   }
 }

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

@@ -0,0 +1,5 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+commands = ["open","save","message"]

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/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": [
+          "const": "macOS"
-            "macOS"
-          ]
         },
         {
           "description": "Windows.",
           "type": "string",
-          "enum": [
+          "const": "windows"
-            "windows"
-          ]
         },
         {
           "description": "Linux.",
           "type": "string",
-          "enum": [
+          "const": "linux"
-            "linux"
-          ]
         },
         {
           "description": "Android.",
           "type": "string",
-          "enum": [
+          "const": "android"
-            "android"
-          ]
         },
         {
           "description": "iOS.",
           "type": "string",
-          "enum": [
+          "const": "iOS"
-            "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`"
         }
       ]
     }

plugins/dialog/tsconfig.json

@@ -1,4 +1,7 @@
 {
   "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "rootDir": "guest-js"
+  },
   "include": ["guest-js/*.ts"]
 }

plugins/fs/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## \[2.5.1]
+
+- [`ec054013`](https://github.com/tauri-apps/plugins-workspace/commit/ec0540138bece081e9a87982091947360e61987a) ([#3323](https://github.com/tauri-apps/plugins-workspace/pull/3323) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated dependency `toml` from 0.9 to 1
+
 ## \[2.5.0]
 
 - [`e97a4ded`](https://github.com/tauri-apps/plugins-workspace/commit/e97a4dedab8608d9d57029784ee8a2607ca3a996) ([#3244](https://github.com/tauri-apps/plugins-workspace/pull/3244) by [@SeijiOkuda](https://github.com/tauri-apps/plugins-workspace/../../SeijiOkuda)) Add `encoding` option for `readTextFile` and `readTextFileLines`

plugins/fs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-fs"
-version = "2.5.0"
+version = "2.5.1"
 description = "Access the file system."
 authors = { workspace = true }
 license = { workspace = true }
@@ -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 = "0.9"
-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])] = &[
+// `write_file` and `read_text_file_lines` allow nested commands, so their permissions are
-    ("mkdir", &[]),
+// manually authored in `permissions/commands/` instead of being autogenerated from this list.
-    ("create", &[]),
+const COMMANDS: &[&str] = &[
-    ("copy_file", &[]),
+    "mkdir",
-    ("remove", &[]),
+    "create",
-    ("rename", &[]),
+    "copy_file",
-    ("truncate", &[]),
+    "remove",
-    ("ftruncate", &[]),
+    "rename",
-    ("write", &[]),
+    "truncate",
-    ("write_file", &["open", "write"]),
+    "ftruncate",
-    ("write_text_file", &[]),
+    "write",
-    ("read_dir", &[]),
+    "write_text_file",
-    ("read_file", &[]),
+    "read_dir",
-    ("read", &[]),
+    "read_file",
-    ("open", &[]),
+    "read",
-    ("read_text_file", &[]),
+    "open",
-    ("read_text_file_lines", &["read_text_file_lines_next"]),
+    "read_text_file",
-    ("read_text_file_lines_next", &[]),
+    "read_text_file_lines_next",
-    ("seek", &[]),
+    "seek",
-    ("stat", &[]),
+    "stat",
-    ("lstat", &[]),
+    "lstat",
-    ("fstat", &[]),
+    "fstat",
-    ("exists", &[]),
+    "exists",
-    ("watch", &[]),
+    "watch",
     // TODO: Remove this in v3
-    ("unwatch", &[]),
+    "unwatch",
-    ("size", &[]),
+    "size",
-    ("start_accessing_security_scoped_resource", &[]),
+    "start_accessing_security_scoped_resource",
-    ("stop_accessing_security_scoped_resource", &[]),
+    "stop_accessing_security_scoped_resource",
 ];
 
 fn main() {
@@ -211,59 +209,12 @@ permissions = [
         }
     }
 
-    tauri_plugin::Builder::new(
+    tauri_plugin::Builder::new(COMMANDS)
-        &COMMANDS
+        .global_api_script_path("./api-iife.js")
-            .iter()
+        .global_scope_schema(
-            // FIXME: https://docs.rs/crate/tauri-plugin-fs/2.1.0/builds/1571296
+            schemars::SchemaGenerator::new(schemars::generate::SchemaSettings::draft07())
-            .filter(|c| c.1.is_empty())
+                .into_root_schema_for::<FsScopeEntry>(),
-            .map(|c| c.0)
+        )
-            .collect::<Vec<_>>(),
+        .android_path("android")
-    )
+        .build();
-    .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"));
-        }
-    }
 }

plugins/fs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-fs",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "Access the file system.",
   "license": "MIT OR Apache-2.0",
   "authors": [
@@ -25,6 +25,6 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@tauri-apps/api": "^2.10.1"
+    "@tauri-apps/api": "^2.11.0"
   }
 }

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

@@ -0,0 +1,5 @@
+# Automatically generated - DO NOT EDIT!
+
+"$schema" = "../../schemas/schema.json"
+
+commands = ["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","unwatch","size","start_accessing_security_scoped_resource","stop_accessing_security_scoped_resource"]

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"]

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

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

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

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