Merge branch 'upgrade-electron-to-31-des-1460'

mullvad · Dec 17, 2024 · a59360c · a59360c
2 parents c065a5f + 757fa42
commit a59360c
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 55 deletions.
diff --git a/desktop/package-lock.json b/desktop/package-lock.json
diff --git a/desktop/package.json b/desktop/package.json
@@ -19,22 +19,22 @@
   "devDependencies": {
     "@eslint/js": "^9.10.0",
     "@types/eslint__js": "^8.42.3",
-    "@types/node": "^20.12.11",
+    "@types/node": "^20.17.9",
     "eslint": "^9.10.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "prettier": "^3.3.3",
     "ts-node": "^10.9.2",
-    "typescript": "^5.4.5",
+    "typescript": "^5.6.3",
     "typescript-eslint": "^8.15.0"
   },
   "engines": {
     "node": ">=16",
     "npm": ">=8.3"
   },
   "volta": {
-    "node": "20.13.0",
-    "npm": "9.9.0"
+    "node": "20.18.1",
+    "npm": "10.9.1"
   }
 }
diff --git a/desktop/packages/mullvad-vpn/package.json b/desktop/packages/mullvad-vpn/package.json
@@ -12,21 +12,21 @@
   "repository": "https://github.com/mullvad/mullvadvpn-app",
   "license": "GPL-3.0",
   "dependencies": {
-    "@grpc/grpc-js": "^1.9.6",
+    "@grpc/grpc-js": "^1.12.2",
     "argv-split": "^2.0.1",
     "gettext-parser": "^6.0.0",
     "gl-matrix": "^3.4.3",
     "google-protobuf": "^3.21.0",
     "node-gettext": "^3.0.0",
+    "nseventforwarder": "0.0.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-redux": "^7.2.9",
     "react-router": "^5.3.4",
     "redux": "^4.2.0",
     "simple-plist": "^1.3.1",
     "sprintf-js": "^1.1.2",
-    "styled-components": "^6.1.13",
-    "nseventforwarder": "0.0.0"
+    "styled-components": "^6.1.13"
   },
   "optionalDependencies": {
     "grpc-tools": "^1.12.4"
@@ -52,15 +52,15 @@
     "chai-as-promised": "^7.1.1",
     "chai-spies": "^1.0.0",
     "cross-env": "^7.0.3",
-    "electron": "30.0.4",
+    "electron": "33.2.1",
     "electron-builder": "^24.13.3",
     "electron-devtools-installer": "^3.2.0",
     "eslint-plugin-react": "^7.36.1",
     "eslint-plugin-react-compiler": "^0.0.0-experimental-42acc6a-20241001",
     "eslint-plugin-react-hooks": "^0.0.0-experimental-2d16326d-20240930",
     "gettext-extractor": "^3.5.4",
     "globals": "^15.9.0",
-    "grpc_tools_node_protoc_ts": "^5.3.2",
+    "grpc_tools_node_protoc_ts": "^5.3.3",
     "gulp": "^4.0.2",
     "gulp-inject-string": "^1.1.2",
     "gulp-sourcemaps": "^3.0.0",