fix(upload): Enable http2 and charset

examples/api/CHANGELOG.md

@@ -1,41 +1,5 @@
 # Changelog
 
-## \[2.0.22]
-
-### Dependencies
-
-- Upgraded to `fs-js@2.3.0`
-- Upgraded to `global-shortcut-js@2.2.1`
-- Upgraded to `http-js@2.4.4`
-- Upgraded to `opener-js@2.2.7`
-- Upgraded to `dialog-js@2.2.2`
-
-## \[2.0.21]
-
-### Dependencies
-
-- Upgraded to `log-js@2.4.0`
-- Upgraded to `biometric-js@2.2.1`
-- Upgraded to `updater-js@2.7.1`
-
-## \[2.0.20]
-
-### Dependencies
-
-- Upgraded to `http-js@2.4.3`
-- Upgraded to `shell-js@2.2.1`
-- Upgraded to `fs-js@2.2.1`
-- Upgraded to `process-js@2.2.1`
-- Upgraded to `updater-js@2.7.0`
-- Upgraded to `dialog-js@2.2.1`
-
-## \[2.0.19]
-
-### Dependencies
-
-- Upgraded to `http-js@2.4.2`
-- Upgraded to `updater-js@2.6.1`
-
 ## \[2.0.18]
 
 ### Dependencies

examples/api/package.json

@@ -1,7 +1,7 @@
 {
   "name": "api",
   "private": true,
-  "version": "2.0.22",
+  "version": "2.0.18",
   "type": "module",
   "scripts": {
     "dev": "vite --clearScreen false",
@@ -10,35 +10,35 @@
     "tauri": "tauri"
   },
   "dependencies": {
-    "@tauri-apps/api": "2.5.0",
+    "@tauri-apps/api": "2.3.0",
     "@tauri-apps/plugin-barcode-scanner": "^2.2.0",
-    "@tauri-apps/plugin-biometric": "^2.2.1",
+    "@tauri-apps/plugin-biometric": "^2.2.0",
     "@tauri-apps/plugin-cli": "^2.2.0",
     "@tauri-apps/plugin-clipboard-manager": "^2.2.2",
-    "@tauri-apps/plugin-dialog": "^2.2.2",
+    "@tauri-apps/plugin-dialog": "^2.2.0",
-    "@tauri-apps/plugin-fs": "^2.3.0",
+    "@tauri-apps/plugin-fs": "^2.2.0",
     "@tauri-apps/plugin-geolocation": "^2.2.0",
-    "@tauri-apps/plugin-global-shortcut": "^2.2.1",
+    "@tauri-apps/plugin-global-shortcut": "^2.2.0",
     "@tauri-apps/plugin-haptics": "^2.2.0",
-    "@tauri-apps/plugin-http": "^2.4.4",
+    "@tauri-apps/plugin-http": "^2.4.1",
     "@tauri-apps/plugin-nfc": "^2.2.0",
     "@tauri-apps/plugin-notification": "^2.2.2",
-    "@tauri-apps/plugin-opener": "^2.2.7",
+    "@tauri-apps/plugin-opener": "^2.2.6",
     "@tauri-apps/plugin-os": "^2.2.1",
-    "@tauri-apps/plugin-process": "^2.2.1",
+    "@tauri-apps/plugin-process": "^2.2.0",
-    "@tauri-apps/plugin-shell": "^2.2.1",
+    "@tauri-apps/plugin-shell": "^2.2.0",
     "@tauri-apps/plugin-store": "^2.2.0",
-    "@tauri-apps/plugin-updater": "^2.7.1",
+    "@tauri-apps/plugin-updater": "^2.6.0",
     "@zerodevx/svelte-json-view": "1.0.11"
   },
   "devDependencies": {
     "@iconify-json/codicon": "^1.2.12",
     "@iconify-json/ph": "^1.2.2",
     "@sveltejs/vite-plugin-svelte": "^5.0.3",
-    "@tauri-apps/cli": "2.5.0",
+    "@tauri-apps/cli": "2.3.1",
     "@unocss/extractor-svelte": "^66.0.0",
     "svelte": "^5.20.4",
     "unocss": "^66.0.0",
-    "vite": "^6.2.6"
+    "vite": "^6.2.0"
   }
 }

examples/api/src-tauri/CHANGELOG.md

@@ -1,41 +1,5 @@
 # Changelog
 
-## \[2.0.26]
-
-### Dependencies
-
-- Upgraded to `fs@2.3.0`
-- Upgraded to `global-shortcut@2.2.1`
-- Upgraded to `http@2.4.4`
-- Upgraded to `opener@2.2.7`
-- Upgraded to `dialog@2.2.2`
-
-## \[2.0.25]
-
-### Dependencies
-
-- Upgraded to `log@2.4.0`
-- Upgraded to `biometric@2.2.1`
-- Upgraded to `updater@2.7.1`
-
-## \[2.0.24]
-
-### Dependencies
-
-- Upgraded to `http@2.4.3`
-- Upgraded to `shell@2.2.1`
-- Upgraded to `fs@2.2.1`
-- Upgraded to `process@2.2.1`
-- Upgraded to `updater@2.7.0`
-- Upgraded to `dialog@2.2.1`
-
-## \[2.0.23]
-
-### Dependencies
-
-- Upgraded to `http@2.4.2`
-- Upgraded to `updater@2.6.1`
-
 ## \[2.0.22]
 
 ### Dependencies

examples/api/src-tauri/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "api"
 publish = false
-version = "2.0.26"
+version = "2.0.22"
 description = "An example Tauri Application showcasing the api"
 edition = "2021"
 rust-version = { workspace = true }
@@ -18,25 +18,23 @@ tauri-build = { workspace = true, features = ["codegen", "isolation"] }
 serde_json = { workspace = true }
 serde = { workspace = true }
 tiny_http = "0.12"
-time = "0.3"
 log = { workspace = true }
-tauri-plugin-log = { path = "../../../plugins/log", version = "2.4.0" }
+tauri-plugin-log = { path = "../../../plugins/log", version = "2.3.1" }
-tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.3.0", features = [
+tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.2.0", features = [
   "watch",
 ] }
 tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.2.2" }
-tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.2.2" }
+tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.2.0" }
 tauri-plugin-http = { path = "../../../plugins/http", features = [
   "multipart",
-  "cookies",
+], version = "2.4.1" }
-], version = "2.4.4" }
 tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.2.2", features = [
   "windows7-compat",
 ] }
 tauri-plugin-os = { path = "../../../plugins/os", version = "2.2.1" }
-tauri-plugin-process = { path = "../../../plugins/process", version = "2.2.1" }
+tauri-plugin-process = { path = "../../../plugins/process", version = "2.2.0" }
-tauri-plugin-opener = { path = "../../../plugins/opener", version = "2.2.7" }
+tauri-plugin-opener = { path = "../../../plugins/opener", version = "2.2.6" }
-tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.2.1" }
+tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.2.0" }
 tauri-plugin-store = { path = "../../../plugins/store", version = "2.2.0" }
 
 [dependencies.tauri]
@@ -54,14 +52,14 @@ 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.2.0" }
-tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.2.1" }
+tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.2.0" }
-tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.7.1" }
+tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.6.0" }
 tauri-plugin-window-state = { path = "../../../plugins/window-state", version = "2.2.0" }
 
 [target."cfg(any(target_os = \"android\", target_os = \"ios\"))".dependencies]
 tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.2.0" }
 tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "2.2.0" }
-tauri-plugin-biometric = { path = "../../../plugins/biometric/", version = "2.2.1" }
+tauri-plugin-biometric = { path = "../../../plugins/biometric/", version = "2.2.0" }
 tauri-plugin-geolocation = { path = "../../../plugins/geolocation/", version = "2.2.4" }
 tauri-plugin-haptics = { path = "../../../plugins/haptics/", version = "2.2.4" }
 

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

@@ -53,7 +53,7 @@
         }
       ]
     },
-    "shell:default",
+    "shell:allow-open",
     "shell:allow-kill",
     "shell:allow-stdin-write",
     "process:allow-exit",
@@ -69,7 +69,6 @@
     "fs:allow-mkdir",
     "fs:allow-remove",
     "fs:allow-write-text-file",
