diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-02-07 12:51:51 +0100 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-02-07 12:51:51 +0100 |
| commit | b8aff843a4e2777198d64340bb82bbe2539b25af (patch) | |
| tree | dd5a3f7f362f588aefcf2991275eb83b53adce25 | |
| parent | 7251f29a66ed7f25b7a0184d4e7bf0e3d7bfef84 (diff) | |
| parent | 4629c66891d5fcc2f70e45de0c418bef3a7d8d06 (diff) | |
| download | mullvadvpn-b8aff843a4e2777198d64340bb82bbe2539b25af.tar.xz mullvadvpn-b8aff843a4e2777198d64340bb82bbe2539b25af.zip | |
Merge branch 'update-electron-to-fix-shortcut-bug-des-1676'
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | desktop/package-lock.json | 29 | ||||
| -rw-r--r-- | desktop/packages/mullvad-vpn/package.json | 2 |
3 files changed, 19 insertions, 15 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 73f8ada84f..05f2715f15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,9 @@ Line wrap the file at 100 chars. Th - Add support for DAITA V2. - Add back wireguard-go (userspace WireGuard) support. +### Changed +- Update Electron from 33.2.1 to 33.4.0. + ## [2025.3-beta1] - 2025-01-21 ### Added diff --git a/desktop/package-lock.json b/desktop/package-lock.json index bc2c4084ad..fc1c088646 100644 --- a/desktop/package-lock.json +++ b/desktop/package-lock.json @@ -2031,9 +2031,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.17.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.9.tgz", - "integrity": "sha512-0JOXkRyLanfGPE2QRCwgxhzlBAvaRdCNMcvbd7jFfpmD4eEXll7LRwy5ymJmyeZqk7Nh7eD2LeUyQ68BbndmXw==", + "version": "20.17.17", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.17.tgz", + "integrity": "sha512-/WndGO4kIfMicEQLTi/mDANUu/iVUhT7KboZPdEqqHQ4aTS+3qT3U5gIqWDFV+XouorjfgGqvKILJeHhuQgFYg==", "license": "MIT", "dependencies": { "undici-types": "~6.19.2" @@ -5375,11 +5375,12 @@ } }, "node_modules/electron": { - "version": "33.2.1", - "resolved": "https://registry.npmjs.org/electron/-/electron-33.2.1.tgz", - "integrity": "sha512-SG/nmSsK9Qg1p6wAW+ZfqU+AV8cmXMTIklUL18NnOKfZLlum4ZsDoVdmmmlL39ZmeCaq27dr7CgslRPahfoVJg==", + "version": "33.4.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-33.4.0.tgz", + "integrity": "sha512-AO+Q/ygWwKKs+JtNEFgfS5ntjG3TA2HX7s4IEbiYi6lktaocuLP2oScG1/mmKRuUWoOcow2RRsf995L2mM4bvQ==", "dev": true, "hasInstallScript": true, + "license": "MIT", "dependencies": { "@electron/get": "^2.0.0", "@types/node": "^20.9.0", @@ -14691,7 +14692,7 @@ "chai-as-promised": "^7.1.1", "chai-spies": "^1.0.0", "cross-env": "^7.0.3", - "electron": "33.2.1", + "electron": "33.4.0", "electron-builder": "^24.13.3", "electron-devtools-installer": "^3.2.0", "eslint-plugin-react": "^7.36.1", @@ -16285,9 +16286,9 @@ "dev": true }, "@types/node": { - "version": "20.17.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.9.tgz", - "integrity": "sha512-0JOXkRyLanfGPE2QRCwgxhzlBAvaRdCNMcvbd7jFfpmD4eEXll7LRwy5ymJmyeZqk7Nh7eD2LeUyQ68BbndmXw==", + "version": "20.17.17", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.17.tgz", + "integrity": "sha512-/WndGO4kIfMicEQLTi/mDANUu/iVUhT7KboZPdEqqHQ4aTS+3qT3U5gIqWDFV+XouorjfgGqvKILJeHhuQgFYg==", "requires": { "undici-types": "~6.19.2" } @@ -18948,9 +18949,9 @@ } }, "electron": { - "version": "33.2.1", - "resolved": "https://registry.npmjs.org/electron/-/electron-33.2.1.tgz", - "integrity": "sha512-SG/nmSsK9Qg1p6wAW+ZfqU+AV8cmXMTIklUL18NnOKfZLlum4ZsDoVdmmmlL39ZmeCaq27dr7CgslRPahfoVJg==", + "version": "33.4.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-33.4.0.tgz", + "integrity": "sha512-AO+Q/ygWwKKs+JtNEFgfS5ntjG3TA2HX7s4IEbiYi6lktaocuLP2oScG1/mmKRuUWoOcow2RRsf995L2mM4bvQ==", "dev": true, "requires": { "@electron/get": "^2.0.0", @@ -22573,7 +22574,7 @@ "chai-as-promised": "^7.1.1", "chai-spies": "^1.0.0", "cross-env": "^7.0.3", - "electron": "33.2.1", + "electron": "33.4.0", "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 1b070ac9db..056b0be93f 100644 --- a/desktop/packages/mullvad-vpn/package.json +++ b/desktop/packages/mullvad-vpn/package.json @@ -50,7 +50,7 @@ "chai-as-promised": "^7.1.1", "chai-spies": "^1.0.0", "cross-env": "^7.0.3", - "electron": "33.2.1", + "electron": "33.4.0", "electron-builder": "^24.13.3", "electron-devtools-installer": "^3.2.0", "eslint-plugin-react": "^7.36.1", |