diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2022-08-23 15:55:00 +0200 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2022-08-23 15:55:00 +0200 |
| commit | f73b8dd0c4bafeaf80cb8bd69d86c584c6860911 (patch) | |
| tree | c8570a6e12e00af9622522c5cbf09869dbc47098 | |
| parent | d700a434ca4214f931dbe180a39b6b95659fb392 (diff) | |
| parent | e24df9de5e039870d467425e96fcfdfe051776a8 (diff) | |
| download | mullvadvpn-f73b8dd0c4bafeaf80cb8bd69d86c584c6860911.tar.xz mullvadvpn-f73b8dd0c4bafeaf80cb8bd69d86c584c6860911.zip | |
Merge branch 'upgrade-electron-to-19'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | gui/package-lock.json | 18 | ||||
| -rw-r--r-- | gui/package.json | 2 |
3 files changed, 11 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1267a6822e..9b5d2b6a01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,7 @@ Line wrap the file at 100 chars. Th - Prune bridges far away from the selected relay. - Stay connected when desktop app is killed or crashes. The only situation where the app now disconnects on quit is when the user presses the quit button. +- Update Electron from 18.0.3 to 19.0.13. #### Windows - Remove dependency on `ipconfig.exe`. Call `DnsFlushResolverCache` to flush the DNS cache. diff --git a/gui/package-lock.json b/gui/package-lock.json index cb269265a6..bda9bbaab7 100644 --- a/gui/package-lock.json +++ b/gui/package-lock.json @@ -54,7 +54,7 @@ "chai-as-promised": "^7.1.1", "chai-spies": "^1.0.0", "cross-env": "^5.1.3", - "electron": "^18.0.3", + "electron": "^19.0.13", "electron-builder": "^23.0.8", "electron-devtools-installer": "^3.2.0", "electron-mocha": "^11.0.2", @@ -4939,13 +4939,13 @@ } }, "node_modules/electron": { - "version": "18.3.5", - "resolved": "https://registry.npmjs.org/electron/-/electron-18.3.5.tgz", - "integrity": "sha512-/GJ39X3ijpyZiOtYQ1ha5Ly0hWiIzF19CGEapM9euaM2AZrmt79x+MckQDXqJxOaVA9YHXju5Ho6b9pB9a/2pQ==", + "version": "19.0.13", + "resolved": "https://registry.npmjs.org/electron/-/electron-19.0.13.tgz", + "integrity": "sha512-11Ne0VJy8L1GU7sGcbJHhkAz73szR27uP4vmfUVGlppC/ipA39AUkdzqiQoPC/F1EJdjEOBvHySG8K8Xe9yETA==", "dev": true, "hasInstallScript": true, "dependencies": { - "@electron/get": "^1.13.0", + "@electron/get": "^1.14.1", "@types/node": "^16.11.26", "extract-zip": "^1.0.3" }, @@ -18256,12 +18256,12 @@ } }, "electron": { - "version": "18.3.5", - "resolved": "https://registry.npmjs.org/electron/-/electron-18.3.5.tgz", - "integrity": "sha512-/GJ39X3ijpyZiOtYQ1ha5Ly0hWiIzF19CGEapM9euaM2AZrmt79x+MckQDXqJxOaVA9YHXju5Ho6b9pB9a/2pQ==", + "version": "19.0.13", + "resolved": "https://registry.npmjs.org/electron/-/electron-19.0.13.tgz", + "integrity": "sha512-11Ne0VJy8L1GU7sGcbJHhkAz73szR27uP4vmfUVGlppC/ipA39AUkdzqiQoPC/F1EJdjEOBvHySG8K8Xe9yETA==", "dev": true, "requires": { - "@electron/get": "^1.13.0", + "@electron/get": "^1.14.1", "@types/node": "^16.11.26", "extract-zip": "^1.0.3" } diff --git a/gui/package.json b/gui/package.json index 14639cfdb6..cf2efa49de 100644 --- a/gui/package.json +++ b/gui/package.json @@ -60,7 +60,7 @@ "chai-as-promised": "^7.1.1", "chai-spies": "^1.0.0", "cross-env": "^5.1.3", - "electron": "^18.0.3", + "electron": "^19.0.13", "electron-builder": "^23.0.8", "electron-devtools-installer": "^3.2.0", "electron-mocha": "^11.0.2", |