Merge branch 'v2' into handle-icon-state

tauri-apps · Sep 26, 2024 · c45c6e7 · c45c6e7
2 parents de17755 + aabc4d3
commit c45c6e7
Show file tree

Hide file tree

Showing 46 changed files with 577 additions and 295 deletions.
diff --git a/.changes/fix-fs-scope-unknown-path.md b/.changes/fix-fs-scope-unknown-path.md
@@ -0,0 +1,5 @@
+---
+fs: patch
+---
+
+Fix failing to deserialize capability file when using an OS specific path in the scope that is not available on the current OS.
diff --git a/.changes/updater-endpoints-result.md b/.changes/updater-endpoints-result.md
@@ -0,0 +1,5 @@
+---
+"updater": patch
+---
+
+**Breaking change**, Changed `UpdaterBuilder::endpoints` method to return a `Result`.
diff --git a/.changes/updater-insecure-transport-protocol.md b/.changes/updater-insecure-transport-protocol.md
@@ -0,0 +1,5 @@
+---
+"updater": patch
+---
+
+Add `dangerousInsecureTransportProtocol` config option to allow using insecure transport protocols, like `http`
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/api/package.json b/examples/api/package.json
@@ -27,7 +27,7 @@
     "@tauri-apps/plugin-shell": "2.0.0-rc.1",
     "@tauri-apps/plugin-store": "2.0.0-rc.1",
     "@tauri-apps/plugin-updater": "2.0.0-rc.2",
-    "@zerodevx/svelte-json-view": "1.0.10"
+    "@zerodevx/svelte-json-view": "1.0.11"
   },
   "devDependencies": {
     "@iconify-json/codicon": "^1.1.37",
@@ -37,6 +37,6 @@
     "@unocss/extractor-svelte": "^0.62.0",
     "svelte": "^4.2.19",
     "unocss": "^0.62.0",
-    "vite": "^5.0.13"
+    "vite": "^5.4.7"
   }
 }
diff --git a/package.json b/package.json
@@ -10,20 +10,20 @@
     "format:check": "prettier --check ."
   },
   "devDependencies": {
-    "@eslint/js": "9.10.0",
-    "@rollup/plugin-node-resolve": "15.2.3",
+    "@eslint/js": "9.11.1",
+    "@rollup/plugin-node-resolve": "15.3.0",
     "@rollup/plugin-terser": "0.4.4",
     "@rollup/plugin-typescript": "11.1.6",
     "@types/eslint__js": "8.42.3",
-    "covector": "^0.12.0",
-    "eslint": "9.10.0",
+    "covector": "^0.12.3",
+    "eslint": "9.11.1",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-security": "3.0.1",
     "prettier": "3.3.3",
-    "rollup": "4.22.0",
+    "rollup": "4.22.4",
     "tslib": "2.7.0",
     "typescript": "5.6.2",
-    "typescript-eslint": "8.6.0"
+    "typescript-eslint": "8.7.0"
   },
   "resolutions": {
     "semver": ">=7.5.2",

diff --git a/plugins/autostart/Cargo.toml b/plugins/autostart/Cargo.toml
@@ -13,6 +13,13 @@ links = "tauri-plugin-autostart"
 rustc-args = ["--cfg", "docsrs"]
 rustdoc-args = ["--cfg", "docsrs"]
 
+[package.metadata.platforms.support]
+windows = { level = "full", notes = "" }
+linux = { level = "full", notes = "" }
+macos = { level = "full", notes = "" }
+android = { level = "none", notes = "" }
+ios = { level = "none", notes = "" }
+
 [build-dependencies]
 tauri-plugin = { workspace = true, features = ["build"] }
 

diff --git a/plugins/barcode-scanner/Cargo.toml b/plugins/barcode-scanner/Cargo.toml
@@ -14,6 +14,14 @@ rustc-args = ["--cfg", "docsrs"]
 rustdoc-args = ["--cfg", "docsrs"]
 targets = ["x86_64-linux-android"]
 
+[package.metadata.platforms.support]
+windows = { level = "none", notes = "" }
+linux = { level = "none", notes = "" }
+macos = { level = "none", notes = "" }
+android = { level = "full", notes = "" }
+ios = { level = "full", notes = "" }
+
+
 [build-dependencies]
 tauri-plugin = { workspace = true, features = ["build"] }
 

diff --git a/plugins/biometric/Cargo.toml b/plugins/biometric/Cargo.toml
@@ -13,6 +13,14 @@ rustc-args = ["--cfg", "docsrs"]
 rustdoc-args = ["--cfg", "docsrs"]
 targets = ["x86_64-linux-android"]
 
+[package.metadata.platforms.support]
+windows = { level = "none", notes = "" }
+linux = { level = "none", notes = "" }
+macos = { level = "none", notes = "" }
+android = { level = "full", notes = "" }
+ios = { level = "full", notes = "" }
+
+
 [build-dependencies]
 tauri-plugin = { workspace = true, features = ["build"] }
 

diff --git a/plugins/cli/Cargo.toml b/plugins/cli/Cargo.toml
@@ -13,6 +13,14 @@ links = "tauri-plugin-cli"
 rustc-args = ["--cfg", "docsrs"]
 rustdoc-args = ["--cfg", "docsrs"]
 
+[package.metadata.platforms.support]
+windows = { level = "full", notes = "" }
+linux = { level = "full", notes = "" }
+macos = { level = "full", notes = "" }
+android = { level = "none", notes = "" }
+ios = { level = "none", notes = "" }
+
+
 [build-dependencies]
 tauri-plugin = { workspace = true, features = ["build"] }
 

diff --git a/plugins/clipboard-manager/Cargo.toml b/plugins/clipboard-manager/Cargo.toml
@@ -14,6 +14,14 @@ rustc-args = ["--cfg", "docsrs"]
 rustdoc-args = ["--cfg", "docsrs"]
 targets = ["x86_64-unknown-linux-gnu", "x86_64-linux-android"]
 
+[package.metadata.platforms.support]
+windows = { level = "full", notes = "" }
+linux = { level = "full", notes = "" }
+macos = { level = "full", notes = "" }
+android = { level = "partial", notes = "Only plain-text content support" }
+ios = { level = "partial", notes = "Only plain-text content support" }
+
+
 [build-dependencies]
 tauri-plugin = { workspace = true, features = ["build"] }
 

diff --git a/plugins/deep-link/Cargo.toml b/plugins/deep-link/Cargo.toml
@@ -14,6 +14,13 @@ rustc-args = ["--cfg", "docsrs"]
 rustdoc-args = ["--cfg", "docsrs"]
 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" }
+
 [build-dependencies]
 serde = { workspace = true }
 serde_json = { workspace = true }
@@ -31,7 +38,7 @@ url = { workspace = true }
 
 [target."cfg(windows)".dependencies]
 dunce = "1"
-windows-registry = "0.2"
+windows-registry = "0.3"
 windows-result = "0.2"
 
 [target."cfg(target_os = \"linux\")".dependencies]

diff --git a/plugins/deep-link/examples/app/package.json b/plugins/deep-link/examples/app/package.json
@@ -16,6 +16,6 @@
   "devDependencies": {
     "@tauri-apps/cli": "2.0.0-rc.16",
     "typescript": "^5.2.2",
-    "vite": "^5.0.13"
+    "vite": "^5.4.7"
   }
 }
