Skip to content

Commit 6c58554

Browse files
authored
Merge branch 'tauri-apps:v2' into feature/v2-http-dangerous-settings
2 parents 398c603 + da64d9b commit 6c58554

File tree

3 files changed

+18
-20
lines changed

3 files changed

+18
-20
lines changed

examples/api/src-tauri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ features = [
5454
tauri-plugin-cli = { path = "../../../plugins/cli", version = "2.2.0" }
5555
tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.2.0" }
5656
tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.3.0" }
57-
tauri-plugin-window-state = { path = "../../../plugins/window-state", version = "2.0.0" }
57+
tauri-plugin-window-state = { path = "../../../plugins/window-state", version = "2.2.0" }
5858

5959
[target."cfg(any(target_os = \"android\", target_os = \"ios\"))".dependencies]
6060
tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.2.0" }

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"devDependencies": {
1414
"@eslint/js": "9.17.0",
15-
"@rollup/plugin-node-resolve": "15.3.0",
15+
"@rollup/plugin-node-resolve": "16.0.0",
1616
"@rollup/plugin-terser": "0.4.4",
1717
"@rollup/plugin-typescript": "11.1.6",
1818
"@types/eslint__js": "8.42.3",

pnpm-lock.yaml

Lines changed: 16 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)