From 11be0546612b2f2d03b927c568d25208d699974e Mon Sep 17 00:00:00 2001 From: Oskar Date: Mon, 18 Nov 2024 08:48:40 +0100 Subject: [PATCH 1/4] Update Electron to 33.2.1 --- desktop/package-lock.json | 16 ++++++++-------- desktop/packages/mullvad-vpn/package.json | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/desktop/package-lock.json b/desktop/package-lock.json index 2a3f727b2815..b4f7726b76be 100644 --- a/desktop/package-lock.json +++ b/desktop/package-lock.json @@ -5373,9 +5373,9 @@ } }, "node_modules/electron": { - "version": "30.0.4", - "resolved": "https://registry.npmjs.org/electron/-/electron-30.0.4.tgz", - "integrity": "sha512-z8tGQeiVM6CHj0t8PKWVhAB4FZTRNN0vSrd1jA4edX1aOjBztddk4d0Gyw91pQb4arIVf2RGPu0hYbHG2+vDcA==", + "version": "33.2.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-33.2.1.tgz", + "integrity": "sha512-SG/nmSsK9Qg1p6wAW+ZfqU+AV8cmXMTIklUL18NnOKfZLlum4ZsDoVdmmmlL39ZmeCaq27dr7CgslRPahfoVJg==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -14667,7 +14667,7 @@ "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", @@ -18928,9 +18928,9 @@ } }, "electron": { - "version": "30.0.4", - "resolved": "https://registry.npmjs.org/electron/-/electron-30.0.4.tgz", - "integrity": "sha512-z8tGQeiVM6CHj0t8PKWVhAB4FZTRNN0vSrd1jA4edX1aOjBztddk4d0Gyw91pQb4arIVf2RGPu0hYbHG2+vDcA==", + "version": "33.2.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-33.2.1.tgz", + "integrity": "sha512-SG/nmSsK9Qg1p6wAW+ZfqU+AV8cmXMTIklUL18NnOKfZLlum4ZsDoVdmmmlL39ZmeCaq27dr7CgslRPahfoVJg==", "dev": true, "requires": { "@electron/get": "^2.0.0", @@ -22546,7 +22546,7 @@ "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", diff --git a/desktop/packages/mullvad-vpn/package.json b/desktop/packages/mullvad-vpn/package.json index 7137419a8e55..6bfc94507c59 100644 --- a/desktop/packages/mullvad-vpn/package.json +++ b/desktop/packages/mullvad-vpn/package.json @@ -18,6 +18,7 @@ "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", @@ -25,8 +26,7 @@ "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,7 +52,7 @@ "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", From 914405a786a0f9fab3d147a24cea9bfda9f40c08 Mon Sep 17 00:00:00 2001 From: Oskar Date: Mon, 18 Nov 2024 08:50:13 +0100 Subject: [PATCH 2/4] Update node and npm --- desktop/package-lock.json | 32 +++++++++++++++++--------------- desktop/package.json | 6 +++--- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/desktop/package-lock.json b/desktop/package-lock.json index b4f7726b76be..ac95b27bacb2 100644 --- a/desktop/package-lock.json +++ b/desktop/package-lock.json @@ -14,7 +14,7 @@ "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", @@ -2030,11 +2030,12 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.12.11", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.11.tgz", - "integrity": "sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==", + "version": "20.17.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.9.tgz", + "integrity": "sha512-0JOXkRyLanfGPE2QRCwgxhzlBAvaRdCNMcvbd7jFfpmD4eEXll7LRwy5ymJmyeZqk7Nh7eD2LeUyQ68BbndmXw==", + "license": "MIT", "dependencies": { - "undici-types": "~5.26.4" + "undici-types": "~6.19.2" } }, "node_modules/@types/node-gettext": { @@ -13713,9 +13714,10 @@ "dev": true }, "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", + "license": "MIT" }, "node_modules/union-value": { "version": "1.0.1", @@ -16265,11 +16267,11 @@ "dev": true }, "@types/node": { - "version": "20.12.11", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.11.tgz", - "integrity": "sha512-vDg9PZ/zi+Nqp6boSOT7plNuthRugEKixDv5sFTIpkE89MmNtEArAShI4mxuX2+UrLEe9pxC1vm2cjm9YlWbJw==", + "version": "20.17.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.9.tgz", + "integrity": "sha512-0JOXkRyLanfGPE2QRCwgxhzlBAvaRdCNMcvbd7jFfpmD4eEXll7LRwy5ymJmyeZqk7Nh7eD2LeUyQ68BbndmXw==", "requires": { - "undici-types": "~5.26.4" + "undici-types": "~6.19.2" } }, "@types/node-gettext": { @@ -25425,9 +25427,9 @@ "dev": true }, "undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==" }, "union-value": { "version": "1.0.1", diff --git a/desktop/package.json b/desktop/package.json index 8069d389699e..cdea7a995d1e 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -19,7 +19,7 @@ "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", @@ -34,7 +34,7 @@ "npm": ">=8.3" }, "volta": { - "node": "20.13.0", - "npm": "9.9.0" + "node": "20.18.1", + "npm": "10.9.1" } } From 983fbd432fe4211a226c0177c5857b58983b4fcc Mon Sep 17 00:00:00 2001 From: Oskar Date: Mon, 18 Nov 2024 08:50:44 +0100 Subject: [PATCH 3/4] Update TypeScript to latest --- desktop/package-lock.json | 15 ++++++++------- desktop/package.json | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/desktop/package-lock.json b/desktop/package-lock.json index ac95b27bacb2..63a394e12add 100644 --- a/desktop/package-lock.json +++ b/desktop/package-lock.json @@ -21,7 +21,7 @@ "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": { @@ -13577,10 +13577,11 @@ "dev": true }, "node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", + "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -25334,9 +25335,9 @@ "dev": true }, "typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "version": "5.6.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", + "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "dev": true }, "typescript-eslint": { diff --git a/desktop/package.json b/desktop/package.json index cdea7a995d1e..d4bb366915b2 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -26,7 +26,7 @@ "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": { From c4fd7f7a1d7e0d051c98b5a1d3be402dd6b9da43 Mon Sep 17 00:00:00 2001 From: Oskar Date: Tue, 19 Nov 2024 14:22:34 +0100 Subject: [PATCH 4/4] Update grpc-dependencies --- desktop/package-lock.json | 34 ++++++++++++----------- desktop/packages/mullvad-vpn/package.json | 4 +-- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/desktop/package-lock.json b/desktop/package-lock.json index 63a394e12add..64e60bd9935f 100644 --- a/desktop/package-lock.json +++ b/desktop/package-lock.json @@ -1097,9 +1097,10 @@ } }, "node_modules/@grpc/grpc-js": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.11.2.tgz", - "integrity": "sha512-DWp92gDD7/Qkj7r8kus6/HCINeo3yPZWZ3paKgDgsbKbSpoxKg1yvN8xe2Q8uE3zOsPe3bX8FQX2+XValq2yTw==", + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.12.2.tgz", + "integrity": "sha512-bgxdZmgTrJZX50OjyVwz3+mNEnCTNkh3cIqGPWVNeW9jX6bn1ZkU80uPd+67/ZpIJIjRQ9qaHCjhavyoWYxumg==", + "license": "Apache-2.0", "dependencies": { "@grpc/proto-loader": "^0.7.13", "@js-sdsl/ordered-map": "^4.4.2" @@ -7396,10 +7397,11 @@ "dev": true }, "node_modules/grpc_tools_node_protoc_ts": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/grpc_tools_node_protoc_ts/-/grpc_tools_node_protoc_ts-5.3.2.tgz", - "integrity": "sha512-7xPSeu8bwjcird3i9R5+9O4BF2Lhv9fMBdeobfUc2Bys9tSVtm/VB3WjTpKV78WlLYJyD94+wL/8hJqaMZ53Hw==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/grpc_tools_node_protoc_ts/-/grpc_tools_node_protoc_ts-5.3.3.tgz", + "integrity": "sha512-M/YrklvVXMtuuj9kb42PxeouZhs7Ul+R4e/31XwrankUcKL8cQQP50Q9q+KEHGyHQaPt6VtKKsxMgLaKbCxeww==", "dev": true, + "license": "MIT", "dependencies": { "google-protobuf": "3.15.8", "handlebars": "4.7.7" @@ -14633,7 +14635,7 @@ "hasInstallScript": true, "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", @@ -14678,7 +14680,7 @@ "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", @@ -15515,9 +15517,9 @@ } }, "@grpc/grpc-js": { - "version": "1.11.2", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.11.2.tgz", - "integrity": "sha512-DWp92gDD7/Qkj7r8kus6/HCINeo3yPZWZ3paKgDgsbKbSpoxKg1yvN8xe2Q8uE3zOsPe3bX8FQX2+XValq2yTw==", + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.12.2.tgz", + "integrity": "sha512-bgxdZmgTrJZX50OjyVwz3+mNEnCTNkh3cIqGPWVNeW9jX6bn1ZkU80uPd+67/ZpIJIjRQ9qaHCjhavyoWYxumg==", "requires": { "@grpc/proto-loader": "^0.7.13", "@js-sdsl/ordered-map": "^4.4.2" @@ -20505,9 +20507,9 @@ "dev": true }, "grpc_tools_node_protoc_ts": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/grpc_tools_node_protoc_ts/-/grpc_tools_node_protoc_ts-5.3.2.tgz", - "integrity": "sha512-7xPSeu8bwjcird3i9R5+9O4BF2Lhv9fMBdeobfUc2Bys9tSVtm/VB3WjTpKV78WlLYJyD94+wL/8hJqaMZ53Hw==", + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/grpc_tools_node_protoc_ts/-/grpc_tools_node_protoc_ts-5.3.3.tgz", + "integrity": "sha512-M/YrklvVXMtuuj9kb42PxeouZhs7Ul+R4e/31XwrankUcKL8cQQP50Q9q+KEHGyHQaPt6VtKKsxMgLaKbCxeww==", "dev": true, "requires": { "google-protobuf": "3.15.8", @@ -22527,7 +22529,7 @@ "mullvad-vpn": { "version": "file:packages/mullvad-vpn", "requires": { - "@grpc/grpc-js": "^1.9.6", + "@grpc/grpc-js": "^1.12.2", "@playwright/test": "^1.41.1", "@types/chai": "^4.3.3", "@types/chai-as-promised": "^7.1.5", @@ -22560,7 +22562,7 @@ "gl-matrix": "^3.4.3", "globals": "^15.9.0", "google-protobuf": "^3.21.0", - "grpc_tools_node_protoc_ts": "^5.3.2", + "grpc_tools_node_protoc_ts": "^5.3.3", "grpc-tools": "^1.12.4", "gulp": "^4.0.2", "gulp-inject-string": "^1.1.2", diff --git a/desktop/packages/mullvad-vpn/package.json b/desktop/packages/mullvad-vpn/package.json index 6bfc94507c59..63bacb6072d7 100644 --- a/desktop/packages/mullvad-vpn/package.json +++ b/desktop/packages/mullvad-vpn/package.json @@ -12,7 +12,7 @@ "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", @@ -60,7 +60,7 @@ "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",