Merge branch 'v2' of https://github.com/tauri-apps/plugins-workspace into feature/fallback_targets

Legend-Master · Legend-Master · commit 043d89f4ff39 · 2025-07-25T09:53:36.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/api/package.json b/examples/api/package.json
@@ -36,7 +36,7 @@
     "@iconify-json/codicon": "^1.2.12",
     "@iconify-json/ph": "^1.2.2",
     "@sveltejs/vite-plugin-svelte": "^6.0.0",
-    "@tauri-apps/cli": "2.7.0",
+    "@tauri-apps/cli": "2.7.1",
     "@unocss/extractor-svelte": "^66.3.3",
     "svelte": "^5.20.4",
     "unocss": "^66.3.3",
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "rollup": "4.45.1",
     "tslib": "2.8.1",
     "typescript": "5.8.3",
-    "typescript-eslint": "8.37.0"
+    "typescript-eslint": "8.38.0"
   },
   "pnpm": {
     "overrides": {
diff --git a/plugins/deep-link/CHANGELOG.md b/plugins/deep-link/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## \[2.4.1]
+
+- [`d4f8299b`](https://github.com/tauri-apps/plugins-workspace/commit/d4f8299b12f107718c70692840a63768d65baaf9) ([#2844](https://github.com/tauri-apps/plugins-workspace/pull/2844) by [@yobson1](https://github.com/tauri-apps/plugins-workspace/../../yobson1)) Fix deep link protocol handler not set as default on linux
+  Fix duplicate protocols added to MimeType section in .desktop files on linux
+
 ## \[2.4.0]
 
 - [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
diff --git a/plugins/deep-link/Cargo.toml b/plugins/deep-link/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-deep-link"
-version = "2.4.0"
+version = "2.4.1"
 description = "Set your Tauri application as the default handler for an URL"
 authors = { workspace = true }
 license = { workspace = true }
@@ -17,9 +17,9 @@ targets = ["x86_64-linux-android"]
 [package.metadata.platforms.support]
 windows = { level = "full", notes = "" }
 linux = { level = "full", notes = "" }
-macos = { level = "partial", notes = "Runtime deep link registration is not supported" }
-android = { level = "partial", notes = "Runtime deep link registration is not supported" }
-ios = { level = "partial", notes = "Runtime deep link registration is not supported" }
+macos = { level = "partial", notes = "Deep links must be registered in config. Dynamic registration at runtime is not supported." }
+android = { level = "partial", notes = "Deep links must be registered in config. Dynamic registration at runtime is not supported." }
+ios = { level = "partial", notes = "Deep links must be registered in config. Dynamic registration at runtime is not supported." }
 
 [build-dependencies]
 serde = { workspace = true }
diff --git a/plugins/deep-link/examples/app/CHANGELOG.md b/plugins/deep-link/examples/app/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.2.4]
+
+### Dependencies
+
+- Upgraded to `deep-link-js@2.4.1`
+
 ## \[2.2.3]
 
 ### Dependencies
diff --git a/plugins/deep-link/examples/app/package.json b/plugins/deep-link/examples/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "deep-link-example",
   "private": true,
-  "version": "2.2.3",
+  "version": "2.2.4",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -11,10 +11,10 @@
   },
   "dependencies": {
     "@tauri-apps/api": "2.7.0",
-    "@tauri-apps/plugin-deep-link": "2.4.0"
+    "@tauri-apps/plugin-deep-link": "2.4.1"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.7.0",
+    "@tauri-apps/cli": "2.7.1",
     "typescript": "^5.7.3",
     "vite": "^7.0.4"
   }
diff --git a/plugins/deep-link/package.json b/plugins/deep-link/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tauri-apps/plugin-deep-link",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "description": "Set your Tauri application as the default handler for an URL",
   "license": "MIT OR Apache-2.0",
   "authors": [
diff --git a/plugins/deep-link/src/lib.rs b/plugins/deep-link/src/lib.rs
@@ -303,12 +303,14 @@ mod imp {
 
                 if let Ok(mut desktop_file) = ini::Ini::load_from_file(&target_file) {
                     if let Some(section) = desktop_file.section_mut(Some("Desktop Entry")) {
-                        let old_mimes = section.remove("MimeType");
-                        section.append(
-                            "MimeType",
-                            format!("{mime_type};{}", old_mimes.unwrap_or_default()),
-                        );
-                        desktop_file.write_to_file(&target_file)?;
+                        // it's ok to remove it - we only write to the file if it's missing
+                        // and in that case we include old_mimes
+                        let old_mimes = section.remove("MimeType").unwrap_or_default();
+
+                        if !old_mimes.split(';').any(|mime| mime == mime_type) {
+                            section.append("MimeType", format!("{mime_type};{old_mimes}"));
+                            desktop_file.write_to_file(&target_file)?;
+                        }
                     }
                 } else {
                     let mut file = File::create(target_file)?;
@@ -333,7 +335,7 @@ mod imp {
                     .status()?;
 
                 Command::new("xdg-mime")
-                    .args(["default", &file_name, _protocol.as_ref()])
+                    .args(["default", &file_name, mime_type.as_str()])
                     .status()?;
 
                 Ok(())
diff --git a/plugins/shell/guest-js/index.ts b/plugins/shell/guest-js/index.ts
@@ -388,7 +388,7 @@ class Command<O extends IOPayload> extends EventEmitter<CommandEvents> {
    * Creates a new `Command` instance.
    *
    * @param program The program name to execute.
-   * It must be configured on `tauri.conf.json > plugins > shell > scope`.
+   * It must be configured in your project's capabilities.
    * @param args Program arguments.
    * @param options Spawn options.
    */
@@ -425,7 +425,7 @@ class Command<O extends IOPayload> extends EventEmitter<CommandEvents> {
    * ```
    *
    * @param program The program to execute.
-   * It must be configured on `tauri.conf.json > plugins > shell > scope`.
+   * It must be configured in your project's capabilities.
    */
   static create<O extends IOPayload>(
     program: string,
@@ -457,7 +457,7 @@ class Command<O extends IOPayload> extends EventEmitter<CommandEvents> {
    * ```
    *
    * @param program The program to execute.
-   * It must be configured on `tauri.conf.json > plugins > shell > scope`.
+   * It must be configured in your project's capabilities.
    */
   static sidecar<O extends IOPayload>(
     program: string,
diff --git a/plugins/single-instance/CHANGELOG.md b/plugins/single-instance/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## \[2.3.2]
+
+### Dependencies
+
+- Upgraded to `deep-link@2.4.1`
+
 ## \[2.3.1]
 
 - [`6f345870`](https://github.com/tauri-apps/plugins-workspace/commit/6f345870df4e7b187deb869df03b79858e03b4fe) ([#2860](https://github.com/tauri-apps/plugins-workspace/pull/2860) by [@MorpheusXAUT](https://github.com/tauri-apps/plugins-workspace/../../MorpheusXAUT)) Fix D-Bus name replacement logic on Linux to prevent multiple instances from acquiring the same well-known name.\
diff --git a/plugins/single-instance/Cargo.toml b/plugins/single-instance/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tauri-plugin-single-instance"
-version = "2.3.1"
+version = "2.3.2"
 description = "Ensure a single instance of your tauri app is running."
 authors = { workspace = true }
 license = { workspace = true }
@@ -26,7 +26,7 @@ serde_json = { workspace = true }
 tauri = { workspace = true }
 tracing = { workspace = true }
 thiserror = { workspace = true }
-tauri-plugin-deep-link = { path = "../deep-link", version = "2.4.0", optional = true }
+tauri-plugin-deep-link = { path = "../deep-link", version = "2.4.1", optional = true }
 semver = { version = "1", optional = true }
 
 [target."cfg(target_os = \"windows\")".dependencies.windows-sys]
diff --git a/plugins/single-instance/examples/vanilla/package.json b/plugins/single-instance/examples/vanilla/package.json
@@ -9,6 +9,6 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "@tauri-apps/cli": "2.7.0"
+    "@tauri-apps/cli": "2.7.1"
   }
 }
diff --git a/plugins/store/examples/AppSettingsManager/package.json b/plugins/store/examples/AppSettingsManager/package.json
@@ -8,7 +8,7 @@
     "tauri": "tauri"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.7.0",
+    "@tauri-apps/cli": "2.7.1",
     "typescript": "^5.7.3",
     "vite": "^7.0.4"
   }
diff --git a/plugins/websocket/examples/tauri-app/package.json b/plugins/websocket/examples/tauri-app/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.7.0",
+    "@tauri-apps/cli": "2.7.1",
     "typescript": "^5.7.3",
     "vite": "^7.0.4"
   },
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@tauri-apps/plugin-deep-link",`
`3`		`- "version": "2.4.0",`
	`3`	`+ "version": "2.4.1",`
`4`	`4`	`"description": "Set your Tauri application as the default handler for an URL",`
`5`	`5`	`"license": "MIT OR Apache-2.0",`
`6`	`6`	`"authors": [`