sync v2 with upstream/v2

.changes/positioner-panic.md

@@ -0,0 +1,6 @@
+---
+positioner: patch
+positioner-js: patch
+---
+
+Removed panics and replaced them with error handling.

examples/api/package.json

@@ -36,7 +36,7 @@
     "@iconify-json/codicon": "^1.2.49",
     "@iconify-json/ph": "^1.2.2",
     "@sveltejs/vite-plugin-svelte": "^7.0.0",
-    "@tauri-apps/cli": "2.11.0",
+    "@tauri-apps/cli": "2.11.2",
     "@unocss/extractor-svelte": "^66.6.7",
     "svelte": "^5.54.0",
     "unocss": "^66.6.7",

package.json

@@ -15,11 +15,11 @@
     "@rollup/plugin-node-resolve": "16.0.3",
     "@rollup/plugin-terser": "1.0.0",
     "@rollup/plugin-typescript": "12.3.0",
-    "eslint": "10.2.0",
+    "eslint": "10.4.0",
     "eslint-config-prettier": "10.1.8",
     "eslint-plugin-security": "4.0.0",
     "prettier": "3.8.1",
-    "rollup": "4.59.0",
+    "rollup": "4.60.3",
     "tslib": "2.8.1",
     "typescript": "6.0.3",
     "typescript-eslint": "8.58.2"

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

@@ -14,7 +14,7 @@
     "@tauri-apps/plugin-deep-link": "2.4.9"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.11.0",
+    "@tauri-apps/cli": "2.11.2",
     "typescript": "^6.0.0",
     "vite": "^8.0.1"
   }

plugins/deep-link/package.json

@@ -28,6 +28,6 @@
     "@tauri-apps/api": "^2.11.0"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.11.0"
+    "@tauri-apps/cli": "2.11.2"
   }
 }

plugins/fs/src/commands.rs

@@ -707,7 +707,7 @@ pub async fn read_text_file_lines_next<R: Runtime>(
     let lines = resource_table.get::<StdLinesResource>(rid)?;
 
     let ret = StdLinesResource::with_lock(&lines, |lines| -> CommandResult<Vec<u8>> {
-        // This is an optimization to include wether we finished iteration or not (1 or 0)
+        // This is an optimization to include whether we finished iteration or not (1 or 0)
         // at the end of returned vector so we can use `tauri::ipc::Response`
         // and avoid serialization overhead of separate values.
         match lines.next() {

plugins/positioner/src/ext.rs

@@ -225,7 +225,9 @@ fn calculate_position<R: Runtime>(
 
                 PhysicalPosition { x: tray_x, y }
             } else {
-                panic!("Tray position not set");
+                return Err(tauri::Error::Io(std::io::Error::other(
+                    "Tray position not set",
+                )));
             }
         }
         #[cfg(feature = "tray-icon")]
@@ -236,7 +238,9 @@ fn calculate_position<R: Runtime>(
                     y: tray_y,
                 }
             } else {
-                panic!("Tray position not set");
+                return Err(tauri::Error::Io(std::io::Error::other(
+                    "Tray position not set",
+                )));
             }
         }
         #[cfg(feature = "tray-icon")]
@@ -257,7 +261,9 @@ fn calculate_position<R: Runtime>(
                     y,
                 }
             } else {
-                panic!("Tray position not set");
+                return Err(tauri::Error::Io(std::io::Error::other(
+                    "Tray position not set",
+                )));
             }
         }
         #[cfg(feature = "tray-icon")]
@@ -268,7 +274,9 @@ fn calculate_position<R: Runtime>(
                     y: tray_y,
                 }
             } else {
-                panic!("Tray position not set");
+                return Err(tauri::Error::Io(std::io::Error::other(
+                    "Tray position not set",
+                )));
             }
         }
         #[cfg(feature = "tray-icon")]
@@ -287,7 +295,9 @@ fn calculate_position<R: Runtime>(
 
                 PhysicalPosition { x, y }
             } else {
-                panic!("Tray position not set");
+                return Err(tauri::Error::Io(std::io::Error::other(
+                    "Tray position not set",
+                )));
             }
         }
         #[cfg(feature = "tray-icon")]
@@ -298,7 +308,9 @@ fn calculate_position<R: Runtime>(
                     y: tray_y,
                 }
             } else {
-                panic!("Tray position not set");
+                return Err(tauri::Error::Io(std::io::Error::other(
+                    "Tray position not set",
+                )));
             }
         }
     };

plugins/single-instance/examples/vanilla/package.json

@@ -9,6 +9,6 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "@tauri-apps/cli": "2.11.0"
+    "@tauri-apps/cli": "2.11.2"
   }
 }

plugins/store/examples/AppSettingsManager/package.json

@@ -8,7 +8,7 @@
     "tauri": "tauri"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.11.0",
+    "@tauri-apps/cli": "2.11.2",
     "typescript": "^6.0.0",
     "vite": "^8.0.1"
   }

plugins/upload/README.md

@@ -66,15 +66,17 @@ import { upload, HttpMethod } from '@tauri-apps/plugin-upload'
 upload(
   'https://example.com/file-upload',
   './path/to/my/file.txt',
-  (progress, total) => console.log(`Uploaded ${progress} of ${total} bytes`), // a callback that will be called with the upload progress
+  ({ progressTotal, total }) =>
+    console.log(`Uploaded ${progressTotal} of ${total} bytes`), // a callback that will be called with the upload progress
   { 'Content-Type': 'text/plain' } // optional headers to send with the request
 )
 
 // Upload with specific HTTP method
 upload(
   'https://example.com/file-upload',
   './path/to/my/file.txt',
-  (progress, total) => console.log(`Uploaded ${progress} of ${total} bytes`),
+  ({ progressTotal, total }) =>
+    console.log(`Uploaded ${progressTotal} of ${total} bytes`),
   { 'Content-Type': 'text/plain' },
   HttpMethod.Put // Use HttpMethod enum - supports POST, PUT, PATCH
 )
@@ -86,7 +88,8 @@ import { download } from '@tauri-apps/plugin-upload'
 download(
   'https://example.com/file-download-link',
   './path/to/save/my/file.txt',
-  (progress, total) => console.log(`Downloaded ${progress} of ${total} bytes`), // a callback that will be called with the download progress
+  ({ progressTotal, total }) =>
+    console.log(`Downloaded ${progressTotal} of ${total} bytes`), // a callback that will be called with the download progress
   { 'Content-Type': 'text/plain' } // optional headers to send with the request
 )
 ```

plugins/websocket/examples/tauri-app/package.json

@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.11.0",
+    "@tauri-apps/cli": "2.11.2",
     "typescript": "^6.0.0",
     "vite": "^8.0.1"
   },