diff options
| author | Oskar Nyberg <oskar@mullvad.net> | 2022-03-02 10:51:55 +0100 |
|---|---|---|
| committer | Oskar Nyberg <oskar@mullvad.net> | 2022-03-02 10:51:55 +0100 |
| commit | d9b31cef915e1eabef23c3677d5c142458edee73 (patch) | |
| tree | 881f11e35c10d9bb02fd13b98232133b23551c0d | |
| parent | 8e601e3145c558ab80a5e2f4310977f26e402183 (diff) | |
| parent | 3f09710c8195d10883dda04bb9122b124fea4238 (diff) | |
| download | mullvadvpn-d9b31cef915e1eabef23c3677d5c142458edee73.tar.xz mullvadvpn-d9b31cef915e1eabef23c3677d5c142458edee73.zip | |
Merge branch 'update-to-electron-17'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | gui/package-lock.json | 14 | ||||
| -rw-r--r-- | gui/package.json | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fe3d7173e..498601fd39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ Line wrap the file at 100 chars. Th if an error occurs. - Change behavior of escape key in the desktop app. It now navigates backwards one step instead of to the main view. To navigate back to the main view Shift+Escape can be used. +- Update Electron from 16.0.4 to 17.1.0. ### Fixed - Fix the sometimes incorrect time added text after adding time to the account. diff --git a/gui/package-lock.json b/gui/package-lock.json index c748dcd7a1..4063e9da82 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": "^16.0.4", + "electron": "^17.1.0", "electron-builder": "^22.11.7", "electron-devtools-installer": "^3.2.0", "electron-mocha": "^11.0.2", @@ -4710,9 +4710,9 @@ } }, "node_modules/electron": { - "version": "16.0.4", - "resolved": "https://registry.npmjs.org/electron/-/electron-16.0.4.tgz", - "integrity": "sha512-IptwmowvMP1SFOmZLh6rrURwfnOxbDBXBRBcaOdfBM5I+B9mgtdNwzNC3ymFFNzEkZUwdOyg9fu3iyjAAQIQgw==", + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-17.1.0.tgz", + "integrity": "sha512-X/qdldmQ8lA15NmeraubWCTtMeTO8K9Ser0wtSCgOXVh53Sr1Ea0VQQ7Q9LuGgWRVz4qtr40cntuEdM8icdmTw==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -17881,9 +17881,9 @@ } }, "electron": { - "version": "16.0.4", - "resolved": "https://registry.npmjs.org/electron/-/electron-16.0.4.tgz", - "integrity": "sha512-IptwmowvMP1SFOmZLh6rrURwfnOxbDBXBRBcaOdfBM5I+B9mgtdNwzNC3ymFFNzEkZUwdOyg9fu3iyjAAQIQgw==", + "version": "17.1.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-17.1.0.tgz", + "integrity": "sha512-X/qdldmQ8lA15NmeraubWCTtMeTO8K9Ser0wtSCgOXVh53Sr1Ea0VQQ7Q9LuGgWRVz4qtr40cntuEdM8icdmTw==", "dev": true, "requires": { "@electron/get": "^1.13.0", diff --git a/gui/package.json b/gui/package.json index 99406e099e..964505d7b1 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": "^16.0.4", + "electron": "^17.1.0", "electron-builder": "^22.11.7", "electron-devtools-installer": "^3.2.0", "electron-mocha": "^11.0.2", |