diff --git a/plugins/dialog/Cargo.toml b/plugins/dialog/Cargo.toml
@@ -14,6 +14,13 @@ rustc-args = ["--cfg", "docsrs"]
 rustdoc-args = ["--cfg", "docsrs"]
 targets = ["x86_64-unknown-linux-gnu", "x86_64-linux-android"]
 
+[package.metadata.platforms.support]
+windows = { level = "full", notes = "" }
+linux = { level = "full", notes = "" }
+macos = { level = "full", notes = "" }
+android = { level = "partial", notes = "Does not support folder picker" }
+ios = { level = "partial", notes = "Does not support folder picker" }
+
 [build-dependencies]
 tauri-plugin = { workspace = true, features = ["build"] }
 

diff --git a/plugins/fs/Cargo.toml b/plugins/fs/Cargo.toml
@@ -13,6 +13,13 @@ links = "tauri-plugin-fs"
 rustc-args = ["--cfg", "docsrs"]
 rustdoc-args = ["--cfg", "docsrs"]
 
+[package.metadata.platforms.support]
+windows = { level = "full", notes = "" }
+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" }
+ios = { level = "partial", notes = "Access is restricted to Application folder by default" }
+
 [build-dependencies]
 tauri-plugin = { workspace = true, features = ["build"] }
 schemars = { workspace = true }