-    "fs:read-meta",
     "fs:scope-download-recursive",
     "fs:scope-resource-recursive",
     {

examples/api/src-tauri/src/lib.rs

@@ -102,28 +102,9 @@ pub fn run() {
                     if let Ok(mut request) = server.recv() {
                         let mut body = Vec::new();
                         let _ = request.as_reader().read_to_end(&mut body);
-                        let mut headers = request.headers().to_vec();
-
-                        if !headers.iter().any(|header| header.field == tiny_http::HeaderField::from_bytes(b"Cookie").unwrap()) {
-                            let expires = time::OffsetDateTime::now_utc() + time::Duration::days(1);
-                            // RFC 1123 format
-                            let format = time::macros::format_description!(
-                                "[weekday repr:short], [day] [month repr:short] [year] [hour]:[minute]:[second] GMT"
-                            );
-                            let expires_str = expires.format(format).unwrap();
-                            headers.push(
-                                tiny_http::Header::from_bytes(
-                                    &b"Set-Cookie"[..],
-                                    format!("session-token=test-value; Secure; Path=/; Expires={expires_str}")
-                                        .as_bytes(),
-                                )
-                                .unwrap(),
-                            );
-                        }
-
                         let response = tiny_http::Response::new(
                             tiny_http::StatusCode(200),
-                            headers,
+                            request.headers().to_vec(),
                             std::io::Cursor::new(body),
                             request.body_length(),
                             None,

examples/api/src/views/FileSystem.svelte

@@ -2,18 +2,16 @@
   import * as fs from "@tauri-apps/plugin-fs";
   import { convertFileSrc } from "@tauri-apps/api/core";
   import { arrayBufferToBase64 } from "../lib/utils";
-  import { onDestroy } from "svelte";
 
   export let onMessage;
   export let insecureRenderHtml;
 
   let path = "";
   let img;
-  /** @type {fs.FileHandle} */
   let file;
   let renameTo;
   let watchPath = "";
-  let watchDebounceDelay = "0";
+  let watchDebounceDelay = 0;
   let watchRecursive = false;
   let unwatchFn;
   let unwatchPath = "";
@@ -120,7 +118,7 @@
                     .getElementById("file-save")
                     .addEventListener("click", function () {
                       fs.writeTextFile(path, fileInput.value, {
-                        baseDir: getDir(),
+                        dir: getDir(),
                       }).catch(onMessage);
                     });
                 });
@@ -172,15 +170,6 @@
     unwatchFn = undefined;
     unwatchPath = undefined;
   }
-
-  onDestroy(() => {
-    if (file) {
-      file.close();
-    }
-    if (unwatchFn) {
-      unwatchFn();
-    }
-  })
 </script>
 
 <div class="flex flex-col">

examples/api/src/views/Updater.svelte

@@ -12,14 +12,10 @@
     isChecking = true
     try {
       const update = await check()
-      if (update) {
+      onMessage(`Should update: ${update.available}`)
-        onMessage(`Should update: ${update.available}`)
+      onMessage(update)
-        onMessage(update)
 
-        newUpdate = update
+      newUpdate = update
-      } else {
-        onMessage('No update available')
-      }
     } catch (e) {
       onMessage(e)
     } finally {

package.json

@@ -11,19 +11,19 @@
     "example:api:dev": "pnpm run --filter \"api\" tauri dev"
   },
   "devDependencies": {
-    "@eslint/js": "9.27.0",
+    "@eslint/js": "9.22.0",
     "@rollup/plugin-node-resolve": "16.0.1",
     "@rollup/plugin-terser": "0.4.4",
     "@rollup/plugin-typescript": "12.1.2",
     "covector": "^0.12.4",
-    "eslint": "9.27.0",
+    "eslint": "9.22.0",
-    "eslint-config-prettier": "10.1.5",
+    "eslint-config-prettier": "10.1.1",
     "eslint-plugin-security": "3.0.1",
     "prettier": "3.5.3",
-    "rollup": "4.41.0",
+    "rollup": "4.35.0",
     "tslib": "2.8.1",
-    "typescript": "5.8.3",
+    "typescript": "5.8.2",
-    "typescript-eslint": "8.32.1"
+    "typescript-eslint": "8.26.1"
   },
   "pnpm": {
     "overrides": {

plugins/autostart/CHANGELOG.md

@@ -1,9 +1,5 @@
 # Changelog
 
-## \[2.3.0]
-
-- [`8ecb418a`](https://github.com/tauri-apps/plugins-workspace/commit/8ecb418a1a35d7f234dc5d833746ac2d8e062aec) ([#2569](https://github.com/tauri-apps/plugins-workspace/pull/2569)) Add a `Builder` for more flexible settings
-
 ## \[2.2.0]
 
 - [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.

plugins/autostart/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-autostart"
-version = "2.3.0"
+version = "2.2.0"
 description = "Automatically launch your application at startup."
 authors = { workspace = true }
 license = { workspace = true }

plugins/autostart/README.md

@@ -57,9 +57,11 @@ First you need to register the core plugin with Tauri:
 `src-tauri/src/lib.rs`
 
 ```rust
+use tauri_plugin_autostart::MacosLauncher;
+
 fn main() {
     tauri::Builder::default()
-        .plugin(tauri_plugin_autostart::Builder::new().args((["--flag1", "--flag2"])).build()))
+        .plugin(tauri_plugin_autostart::init(MacosLauncher::LaunchAgent, Some(vec!["--flag1", "--flag2"]) /* arbitrary number of args to pass to your app */))
         .run(tauri::generate_context!())
         .expect("error while running tauri application");
 }

plugins/autostart/package.json

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

plugins/autostart/permissions/autogenerated/reference.md

@@ -11,8 +11,6 @@ disable the automatic start on boot.
 
 
 
-#### This default permission set includes the following:
-
 - `allow-enable`
 - `allow-disable`
 - `allow-is-enabled`

plugins/autostart/permissions/schemas/schema.json

@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "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. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "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. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -297,44 +297,37 @@
         {
           "description": "Enables the disable command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-disable",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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`",
+          "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",
           "type": "string",
-          "const": "default",
+          "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/src/lib.rs

@@ -14,7 +14,7 @@ use auto_launch::{AutoLaunch, AutoLaunchBuilder};
 use serde::{ser::Serializer, Serialize};
 use tauri::{
     command,
-    plugin::{Builder as PluginBuilder, TauriPlugin},
+    plugin::{Builder, TauriPlugin},
     Manager, Runtime, State,
 };
 
@@ -22,9 +22,8 @@ use std::env::current_exe;
 
 type Result<T> = std::result::Result<T, Error>;
 
-#[derive(Debug, Default, Copy, Clone)]
+#[derive(Debug, Copy, Clone)]
 pub enum MacosLauncher {
-    #[default]
     LaunchAgent,
     AppleScript,
 }
@@ -72,12 +71,10 @@ impl AutoLaunchManager {
 }
 
 pub trait ManagerExt<R: Runtime> {
-    /// TODO: Rename these to `autostart` or `auto_start` in v3
     fn autolaunch(&self) -> State<'_, AutoLaunchManager>;
 }
 
 impl<R: Runtime, T: Manager<R>> ManagerExt<R> for T {
-    /// TODO: Rename these to `autostart` or `auto_start` in v3
     fn autolaunch(&self) -> State<'_, AutoLaunchManager> {
         self.state::<AutoLaunchManager>()
     }
@@ -98,132 +95,59 @@ async fn is_enabled(manager: State<'_, AutoLaunchManager>) -> Result<bool> {
     manager.is_enabled()
 }
 
-#[derive(Default)]
-pub struct Builder {
-    #[cfg(target_os = "macos")]
-    macos_launcher: MacosLauncher,
-    args: Vec<String>,
-}
-
-impl Builder {
-    /// Create a new auto start builder with default settings
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    /// Adds an argument to pass to your app on startup.
-    ///
-    /// ## Examples
-    ///
-    /// ```no_run
-    /// Builder::new()
-    ///     .arg("--from-autostart")
-    ///     .arg("--hey")
-    ///     .build();
-    /// ```
-    pub fn arg<S: Into<String>>(mut self, arg: S) -> Self {
-        self.args.push(arg.into());
-        self
-    }
-
-    /// Adds multiple arguments to pass to your app on startup.
-    ///
-    /// ## Examples
-    ///
-    /// ```no_run
-    /// Builder::new()
-    ///     .args(["--from-autostart", "--hey"])
-    ///     .build();
-    /// ```
-    pub fn args<I, S>(mut self, args: I) -> Self
-    where
-        I: IntoIterator<Item = S>,
-        S: Into<String>,
-    {
-        for arg in args {
-            self = self.arg(arg);
-        }
-        self
-    }
-
-    /// Sets whether to use launch agent or apple script to be used to enable auto start,
-    /// the builder's default is [`MacosLauncher::LaunchAgent`]
-    #[cfg(target_os = "macos")]
-    pub fn macos_launcher(mut self, macos_launcher: MacosLauncher) -> Self {
-        self.macos_launcher = macos_launcher;
-        self
-    }
-
-    pub fn build<R: Runtime>(self) -> TauriPlugin<R> {
-        PluginBuilder::new("autostart")
-            .invoke_handler(tauri::generate_handler![enable, disable, is_enabled])
-            .setup(move |app, _api| {
-                let mut builder = AutoLaunchBuilder::new();
-                builder.set_app_name(&app.package_info().name);
-                builder.set_args(&self.args);
-
-                let current_exe = current_exe()?;
-
-                #[cfg(windows)]
-                builder.set_app_path(&current_exe.display().to_string());
-
-                #[cfg(target_os = "macos")]
-                {
-                    builder.set_use_launch_agent(matches!(
-                        self.macos_launcher,
-                        MacosLauncher::LaunchAgent
-                    ));
-                    // on macOS, current_exe gives path to /Applications/Example.app/MacOS/Example
-                    // but this results in seeing a Unix Executable in macOS login items
-                    // It must be: /Applications/Example.app
-                    // If it didn't find exactly a single occurance of .app, it will default to
-                    // exe path to not break it.
-                    let exe_path = current_exe.canonicalize()?.display().to_string();
-                    let parts: Vec<&str> = exe_path.split(".app/").collect();
-                    let app_path = if parts.len() == 2
-                        && matches!(self.macos_launcher, MacosLauncher::AppleScript)
-                    {
-                        format!("{}.app", parts.first().unwrap())
-                    } else {
-                        exe_path
-                    };
-                    builder.set_app_path(&app_path);
-                }
-
-                #[cfg(target_os = "linux")]
-                if let Some(appimage) = app
-                    .env()
-                    .appimage
-                    .and_then(|p| p.to_str().map(|s| s.to_string()))
-                {
-                    builder.set_app_path(&appimage);
-                } else {
-                    builder.set_app_path(&current_exe.display().to_string());
-                }
-
-                app.manage(AutoLaunchManager(
-                    builder.build().map_err(|e| e.to_string())?,
-                ));
-                Ok(())
-            })
-            .build()
-    }
-}
-
 /// Initializes the plugin.
 ///
 /// `args` - are passed to your app on startup.
 pub fn init<R: Runtime>(
-    #[allow(unused)] macos_launcher: MacosLauncher,
+    macos_launcher: MacosLauncher,
     args: Option<Vec<&'static str>>,
 ) -> TauriPlugin<R> {
-    let mut builder = Builder::new();
+    Builder::new("autostart")
-    if let Some(args) = args {
+        .invoke_handler(tauri::generate_handler![enable, disable, is_enabled])
-        builder = builder.args(args)
+        .setup(move |app, _api| {
-    }
+            let mut builder = AutoLaunchBuilder::new();
-    #[cfg(target_os = "macos")]
+            builder.set_app_name(&app.package_info().name);
-    {
+            if let Some(args) = args {
-        builder = builder.macos_launcher(macos_launcher);
+                builder.set_args(&args);
-    }
+            }
-    builder.build()
+            builder.set_use_launch_agent(matches!(macos_launcher, MacosLauncher::LaunchAgent));
+
+            let current_exe = current_exe()?;
+
+            #[cfg(windows)]
+            builder.set_app_path(&current_exe.display().to_string());
+            #[cfg(target_os = "macos")]
+            {
+                // on macOS, current_exe gives path to /Applications/Example.app/MacOS/Example
+                // but this results in seeing a Unix Executable in macOS login items
+                // It must be: /Applications/Example.app
+                // If it didn't find exactly a single occurance of .app, it will default to
+                // exe path to not break it.
+                let exe_path = current_exe.canonicalize()?.display().to_string();
+                let parts: Vec<&str> = exe_path.split(".app/").collect();
+                let app_path =
+                    if parts.len() == 2 && matches!(macos_launcher, MacosLauncher::AppleScript) {
+                        format!("{}.app", parts.first().unwrap())
+                    } else {
+                        exe_path
+                    };
+                builder.set_app_path(&app_path);
+            }
+            #[cfg(target_os = "linux")]
+            if let Some(appimage) = app
+                .env()
+                .appimage
+                .and_then(|p| p.to_str().map(|s| s.to_string()))
+            {
+                builder.set_app_path(&appimage);
+            } else {
+                builder.set_app_path(&current_exe.display().to_string());
+            }
+
+            app.manage(AutoLaunchManager(
+                builder.build().map_err(|e| e.to_string())?,
+            ));
+            Ok(())
+        })
+        .build()
 }

plugins/barcode-scanner/permissions/autogenerated/reference.md

@@ -9,8 +9,6 @@ It allows all barcode related features.
 
 
 
-#### This default permission set includes the following:
-
 - `allow-cancel`
 - `allow-check-permissions`
 - `allow-open-app-settings`

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

@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "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. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "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. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -297,80 +297,67 @@
         {
           "description": "Enables the cancel command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-cancel",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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`",
+          "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",
           "type": "string",
-          "const": "default",
+          "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/biometric/CHANGELOG.md

@@ -1,11 +1,5 @@
 # Changelog
 
-## \[2.2.1]
-
-### bug
-
-- [`10f9e66e`](https://github.com/tauri-apps/plugins-workspace/commit/10f9e66e32141dd35f4bf884fbf9102691187e92) ([#2633](https://github.com/tauri-apps/plugins-workspace/pull/2633) by [@pjf-dev](https://github.com/tauri-apps/plugins-workspace/../../pjf-dev)) Fix biometric plugin ignoring fallback logic when biometry status is unavailable or not enrolled on iOS.
-
 ## \[2.2.0]
 
 - [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.

plugins/biometric/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-biometric"
-version = "2.2.1"
+version = "2.2.0"
 description = "Prompt the user for biometric authentication on Android and iOS."
 edition = { workspace = true }
 authors = { workspace = true }

plugins/biometric/ios/Sources/BiometricPlugin.swift

@@ -98,12 +98,7 @@ class BiometricPlugin: Plugin {
   }
 
   @objc func authenticate(_ invoke: Invoke) throws {
-    let args = try invoke.parseArgs(AuthOptions.self)
+    guard self.status.available else {
-
-    let allowDeviceCredential = args.allowDeviceCredential ?? false
-
-    guard self.status.available || allowDeviceCredential else {
-      // Biometry unavailable, fallback disabled
       invoke.reject(
         self.status.errorReason ?? "",
         code: self.status.errorCode ?? ""
@@ -111,11 +106,15 @@ class BiometricPlugin: Plugin {
       return
     }
 
+    let args = try invoke.parseArgs(AuthOptions.self)
+
     let context = LAContext()
     context.localizedFallbackTitle = args.fallbackTitle
     context.localizedCancelTitle = args.cancelTitle
     context.touchIDAuthenticationAllowableReuseDuration = 0
 
+    let allowDeviceCredential = args.allowDeviceCredential ?? false
+
     // force system default fallback title if an empty string is provided (the OS hides the fallback button in this case)
     if allowDeviceCredential,
       let fallbackTitle = context.localizedFallbackTitle,

plugins/biometric/package.json

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

plugins/biometric/permissions/autogenerated/reference.md

@@ -9,8 +9,6 @@ It allows acccess to all biometric commands.
 
 
 
-#### This default permission set includes the following:
-
 - `allow-authenticate`
 - `allow-status`
 

plugins/biometric/permissions/schemas/schema.json

@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "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. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "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. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -297,32 +297,27 @@
         {
           "description": "Enables the authenticate command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-authenticate",
+          "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",
+          "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",
+          "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",
+          "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`",
+          "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",
           "type": "string",
-          "const": "default",
+          "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/cli/permissions/autogenerated/reference.md

@@ -2,8 +2,6 @@
 
 Allows reading the CLI matches
 
-#### This default permission set includes the following:
-
 - `allow-cli-matches`
 
 ## Permission Table

plugins/cli/permissions/schemas/schema.json

@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "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. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "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. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -297,20 +297,17 @@
         {
           "description": "Enables the cli_matches command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-cli-matches",
+          "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",
+          "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`",
+          "description": "Allows reading the CLI matches",
           "type": "string",
-          "const": "default",
+          "const": "default"
-          "markdownDescription": "Allows reading the CLI matches\n#### This default permission set includes:\n\n- `allow-cli-matches`"
         }
       ]
     }

plugins/clipboard-manager/permissions/autogenerated/reference.md

@@ -7,8 +7,6 @@ application specific if read and/or write access is needed.
 Clipboard interaction needs to be explicitly enabled.
 
 
-#### This default permission set includes the following:
-
 
 ## Permission Table
 

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

@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "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. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "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. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -297,80 +297,67 @@
         {
           "description": "Enables the clear command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-clear",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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/deep-link/CHANGELOG.md

@@ -1,17 +1,5 @@
 # Changelog
 
-## \[2.3.0]
-
-- [`4d10acee`](https://github.com/tauri-apps/plugins-workspace/commit/4d10acee61bad8045705508121424ed5f2d381f6) ([#993](https://github.com/tauri-apps/plugins-workspace/pull/993) by [@m00nwtchr](https://github.com/tauri-apps/plugins-workspace/../../m00nwtchr)) Exposed Android's `path`, `pathPattern` and `pathSuffix` configurations.
-- [`4d10acee`](https://github.com/tauri-apps/plugins-workspace/commit/4d10acee61bad8045705508121424ed5f2d381f6) ([#993](https://github.com/tauri-apps/plugins-workspace/pull/993) by [@m00nwtchr](https://github.com/tauri-apps/plugins-workspace/../../m00nwtchr)) Added a `scheme` configuration to set a scheme other than http/https. This is only supported on Android and will still default to http,https if not set.
-
-## \[2.2.1]
-
-### bug
-
-- [`38deef43`](https://github.com/tauri-apps/plugins-workspace/commit/38deef43dca9d5a09a38ed2da45b0f86c6afa1c5) ([#2483](https://github.com/tauri-apps/plugins-workspace/pull/2483)) Fix `is_registered` not being able to pickup deep link registered in `HKEY_LOCAL_MACHINE` on Windows
-- [`38deef43`](https://github.com/tauri-apps/plugins-workspace/commit/38deef43dca9d5a09a38ed2da45b0f86c6afa1c5) ([#2483](https://github.com/tauri-apps/plugins-workspace/pull/2483)) Fix `unregister` not being able to remove deep link registered in `HKEY_LOCAL_MACHINE` on Windows
-
 ## \[2.2.0]
 
 - [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.

plugins/deep-link/Cargo.toml

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

plugins/deep-link/build.rs

@@ -9,50 +9,25 @@ use config::{AssociatedDomain, Config};
 const COMMANDS: &[&str] = &["get_current", "register", "unregister", "is_registered"];
 
 // TODO: Consider using activity-alias in case users may have multiple activities in their app.
+// TODO: Do we want to support the other path* configs too?
 fn intent_filter(domain: &AssociatedDomain) -> String {
     format!(
         r#"<intent-filter android:autoVerify="true">
     <action android:name="android.intent.action.VIEW" />
     <category android:name="android.intent.category.DEFAULT" />
     <category android:name="android.intent.category.BROWSABLE" />
-    {}
+    <data android:scheme="http" />
+    <data android:scheme="https" />
     <data android:host="{}" />
     {}
-    {}
-    {}
-    {}
 </intent-filter>"#,
-        domain
-            .scheme
-            .iter()
-            .map(|scheme| format!(r#"<data android:scheme="{scheme}" />"#))
-            .collect::<Vec<_>>()
-            .join("\n    "),
         domain.host,
-        domain
-            .path
-            .iter()
-            .map(|path| format!(r#"<data android:path="{path}" />"#))
-            .collect::<Vec<_>>()
-            .join("\n    "),
-        domain
-            .path_pattern
-            .iter()
-            .map(|pattern| format!(r#"<data android:pathPattern="{pattern}" />"#))
-            .collect::<Vec<_>>()
-            .join("\n    "),
         domain
             .path_prefix
             .iter()
             .map(|prefix| format!(r#"<data android:pathPrefix="{prefix}" />"#))
             .collect::<Vec<_>>()
-            .join("\n    "),
+            .join("\n    ")
-        domain
-            .path_suffix
-            .iter()
-            .map(|suffix| format!(r#"<data android:pathSuffix="{suffix}" />"#))
-            .collect::<Vec<_>>()
-            .join("\n    "),
     )
 }
 

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

@@ -1,17 +1,5 @@
 # Changelog
 
-## \[2.2.2]
-
-### Dependencies
-
-- Upgraded to `deep-link-js@2.3.0`
-
-## \[2.2.1]
-
-### Dependencies
-
-- Upgraded to `deep-link-js@2.2.1`
-
 ## \[2.2.0]
 
 ### Dependencies

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

@@ -1,7 +1,7 @@
 {
   "name": "deep-link-example",
   "private": true,
-  "version": "2.2.2",
+  "version": "2.2.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -10,12 +10,12 @@
     "tauri": "tauri"
   },
   "dependencies": {
-    "@tauri-apps/api": "2.5.0",
+    "@tauri-apps/api": "2.3.0",
-    "@tauri-apps/plugin-deep-link": "2.3.0"
+    "@tauri-apps/plugin-deep-link": "2.2.0"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.5.0",
+    "@tauri-apps/cli": "2.3.1",
     "typescript": "^5.7.3",
-    "vite": "^6.2.6"
+    "vite": "^6.2.0"
   }
 }

plugins/deep-link/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-deep-link",
-  "version": "2.3.0",
+  "version": "2.2.0",
   "description": "Set your Tauri application as the default handler for an URL",
   "license": "MIT OR Apache-2.0",
   "authors": [

plugins/deep-link/permissions/autogenerated/reference.md

@@ -2,8 +2,6 @@
 
 Allows reading the opened deep link via the get_current command
 
-#### This default permission set includes the following:
-
 - `allow-get-current`
 
 ## Permission Table

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

@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "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. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "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. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -297,56 +297,47 @@
         {
           "description": "Enables the get_current command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-get-current",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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`",
+          "description": "Allows reading the opened deep link via the get_current command",
           "type": "string",
-          "const": "default",
+          "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/config.rs

@@ -9,25 +9,10 @@ use tauri_utils::config::DeepLinkProtocol;
 
 #[derive(Deserialize, Clone)]
 pub struct AssociatedDomain {
-    #[serde(default = "default_schemes")]
-    pub scheme: Vec<String>,
-
     #[serde(deserialize_with = "deserialize_associated_host")]
     pub host: String,
-
-    #[serde(default)]
-    pub path: Vec<String>,
-    #[serde(default, alias = "path-pattern", rename = "pathPattern")]
-    pub path_pattern: Vec<String>,
     #[serde(default, alias = "path-prefix", rename = "pathPrefix")]
     pub path_prefix: Vec<String>,
-    #[serde(default, alias = "path-suffix", rename = "pathSuffix")]
-    pub path_suffix: Vec<String>,
-}
-
-// TODO: Consider removing this in v3
-fn default_schemes() -> Vec<String> {
-    vec!["https".to_string(), "http".to_string()]
 }
 
 fn deserialize_associated_host<'de, D>(deserializer: D) -> Result<String, D::Error>

plugins/deep-link/src/lib.rs

@@ -114,8 +114,8 @@ mod imp {
         /// ## Platform-specific:
         ///
         /// - **Windows / Linux**: This function reads the command line arguments and checks if there's only one value, which must be an URL with scheme matching one of the configured values.
-        ///   Note that you must manually check the arguments when registering deep link schemes dynamically with [`Self::register`].
+        ///     Note that you must manually check the arguments when registering deep link schemes dynamically with [`Self::register`].
-        ///   Additionally, the deep link might have been provided as a CLI argument so you should check if its format matches what you expect.
+        ///     Additionally, the deep link might have been provided as a CLI argument so you should check if its format matches what you expect.
         pub fn get_current(&self) -> crate::Result<Option<Vec<url::Url>>> {
             self.plugin_handle
                 .run_mobile_plugin::<GetCurrentResponse>("getCurrent", ())
@@ -172,7 +172,7 @@ mod imp {
     use tauri::Manager;
     use tauri::{AppHandle, Runtime};
     #[cfg(windows)]
-    use windows_registry::{CLASSES_ROOT, CURRENT_USER, LOCAL_MACHINE};
+    use windows_registry::CURRENT_USER;
 
     /// Access to the deep-link APIs.
     pub struct DeepLink<R: Runtime> {
@@ -226,8 +226,8 @@ mod imp {
         /// ## Platform-specific:
         ///
         /// - **Windows / Linux**: This function reads the command line arguments and checks if there's only one value, which must be an URL with scheme matching one of the configured values.
-        ///   Note that you must manually check the arguments when registering deep link schemes dynamically with [`Self::register`].
+        ///     Note that you must manually check the arguments when registering deep link schemes dynamically with [`Self::register`].
-        ///   Additionally, the deep link might have been provided as a CLI argument so you should check if its format matches what you expect.
+        ///     Additionally, the deep link might have been provided as a CLI argument so you should check if its format matches what you expect.
         pub fn get_current(&self) -> crate::Result<Option<Vec<url::Url>>> {
             return Ok(self.current.lock().unwrap().clone());
         }
@@ -258,8 +258,7 @@ mod imp {
         pub fn register<S: AsRef<str>>(&self, _protocol: S) -> crate::Result<()> {
             #[cfg(windows)]
             {
-                let protocol = _protocol.as_ref();
+                let key_base = format!("Software\\Classes\\{}", _protocol.as_ref());
-                let key_base = format!("Software\\Classes\\{protocol}");
 
                 let exe = dunce::simplified(&tauri::utils::platform::current_exe()?)
                     .display()
@@ -349,21 +348,13 @@ mod imp {
         ///
         /// ## Platform-specific:
         ///
-        /// - **Windows**: Requires admin rights if the protocol is registered on local machine
-        ///   (this can happen when registered from the NSIS installer when the install mode is set to both or per machine)
         /// - **Linux**: Can only unregister the scheme if it was initially registered with [`register`](`Self::register`). May not work on older distros.
         /// - **macOS / Android / iOS**: Unsupported, will return [`Error::UnsupportedPlatform`](`crate::Error::UnsupportedPlatform`).
         pub fn unregister<S: AsRef<str>>(&self, _protocol: S) -> crate::Result<()> {
             #[cfg(windows)]
             {
-                let protocol = _protocol.as_ref();
+                CURRENT_USER.remove_tree(format!("Software\\Classes\\{}", _protocol.as_ref()))?;
-                let path = format!("Software\\Classes\\{protocol}");
+
-                if LOCAL_MACHINE.open(&path).is_ok() {
-                    LOCAL_MACHINE.remove_tree(&path)?;
-                }
-                if CURRENT_USER.open(&path).is_ok() {
-                    CURRENT_USER.remove_tree(&path)?;
-                }
                 Ok(())
             }
 
@@ -407,11 +398,10 @@ mod imp {
         pub fn is_registered<S: AsRef<str>>(&self, _protocol: S) -> crate::Result<bool> {
             #[cfg(windows)]
             {
-                let protocol = _protocol.as_ref();
+                let cmd_reg = CURRENT_USER.open(format!(
-                let Ok(cmd_reg) = CLASSES_ROOT.open(format!("{protocol}\\shell\\open\\command"))
+                    "Software\\Classes\\{}\\shell\\open\\command",
-                else {
+                    _protocol.as_ref()
-                    return Ok(false);
+                ))?;
-                };
 
                 let registered_cmd = cmd_reg.get_string("")?;
 

plugins/dialog/CHANGELOG.md

@@ -1,17 +1,5 @@
 # Changelog
 
-## \[2.2.2]
-
-### Dependencies
-
-- Upgraded to `fs-js@2.3.0`
-
-## \[2.2.1]
-
-### Dependencies
-
-- Upgraded to `fs-js@2.2.1`
-
 ## \[2.2.0]
 
 - [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.

plugins/dialog/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-dialog"
-version = "2.2.2"
+version = "2.2.0"
 description = "Native system dialogs for opening and saving files along with message dialogs on your Tauri application."
 edition = { workspace = true }
 authors = { workspace = true }
@@ -34,7 +34,7 @@ tauri = { workspace = true }
 log = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
-tauri-plugin-fs = { path = "../fs", version = "2.3.0" }
+tauri-plugin-fs = { path = "../fs", version = "2.2.0" }
 
 [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.2.2",
+  "version": "2.2.0",
   "license": "MIT OR Apache-2.0",
   "authors": [
     "Tauri Programme within The Commons Conservancy"

plugins/dialog/permissions/autogenerated/reference.md

@@ -10,8 +10,6 @@ All dialog types are enabled.
 
 
 
-#### This default permission set includes the following:
-
 - `allow-ask`
 - `allow-confirm`
 - `allow-message`

plugins/dialog/permissions/schemas/schema.json

@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "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. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "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. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -297,68 +297,57 @@
         {
           "description": "Enables the ask command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-ask",
+          "const": "allow-ask"
-          "markdownDescription": "Enables the ask command without any pre-configured scope."
         },
         {
           "description": "Denies the ask command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-ask",
+          "const": "deny-ask"
-          "markdownDescription": "Denies the ask command without any pre-configured scope."
         },
         {
           "description": "Enables the confirm command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-confirm",
+          "const": "allow-confirm"
-          "markdownDescription": "Enables the confirm command without any pre-configured scope."
         },
         {
           "description": "Denies the confirm command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-confirm",
+          "const": "deny-confirm"
-          "markdownDescription": "Denies the confirm command without any pre-configured scope."
         },
         {
           "description": "Enables the message command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-message",
+          "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",
+          "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",
+          "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",
+          "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",
+          "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",
+          "const": "deny-save"
-          "markdownDescription": "Denies the save command without any pre-configured scope."
         },
         {
-          "description": "This permission set configures the types of dialogs\navailable from the dialog plugin.\n\n#### Granted Permissions\n\nAll dialog types are enabled.\n\n\n\n#### This default permission set includes:\n\n- `allow-ask`\n- `allow-confirm`\n- `allow-message`\n- `allow-save`\n- `allow-open`",
+          "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",
           "type": "string",
-          "const": "default",
+          "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-ask`\n- `allow-confirm`\n- `allow-message`\n- `allow-save`\n- `allow-open`"
         }
       ]
     }

plugins/fs/CHANGELOG.md

@@ -1,15 +1,5 @@
 # Changelog
 
-## \[2.3.0]
-
-- [`dac4d537`](https://github.com/tauri-apps/plugins-workspace/commit/dac4d53724bb3430a00a3f0119857cba32a031e8) ([#2613](https://github.com/tauri-apps/plugins-workspace/pull/2613) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Reduce the overhead of `watch` and `unwatch`
-
-## \[2.2.1]
-
-### bug
-
-- [`831c35ff`](https://github.com/tauri-apps/plugins-workspace/commit/831c35ff3940e841fe4418bb4cb104038b03304b) ([#2550](https://github.com/tauri-apps/plugins-workspace/pull/2550)) Fix `writeFile` ReadableStream handling due to missing async iterator support on macOS platform
-
 ## \[2.2.0]
 
 - [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.

plugins/fs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-fs"
-version = "2.3.0"
+version = "2.2.0"
 description = "Access the file system."
 authors = { workspace = true }
 license = { workspace = true }
@@ -14,7 +14,7 @@ rustc-args = ["--cfg", "docsrs"]
 rustdoc-args = ["--cfg", "docsrs"]
 
 [package.metadata.platforms.support]
-windows = { level = "full", notes = "Apps installed via MSI or NSIS in `perMachine` and `both` mode require admin permissions for write access in `$RESOURCES` folder" }
+windows = { level = "full", notes = "Apps installed via MSI or NSIS in `perMachine` and `both` mode require admin permissions for write acces in `$RESOURCES` folder" }
 linux = { level = "full", notes = "No write access to `$RESOURCES` folder" }
 macos = { level = "full", notes = "No write access to `$RESOURCES` folder" }
 android = { level = "partial", notes = "Access is restricted to Application folder by default" }
@@ -35,6 +35,7 @@ tauri = { workspace = true }
 thiserror = { workspace = true }
 url = { workspace = true }
 anyhow = "1"
+uuid = { version = "1", features = ["v4"] }
 glob = { workspace = true }
 # TODO: Remove `serialization-compat-6` in v3
 notify = { version = "8", optional = true, features = [

plugins/fs/README.md

@@ -68,9 +68,9 @@ fn main() {
 Afterwards all the plugin's APIs are available through the JavaScript guest bindings:
 
 ```javascript
-import { stat } from '@tauri-apps/plugin-fs'
+import { metadata } from '@tauri-apps/plugin-fs'
 
-await stat('/path/to/file')
+await metadata('/path/to/file')
 ```
 
 ## Contributing

plugins/fs/build.rs

@@ -101,7 +101,6 @@ const COMMANDS: &[(&str, &[&str])] = &[
     ("fstat", &[]),
     ("exists", &[]),
     ("watch", &[]),
-    // TODO: Remove this in v3
     ("unwatch", &[]),
     ("size", &[]),
 ];

plugins/fs/guest-js/index.ts

@@ -1075,18 +1075,10 @@ async function writeFile(
 
   if (data instanceof ReadableStream) {
     const file = await open(path, options)
-    const reader = data.getReader()
+    for await (const chunk of data) {
-
+      await file.write(chunk)
-    try {
-      while (true) {
-        const { done, value } = await reader.read()
-        if (done) break
-        await file.write(value)
-      }
-    } finally {
-      reader.releaseLock()
-      await file.close()
     }
+    await file.close()
   } else {
     await invoke('plugin:fs|write_file', data, {
       headers: {
@@ -1245,19 +1237,31 @@ type WatchEventKindRemove =
   | { kind: 'folder' }
   | { kind: 'other' }
 
-// TODO: Remove this in v3, return `Watcher` instead
 /**
  * @since 2.0.0
  */
 type UnwatchFn = () => void
 
-class Watcher extends Resource {}
+async function unwatch(rid: number): Promise<void> {
+  await invoke('plugin:fs|unwatch', { rid })
+}
 
-async function watchInternal(
+/**
+ * Watch changes (after a delay) on files or directories.
+ *
+ * @since 2.0.0
+ */
+async function watch(
   paths: string | string[] | URL | URL[],
   cb: (event: WatchEvent) => void,
-  options: DebouncedWatchOptions
+  options?: DebouncedWatchOptions
 ): Promise<UnwatchFn> {
+  const opts = {
+    recursive: false,
+    delayMs: 2000,
+    ...options
+  }
+
   const watchPaths = Array.isArray(paths) ? paths : [paths]
 
   for (const path of watchPaths) {
@@ -1271,35 +1275,15 @@ async function watchInternal(
 
   const rid: number = await invoke('plugin:fs|watch', {
     paths: watchPaths.map((p) => (p instanceof URL ? p.toString() : p)),
-    options,
+    options: opts,
     onEvent
   })
 
-  const watcher = new Watcher(rid)
-
   return () => {
-    void watcher.close()
+    void unwatch(rid)
   }
 }
 
-// TODO: Return `Watcher` instead in v3
-/**
- * Watch changes (after a delay) on files or directories.
- *
- * @since 2.0.0
- */
-async function watch(
-  paths: string | string[] | URL | URL[],
-  cb: (event: WatchEvent) => void,
-  options?: DebouncedWatchOptions
-): Promise<UnwatchFn> {
-  return await watchInternal(paths, cb, {
-    delayMs: 2000,
-    ...options
-  })
-}
-
-// TODO: Return `Watcher` instead in v3
 /**
  * Watch changes on files or directories.
  *
@@ -1310,10 +1294,32 @@ async function watchImmediate(
   cb: (event: WatchEvent) => void,
   options?: WatchOptions
 ): Promise<UnwatchFn> {
-  return await watchInternal(paths, cb, {
+  const opts = {
+    recursive: false,
     ...options,
-    delayMs: undefined
+    delayMs: null
+  }
+
+  const watchPaths = Array.isArray(paths) ? paths : [paths]
+
+  for (const path of watchPaths) {
+    if (path instanceof URL && path.protocol !== 'file:') {
+      throw new TypeError('Must be a file URL.')
+    }
+  }
+
+  const onEvent = new Channel<WatchEvent>()
+  onEvent.onmessage = cb
+
+  const rid: number = await invoke('plugin:fs|watch', {
+    paths: watchPaths.map((p) => (p instanceof URL ? p.toString() : p)),
+    options: opts,
+    onEvent
   })
+
+  return () => {
+    void unwatch(rid)
+  }
 }
 
 /**

plugins/fs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-fs",
-  "version": "2.3.0",
+  "version": "2.2.0",
   "description": "Access the file system.",
   "license": "MIT OR Apache-2.0",
   "authors": [

plugins/fs/permissions/autogenerated/reference.md

@@ -24,8 +24,8 @@ This default permission set prevents access to critical components
 of the Tauri application by default.
 On Windows the webview data folder access is denied.
 
+#### Included permissions within this default permission set:
 
-#### This default permission set includes the following:
 
 - `create-app-specific-dirs`
 - `read-app-specific-dirs-recursive`

plugins/fs/permissions/default.toml

@@ -25,6 +25,8 @@ the `mkdir` command.
 This default permission set prevents access to critical components
 of the Tauri application by default.
 On Windows the webview data folder access is denied.
+
+#### Included permissions within this default permission set:
 """
 permissions = [
   "create-app-specific-dirs",

plugins/fs/src/commands.rs

@@ -150,6 +150,11 @@ pub fn open<R: Runtime>(
     Ok(rid)
 }
 
+#[tauri::command]
+pub fn close<R: Runtime>(webview: Webview<R>, rid: ResourceId) -> CommandResult<()> {
+    webview.resources_table().close(rid).map_err(Into::into)
+}
+
 #[derive(Debug, Clone, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct CopyFileOptions {

plugins/fs/src/lib.rs

@@ -397,6 +397,7 @@ pub fn init<R: Runtime>() -> TauriPlugin<R, Option<config::Config>> {
             commands::create,
             commands::open,
             commands::copy_file,
+            commands::close,
             commands::mkdir,
             commands::read_dir,
             commands::read,
@@ -419,6 +420,8 @@ pub fn init<R: Runtime>() -> TauriPlugin<R, Option<config::Config>> {
             commands::size,
             #[cfg(feature = "watch")]
             watcher::watch,
+            #[cfg(feature = "watch")]
+            watcher::unwatch
         ])
         .setup(|app, api| {
             let scope = Scope {

plugins/fs/src/watcher.rs

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use notify::{Config, RecommendedWatcher, RecursiveMode, Watcher};
+use notify::{Config, Event, RecommendedWatcher, RecursiveMode, Watcher};
-use notify_debouncer_full::{new_debouncer, DebouncedEvent, Debouncer, RecommendedCache};
+use notify_debouncer_full::{new_debouncer, DebounceEventResult, Debouncer, RecommendedCache};
 use serde::Deserialize;
 use tauri::{
     ipc::{Channel, CommandScope, GlobalScope},
@@ -11,7 +11,15 @@ use tauri::{
     Manager, Resource, ResourceId, Runtime, Webview,
 };
 
-use std::time::Duration;
+use std::{
+    path::PathBuf,
+    sync::{
+        mpsc::{channel, Receiver},
+        Mutex,
+    },
+    thread::spawn,
+    time::Duration,
+};
 
 use crate::{
     commands::{resolve_path, CommandResult},
@@ -19,44 +27,79 @@ use crate::{
     SafeFilePath,
 };
 
-#[allow(unused)]
+struct InnerWatcher {
+    pub kind: WatcherKind,
+    paths: Vec<PathBuf>,
+}
+
+pub struct WatcherResource(Mutex<InnerWatcher>);
+impl WatcherResource {
+    fn new(kind: WatcherKind, paths: Vec<PathBuf>) -> Self {
+        Self(Mutex::new(InnerWatcher { kind, paths }))
+    }
+
+    fn with_lock<R, F: FnMut(&mut InnerWatcher) -> R>(&self, mut f: F) -> R {
+        let mut watcher = self.0.lock().unwrap();
+        f(&mut watcher)
+    }
+}
+
+impl Resource for WatcherResource {}
+
 enum WatcherKind {
     Debouncer(Debouncer<RecommendedWatcher, RecommendedCache>),
     Watcher(RecommendedWatcher),
 }
 
-impl Resource for WatcherKind {}
+fn watch_raw(on_event: Channel<Event>, rx: Receiver<notify::Result<Event>>) {
+    spawn(move || {
+        while let Ok(event) = rx.recv() {
+            if let Ok(event) = event {
+                // TODO: Should errors be emitted too?
+                let _ = on_event.send(event);
+            }
+        }
+    });
+}
+
+fn watch_debounced(on_event: Channel<Event>, rx: Receiver<DebounceEventResult>) {
+    spawn(move || {
+        while let Ok(Ok(events)) = rx.recv() {
+            for event in events {
+                // TODO: Should errors be emitted too?
+                let _ = on_event.send(event.event);
+            }
+        }
+    });
+}
 
 #[derive(Clone, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct WatchOptions {
     base_dir: Option<BaseDirectory>,
-    #[serde(default)]
     recursive: bool,
     delay_ms: Option<u64>,
 }
 
 #[tauri::command]
-pub fn watch<R: Runtime>(
+pub async fn watch<R: Runtime>(
     webview: Webview<R>,
     paths: Vec<SafeFilePath>,
     options: WatchOptions,
-    on_event: Channel<notify::Event>,
+    on_event: Channel<Event>,
     global_scope: GlobalScope<Entry>,
     command_scope: CommandScope<Entry>,
 ) -> CommandResult<ResourceId> {
-    let resolved_paths = paths
+    let mut resolved_paths = Vec::with_capacity(paths.capacity());
-        .into_iter()
+    for path in paths {
-        .map(|path| {
+        resolved_paths.push(resolve_path(
-            resolve_path(
+            &webview,
-                &webview,
+            &global_scope,
-                &global_scope,
+            &command_scope,
-                &command_scope,
+            path,
-                path,
+            options.base_dir,
-                options.base_dir,
+        )?);
-            )
+    }
-        })
-        .collect::<CommandResult<Vec<_>>>()?;
 
     let recursive_mode = if options.recursive {
         RecursiveMode::Recursive
@@ -64,40 +107,52 @@ pub fn watch<R: Runtime>(
         RecursiveMode::NonRecursive
     };
 
-    let watcher_kind = if let Some(delay) = options.delay_ms {
+    let kind = if let Some(delay) = options.delay_ms {
-        let mut debouncer = new_debouncer(
+        let (tx, rx) = channel();
-            Duration::from_millis(delay),
+        let mut debouncer = new_debouncer(Duration::from_millis(delay), None, tx)?;
-            None,
-            move |events: Result<Vec<DebouncedEvent>, Vec<notify::Error>>| {
-                if let Ok(events) = events {
-                    for event in events {
-                        // TODO: Should errors be emitted too?
-                        let _ = on_event.send(event.event);
-                    }
-                }
-            },
-        )?;
         for path in &resolved_paths {
             debouncer.watch(path, recursive_mode)?;
         }
+        watch_debounced(on_event, rx);
         WatcherKind::Debouncer(debouncer)
     } else {
-        let mut watcher = RecommendedWatcher::new(
+        let (tx, rx) = channel();
-            move |event| {
+        let mut watcher = RecommendedWatcher::new(tx, Config::default())?;
-                if let Ok(event) = event {
-                    // TODO: Should errors be emitted too?
-                    let _ = on_event.send(event);
-                }
-            },
-            Config::default(),
-        )?;
         for path in &resolved_paths {
             watcher.watch(path, recursive_mode)?;
         }
+        watch_raw(on_event, rx);
         WatcherKind::Watcher(watcher)
     };
 
-    let rid = webview.resources_table().add(watcher_kind);
+    let rid = webview
+        .resources_table()
+        .add(WatcherResource::new(kind, resolved_paths));
 
     Ok(rid)
 }
+
+#[tauri::command]
+pub async fn unwatch<R: Runtime>(webview: Webview<R>, rid: ResourceId) -> CommandResult<()> {
+    let watcher = webview.resources_table().take::<WatcherResource>(rid)?;
+    WatcherResource::with_lock(&watcher, |watcher| {
+        match &mut watcher.kind {
+            WatcherKind::Debouncer(ref mut debouncer) => {
+                for path in &watcher.paths {
+                    debouncer.unwatch(path).map_err(|e| {
+                        format!("failed to unwatch path: {} with error: {e}", path.display())
+                    })?;
+                }
+            }
+            WatcherKind::Watcher(ref mut w) => {
+                for path in &watcher.paths {
+                    w.unwatch(path).map_err(|e| {
+                        format!("failed to unwatch path: {} with error: {e}", path.display())
+                    })?;
+                }
+            }
+        }
+
+        Ok(())
+    })
+}

plugins/geolocation/api-iife.js

@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_GEOLOCATION__=function(t){"use strict";function n(t,n,e,i){if("function"==typeof n||!n.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===e?i:"a"===e?i.call(t):i?i.value:n.get(t)}function e(t,n,e,i,s){if("function"==typeof n||!n.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return n.set(t,e),e}var i,s,o,r;"function"==typeof SuppressedError&&SuppressedError;const a="__TAURI_TO_IPC_KEY__";class c{constructor(t){i.set(this,void 0),s.set(this,0),o.set(this,[]),r.set(this,void 0),e(this,i,t||(()=>{})),this.id=function(t,n=!1){return window.__TAURI_INTERNALS__.transformCallback(t,n)}((t=>{const a=t.index;if("end"in t)return void(a==n(this,s,"f")?this.cleanupCallback():e(this,r,a));const c=t.message;if(a==n(this,s,"f")){for(n(this,i,"f").call(this,c),e(this,s,n(this,s,"f")+1);n(this,s,"f")in n(this,o,"f");){const t=n(this,o,"f")[n(this,s,"f")];n(this,i,"f").call(this,t),delete n(this,o,"f")[n(this,s,"f")],e(this,s,n(this,s,"f")+1)}n(this,s,"f")===n(this,r,"f")&&this.cleanupCallback()}else n(this,o,"f")[a]=c}))}cleanupCallback(){Reflect.deleteProperty(window,`_${this.id}`)}set onmessage(t){e(this,i,t)}get onmessage(){return n(this,i,"f")}[(i=new WeakMap,s=new WeakMap,o=new WeakMap,r=new WeakMap,a)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[a]()}}async function _(t,n={},e){return window.__TAURI_INTERNALS__.invoke(t,n,e)}return t.checkPermissions=async function(){return await async function(t){return _(`plugin:${t}|check_permissions`)}("geolocation")},t.clearWatch=async function(t){await _("plugin:geolocation|clear_watch",{channelId:t})},t.getCurrentPosition=async function(t){return await _("plugin:geolocation|get_current_position",{options:t})},t.requestPermissions=async function(t){return await _("plugin:geolocation|request_permissions",{permissions:t})},t.watchPosition=async function(t,n){const e=new c;return e.onmessage=t=>{"string"==typeof t?n(null,t):n(t)},await _("plugin:geolocation|watch_position",{options:t,channel:e}),e.id},t}({});Object.defineProperty(window.__TAURI__,"geolocation",{value:__TAURI_PLUGIN_GEOLOCATION__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_GEOLOCATION__=function(t){"use strict";function n(t,n,e,i){if("function"==typeof n||!n.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===e?i:"a"===e?i.call(t):i?i.value:n.get(t)}function e(t,n,e,i,s){if("function"==typeof n||!n.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return n.set(t,e),e}var i,s,o;"function"==typeof SuppressedError&&SuppressedError;const r="__TAURI_TO_IPC_KEY__";class a{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,i.set(this,(()=>{})),s.set(this,0),o.set(this,[]),this.id=function(t,n=!1){return window.__TAURI_INTERNALS__.transformCallback(t,n)}((({message:t,id:r})=>{if(r==n(this,s,"f"))for(n(this,i,"f").call(this,t),e(this,s,n(this,s,"f")+1);n(this,s,"f")in n(this,o,"f");){const t=n(this,o,"f")[n(this,s,"f")];n(this,i,"f").call(this,t),delete n(this,o,"f")[n(this,s,"f")],e(this,s,n(this,s,"f")+1)}else n(this,o,"f")[r]=t}))}set onmessage(t){e(this,i,t)}get onmessage(){return n(this,i,"f")}[(i=new WeakMap,s=new WeakMap,o=new WeakMap,r)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[r]()}}async function c(t,n={},e){return window.__TAURI_INTERNALS__.invoke(t,n,e)}return t.checkPermissions=async function(){return await async function(t){return c(`plugin:${t}|check_permissions`)}("geolocation")},t.clearWatch=async function(t){await c("plugin:geolocation|clear_watch",{channelId:t})},t.getCurrentPosition=async function(t){return await c("plugin:geolocation|get_current_position",{options:t})},t.requestPermissions=async function(t){return await c("plugin:geolocation|request_permissions",{permissions:t})},t.watchPosition=async function(t,n){const e=new a;return e.onmessage=t=>{"string"==typeof t?n(null,t):n(t)},await c("plugin:geolocation|watch_position",{options:t,channel:e}),e.id},t}({});Object.defineProperty(window.__TAURI__,"geolocation",{value:__TAURI_PLUGIN_GEOLOCATION__})}

plugins/geolocation/permissions/schemas/schema.json

@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "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. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "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. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -297,74 +297,62 @@
         {
           "description": "Enables the check_permissions command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-check-permissions",
+          "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",
+          "const": "deny-check-permissions"
-          "markdownDescription": "Denies the check_permissions command without any pre-configured scope."
         },
         {
           "description": "Enables the clear_permissions command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-clear-permissions",
+          "const": "allow-clear-permissions"
-          "markdownDescription": "Enables the clear_permissions command without any pre-configured scope."
         },
         {
           "description": "Denies the clear_permissions command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-clear-permissions",
+          "const": "deny-clear-permissions"
-          "markdownDescription": "Denies the clear_permissions command without any pre-configured scope."
         },
         {
           "description": "Enables the clear_watch command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-clear-watch",
+          "const": "allow-clear-watch"
-          "markdownDescription": "Enables the clear_watch command without any pre-configured scope."
         },
         {
           "description": "Denies the clear_watch command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-clear-watch",
+          "const": "deny-clear-watch"
-          "markdownDescription": "Denies the clear_watch command without any pre-configured scope."
         },
         {
           "description": "Enables the get_current_position command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-get-current-position",
+          "const": "allow-get-current-position"
-          "markdownDescription": "Enables the get_current_position command without any pre-configured scope."
         },
         {
           "description": "Denies the get_current_position command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-get-current-position",
+          "const": "deny-get-current-position"
-          "markdownDescription": "Denies the get_current_position command without any pre-configured scope."
         },
         {
           "description": "Enables the request_permissions command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-request-permissions",
+          "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",
+          "const": "deny-request-permissions"
-          "markdownDescription": "Denies the request_permissions command without any pre-configured scope."
         },
         {
           "description": "Enables the watch_position command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-watch-position",
+          "const": "allow-watch-position"
-          "markdownDescription": "Enables the watch_position command without any pre-configured scope."
         },
         {
           "description": "Denies the watch_position command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-watch-position",
+          "const": "deny-watch-position"
-          "markdownDescription": "Denies the watch_position command without any pre-configured scope."
         }
       ]
     }

plugins/global-shortcut/CHANGELOG.md

@@ -1,9 +1,5 @@
 # Changelog
 
-## \[2.2.1]
-
-- [`494d1fea`](https://github.com/tauri-apps/plugins-workspace/commit/494d1fea137ffd60da98b25305c9d666df62cc63) ([#2684](https://github.com/tauri-apps/plugins-workspace/pull/2684) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated `global-hotkey` crate to `0.7` to fix a panic when trying to register a key combination which was already registered by another program. No API changes.
-
 ## \[2.2.0]
 
 - [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.

plugins/global-shortcut/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-global-shortcut"
-version = "2.2.1"
+version = "2.2.0"
 description = "Register global hotkeys listeners on your Tauri application."
 edition = { workspace = true }
 authors = { workspace = true }
@@ -31,4 +31,4 @@ log = { workspace = true }
 thiserror = { workspace = true }
 
 [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies]
-global-hotkey = { version = "0.7", features = ["serde"] }
+global-hotkey = { version = "0.6", features = ["serde"] }

plugins/global-shortcut/api-iife.js

@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_GLOBAL_SHORTCUT__=function(t){"use strict";function e(t,e,s,i){if("function"==typeof e||!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===s?i:"a"===s?i.call(t):i?i.value:e.get(t)}function s(t,e,s,i,r){if("function"==typeof e||!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return e.set(t,s),s}var i,r,n,a;"function"==typeof SuppressedError&&SuppressedError;const o="__TAURI_TO_IPC_KEY__";class c{constructor(t){i.set(this,void 0),r.set(this,0),n.set(this,[]),a.set(this,void 0),s(this,i,t||(()=>{})),this.id=function(t,e=!1){return window.__TAURI_INTERNALS__.transformCallback(t,e)}((t=>{const o=t.index;if("end"in t)return void(o==e(this,r,"f")?this.cleanupCallback():s(this,a,o));const c=t.message;if(o==e(this,r,"f")){for(e(this,i,"f").call(this,c),s(this,r,e(this,r,"f")+1);e(this,r,"f")in e(this,n,"f");){const t=e(this,n,"f")[e(this,r,"f")];e(this,i,"f").call(this,t),delete e(this,n,"f")[e(this,r,"f")],s(this,r,e(this,r,"f")+1)}e(this,r,"f")===e(this,a,"f")&&this.cleanupCallback()}else e(this,n,"f")[o]=c}))}cleanupCallback(){Reflect.deleteProperty(window,`_${this.id}`)}set onmessage(t){s(this,i,t)}get onmessage(){return e(this,i,"f")}[(i=new WeakMap,r=new WeakMap,n=new WeakMap,a=new WeakMap,o)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[o]()}}async function u(t,e={},s){return window.__TAURI_INTERNALS__.invoke(t,e,s)}return t.isRegistered=async function(t){return await u("plugin:global-shortcut|is_registered",{shortcut:t})},t.register=async function(t,e){const s=new c;return s.onmessage=e,await u("plugin:global-shortcut|register",{shortcuts:Array.isArray(t)?t:[t],handler:s})},t.unregister=async function(t){return await u("plugin:global-shortcut|unregister",{shortcuts:Array.isArray(t)?t:[t]})},t.unregisterAll=async function(){return await u("plugin:global-shortcut|unregister_all",{})},t}({});Object.defineProperty(window.__TAURI__,"globalShortcut",{value:__TAURI_PLUGIN_GLOBAL_SHORTCUT__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_GLOBAL_SHORTCUT__=function(t){"use strict";function e(t,e,r,s){if("function"==typeof e||!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===r?s:"a"===r?s.call(t):s?s.value:e.get(t)}function r(t,e,r,s,i){if("function"==typeof e||!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return e.set(t,r),r}var s,i,n;"function"==typeof SuppressedError&&SuppressedError;const o="__TAURI_TO_IPC_KEY__";class a{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,s.set(this,(()=>{})),i.set(this,0),n.set(this,[]),this.id=function(t,e=!1){return window.__TAURI_INTERNALS__.transformCallback(t,e)}((({message:t,id:o})=>{if(o==e(this,i,"f"))for(e(this,s,"f").call(this,t),r(this,i,e(this,i,"f")+1);e(this,i,"f")in e(this,n,"f");){const t=e(this,n,"f")[e(this,i,"f")];e(this,s,"f").call(this,t),delete e(this,n,"f")[e(this,i,"f")],r(this,i,e(this,i,"f")+1)}else e(this,n,"f")[o]=t}))}set onmessage(t){r(this,s,t)}get onmessage(){return e(this,s,"f")}[(s=new WeakMap,i=new WeakMap,n=new WeakMap,o)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[o]()}}async function _(t,e={},r){return window.__TAURI_INTERNALS__.invoke(t,e,r)}return t.isRegistered=async function(t){return await _("plugin:global-shortcut|is_registered",{shortcut:t})},t.register=async function(t,e){const r=new a;return r.onmessage=e,await _("plugin:global-shortcut|register",{shortcuts:Array.isArray(t)?t:[t],handler:r})},t.unregister=async function(t){return await _("plugin:global-shortcut|unregister",{shortcuts:Array.isArray(t)?t:[t]})},t.unregisterAll=async function(){return await _("plugin:global-shortcut|unregister_all",{})},t}({});Object.defineProperty(window.__TAURI__,"globalShortcut",{value:__TAURI_PLUGIN_GLOBAL_SHORTCUT__})}

plugins/global-shortcut/package.json

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

plugins/global-shortcut/permissions/autogenerated/reference.md

@@ -6,8 +6,6 @@ application specific if specific shortcuts should be
 registered or unregistered.
 
 
-#### This default permission set includes the following:
-
 
 ## Permission Table
 

plugins/global-shortcut/permissions/schemas/schema.json

@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "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. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "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. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -297,68 +297,57 @@
         {
           "description": "Enables the is_registered command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-is-registered",
+          "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",
+          "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",
+          "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",
+          "const": "deny-register"
-          "markdownDescription": "Denies the register command without any pre-configured scope."
         },
         {
           "description": "Enables the register_all command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-register-all",
+          "const": "allow-register-all"
-          "markdownDescription": "Enables the register_all command without any pre-configured scope."
         },
         {
           "description": "Denies the register_all command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-register-all",
+          "const": "deny-register-all"
-          "markdownDescription": "Denies the register_all command without any pre-configured scope."
         },
         {
           "description": "Enables the unregister command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-unregister",
+          "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",
+          "const": "deny-unregister"
-          "markdownDescription": "Denies the unregister command without any pre-configured scope."
         },
         {
           "description": "Enables the unregister_all command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-unregister-all",
+          "const": "allow-unregister-all"
-          "markdownDescription": "Enables the unregister_all command without any pre-configured scope."
         },
         {
           "description": "Denies the unregister_all command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-unregister-all",
+          "const": "deny-unregister-all"
-          "markdownDescription": "Denies the unregister_all command without any pre-configured scope."
         },
         {
           "description": "No features are enabled by default, as we believe\nthe shortcuts can be inherently dangerous and it is\napplication specific if specific shortcuts should be\nregistered or unregistered.\n",
           "type": "string",
-          "const": "default",
+          "const": "default"
-          "markdownDescription": "No features are enabled by default, as we believe\nthe shortcuts can be inherently dangerous and it is\napplication specific if specific shortcuts should be\nregistered or unregistered.\n"
         }
       ]
     }

plugins/haptics/permissions/schemas/schema.json

@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "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. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "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. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -297,50 +297,42 @@
         {
           "description": "Enables the impact_feedback command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-impact-feedback",
+          "const": "allow-impact-feedback"
-          "markdownDescription": "Enables the impact_feedback command without any pre-configured scope."
         },
         {
           "description": "Denies the impact_feedback command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-impact-feedback",
+          "const": "deny-impact-feedback"
-          "markdownDescription": "Denies the impact_feedback command without any pre-configured scope."
         },
         {
           "description": "Enables the notification_feedback command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-notification-feedback",
+          "const": "allow-notification-feedback"
-          "markdownDescription": "Enables the notification_feedback command without any pre-configured scope."
         },
         {
           "description": "Denies the notification_feedback command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-notification-feedback",
+          "const": "deny-notification-feedback"
-          "markdownDescription": "Denies the notification_feedback command without any pre-configured scope."
         },
         {
           "description": "Enables the selection_feedback command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-selection-feedback",
+          "const": "allow-selection-feedback"
-          "markdownDescription": "Enables the selection_feedback command without any pre-configured scope."
         },
         {
           "description": "Denies the selection_feedback command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-selection-feedback",
+          "const": "deny-selection-feedback"
-          "markdownDescription": "Denies the selection_feedback command without any pre-configured scope."
         },
         {
           "description": "Enables the vibrate command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-vibrate",
+          "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",
+          "const": "deny-vibrate"
-          "markdownDescription": "Denies the vibrate command without any pre-configured scope."
         }
       ]
     }

plugins/http/CHANGELOG.md

@@ -1,26 +1,5 @@
 # Changelog
 
-## \[2.4.4]
-
-- [`ff384cba`](https://github.com/tauri-apps/plugins-workspace/commit/ff384cbabe82ae715798a4ee49fd07ffcfbcdb5d) ([#2636](https://github.com/tauri-apps/plugins-workspace/pull/2636) by [@asomethings](https://github.com/tauri-apps/plugins-workspace/../../asomethings)) Properly handle responses with status code 204.
-
-### Dependencies
-
-- Upgraded to `fs-js@2.3.0`
-
-## \[2.4.3]
-
-- [`37c0477a`](https://github.com/tauri-apps/plugins-workspace/commit/37c0477afe926d326573f1827045875ce8bf8187) ([#2561](https://github.com/tauri-apps/plugins-workspace/pull/2561)) Add `zstd` cargo feature flag to enable `reqwest/zstd` flag.
-- [`9ebbfb2e`](https://github.com/tauri-apps/plugins-workspace/commit/9ebbfb2e3ccef8e0f277a0c02fe6b399b41feeb6) ([#1978](https://github.com/tauri-apps/plugins-workspace/pull/1978)) Persist cookies to disk and load it on next app start.
-
-### Dependencies
-
-- Upgraded to `fs-js@2.2.1`
-
-## \[2.4.2]
-
-- [`a15eedf3`](https://github.com/tauri-apps/plugins-workspace/commit/a15eedf37854344f7ffbcb0d373d848563817011) ([#2535](https://github.com/tauri-apps/plugins-workspace/pull/2535) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) Fix `fetch` occasionally throwing an error due to trying to close the underline stream twice.
-
 ## \[2.4.1]
 
 - [`d3183aa9`](https://github.com/tauri-apps/plugins-workspace/commit/d3183aa99da7ca67e627394132ddeb3b85ccef06) ([#2522](https://github.com/tauri-apps/plugins-workspace/pull/2522) by [@adrieljss](https://github.com/tauri-apps/plugins-workspace/../../adrieljss)) Fix `fetch` blocking until the whole response is read even if it was a streaming response.

plugins/http/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-http"
-version = "2.4.4"
+version = "2.4.1"
 description = "Access an HTTP client written in Rust."
 edition = { workspace = true }
 authors = { workspace = true }
@@ -34,15 +34,13 @@ serde_json = { workspace = true }
 tauri = { workspace = true }
 thiserror = { workspace = true }
 tokio = { version = "1", features = ["sync", "macros"] }
-tauri-plugin-fs = { path = "../fs", version = "2.3.0" }
+tauri-plugin-fs = { path = "../fs", version = "2.2.0" }
 urlpattern = "0.3"
 regex = "1"
 http = "1"
 reqwest = { version = "0.12", default-features = false }
 url = { workspace = true }
 data-url = "0.3"
-cookie_store = { version = "0.21.1", optional = true, features = ["serde"] }
-bytes = { version = "1.9", optional = true }
 tracing = { workspace = true, optional = true }
 
 [features]
@@ -64,11 +62,10 @@ rustls-tls-manual-roots = ["reqwest/rustls-tls-manual-roots"]
 rustls-tls-webpki-roots = ["reqwest/rustls-tls-webpki-roots"]
 rustls-tls-native-roots = ["reqwest/rustls-tls-native-roots"]
 blocking = ["reqwest/blocking"]
-cookies = ["reqwest/cookies", "dep:cookie_store", "dep:bytes"]
+cookies = ["reqwest/cookies"]
 gzip = ["reqwest/gzip"]
 brotli = ["reqwest/brotli"]
 deflate = ["reqwest/deflate"]
-zstd = ["reqwest/zstd"]
 trust-dns = ["reqwest/trust-dns"]
 socks = ["reqwest/socks"]
 http2 = ["reqwest/http2"]

plugins/http/api-iife.js

@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_HTTP__=function(e){"use strict";function t(e,t,r,n){if("function"==typeof t||!t.has(e))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===r?n:"a"===r?n.call(e):n?n.value:t.get(e)}function r(e,t,r,n,s){if("function"==typeof t||!t.has(e))throw new TypeError("Cannot write private member to an object whose class did not declare it");return t.set(e,r),r}var n,s,i,a;"function"==typeof SuppressedError&&SuppressedError;const o="__TAURI_TO_IPC_KEY__";class c{constructor(e){n.set(this,void 0),s.set(this,0),i.set(this,[]),a.set(this,void 0),r(this,n,e||(()=>{})),this.id=function(e,t=!1){return window.__TAURI_INTERNALS__.transformCallback(e,t)}((e=>{const o=e.index;if("end"in e)return void(o==t(this,s,"f")?this.cleanupCallback():r(this,a,o));const c=e.message;if(o==t(this,s,"f")){for(t(this,n,"f").call(this,c),r(this,s,t(this,s,"f")+1);t(this,s,"f")in t(this,i,"f");){const e=t(this,i,"f")[t(this,s,"f")];t(this,n,"f").call(this,e),delete t(this,i,"f")[t(this,s,"f")],r(this,s,t(this,s,"f")+1)}t(this,s,"f")===t(this,a,"f")&&this.cleanupCallback()}else t(this,i,"f")[o]=c}))}cleanupCallback(){Reflect.deleteProperty(window,`_${this.id}`)}set onmessage(e){r(this,n,e)}get onmessage(){return t(this,n,"f")}[(n=new WeakMap,s=new WeakMap,i=new WeakMap,a=new WeakMap,o)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[o]()}}async function d(e,t={},r){return window.__TAURI_INTERNALS__.invoke(e,t,r)}const h="Request cancelled";return e.fetch=async function(e,t){const r=t?.signal;if(r?.aborted)throw new Error(h);const n=t?.maxRedirections,s=t?.connectTimeout,i=t?.proxy,a=t?.danger;t&&(delete t.maxRedirections,delete t.connectTimeout,delete t.proxy,delete t.danger);const o=t?.headers?t.headers instanceof Headers?t.headers:new Headers(t.headers):new Headers,f=new Request(e,t),l=await f.arrayBuffer(),u=0!==l.byteLength?Array.from(new Uint8Array(l)):null;for(const[e,t]of f.headers)o.get(e)||o.set(e,t);const _=(o instanceof Headers?Array.from(o.entries()):Array.isArray(o)?o:Object.entries(o)).map((([e,t])=>[e,"string"==typeof t?t:t.toString()]));if(r?.aborted)throw new Error(h);const w=await d("plugin:http|fetch",{clientConfig:{method:f.method,url:f.url,headers:_,data:u,maxRedirections:n,connectTimeout:s,proxy:i,danger:a}}),p=()=>d("plugin:http|fetch_cancel",{rid:w});if(r?.aborted)throw p(),new Error(h);r?.addEventListener("abort",(()=>{p()}));const{status:y,statusText:m,url:b,headers:g,rid:T}=await d("plugin:http|fetch_send",{rid:w}),R=[101,103,204,205,304].includes(y)?null:new ReadableStream({start:e=>{const t=new c;t.onmessage=t=>{if(r?.aborted)return void e.error(h);const n=new Uint8Array(t),s=n[n.byteLength-1],i=n.slice(0,n.byteLength-1);1!=s?e.enqueue(i):e.close()},d("plugin:http|fetch_read_body",{rid:T,streamChannel:t}).catch((t=>{e.error(t)}))}}),A=new Response(R,{status:y,statusText:m});return Object.defineProperty(A,"url",{value:b}),Object.defineProperty(A,"headers",{value:new Headers(g)}),A},e}({});Object.defineProperty(window.__TAURI__,"http",{value:__TAURI_PLUGIN_HTTP__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_HTTP__=function(e){"use strict";function t(e,t,r,n){if("function"==typeof t||!t.has(e))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===r?n:"a"===r?n.call(e):n?n.value:t.get(e)}function r(e,t,r,n,s){if("function"==typeof t||!t.has(e))throw new TypeError("Cannot write private member to an object whose class did not declare it");return t.set(e,r),r}var n,s,a;"function"==typeof SuppressedError&&SuppressedError;const i="__TAURI_TO_IPC_KEY__";class o{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,n.set(this,(()=>{})),s.set(this,0),a.set(this,[]),this.id=function(e,t=!1){return window.__TAURI_INTERNALS__.transformCallback(e,t)}((({message:e,id:i})=>{if(i==t(this,s,"f"))for(t(this,n,"f").call(this,e),r(this,s,t(this,s,"f")+1);t(this,s,"f")in t(this,a,"f");){const e=t(this,a,"f")[t(this,s,"f")];t(this,n,"f").call(this,e),delete t(this,a,"f")[t(this,s,"f")],r(this,s,t(this,s,"f")+1)}else t(this,a,"f")[i]=e}))}set onmessage(e){r(this,n,e)}get onmessage(){return t(this,n,"f")}[(n=new WeakMap,s=new WeakMap,a=new WeakMap,i)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[i]()}}async function c(e,t={},r){return window.__TAURI_INTERNALS__.invoke(e,t,r)}const d="Request cancelled";return e.fetch=async function(e,t){const r=t?.signal;if(r?.aborted)throw new Error(d);const n=t?.maxRedirections,s=t?.connectTimeout,a=t?.proxy,i=t?.danger;t&&(delete t.maxRedirections,delete t.connectTimeout,delete t.proxy,delete t.danger);const h=t?.headers?t.headers instanceof Headers?t.headers:new Headers(t.headers):new Headers,f=new Request(e,t),_=await f.arrayBuffer(),u=0!==_.byteLength?Array.from(new Uint8Array(_)):null;for(const[e,t]of f.headers)h.get(e)||h.set(e,t);const l=(h instanceof Headers?Array.from(h.entries()):Array.isArray(h)?h:Object.entries(h)).map((([e,t])=>[e,"string"==typeof t?t:t.toString()]));if(r?.aborted)throw new Error(d);const w=await c("plugin:http|fetch",{clientConfig:{method:f.method,url:f.url,headers:l,data:u,maxRedirections:n,connectTimeout:s,proxy:a,danger:i}}),p=()=>c("plugin:http|fetch_cancel",{rid:w});if(r?.aborted)throw p(),new Error(d);r?.addEventListener("abort",(()=>{p()}));const{status:y,statusText:m,url:T,headers:g,rid:A}=await c("plugin:http|fetch_send",{rid:w}),R=new ReadableStream({start:e=>{const t=new o;t.onmessage=t=>{r?.aborted?e.error(d):(t instanceof ArrayBuffer?0!=t.byteLength:0!=t.length)?e.enqueue(new Uint8Array(t)):e.close()},c("plugin:http|fetch_read_body",{rid:A,streamChannel:t}).catch((t=>{e.error(t)}))}}),b=new Response(R,{status:y,statusText:m});return Object.defineProperty(b,"url",{value:T}),Object.defineProperty(b,"headers",{value:new Headers(g)}),b},e}({});Object.defineProperty(window.__TAURI__,"http",{value:__TAURI_PLUGIN_HTTP__})}

plugins/http/guest-js/index.ts

@@ -229,53 +229,52 @@ export async function fetch(
     rid
   })
 
-  // no body for 101, 103, 204, 205 and 304
+  const readableStreamBody = new ReadableStream({
-  // see https://fetch.spec.whatwg.org/#null-body-status
+    start: (controller) => {
-  const body = [101, 103, 204, 205, 304].includes(status)
+      const streamChannel = new Channel<ArrayBuffer | number[]>()
-    ? null
+      streamChannel.onmessage = (res: ArrayBuffer | number[]) => {
-    : new ReadableStream({
+        // close early if aborted
-        start: (controller) => {
+        if (signal?.aborted) {
-          const streamChannel = new Channel<ArrayBuffer | number[]>()
+          controller.error(ERROR_REQUEST_CANCELLED)
-          streamChannel.onmessage = (res: ArrayBuffer | number[]) => {
+          return
-            // close early if aborted
-            if (signal?.aborted) {
-              controller.error(ERROR_REQUEST_CANCELLED)
-              return
-            }
-
-            const resUint8 = new Uint8Array(res)
-            const lastByte = resUint8[resUint8.byteLength - 1]
-            const actualRes = resUint8.slice(0, resUint8.byteLength - 1)
-
-            // close when the signal to close (last byte is 1) is sent from the IPC.
-            if (lastByte == 1) {
-              controller.close()
-              return
-            }
-
-            controller.enqueue(actualRes)
-          }
-
-          // run a non-blocking body stream fetch
-          invoke('plugin:http|fetch_read_body', {
-            rid: responseRid,
-            streamChannel
-          }).catch((e) => {
-            controller.error(e)
-          })
         }
-      })
 
-  const res = new Response(body, {
+        // close when the signal to close (an empty chunk)
+        // is sent from the IPC.
+        if (
+          res instanceof ArrayBuffer ? res.byteLength == 0 : res.length == 0
+        ) {
+          controller.close()
+          return
+        }
+
+        // the content conversion (like .text(), .json(), etc.) in Response
+        // must have Uint8Array as its content, else it will
+        // have untraceable error that's hard to debug.
+        controller.enqueue(new Uint8Array(res))
+      }
+
+      // run a non-blocking body stream fetch
+      invoke('plugin:http|fetch_read_body', {
+        rid: responseRid,
+        streamChannel
+      }).catch((e) => {
+        controller.error(e)
+      })
+    }
+  })
+
+  const res = new Response(readableStreamBody, {
     status,
     statusText
   })
 
-  // Set `Response` properties that are ignored by the
+  // url and headers are read only properties
-  // constructor, like url and some headers
+  // but seems like we can set them like this
   //
-  // Since url and headers are read only properties
+  // we define theme like this, because using `Response`
-  // this is the only way to set them.
+  // constructor, it removes url and some headers
+  // like `set-cookie` headers
   Object.defineProperty(res, 'url', { value: url })
   Object.defineProperty(res, 'headers', {
     value: new Headers(responseHeaders)

plugins/http/package.json

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

plugins/http/permissions/autogenerated/reference.md

@@ -13,8 +13,6 @@ All fetch operations are enabled.
 
 
 
-#### This default permission set includes the following:
-
 - `allow-fetch`
 - `allow-fetch-cancel`
 - `allow-fetch-read-body`

plugins/http/permissions/schemas/schema.json

@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "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. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "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. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -297,56 +297,47 @@
         {
           "description": "Enables the fetch command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-fetch",
+          "const": "allow-fetch"
-          "markdownDescription": "Enables the fetch command without any pre-configured scope."
         },
         {
           "description": "Denies the fetch command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-fetch",
+          "const": "deny-fetch"
-          "markdownDescription": "Denies the fetch command without any pre-configured scope."
         },
         {
           "description": "Enables the fetch_cancel command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-fetch-cancel",
+          "const": "allow-fetch-cancel"
-          "markdownDescription": "Enables the fetch_cancel command without any pre-configured scope."
         },
         {
           "description": "Denies the fetch_cancel command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-fetch-cancel",
+          "const": "deny-fetch-cancel"
-          "markdownDescription": "Denies the fetch_cancel command without any pre-configured scope."
         },
         {
           "description": "Enables the fetch_read_body command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-fetch-read-body",
+          "const": "allow-fetch-read-body"
-          "markdownDescription": "Enables the fetch_read_body command without any pre-configured scope."
         },
         {
           "description": "Denies the fetch_read_body command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-fetch-read-body",
+          "const": "deny-fetch-read-body"
-          "markdownDescription": "Denies the fetch_read_body command without any pre-configured scope."
         },
         {
           "description": "Enables the fetch_send command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-fetch-send",
+          "const": "allow-fetch-send"
-          "markdownDescription": "Enables the fetch_send command without any pre-configured scope."
         },
         {
           "description": "Denies the fetch_send command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-fetch-send",
+          "const": "deny-fetch-send"
-          "markdownDescription": "Denies the fetch_send command without any pre-configured scope."
         },
         {
-          "description": "This permission set configures what kind of\nfetch operations are available from the http plugin.\n\nThis enables all fetch operations but does not\nallow explicitly any origins to be fetched. This needs to\nbe manually configured before usage.\n\n#### Granted Permissions\n\nAll fetch operations are enabled.\n\n\n#### This default permission set includes:\n\n- `allow-fetch`\n- `allow-fetch-cancel`\n- `allow-fetch-read-body`\n- `allow-fetch-send`",
+          "description": "This permission set configures what kind of\nfetch operations are available from the http plugin.\n\nThis enables all fetch operations but does not\nallow explicitly any origins to be fetched. This needs to\nbe manually configured before usage.\n\n#### Granted Permissions\n\nAll fetch operations are enabled.\n\n",
           "type": "string",
-          "const": "default",
+          "const": "default"
-          "markdownDescription": "This permission set configures what kind of\nfetch operations are available from the http plugin.\n\nThis enables all fetch operations but does not\nallow explicitly any origins to be fetched. This needs to\nbe manually configured before usage.\n\n#### Granted Permissions\n\nAll fetch operations are enabled.\n\n\n#### This default permission set includes:\n\n- `allow-fetch`\n- `allow-fetch-cancel`\n- `allow-fetch-read-body`\n- `allow-fetch-send`"
         }
       ]
     }

plugins/http/src/commands.rs

@@ -426,14 +426,11 @@ pub async fn fetch_read_body<R: Runtime>(
 
     // send response through IPC channel
     while let Some(chunk) = res.chunk().await? {
-        let mut chunk = chunk.to_vec();
+        stream_channel.send(tauri::ipc::InvokeResponseBody::Raw(chunk.to_vec()))?;
-        // append 0 to indicate we are not done yet
-        chunk.push(0);
-        stream_channel.send(tauri::ipc::InvokeResponseBody::Raw(chunk))?;
     }
 
-    // send 1 to indicate we are done
+    // send empty vector when done
-    stream_channel.send(tauri::ipc::InvokeResponseBody::Raw(vec![1]))?;
+    stream_channel.send(tauri::ipc::InvokeResponseBody::Raw(Vec::new()))?;
 
     Ok(())
 }

plugins/http/src/lib.rs

@@ -14,72 +14,25 @@ pub use error::{Error, Result};
 
 mod commands;
 mod error;
-#[cfg(feature = "cookies")]
-mod reqwest_cookie_store;
 mod scope;
 
-#[cfg(feature = "cookies")]
-const COOKIES_FILENAME: &str = ".cookies";
-
 pub(crate) struct Http {
     #[cfg(feature = "cookies")]
-    cookies_jar: std::sync::Arc<crate::reqwest_cookie_store::CookieStoreMutex>,
+    cookies_jar: std::sync::Arc<reqwest::cookie::Jar>,
 }
 
 pub fn init<R: Runtime>() -> TauriPlugin<R> {
     Builder::<R>::new("http")
         .setup(|app, _| {
-            #[cfg(feature = "cookies")]
-            let cookies_jar = {
-                use crate::reqwest_cookie_store::*;
-                use std::fs::File;
-                use std::io::BufReader;
-
-                let cache_dir = app.path().app_cache_dir()?;
-                std::fs::create_dir_all(&cache_dir)?;
-
-                let path = cache_dir.join(COOKIES_FILENAME);
-                let file = File::options()
-                    .create(true)
-                    .append(true)
-                    .read(true)
-                    .open(&path)?;
-
-                let reader = BufReader::new(file);
-                CookieStoreMutex::load(path.clone(), reader).unwrap_or_else(|_e| {
-                    #[cfg(feature = "tracing")]
-                    tracing::warn!(
-                        "failed to load cookie store: {_e}, falling back to empty store"
-                    );
-                    CookieStoreMutex::new(path, Default::default())
-                })
-            };
-
             let state = Http {
                 #[cfg(feature = "cookies")]
-                cookies_jar: std::sync::Arc::new(cookies_jar),
+                cookies_jar: std::sync::Arc::new(reqwest::cookie::Jar::default()),
             };
 
             app.manage(state);
 
             Ok(())
         })
-        .on_event(|app, event| {
-            #[cfg(feature = "cookies")]
-            if let tauri::RunEvent::Exit = event {
-                let state = app.state::<Http>();
-
-                match state.cookies_jar.request_save() {
-                    Ok(rx) => {
-                        let _ = rx.recv();
-                    }
-                    Err(_e) => {
-                        #[cfg(feature = "tracing")]
-                        tracing::error!("failed to save cookie jar: {_e}");
-                    }
-                }
-            }
-        })
         .invoke_handler(tauri::generate_handler![
             commands::fetch,
             commands::fetch_cancel,

plugins/http/src/reqwest_cookie_store.rs

@@ -1,133 +0,0 @@
-// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
-// taken from https://github.com/pfernie/reqwest_cookie_store/blob/2ec4afabcd55e24d3afe3f0626ee6dc97bed938d/src/lib.rs
-
-use std::{
-    path::PathBuf,
-    sync::{mpsc::Receiver, Mutex},
-};
-
-use cookie_store::{CookieStore, RawCookie, RawCookieParseError};
-use reqwest::header::HeaderValue;
-
-fn set_cookies(
-    cookie_store: &mut CookieStore,
-    cookie_headers: &mut dyn Iterator<Item = &HeaderValue>,
-    url: &url::Url,
-) {
-    let cookies = cookie_headers.filter_map(|val| {
-        std::str::from_utf8(val.as_bytes())
-            .map_err(RawCookieParseError::from)
-            .and_then(RawCookie::parse)
-            .map(|c| c.into_owned())
-            .ok()
-    });
-    cookie_store.store_response_cookies(cookies, url);
-}
-
-fn cookies(cookie_store: &CookieStore, url: &url::Url) -> Option<HeaderValue> {
-    let s = cookie_store
-        .get_request_values(url)
-        .map(|(name, value)| format!("{}={}", name, value))
-        .collect::<Vec<_>>()
-        .join("; ");
-
-    if s.is_empty() {
-        return None;
-    }
-
-    HeaderValue::from_maybe_shared(bytes::Bytes::from(s)).ok()
-}
-
-/// A [`cookie_store::CookieStore`] wrapped internally by a [`std::sync::Mutex`], suitable for use in
-/// async/concurrent contexts.
-#[derive(Debug)]
-pub struct CookieStoreMutex {
-    pub path: PathBuf,
-    store: Mutex<CookieStore>,
-    save_task: Mutex<Option<CancellableTask>>,
-}
-
-impl CookieStoreMutex {
-    /// Create a new [`CookieStoreMutex`] from an existing [`cookie_store::CookieStore`].
-    pub fn new(path: PathBuf, cookie_store: CookieStore) -> CookieStoreMutex {
-        CookieStoreMutex {
-            path,
-            store: Mutex::new(cookie_store),
-            save_task: Default::default(),
-        }
-    }
-
-    pub fn load<R: std::io::BufRead>(
-        path: PathBuf,
-        reader: R,
-    ) -> cookie_store::Result<CookieStoreMutex> {
-        cookie_store::serde::load(reader, |c| serde_json::from_str(c))
-            .map(|store| CookieStoreMutex::new(path, store))
-    }
-
-    fn cookies_to_str(&self) -> Result<String, serde_json::Error> {
-        let mut cookies = Vec::new();
-        for cookie in self
-            .store
-            .lock()
-            .expect("poisoned cookie jar mutex")
-            .iter_unexpired()
-        {
-            if cookie.is_persistent() {
-                cookies.push(cookie.clone());
-            }
-        }
-        serde_json::to_string(&cookies)
-    }
-
-    pub fn request_save(&self) -> cookie_store::Result<Receiver<()>> {
-        let cookie_str = self.cookies_to_str()?;
-        let path = self.path.clone();
-        let (tx, rx) = std::sync::mpsc::channel();
-        let task = tauri::async_runtime::spawn(async move {
-            match tokio::fs::write(&path, &cookie_str).await {
-                Ok(()) => {
-                    let _ = tx.send(());
-                }
-                Err(_e) => {
-                    #[cfg(feature = "tracing")]
-                    tracing::error!("failed to save cookie jar: {_e}");
-                }
-            }
-        });
-        self.save_task
-            .lock()
-            .unwrap()
-            .replace(CancellableTask(task));
-        Ok(rx)
-    }
-}
-
-impl reqwest::cookie::CookieStore for CookieStoreMutex {
-    fn set_cookies(&self, cookie_headers: &mut dyn Iterator<Item = &HeaderValue>, url: &url::Url) {
-        set_cookies(&mut self.store.lock().unwrap(), cookie_headers, url);
-
-        // try to persist cookies immediately asynchronously
-        if let Err(_e) = self.request_save() {
-            #[cfg(feature = "tracing")]
-            tracing::error!("failed to save cookie jar: {_e}");
-        }
-    }
-
-    fn cookies(&self, url: &url::Url) -> Option<HeaderValue> {
-        let store = self.store.lock().unwrap();
-        cookies(&store, url)
-    }
-}
-
-#[derive(Debug)]
-struct CancellableTask(tauri::async_runtime::JoinHandle<()>);
-
-impl Drop for CancellableTask {
-    fn drop(&mut self) {
-        self.0.abort();
-    }
-}

plugins/log/CHANGELOG.md

@@ -1,15 +1,5 @@
 # Changelog
 
-## \[2.4.0]
-
-- [`c9b21f6f`](https://github.com/tauri-apps/plugins-workspace/commit/c9b21f6f4345806eff5f495885f20dea0082b7d7) ([#2625](https://github.com/tauri-apps/plugins-workspace/pull/2625) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Export the `LogLevel` type.
-- [`9629c2f4`](https://github.com/tauri-apps/plugins-workspace/commit/9629c2f4f90a56b5c2d265d1d13d3af40fc0c525) ([#2600](https://github.com/tauri-apps/plugins-workspace/pull/2600) by [@exoego](https://github.com/tauri-apps/plugins-workspace/../../exoego)) Adds a new varient `TargetKind::Dispatch` that allows you to construct arbitrary log targets
-- [`686a839c`](https://github.com/tauri-apps/plugins-workspace/commit/686a839c96fae1b0334f2df9dc76ca5cdbe00dbe) ([#2626](https://github.com/tauri-apps/plugins-workspace/pull/2626) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Fix iOS app stuck when using the iOS Simulator and the log plugin due to a deadlock when calling os_log too early.
-
-### feat
-
-- [`60fc35d3`](https://github.com/tauri-apps/plugins-workspace/commit/60fc35d35cccaf1654eceb4446ecf0f89dc15502) ([#2576](https://github.com/tauri-apps/plugins-workspace/pull/2576) by [@3lpsy](https://github.com/tauri-apps/plugins-workspace/../../3lpsy)) Add a `tracing` feature to the `log` plugin that emits log messages to the `tracing` system.
-
 ## \[2.3.1]
 
 - [`1bb1ced5`](https://github.com/tauri-apps/plugins-workspace/commit/1bb1ced53820127204aa7adf57510c1cbce55e12) ([#2524](https://github.com/tauri-apps/plugins-workspace/pull/2524) by [@elwerene](https://github.com/tauri-apps/plugins-workspace/../../elwerene)) enable TargetKind::LogDir on mobile

plugins/log/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-log"
-version = "2.4.0"
+version = "2.3.1"
 description = "Configurable logging for your Tauri app."
 authors = { workspace = true }
 license = { workspace = true }
@@ -31,10 +31,8 @@ thiserror = { workspace = true }
 serde_repr = "0.1"
 byte-unit = "5"
 log = { workspace = true, features = ["kv_unstable"] }
-time = { version = "0.3", features = ["formatting", "local-offset", "macros"] }
+time = { version = "0.3", features = ["formatting", "local-offset"] }
 fern = "0.7"
-tracing = { workspace = true, optional = true }
-
 
 [target."cfg(target_os = \"android\")".dependencies]
 android_logger = "0.15"
@@ -49,4 +47,3 @@ objc2-foundation = { version = "0.3", default-features = false, features = [
 
 [features]
 colored = ["fern/colored"]
-tracing = ["dep:tracing"]

plugins/log/api-iife.js

@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_LOG__=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 a,o;async function t(e,a,o){const t={kind:"Any"};return r("plugin:event|listen",{event:e,target:t,handler:n(a)}).then((n=>async()=>async function(e,n){await r("plugin:event|unlisten",{event:e,eventId:n})}(e,n)))}async function i(e,n,a){const o=function(e){if(e){if(!e.startsWith("Error")){const n=e.split("\n").map((e=>e.split("@"))).filter((([e,n])=>e.length>0&&"[native code]"!==n));return n[2]?.filter((e=>e.length>0)).join("@")}{const n=e.split("\n"),r=n[3]?.trim();if(!r)return;const a=/at\s+(?<functionName>.*?)\s+\((?<fileName>.*?):(?<lineNumber>\d+):(?<columnNumber>\d+)\)/,o=r.match(a);if(o){const{functionName:e,fileName:n,lineNumber:r,columnNumber:a}=o.groups;return`${e}@${n}:${r}:${a}`}{const e=/at\s+(?<fileName>.*?):(?<lineNumber>\d+):(?<columnNumber>\d+)/,n=r.match(e);if(n){const{fileName:e,lineNumber:r,columnNumber:a}=n.groups;return`<anonymous>@${e}:${r}:${a}`}}}}}((new Error).stack),{file:t,line:i,keyValues:l}=a??{};await r("plugin:log|log",{level:e,message:n,location:o,file:t,line:i,keyValues:l})}async function l(e){return await t("log://log",(n=>{const{level:r}=n.payload;let{message:a}=n.payload;a=a.replace(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,""),e({message:a,level:r})}))}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"}(a||(a={})),e.LogLevel=void 0,(o=e.LogLevel||(e.LogLevel={}))[o.Trace=1]="Trace",o[o.Debug=2]="Debug",o[o.Info=3]="Info",o[o.Warn=4]="Warn",o[o.Error=5]="Error",e.attachConsole=async function(){return await l((({level:n,message:r})=>{switch(n){case e.LogLevel.Trace:console.log(r);break;case e.LogLevel.Debug:console.debug(r);break;case e.LogLevel.Info:console.info(r);break;case e.LogLevel.Warn:console.warn(r);break;case e.LogLevel.Error:console.error(r);break;default:throw new Error(`unknown log level ${n}`)}}))},e.attachLogger=l,e.debug=async function(n,r){await i(e.LogLevel.Debug,n,r)},e.error=async function(n,r){await i(e.LogLevel.Error,n,r)},e.info=async function(n,r){await i(e.LogLevel.Info,n,r)},e.trace=async function(n,r){await i(e.LogLevel.Trace,n,r)},e.warn=async function(n,r){await i(e.LogLevel.Warn,n,r)},e}({});Object.defineProperty(window.__TAURI__,"log",{value:__TAURI_PLUGIN_LOG__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_LOG__=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 a,t;async function o(e,a,t){const o={kind:"Any"};return r("plugin:event|listen",{event:e,target:o,handler:n(a)}).then((n=>async()=>async function(e,n){await r("plugin:event|unlisten",{event:e,eventId:n})}(e,n)))}async function i(e,n,a){const t=function(e){if(e){if(!e.startsWith("Error")){const n=e.split("\n").map((e=>e.split("@"))).filter((([e,n])=>e.length>0&&"[native code]"!==n));return n[2]?.filter((e=>e.length>0)).join("@")}{const n=e.split("\n"),r=n[3]?.trim();if(!r)return;const a=/at\s+(?<functionName>.*?)\s+\((?<fileName>.*?):(?<lineNumber>\d+):(?<columnNumber>\d+)\)/,t=r.match(a);if(t){const{functionName:e,fileName:n,lineNumber:r,columnNumber:a}=t.groups;return`${e}@${n}:${r}:${a}`}{const e=/at\s+(?<fileName>.*?):(?<lineNumber>\d+):(?<columnNumber>\d+)/,n=r.match(e);if(n){const{fileName:e,lineNumber:r,columnNumber:a}=n.groups;return`<anonymous>@${e}:${r}:${a}`}}}}}((new Error).stack),{file:o,line:i,keyValues:u}=a??{};await r("plugin:log|log",{level:e,message:n,location:t,file:o,line:i,keyValues:u})}async function u(e){return await o("log://log",(n=>{const{level:r}=n.payload;let{message:a}=n.payload;a=a.replace(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,""),e({message:a,level:r})}))}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"}(a||(a={})),function(e){e[e.Trace=1]="Trace",e[e.Debug=2]="Debug",e[e.Info=3]="Info",e[e.Warn=4]="Warn",e[e.Error=5]="Error"}(t||(t={})),e.attachConsole=async function(){return await u((({level:e,message:n})=>{switch(e){case t.Trace:console.log(n);break;case t.Debug:console.debug(n);break;case t.Info:console.info(n);break;case t.Warn:console.warn(n);break;case t.Error:console.error(n);break;default:throw new Error(`unknown log level ${e}`)}}))},e.attachLogger=u,e.debug=async function(e,n){await i(t.Debug,e,n)},e.error=async function(e,n){await i(t.Error,e,n)},e.info=async function(e,n){await i(t.Info,e,n)},e.trace=async function(e,n){await i(t.Trace,e,n)},e.warn=async function(e,n){await i(t.Warn,e,n)},e}({});Object.defineProperty(window.__TAURI__,"log",{value:__TAURI_PLUGIN_LOG__})}

plugins/log/guest-js/index.ts

@@ -11,7 +11,7 @@ export interface LogOptions {
   keyValues?: Record<string, string | undefined>
 }
 
-export enum LogLevel {
+enum LogLevel {
   /**
    * The "trace" level.
    *

plugins/log/ios/Sources/LogPlugin.swift

@@ -2,41 +2,16 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-import SwiftRs
-import Tauri
 import UIKit
-
+import Tauri
-#if targetEnvironment(simulator)
+import SwiftRs
-  var logReady = false
-#else
-  var logReady = true
-#endif
 
 @_cdecl("tauri_log")
 func log(level: Int, message: NSString) {
-  if logReady {
+	switch level {
-    os_log(level, message)
+		case 1: Logger.debug(message as String)
-  } else {
+		case 2: Logger.info(message as String)
-    dispatch_log(level, message)
+		case 3: Logger.error(message as String)
-  }
+		default: break
-}
+	}
-
-func dispatch_log(_ level: Int, _ message: NSString) {
-  // delay logging when the logger isn't immediately available
-  // in some cases when using the simulator the app would hang when calling os_log too soon
-  // better be safe here and wait a few seconds than actually freeze the app in dev mode
-  // in production this isn't a problem
-  DispatchQueue.main.asyncAfter(deadline: .now() + 2) {
-    os_log(level, message)
-    logReady = true
-  }
-}
-
-func os_log(_ level: Int, _ message: NSString) {
-  switch level {
-  case 1: Logger.debug(message as String)
-  case 2: Logger.info(message as String)
-  case 3: Logger.error(message as String)
-  default: break
-  }
 }

plugins/log/package.json

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

plugins/log/permissions/autogenerated/reference.md

@@ -2,8 +2,6 @@
 
 Allows the log command
 
-#### This default permission set includes the following:
-
 - `allow-log`
 
 ## Permission Table

plugins/log/permissions/schemas/schema.json

@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "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. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "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. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -297,20 +297,17 @@
         {
           "description": "Enables the log command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-log",
+          "const": "allow-log"
-          "markdownDescription": "Enables the log command without any pre-configured scope."
         },
         {
           "description": "Denies the log command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-log",
+          "const": "deny-log"
-          "markdownDescription": "Denies the log command without any pre-configured scope."
         },
         {
-          "description": "Allows the log command\n#### This default permission set includes:\n\n- `allow-log`",
+          "description": "Allows the log command",
           "type": "string",
-          "const": "default",
+          "const": "default"
-          "markdownDescription": "Allows the log command\n#### This default permission set includes:\n\n- `allow-log`"
         }
       ]
     }

plugins/log/src/lib.rs

@@ -27,9 +27,9 @@ use tauri::{
     Manager, Runtime,
 };
 use tauri::{AppHandle, Emitter};
-use time::{macros::format_description, OffsetDateTime};
 
 pub use fern;
+use time::OffsetDateTime;
 
 pub const WEBVIEW_TARGET: &str = "webview";
 
@@ -170,10 +170,6 @@ pub enum TargetKind {
     ///
     /// This requires the webview to subscribe to log events, via this plugins `attachConsole` function.
     Webview,
-    /// Send logs to a [`fern::Dispatch`]
-    ///
-    /// You can use this to construct arbitrary log targets.
-    Dispatch(fern::Dispatch),
 }
 
 /// A log target.
@@ -201,38 +197,6 @@ impl Target {
     }
 }
 
-// Target becomes default and location is added as a parameter
-#[cfg(feature = "tracing")]
-fn emit_trace(
-    level: log::Level,
-    message: &String,
-    location: Option<&str>,
-    file: Option<&str>,
-    line: Option<u32>,
-    kv: &HashMap<&str, &str>,
-) {
-    macro_rules! emit_event {
-        ($level:expr) => {
-            tracing::event!(
-                target: WEBVIEW_TARGET,
-                $level,
-                message = %message,
-                location = location,
-                file,
-                line,
-                ?kv
-            )
-        };
-    }
-    match level {
-        log::Level::Error => emit_event!(tracing::Level::ERROR),
-        log::Level::Warn => emit_event!(tracing::Level::WARN),
-        log::Level::Info => emit_event!(tracing::Level::INFO),
-        log::Level::Debug => emit_event!(tracing::Level::DEBUG),
-        log::Level::Trace => emit_event!(tracing::Level::TRACE),
-    }
-}
-
 #[tauri::command]
 fn log(
     level: LogLevel,
@@ -259,8 +223,6 @@ fn log(
         kv.insert(k.as_str(), v.as_str());
     }
     builder.key_values(&kv);
-    #[cfg(feature = "tracing")]
-    emit_trace(level, &message, location, file, line, &kv);
 
     logger().log(&builder.args(format_args!("{message}")).build());
 }
@@ -277,7 +239,9 @@ pub struct Builder {
 impl Default for Builder {
     fn default() -> Self {
         #[cfg(desktop)]
-        let format = format_description!("[[[year]-[month]-[day]][[[hour]:[minute]:[second]]");
+        let format =
+            time::format_description::parse("[[[year]-[month]-[day]][[[hour]:[minute]:[second]]")
+                .unwrap();
         let dispatch = fern::Dispatch::new().format(move |out, message, record| {
             out.finish(
                 #[cfg(mobile)]
@@ -316,7 +280,9 @@ impl Builder {
     pub fn timezone_strategy(mut self, timezone_strategy: TimezoneStrategy) -> Self {
         self.timezone_strategy = timezone_strategy.clone();
 
-        let format = format_description!("[[[year]-[month]-[day]][[[hour]:[minute]:[second]]");
+        let format =
+            time::format_description::parse("[[[year]-[month]-[day]][[[hour]:[minute]:[second]]")
+                .unwrap();
         self.dispatch = self.dispatch.format(move |out, message, record| {
             out.finish(format_args!(
                 "{}[{}][{}] {}",
@@ -380,7 +346,7 @@ impl Builder {
 
     /// Skip the creation and global registration of a logger
     ///
-    /// If you wish to use your own global logger, you must call `skip_logger` so that the plugin does not attempt to set a second global logger. In this configuration, no logger will be created and the plugin's `log` command will rely on the result of `log::logger()`. You will be responsible for configuring the logger yourself and any included targets will be ignored. If ever initializing the plugin multiple times, such as if registering the plugin while testing, call this method to avoid panicking when registering multiple loggers. For interacting with `tracing`, you can leverage the `tracing-log` logger to forward logs to `tracing` or enable the `tracing` feature for this plugin to emit events directly to the tracing system. Both scenarios require calling this method.
+    /// If you wish to use your own global logger, you must call `skip_logger` so that the plugin does not attempt to set a second global logger. In this configuration, no logger will be created and the plugin's `log` command will rely on the result of `log::logger()`. You will be responsible for configuring the logger yourself and any included targets will be ignored. This can also be used with `tracing-log` or if running tests in parallel that require the plugin to be registered.
     /// ```rust
     /// static LOGGER: SimpleLogger = SimpleLogger;
     ///
@@ -394,11 +360,12 @@ impl Builder {
         self
     }
 
-    /// Replaces the targets of the logger.
+    /// Adds a collection of targets to the logger.
     ///
     /// ```rust
     /// use tauri_plugin_log::{Target, TargetKind, WEBVIEW_TARGET};
     /// tauri_plugin_log::Builder::new()
+    ///     .clear_targets()
     ///     .targets([
     ///         Target::new(TargetKind::Webview),
     ///         Target::new(TargetKind::LogDir { file_name: Some("webview".into()) }).filter(|metadata| metadata.target().starts_with(WEBVIEW_TARGET)),
@@ -412,7 +379,9 @@ impl Builder {
 
     #[cfg(feature = "colored")]
     pub fn with_colors(self, colors: fern::colors::ColoredLevelConfig) -> Self {
-        let format = format_description!("[[[year]-[month]-[day]][[[hour]:[minute]:[second]]");
+        let format =
+            time::format_description::parse("[[[year]-[month]-[day]][[[hour]:[minute]:[second]]")
+                .unwrap();
 
         let timezone_strategy = self.timezone_strategy.clone();
         self.format(move |out, message, record| {
@@ -512,7 +481,6 @@ impl Builder {
                         });
                     })
                 }
-                TargetKind::Dispatch(dispatch) => dispatch.into(),
             };
             target_dispatch = target_dispatch.chain(logger);
 
@@ -594,9 +562,11 @@ fn get_log_file_path(
                     let to = dir.as_ref().join(format!(
                         "{}_{}.log",
                         file_name,
-                        timezone_strategy.get_now().format(&format_description!(
+                        timezone_strategy
-                            "[year]-[month]-[day]_[hour]-[minute]-[second]"
+                            .get_now()
-                        ))?,
+                            .format(&time::format_description::parse(
+                                "[year]-[month]-[day]_[hour]-[minute]-[second]"
+                            )?)?,
                     ));
                     if to.is_file() {
                         // designated rotated log file name already exists

plugins/nfc/permissions/autogenerated/reference.md

@@ -11,8 +11,6 @@ Writing to tags needs to be manually enabled.
 
 
 
-#### This default permission set includes the following:
-
 - `allow-is-available`
 - `allow-scan`
 

plugins/nfc/permissions/schemas/schema.json

@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "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. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "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. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -297,44 +297,37 @@
         {
           "description": "Enables the is_available command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-is-available",
+          "const": "allow-is-available"
-          "markdownDescription": "Enables the is_available command without any pre-configured scope."
         },
         {
           "description": "Denies the is_available command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-is-available",
+          "const": "deny-is-available"
-          "markdownDescription": "Denies the is_available command without any pre-configured scope."
         },
         {
           "description": "Enables the scan command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-scan",
+          "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",
+          "const": "deny-scan"
-          "markdownDescription": "Denies the scan command without any pre-configured scope."
         },
         {
           "description": "Enables the write command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-write",
+          "const": "allow-write"
-          "markdownDescription": "Enables the write command without any pre-configured scope."
         },
         {
           "description": "Denies the write command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-write",
+          "const": "deny-write"
-          "markdownDescription": "Denies the write command without any pre-configured scope."
         },
         {
-          "description": "This permission set configures what kind of\noperations are available from the nfc plugin.\n\n#### Granted Permissions\n\nChecking if the NFC functionality is available\nand scanning nearby tags is allowed.\nWriting to tags needs to be manually enabled.\n\n\n#### This default permission set includes:\n\n- `allow-is-available`\n- `allow-scan`",
+          "description": "This permission set configures what kind of\noperations are available from the nfc plugin.\n\n#### Granted Permissions\n\nChecking if the NFC functionality is available\nand scanning nearby tags is allowed.\nWriting to tags needs to be manually enabled.\n\n",
           "type": "string",
-          "const": "default",
+          "const": "default"
-          "markdownDescription": "This permission set configures what kind of\noperations are available from the nfc plugin.\n\n#### Granted Permissions\n\nChecking if the NFC functionality is available\nand scanning nearby tags is allowed.\nWriting to tags needs to be manually enabled.\n\n\n#### This default permission set includes:\n\n- `allow-is-available`\n- `allow-scan`"
         }
       ]
     }

plugins/notification/api-iife.js

@@ -1 +1 @@
-if("__TAURI__"in window){var __TAURI_PLUGIN_NOTIFICATION__=function(i){"use strict";function t(i,t,n,e){if("function"==typeof t||!t.has(i))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===n?e:"a"===n?e.call(i):e?e.value:t.get(i)}function n(i,t,n,e,a){if("function"==typeof t||!t.has(i))throw new TypeError("Cannot write private member to an object whose class did not declare it");return t.set(i,n),n}var e,a,o,r;"function"==typeof SuppressedError&&SuppressedError;const c="__TAURI_TO_IPC_KEY__";class s{constructor(i){e.set(this,void 0),a.set(this,0),o.set(this,[]),r.set(this,void 0),n(this,e,i||(()=>{})),this.id=function(i,t=!1){return window.__TAURI_INTERNALS__.transformCallback(i,t)}((i=>{const c=i.index;if("end"in i)return void(c==t(this,a,"f")?this.cleanupCallback():n(this,r,c));const s=i.message;if(c==t(this,a,"f")){for(t(this,e,"f").call(this,s),n(this,a,t(this,a,"f")+1);t(this,a,"f")in t(this,o,"f");){const i=t(this,o,"f")[t(this,a,"f")];t(this,e,"f").call(this,i),delete t(this,o,"f")[t(this,a,"f")],n(this,a,t(this,a,"f")+1)}t(this,a,"f")===t(this,r,"f")&&this.cleanupCallback()}else t(this,o,"f")[c]=s}))}cleanupCallback(){Reflect.deleteProperty(window,`_${this.id}`)}set onmessage(i){n(this,e,i)}get onmessage(){return t(this,e,"f")}[(e=new WeakMap,a=new WeakMap,o=new WeakMap,r=new WeakMap,c)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[c]()}}class l{constructor(i,t,n){this.plugin=i,this.event=t,this.channelId=n}async unregister(){return f(`plugin:${this.plugin}|remove_listener`,{event:this.event,channelId:this.channelId})}}async function u(i,t,n){const e=new s(n);return f(`plugin:${i}|registerListener`,{event:t,handler:e}).then((()=>new l(i,t,e.id)))}async function f(i,t={},n){return window.__TAURI_INTERNALS__.invoke(i,t,n)}var h,d,w;i.ScheduleEvery=void 0,(h=i.ScheduleEvery||(i.ScheduleEvery={})).Year="year",h.Month="month",h.TwoWeeks="twoWeeks",h.Week="week",h.Day="day",h.Hour="hour",h.Minute="minute",h.Second="second";return i.Importance=void 0,(d=i.Importance||(i.Importance={}))[d.None=0]="None",d[d.Min=1]="Min",d[d.Low=2]="Low",d[d.Default=3]="Default",d[d.High=4]="High",i.Visibility=void 0,(w=i.Visibility||(i.Visibility={}))[w.Secret=-1]="Secret",w[w.Private=0]="Private",w[w.Public=1]="Public",i.Schedule=class{static at(i,t=!1,n=!1){return{at:{date:i,repeating:t,allowWhileIdle:n},interval:void 0,every:void 0}}static interval(i,t=!1){return{at:void 0,interval:{interval:i,allowWhileIdle:t},every:void 0}}static every(i,t,n=!1){return{at:void 0,interval:void 0,every:{interval:i,count:t,allowWhileIdle:n}}}},i.active=async function(){return await f("plugin:notification|get_active")},i.cancel=async function(i){await f("plugin:notification|cancel",{notifications:i})},i.cancelAll=async function(){await f("plugin:notification|cancel")},i.channels=async function(){return await f("plugin:notification|listChannels")},i.createChannel=async function(i){await f("plugin:notification|create_channel",{...i})},i.isPermissionGranted=async function(){return"default"!==window.Notification.permission?await Promise.resolve("granted"===window.Notification.permission):await f("plugin:notification|is_permission_granted")},i.onAction=async function(i){return await u("notification","actionPerformed",i)},i.onNotificationReceived=async function(i){return await u("notification","notification",i)},i.pending=async function(){return await f("plugin:notification|get_pending")},i.registerActionTypes=async function(i){await f("plugin:notification|register_action_types",{types:i})},i.removeActive=async function(i){await f("plugin:notification|remove_active",{notifications:i})},i.removeAllActive=async function(){await f("plugin:notification|remove_active")},i.removeChannel=async function(i){await f("plugin:notification|delete_channel",{id:i})},i.requestPermission=async function(){return await window.Notification.requestPermission()},i.sendNotification=function(i){"string"==typeof i?new window.Notification(i):new window.Notification(i.title,i)},i}({});Object.defineProperty(window.__TAURI__,"notification",{value:__TAURI_PLUGIN_NOTIFICATION__})}
+if("__TAURI__"in window){var __TAURI_PLUGIN_NOTIFICATION__=function(i){"use strict";function n(i,n,t,e){if("function"==typeof n||!n.has(i))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===t?e:"a"===t?e.call(i):e?e.value:n.get(i)}function t(i,n,t,e,o){if("function"==typeof n||!n.has(i))throw new TypeError("Cannot write private member to an object whose class did not declare it");return n.set(i,t),t}var e,o,a;"function"==typeof SuppressedError&&SuppressedError;const r="__TAURI_TO_IPC_KEY__";class c{constructor(){this.__TAURI_CHANNEL_MARKER__=!0,e.set(this,(()=>{})),o.set(this,0),a.set(this,[]),this.id=function(i,n=!1){return window.__TAURI_INTERNALS__.transformCallback(i,n)}((({message:i,id:r})=>{if(r==n(this,o,"f"))for(n(this,e,"f").call(this,i),t(this,o,n(this,o,"f")+1);n(this,o,"f")in n(this,a,"f");){const i=n(this,a,"f")[n(this,o,"f")];n(this,e,"f").call(this,i),delete n(this,a,"f")[n(this,o,"f")],t(this,o,n(this,o,"f")+1)}else n(this,a,"f")[r]=i}))}set onmessage(i){t(this,e,i)}get onmessage(){return n(this,e,"f")}[(e=new WeakMap,o=new WeakMap,a=new WeakMap,r)](){return`__CHANNEL__:${this.id}`}toJSON(){return this[r]()}}class s{constructor(i,n,t){this.plugin=i,this.event=n,this.channelId=t}async unregister(){return u(`plugin:${this.plugin}|remove_listener`,{event:this.event,channelId:this.channelId})}}async function l(i,n,t){const e=new c;return e.onmessage=t,u(`plugin:${i}|registerListener`,{event:n,handler:e}).then((()=>new s(i,n,e.id)))}async function u(i,n={},t){return window.__TAURI_INTERNALS__.invoke(i,n,t)}var f,h,d;i.ScheduleEvery=void 0,(f=i.ScheduleEvery||(i.ScheduleEvery={})).Year="year",f.Month="month",f.TwoWeeks="twoWeeks",f.Week="week",f.Day="day",f.Hour="hour",f.Minute="minute",f.Second="second";return i.Importance=void 0,(h=i.Importance||(i.Importance={}))[h.None=0]="None",h[h.Min=1]="Min",h[h.Low=2]="Low",h[h.Default=3]="Default",h[h.High=4]="High",i.Visibility=void 0,(d=i.Visibility||(i.Visibility={}))[d.Secret=-1]="Secret",d[d.Private=0]="Private",d[d.Public=1]="Public",i.Schedule=class{static at(i,n=!1,t=!1){return{at:{date:i,repeating:n,allowWhileIdle:t},interval:void 0,every:void 0}}static interval(i,n=!1){return{at:void 0,interval:{interval:i,allowWhileIdle:n},every:void 0}}static every(i,n,t=!1){return{at:void 0,interval:void 0,every:{interval:i,count:n,allowWhileIdle:t}}}},i.active=async function(){return await u("plugin:notification|get_active")},i.cancel=async function(i){await u("plugin:notification|cancel",{notifications:i})},i.cancelAll=async function(){await u("plugin:notification|cancel")},i.channels=async function(){return await u("plugin:notification|listChannels")},i.createChannel=async function(i){await u("plugin:notification|create_channel",{...i})},i.isPermissionGranted=async function(){return"default"!==window.Notification.permission?await Promise.resolve("granted"===window.Notification.permission):await u("plugin:notification|is_permission_granted")},i.onAction=async function(i){return await l("notification","actionPerformed",i)},i.onNotificationReceived=async function(i){return await l("notification","notification",i)},i.pending=async function(){return await u("plugin:notification|get_pending")},i.registerActionTypes=async function(i){await u("plugin:notification|register_action_types",{types:i})},i.removeActive=async function(i){await u("plugin:notification|remove_active",{notifications:i})},i.removeAllActive=async function(){await u("plugin:notification|remove_active")},i.removeChannel=async function(i){await u("plugin:notification|delete_channel",{id:i})},i.requestPermission=async function(){return await window.Notification.requestPermission()},i.sendNotification=function(i){"string"==typeof i?new window.Notification(i):new window.Notification(i.title,i)},i}({});Object.defineProperty(window.__TAURI__,"notification",{value:__TAURI_PLUGIN_NOTIFICATION__})}

plugins/notification/permissions/autogenerated/reference.md

@@ -9,8 +9,6 @@ It allows all notification related features.
 
 
 
-#### This default permission set includes the following:
-
 - `allow-is-permission-granted`
 - `allow-request-permission`
 - `allow-notify`

plugins/notification/permissions/schemas/schema.json

@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "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. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "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. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -297,200 +297,167 @@
         {
           "description": "Enables the batch command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-batch",
+          "const": "allow-batch"
-          "markdownDescription": "Enables the batch command without any pre-configured scope."
         },
         {
           "description": "Denies the batch command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-batch",
+          "const": "deny-batch"
-          "markdownDescription": "Denies the batch command without any pre-configured scope."
         },
         {
           "description": "Enables the cancel command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-cancel",
+          "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",
+          "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",
+          "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",
+          "const": "deny-check-permissions"
-          "markdownDescription": "Denies the check_permissions command without any pre-configured scope."
         },
         {
           "description": "Enables the create_channel command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-create-channel",
+          "const": "allow-create-channel"
-          "markdownDescription": "Enables the create_channel command without any pre-configured scope."
         },
         {
           "description": "Denies the create_channel command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-create-channel",
+          "const": "deny-create-channel"
-          "markdownDescription": "Denies the create_channel command without any pre-configured scope."
         },
         {
           "description": "Enables the delete_channel command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-delete-channel",
+          "const": "allow-delete-channel"
-          "markdownDescription": "Enables the delete_channel command without any pre-configured scope."
         },
         {
           "description": "Denies the delete_channel command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-delete-channel",
+          "const": "deny-delete-channel"
-          "markdownDescription": "Denies the delete_channel command without any pre-configured scope."
         },
         {
           "description": "Enables the get_active command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-get-active",
+          "const": "allow-get-active"
-          "markdownDescription": "Enables the get_active command without any pre-configured scope."
         },
         {
           "description": "Denies the get_active command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-get-active",
+          "const": "deny-get-active"
-          "markdownDescription": "Denies the get_active command without any pre-configured scope."
         },
         {
           "description": "Enables the get_pending command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-get-pending",
+          "const": "allow-get-pending"
-          "markdownDescription": "Enables the get_pending command without any pre-configured scope."
         },
         {
           "description": "Denies the get_pending command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-get-pending",
+          "const": "deny-get-pending"
-          "markdownDescription": "Denies the get_pending command without any pre-configured scope."
         },
         {
           "description": "Enables the is_permission_granted command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-is-permission-granted",
+          "const": "allow-is-permission-granted"
-          "markdownDescription": "Enables the is_permission_granted command without any pre-configured scope."
         },
         {
           "description": "Denies the is_permission_granted command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-is-permission-granted",
+          "const": "deny-is-permission-granted"
-          "markdownDescription": "Denies the is_permission_granted command without any pre-configured scope."
         },
         {
           "description": "Enables the list_channels command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-list-channels",
+          "const": "allow-list-channels"
-          "markdownDescription": "Enables the list_channels command without any pre-configured scope."
         },
         {
           "description": "Denies the list_channels command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-list-channels",
+          "const": "deny-list-channels"
-          "markdownDescription": "Denies the list_channels command without any pre-configured scope."
         },
         {
           "description": "Enables the notify command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-notify",
+          "const": "allow-notify"
-          "markdownDescription": "Enables the notify command without any pre-configured scope."
         },
         {
           "description": "Denies the notify command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-notify",
+          "const": "deny-notify"
-          "markdownDescription": "Denies the notify command without any pre-configured scope."
         },
         {
           "description": "Enables the permission_state command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-permission-state",
+          "const": "allow-permission-state"
-          "markdownDescription": "Enables the permission_state command without any pre-configured scope."
         },
         {
           "description": "Denies the permission_state command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-permission-state",
+          "const": "deny-permission-state"
-          "markdownDescription": "Denies the permission_state command without any pre-configured scope."
         },
         {
           "description": "Enables the register_action_types command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-register-action-types",
+          "const": "allow-register-action-types"
-          "markdownDescription": "Enables the register_action_types command without any pre-configured scope."
         },
         {
           "description": "Denies the register_action_types command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-register-action-types",
+          "const": "deny-register-action-types"
-          "markdownDescription": "Denies the register_action_types command without any pre-configured scope."
         },
         {
           "description": "Enables the register_listener command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-register-listener",
+          "const": "allow-register-listener"
-          "markdownDescription": "Enables the register_listener command without any pre-configured scope."
         },
         {
           "description": "Denies the register_listener command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-register-listener",
+          "const": "deny-register-listener"
-          "markdownDescription": "Denies the register_listener command without any pre-configured scope."
         },
         {
           "description": "Enables the remove_active command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-remove-active",
+          "const": "allow-remove-active"
-          "markdownDescription": "Enables the remove_active command without any pre-configured scope."
         },
         {
           "description": "Denies the remove_active command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-remove-active",
+          "const": "deny-remove-active"
-          "markdownDescription": "Denies the remove_active command without any pre-configured scope."
         },
         {
           "description": "Enables the request_permission command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-request-permission",
+          "const": "allow-request-permission"
-          "markdownDescription": "Enables the request_permission command without any pre-configured scope."
         },
         {
           "description": "Denies the request_permission command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-request-permission",
+          "const": "deny-request-permission"
-          "markdownDescription": "Denies the request_permission command without any pre-configured scope."
         },
         {
           "description": "Enables the show command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-show",
+          "const": "allow-show"
-          "markdownDescription": "Enables the show command without any pre-configured scope."
         },
         {
           "description": "Denies the show command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-show",
+          "const": "deny-show"
-          "markdownDescription": "Denies the show command without any pre-configured scope."
         },
         {
-          "description": "This permission set configures which\nnotification features are by default exposed.\n\n#### Granted Permissions\n\nIt allows all notification related features.\n\n\n#### This default permission set includes:\n\n- `allow-is-permission-granted`\n- `allow-request-permission`\n- `allow-notify`\n- `allow-register-action-types`\n- `allow-register-listener`\n- `allow-cancel`\n- `allow-get-pending`\n- `allow-remove-active`\n- `allow-get-active`\n- `allow-check-permissions`\n- `allow-show`\n- `allow-batch`\n- `allow-list-channels`\n- `allow-delete-channel`\n- `allow-create-channel`\n- `allow-permission-state`",
+          "description": "This permission set configures which\nnotification features are by default exposed.\n\n#### Granted Permissions\n\nIt allows all notification related features.\n\n",
           "type": "string",
-          "const": "default",
+          "const": "default"
-          "markdownDescription": "This permission set configures which\nnotification features are by default exposed.\n\n#### Granted Permissions\n\nIt allows all notification related features.\n\n\n#### This default permission set includes:\n\n- `allow-is-permission-granted`\n- `allow-request-permission`\n- `allow-notify`\n- `allow-register-action-types`\n- `allow-register-listener`\n- `allow-cancel`\n- `allow-get-pending`\n- `allow-remove-active`\n- `allow-get-active`\n- `allow-check-permissions`\n- `allow-show`\n- `allow-batch`\n- `allow-list-channels`\n- `allow-delete-channel`\n- `allow-create-channel`\n- `allow-permission-state`"
         }
       ]
     }

plugins/opener/CHANGELOG.md

@@ -1,10 +1,5 @@
 # Changelog
 
-## \[2.2.7]
-
-- [`6c9e08dc`](https://github.com/tauri-apps/plugins-workspace/commit/6c9e08dccb3ac99fccfce586fa2b69717ba81b52) ([#2695](https://github.com/tauri-apps/plugins-workspace/pull/2695) by [@ShaunSHamilton](https://github.com/tauri-apps/plugins-workspace/../../ShaunSHamilton)) Adjust `open_url` url type to allow `URL`
-- [`dde6f3c3`](https://github.com/tauri-apps/plugins-workspace/commit/dde6f3c31c1b79942abb556be31757dc583f509e) ([#2549](https://github.com/tauri-apps/plugins-workspace/pull/2549) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Update `windows` crate to 0.61 to align with Tauri 2.5
-
 ## \[2.2.6]
 
 - [`1a984659`](https://github.com/tauri-apps/plugins-workspace/commit/1a9846599b6a71faf330845847a30f6bf9735898) ([#2469](https://github.com/tauri-apps/plugins-workspace/pull/2469) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Update `objc2` crate to 0.6. No user facing changes.

plugins/opener/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-opener"
-version = "2.2.7"
+version = "2.2.6"
 description = "Open files and URLs using their default application."
 edition = { workspace = true }
 authors = { workspace = true }
@@ -40,7 +40,7 @@ glob = { workspace = true }
 dunce = { workspace = true }
 
 [target."cfg(windows)".dependencies.windows]
-version = "0.61"
+version = "0.60"
 features = [
   "Win32_Foundation",
   "Win32_UI_Shell_Common",

plugins/opener/guest-js/index.ts

@@ -38,10 +38,7 @@ import { invoke } from '@tauri-apps/api/core'
  *
  * @since 2.0.0
  */
-export async function openUrl(
+export async function openUrl(url: string, openWith?: string): Promise<void> {
-  url: string | URL,
-  openWith?: string
-): Promise<void> {
   await invoke('plugin:opener|open_url', {
     url,
     with: openWith

plugins/opener/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-opener",
-  "version": "2.2.7",
+  "version": "2.2.6",
   "description": "Open files and URLs using their default application.",
   "license": "MIT OR Apache-2.0",
   "authors": [

plugins/opener/permissions/autogenerated/reference.md

@@ -3,8 +3,6 @@
 This permission set allows opening `mailto:`, `tel:`, `https://` and `http://` urls using their default application
 as well as reveal file in directories using default file explorer
 
-#### This default permission set includes the following:
-
 - `allow-open-url`
 - `allow-reveal-item-in-dir`
 - `allow-default-urls`

plugins/opener/permissions/schemas/schema.json

@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "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. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "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. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -297,50 +297,42 @@
         {
           "description": "This enables opening `mailto:`, `tel:`, `https://` and `http://` urls using their default application.",
           "type": "string",
-          "const": "allow-default-urls",
+          "const": "allow-default-urls"
-          "markdownDescription": "This enables opening `mailto:`, `tel:`, `https://` and `http://` urls using their default application."
         },
         {
           "description": "Enables the open_path command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-open-path",
+          "const": "allow-open-path"
-          "markdownDescription": "Enables the open_path command without any pre-configured scope."
         },
         {
           "description": "Denies the open_path command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-open-path",
+          "const": "deny-open-path"
-          "markdownDescription": "Denies the open_path command without any pre-configured scope."
         },
         {
           "description": "Enables the open_url command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-open-url",
+          "const": "allow-open-url"
-          "markdownDescription": "Enables the open_url command without any pre-configured scope."
         },
         {
           "description": "Denies the open_url command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-open-url",
+          "const": "deny-open-url"
-          "markdownDescription": "Denies the open_url command without any pre-configured scope."
         },
         {
           "description": "Enables the reveal_item_in_dir command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-reveal-item-in-dir",
+          "const": "allow-reveal-item-in-dir"
-          "markdownDescription": "Enables the reveal_item_in_dir command without any pre-configured scope."
         },
         {
           "description": "Denies the reveal_item_in_dir command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-reveal-item-in-dir",
+          "const": "deny-reveal-item-in-dir"
-          "markdownDescription": "Denies the reveal_item_in_dir command without any pre-configured scope."
         },
         {
-          "description": "This permission set allows opening `mailto:`, `tel:`, `https://` and `http://` urls using their default application\nas well as reveal file in directories using default file explorer\n#### This default permission set includes:\n\n- `allow-open-url`\n- `allow-reveal-item-in-dir`\n- `allow-default-urls`",
+          "description": "This permission set allows opening `mailto:`, `tel:`, `https://` and `http://` urls using their default application\nas well as reveal file in directories using default file explorer",
           "type": "string",
-          "const": "default",
+          "const": "default"
-          "markdownDescription": "This permission set allows opening `mailto:`, `tel:`, `https://` and `http://` urls using their default application\nas well as reveal file in directories using default file explorer\n#### This default permission set includes:\n\n- `allow-open-url`\n- `allow-reveal-item-in-dir`\n- `allow-default-urls`"
         }
       ]
     }

plugins/os/permissions/autogenerated/reference.md

@@ -10,8 +10,6 @@ All information except the host name are available.
 
 
 
-#### This default permission set includes the following:
-
 - `allow-arch`
 - `allow-exe-extension`
 - `allow-family`

plugins/os/permissions/schemas/schema.json

@@ -49,7 +49,7 @@
           "minimum": 1.0
         },
         "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. Tauri convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -111,7 +111,7 @@
           "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. Tauri internal convention is to use <h4> headings in markdown content for Tauri documentation generation purposes.",
           "type": [
             "string",
             "null"
@@ -297,104 +297,87 @@
         {
           "description": "Enables the arch command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-arch",
+          "const": "allow-arch"
-          "markdownDescription": "Enables the arch command without any pre-configured scope."
         },
         {
           "description": "Denies the arch command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-arch",
+          "const": "deny-arch"
-          "markdownDescription": "Denies the arch command without any pre-configured scope."
         },
         {
           "description": "Enables the exe_extension command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-exe-extension",
+          "const": "allow-exe-extension"
-          "markdownDescription": "Enables the exe_extension command without any pre-configured scope."
         },
         {
           "description": "Denies the exe_extension command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-exe-extension",
+          "const": "deny-exe-extension"
-          "markdownDescription": "Denies the exe_extension command without any pre-configured scope."
         },
         {
           "description": "Enables the family command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-family",
+          "const": "allow-family"
-          "markdownDescription": "Enables the family command without any pre-configured scope."
         },
         {
           "description": "Denies the family command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-family",
+          "const": "deny-family"
-          "markdownDescription": "Denies the family command without any pre-configured scope."
         },
         {
           "description": "Enables the hostname command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-hostname",
+          "const": "allow-hostname"
-          "markdownDescription": "Enables the hostname command without any pre-configured scope."
         },
         {
           "description": "Denies the hostname command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-hostname",
+          "const": "deny-hostname"
-          "markdownDescription": "Denies the hostname command without any pre-configured scope."
         },
         {
           "description": "Enables the locale command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-locale",
+          "const": "allow-locale"
-          "markdownDescription": "Enables the locale command without any pre-configured scope."
         },
         {
           "description": "Denies the locale command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-locale",
+          "const": "deny-locale"
-          "markdownDescription": "Denies the locale command without any pre-configured scope."
         },
         {
           "description": "Enables the os_type command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-os-type",
+          "const": "allow-os-type"
-          "markdownDescription": "Enables the os_type command without any pre-configured scope."
         },
         {
           "description": "Denies the os_type command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-os-type",
+          "const": "deny-os-type"
-          "markdownDescription": "Denies the os_type command without any pre-configured scope."
         },
         {
           "description": "Enables the platform command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-platform",
+          "const": "allow-platform"
-          "markdownDescription": "Enables the platform command without any pre-configured scope."
         },
         {
           "description": "Denies the platform command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-platform",
+          "const": "deny-platform"
-          "markdownDescription": "Denies the platform command without any pre-configured scope."
         },
         {
           "description": "Enables the version command without any pre-configured scope.",
           "type": "string",
-          "const": "allow-version",
+          "const": "allow-version"
-          "markdownDescription": "Enables the version command without any pre-configured scope."
         },
         {
           "description": "Denies the version command without any pre-configured scope.",
           "type": "string",
-          "const": "deny-version",
+          "const": "deny-version"
-          "markdownDescription": "Denies the version command without any pre-configured scope."
         },
         {
-          "description": "This permission set configures which\noperating system information are available\nto gather from the frontend.\n\n#### Granted Permissions\n\nAll information except the host name are available.\n\n\n#### This default permission set includes:\n\n- `allow-arch`\n- `allow-exe-extension`\n- `allow-family`\n- `allow-locale`\n- `allow-os-type`\n- `allow-platform`\n- `allow-version`",
+          "description": "This permission set configures which\noperating system information are available\nto gather from the frontend.\n\n#### Granted Permissions\n\nAll information except the host name are available.\n\n",
           "type": "string",
-          "const": "default",
+          "const": "default"
-          "markdownDescription": "This permission set configures which\noperating system information are available\nto gather from the frontend.\n\n#### Granted Permissions\n\nAll information except the host name are available.\n\n\n#### This default permission set includes:\n\n- `allow-arch`\n- `allow-exe-extension`\n- `allow-family`\n- `allow-locale`\n- `allow-os-type`\n- `allow-platform`\n- `allow-version`"
         }
       ]
     }

plugins/persisted-scope/CHANGELOG.md

@@ -1,17 +1,5 @@
 # Changelog
 
-## \[2.2.2]
-
-### Dependencies
-
-- Upgraded to `fs@2.3.0`
-
-## \[2.2.1]
-
-### Dependencies
-
-- Upgraded to `fs@2.2.1`
-
 ## \[2.2.0]
 
 - [`3a79266b`](https://github.com/tauri-apps/plugins-workspace/commit/3a79266b8cf96a55b1ae6339d725567d45a44b1d) ([#2173](https://github.com/tauri-apps/plugins-workspace/pull/2173) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Bumped all plugins to `v2.2.0`. From now, the versions for the Rust and JavaScript packages of each plugin will be in sync with each other.

plugins/persisted-scope/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-persisted-scope"
-version = "2.2.2"
+version = "2.2.0"
 description = "Save filesystem and asset scopes and restore them when the app is reopened."
 authors = { workspace = true }
 license = { workspace = true }
@@ -27,7 +27,7 @@ log = { workspace = true }
 thiserror = { workspace = true }
 aho-corasick = "1"
 bincode = "1"
-tauri-plugin-fs = { path = "../fs", version = "2.3.0" }
+tauri-plugin-fs = { path = "../fs", version = "2.2.0" }
 
 [features]
 protocol-asset = ["tauri/protocol-asset"]