diff options
| author | Tobias Järvelöv <tobias.jarvelov@mullvad.net> | 2026-04-13 15:34:32 +0200 |
|---|---|---|
| committer | Tobias Järvelöv <tobias.jarvelov@mullvad.net> | 2026-04-13 15:34:32 +0200 |
| commit | 7e7905e2db7413716c041dbd96cd3cff8f93357f (patch) | |
| tree | f4cfe7700fc70cffee0283babcf0359028feb1be | |
| parent | 978af62c75290f35c465b7de7de4c52ccda35887 (diff) | |
| parent | 6f1139a2c533b6fab6d7d2a2f24fd98c165f3ed3 (diff) | |
| download | mullvadvpn-7e7905e2db7413716c041dbd96cd3cff8f93357f.tar.xz mullvadvpn-7e7905e2db7413716c041dbd96cd3cff8f93357f.zip | |
Merge branch 'npm-update-electron'
| -rw-r--r-- | desktop/package-lock.json | 21 | ||||
| -rw-r--r-- | desktop/package.json | 4 | ||||
| -rw-r--r-- | desktop/packages/mullvad-vpn/package.json | 2 | ||||
| -rw-r--r-- | desktop/packages/mullvad-vpn/test/e2e/setup/main.ts | 1 |
4 files changed, 14 insertions, 14 deletions
diff --git a/desktop/package-lock.json b/desktop/package-lock.json index b0348d9719..d1b1f28a46 100644 --- a/desktop/package-lock.json +++ b/desktop/package-lock.json @@ -5039,9 +5039,9 @@ } }, "node_modules/electron": { - "version": "39.2.6", - "resolved": "https://registry.npmjs.org/electron/-/electron-39.2.6.tgz", - "integrity": "sha512-dHBgTodWBZd+tL1Dt0PSh/CFLHeDkFCTKCTXu1dgPhlE9Z3k2zzlBQ9B2oW55CFsKanBDHiUomHJNw0XaSdQpA==", + "version": "39.8.5", + "resolved": "https://registry.npmjs.org/electron/-/electron-39.8.5.tgz", + "integrity": "sha512-q6+LiQIcTadSyvtPgLDQkCtVA9jQJXQVMrQcctfOJILh6OFMN+UJJLRkuUTy8CZDYeCIBn1ZycqsL1dAXugxZA==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -11014,7 +11014,7 @@ "@types/topojson-specification": "^1.0.2", "@vitejs/plugin-react": "^5.1.4", "cross-env": "^7.0.3", - "electron": "39.2.6", + "electron": "39.8.5", "electron-builder": "26.8.1", "electron-devtools-installer": "^3.2.0", "eslint-plugin-react": "^7.36.1", @@ -14985,9 +14985,9 @@ } }, "electron": { - "version": "39.2.6", - "resolved": "https://registry.npmjs.org/electron/-/electron-39.2.6.tgz", - "integrity": "sha512-dHBgTodWBZd+tL1Dt0PSh/CFLHeDkFCTKCTXu1dgPhlE9Z3k2zzlBQ9B2oW55CFsKanBDHiUomHJNw0XaSdQpA==", + "version": "39.8.5", + "resolved": "https://registry.npmjs.org/electron/-/electron-39.8.5.tgz", + "integrity": "sha512-q6+LiQIcTadSyvtPgLDQkCtVA9jQJXQVMrQcctfOJILh6OFMN+UJJLRkuUTy8CZDYeCIBn1ZycqsL1dAXugxZA==", "dev": true, "requires": { "@electron/get": "^2.0.0", @@ -16137,7 +16137,7 @@ "dev": true, "requires": { "google-protobuf": "3.15.8", - "handlebars": "^4.7.9" + "handlebars": "4.7.7" }, "dependencies": { "google-protobuf": { @@ -16149,8 +16149,7 @@ } }, "handlebars": { - "version": "4.7.9", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.9.tgz", + "version": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.9.tgz", "integrity": "sha512-4E71E0rpOaQuJR2A3xDZ+GM1HyWYv1clR58tC8emQNeQe3RH7MAzSbat+V0wG78LQBo6m6bzSG/L4pBuCsgnUQ==", "dev": true, "requires": { @@ -17102,7 +17101,7 @@ "@vitejs/plugin-react": "^5.1.4", "argv-split": "^2.0.1", "cross-env": "^7.0.3", - "electron": "39.2.6", + "electron": "39.8.5", "electron-builder": "26.8.1", "electron-devtools-installer": "^3.2.0", "eslint-plugin-react": "^7.36.1", diff --git a/desktop/package.json b/desktop/package.json index 18870f92a8..6fdb56cbed 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -36,8 +36,8 @@ "npm": ">=8.3" }, "volta": { - "node": "22.21.1", - "npm": "11.1.0" + "node": "22.22.1", + "npm": "11.12.1" }, "overrides": { "grpc_tools_node_protoc_ts": { diff --git a/desktop/packages/mullvad-vpn/package.json b/desktop/packages/mullvad-vpn/package.json index e7a16d90fc..742353d45f 100644 --- a/desktop/packages/mullvad-vpn/package.json +++ b/desktop/packages/mullvad-vpn/package.json @@ -45,7 +45,7 @@ "@types/topojson-specification": "^1.0.2", "@vitejs/plugin-react": "^5.1.4", "cross-env": "^7.0.3", - "electron": "39.2.6", + "electron": "39.8.5", "electron-builder": "26.8.1", "electron-devtools-installer": "^3.2.0", "eslint-plugin-react": "^7.36.1", diff --git a/desktop/packages/mullvad-vpn/test/e2e/setup/main.ts b/desktop/packages/mullvad-vpn/test/e2e/setup/main.ts index 10219a32cc..ced5f1eecd 100644 --- a/desktop/packages/mullvad-vpn/test/e2e/setup/main.ts +++ b/desktop/packages/mullvad-vpn/test/e2e/setup/main.ts @@ -91,6 +91,7 @@ class ApplicationMain { maximizable: false, fullscreenable: false, show: DEBUG, + titleBarStyle: 'hidden', frame: true, webPreferences: { offscreen: CI_E2E && !TEST_SHOW_WINDOW, |