diff --git a/plugins/fs/src/commands.rs b/plugins/fs/src/commands.rs
@@ -993,8 +993,8 @@ pub fn resolve_path<R: Runtime>(
                 .unwrap()
                 .clone()
                 .into_iter()
-                .chain(global_scope.allows().iter().map(|e| e.path.clone()))
-                .chain(command_scope.allows().iter().map(|e| e.path.clone()))
+                .chain(global_scope.allows().iter().filter_map(|e| e.path.clone()))
+                .chain(command_scope.allows().iter().filter_map(|e| e.path.clone()))
                 .collect(),
             deny: webview
                 .fs_scope()
@@ -1003,8 +1003,8 @@ pub fn resolve_path<R: Runtime>(
                 .unwrap()
                 .clone()
                 .into_iter()
-                .chain(global_scope.denies().iter().map(|e| e.path.clone()))
-                .chain(command_scope.denies().iter().map(|e| e.path.clone()))
+                .chain(global_scope.denies().iter().filter_map(|e| e.path.clone()))
+                .chain(command_scope.denies().iter().filter_map(|e| e.path.clone()))
                 .collect(),
             require_literal_leading_dot: webview.fs_scope().require_literal_leading_dot,
         },

diff --git a/plugins/fs/src/lib.rs b/plugins/fs/src/lib.rs
@@ -353,17 +353,17 @@ impl ScopeObject for scope::Entry {
         app: &AppHandle<R>,
         raw: Value,
     ) -> std::result::Result<Self, Self::Error> {
-        let entry = serde_json::from_value(raw.into()).map(|raw| {
-            let path = match raw {
-                scope::EntryRaw::Value(path) => path,
-                scope::EntryRaw::Object { path } => path,
-            };
-            Self { path }
+        let path = serde_json::from_value(raw.into()).map(|raw| match raw {
+            scope::EntryRaw::Value(path) => path,
+            scope::EntryRaw::Object { path } => path,
         })?;
 
-        Ok(Self {
-            path: app.path().parse(entry.path)?,
-        })
+        match app.path().parse(path) {
+            Ok(path) => Ok(Self { path: Some(path) }),
+            #[cfg(not(target_os = "android"))]
+            Err(tauri::Error::UnknownPath) => Ok(Self { path: None }),
+            Err(err) => Err(err.into()),
+        }
     }
 }
 

diff --git a/plugins/fs/src/scope.rs b/plugins/fs/src/scope.rs
@@ -23,7 +23,7 @@ pub enum EntryRaw {
 
 #[derive(Debug)]
 pub struct Entry {
-    pub path: PathBuf,
+    pub path: Option<PathBuf>,
 }
 
 pub type EventId = u32;

diff --git a/plugins/geolocation/Cargo.toml b/plugins/geolocation/Cargo.toml
@@ -13,6 +13,13 @@ rustc-args = ["--cfg", "docsrs"]
 rustdoc-args = ["--cfg", "docsrs"]
 targets = ["x86_64-linux-android"]
 
+[package.metadata.platforms.support]
+windows = { level = "none", notes = "" }
+linux = { level = "none", notes = "" }
+macos = { level = "none", notes = "" }
+android = { level = "full", notes = "" }
+ios = { level = "full", notes = "" }
+
 [build-dependencies]
 tauri-plugin = { workspace = true, features = ["build"] }
 

diff --git a/plugins/global-shortcut/Cargo.toml b/plugins/global-shortcut/Cargo.toml
@@ -13,6 +13,13 @@ links = "tauri-plugin-global-shortcut"
 rustc-args = ["--cfg", "docsrs"]
 rustdoc-args = ["--cfg", "docsrs"]
 
+[package.metadata.platforms.support]
+windows = { level = "full", notes = "" }
+linux = { level = "full", notes = "" }
+macos = { level = "full", notes = "" }
+android = { level = "none", notes = "" }
+ios = { level = "none", notes = "" }
+
 [build-dependencies]
 tauri-plugin = { workspace = true, features = ["build"] }
 

diff --git a/plugins/haptics/Cargo.toml b/plugins/haptics/Cargo.toml
@@ -13,6 +13,13 @@ rustc-args = ["--cfg", "docsrs"]
 rustdoc-args = ["--cfg", "docsrs"]
 targets = ["x86_64-linux-android"]
 
+[package.metadata.platforms.support]
+windows = { level = "none", notes = "" }
+linux = { level = "none", notes = "" }
+macos = { level = "none", notes = "" }
+android = { level = "full", notes = "" }
+ios = { level = "full", notes = "" }
+
 [build-dependencies]
 tauri-plugin = { workspace = true, features = ["build"] }
 

diff --git a/plugins/http/Cargo.toml b/plugins/http/Cargo.toml
@@ -13,6 +13,13 @@ links = "tauri-plugin-http"
 rustc-args = ["--cfg", "docsrs"]
 rustdoc-args = ["--cfg", "docsrs"]
 
+[package.metadata.platforms.support]
+windows = { level = "full", notes = "" }
+linux = { level = "full", notes = "" }
+macos = { level = "full", notes = "" }
+android = { level = "none", notes = "" }
+ios = { level = "none", notes = "" }
+
 [build-dependencies]
 tauri-plugin = { workspace = true, features = ["build"] }
 schemars = { workspace = true }

diff --git a/plugins/localhost/Cargo.toml b/plugins/localhost/Cargo.toml
@@ -12,6 +12,13 @@ repository = { workspace = true }
 rustc-args = ["--cfg", "docsrs"]
 rustdoc-args = ["--cfg", "docsrs"]
 
+[package.metadata.platforms.support]
+windows = { level = "full", notes = "" }
+linux = { level = "full", notes = "" }
+macos = { level = "full", notes = "" }
+android = { level = "none", notes = "" }
+ios = { level = "none", notes = "" }
+
 [dependencies]
 serde = { workspace = true }
 serde_json = { workspace = true }