Merge branch 'tauri-apps:v2' into feature/v2-http-dangerous-settings

tauri-apps · Dec 16, 2024 · 6c58554 · 6c58554
2 parents 398c603 + da64d9b
commit 6c58554
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 20 deletions.
diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml
@@ -54,7 +54,7 @@ features = [
 tauri-plugin-cli = { path = "../../../plugins/cli", version = "2.2.0" }
 tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.2.0" }
 tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.3.0" }
-tauri-plugin-window-state = { path = "../../../plugins/window-state", version = "2.0.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" }

diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "@eslint/js": "9.17.0",
-    "@rollup/plugin-node-resolve": "15.3.0",
+    "@rollup/plugin-node-resolve": "16.0.0",
     "@rollup/plugin-terser": "0.4.4",
     "@rollup/plugin-typescript": "11.1.6",
     "@types/eslint__js": "8.42.3",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml