Merge branch 'v2' into fix-ask-dialog-text

tauri-apps · Oct 20, 2024 · 93c4058 · 93c4058
2 parents 221e429 + 44c50c1
commit 93c4058
Show file tree

Hide file tree

Showing 9 changed files with 329 additions and 212 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,7 @@ resolver = "2"
 [workspace.dependencies]
 serde = { version = "1", features = ["derive"] }
 log = "0.4"
-tauri = { version = "2.0.2", default-features = false }
+tauri = { version = "2.0.4", default-features = false }
 tauri-build = "2.0.1"
 tauri-plugin = "2.0.1"
 tauri-utils = "2.0.1"

diff --git a/examples/api/package.json b/examples/api/package.json
@@ -33,7 +33,7 @@
     "@iconify-json/codicon": "^1.1.37",
     "@iconify-json/ph": "^1.1.8",
     "@sveltejs/vite-plugin-svelte": "^3.0.1",
-    "@tauri-apps/cli": "2.0.2",
+    "@tauri-apps/cli": "2.0.3",
     "@unocss/extractor-svelte": "^0.63.0",
     "svelte": "^4.2.19",
     "unocss": "^0.63.0",

diff --git a/package.json b/package.json
@@ -10,20 +10,20 @@
     "format:check": "prettier --check ."
   },
   "devDependencies": {
-    "@eslint/js": "9.12.0",
+    "@eslint/js": "9.13.0",
     "@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.3",
-    "eslint": "9.12.0",
+    "eslint": "9.13.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-security": "3.0.1",
     "prettier": "3.3.3",
     "rollup": "4.22.4",
     "tslib": "2.7.0",
     "typescript": "5.6.3",
-    "typescript-eslint": "8.9.0"
+    "typescript-eslint": "8.10.0"
   },
   "resolutions": {
     "semver": ">=7.5.2",

diff --git a/plugins/deep-link/examples/app/package.json b/plugins/deep-link/examples/app/package.json
@@ -14,7 +14,7 @@
     "@tauri-apps/plugin-deep-link": "2.0.0"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "2.0.2",
+    "@tauri-apps/cli": "2.0.3",
     "typescript": "^5.2.2",
     "vite": "^5.4.7"
   }

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.0.2"
+    "@tauri-apps/cli": "2.0.3"
   }
 }
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.0.2",
+    "@tauri-apps/cli": "2.0.3",
     "vite": "^5.0.12",
     "typescript": "^5.4.7"
   }

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.0.2",
+    "@tauri-apps/cli": "2.0.3",
     "typescript": "^5.3.3",
     "vite": "^5.4.7"
   },