diff options
| author | David Lönnhager <david.l@mullvad.net> | 2024-05-16 21:05:24 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2024-05-16 21:05:24 +0200 |
| commit | be02d6f9c1c93ac91aef35cf47f9dfdfb0932b92 (patch) | |
| tree | 0f6e12ea605fe14379b29a404db9ee975f786243 /gui | |
| parent | 57253b38242959f4dc7b89440a09af8827e5cde8 (diff) | |
| parent | 6f1d1fd7439492f883898d7d8f82d411e2f19532 (diff) | |
| download | mullvadvpn-be02d6f9c1c93ac91aef35cf47f9dfdfb0932b92.tar.xz mullvadvpn-be02d6f9c1c93ac91aef35cf47f9dfdfb0932b92.zip | |
Merge branch 'update-to-electron-30' into main
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/package-lock.json | 68 | ||||
| -rw-r--r-- | gui/package.json | 4 |
2 files changed, 26 insertions, 46 deletions
diff --git a/gui/package-lock.json b/gui/package-lock.json index 4208b274fd..ae912c5e68 100644 --- a/gui/package-lock.json +++ b/gui/package-lock.json @@ -48,7 +48,7 @@ "chai-as-promised": "^7.1.1", "chai-spies": "^1.0.0", "cross-env": "^7.0.3", - "electron": "^28.1.3", + "electron": "^30.0.4", "electron-builder": "^24.13.3", "electron-devtools-installer": "^3.2.0", "eslint": "^8.36.0", @@ -78,7 +78,7 @@ }, "optionalDependencies": { "grpc-tools": "^1.12.4", - "nseventmonitor": "^1.0.4" + "nseventmonitor": "^1.0.5" } }, "node_modules/@babel/runtime": { @@ -4514,14 +4514,14 @@ } }, "node_modules/electron": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/electron/-/electron-28.1.3.tgz", - "integrity": "sha512-NSFyTo6SndTPXzU18XRePv4LnjmuM9rF5GMKta1/kPmi02ISoSRonnD7wUlWXD2x53XyJ6d/TbSVesMW6sXkEQ==", + "version": "30.0.4", + "resolved": "https://registry.npmjs.org/electron/-/electron-30.0.4.tgz", + "integrity": "sha512-z8tGQeiVM6CHj0t8PKWVhAB4FZTRNN0vSrd1jA4edX1aOjBztddk4d0Gyw91pQb4arIVf2RGPu0hYbHG2+vDcA==", "dev": true, "hasInstallScript": true, "dependencies": { "@electron/get": "^2.0.0", - "@types/node": "^18.11.18", + "@types/node": "^20.9.0", "extract-zip": "^2.0.1" }, "bin": { @@ -4603,15 +4603,6 @@ "mime": "^2.5.2" } }, - "node_modules/electron/node_modules/@types/node": { - "version": "18.19.33", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.33.tgz", - "integrity": "sha512-NR9+KrpSajr2qBVp/Yt5TU/rp+b5Mayi3+OlMlcg2cVCfRmcG5PWZ7S4+MG9PZ5gWBoc9Pd0BKSRViuBCRPu0A==", - "dev": true, - "dependencies": { - "undici-types": "~5.26.4" - } - }, "node_modules/elliptic": { "version": "6.5.5", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.5.tgz", @@ -8967,9 +8958,9 @@ } }, "node_modules/nan": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", - "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==", + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.19.0.tgz", + "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==", "optional": true }, "node_modules/nanoid": { @@ -9139,9 +9130,9 @@ } }, "node_modules/nseventmonitor": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/nseventmonitor/-/nseventmonitor-1.0.4.tgz", - "integrity": "sha512-z4dql4cB2GEzzWgBo9yM10NaHhEg5b0yeSd0niiH2Nde6TUbM6G7EZy5UeSjsaIkkL+LgLgiXXQrNB7ccZ8Wyw==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nseventmonitor/-/nseventmonitor-1.0.5.tgz", + "integrity": "sha512-CP1Qvr3yAY08o+2KpNUMjVTM6KM37sQEgRp+3KvzWCcutzwQwsUy4IkixModqgmxqB3BP281SRlizqOnf7sk0w==", "hasInstallScript": true, "optional": true, "os": [ @@ -9149,7 +9140,7 @@ ], "dependencies": { "@mapbox/node-pre-gyp": "^1.0.11", - "nan": "^2.18.0" + "nan": "^2.19.0" } }, "node_modules/number-is-nan": { @@ -16801,25 +16792,14 @@ } }, "electron": { - "version": "28.1.3", - "resolved": "https://registry.npmjs.org/electron/-/electron-28.1.3.tgz", - "integrity": "sha512-NSFyTo6SndTPXzU18XRePv4LnjmuM9rF5GMKta1/kPmi02ISoSRonnD7wUlWXD2x53XyJ6d/TbSVesMW6sXkEQ==", + "version": "30.0.4", + "resolved": "https://registry.npmjs.org/electron/-/electron-30.0.4.tgz", + "integrity": "sha512-z8tGQeiVM6CHj0t8PKWVhAB4FZTRNN0vSrd1jA4edX1aOjBztddk4d0Gyw91pQb4arIVf2RGPu0hYbHG2+vDcA==", "dev": true, "requires": { "@electron/get": "^2.0.0", - "@types/node": "^18.11.18", + "@types/node": "^20.9.0", "extract-zip": "^2.0.1" - }, - "dependencies": { - "@types/node": { - "version": "18.19.33", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.33.tgz", - "integrity": "sha512-NR9+KrpSajr2qBVp/Yt5TU/rp+b5Mayi3+OlMlcg2cVCfRmcG5PWZ7S4+MG9PZ5gWBoc9Pd0BKSRViuBCRPu0A==", - "dev": true, - "requires": { - "undici-types": "~5.26.4" - } - } } }, "electron-builder": { @@ -20295,9 +20275,9 @@ "dev": true }, "nan": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", - "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==", + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.19.0.tgz", + "integrity": "sha512-nO1xXxfh/RWNxfd/XPfbIfFk5vgLsAxUR9y5O0cHMJu/AW9U95JLXqthYHjEp+8gQ5p96K9jUp8nbVOxCdRbtw==", "optional": true }, "nanoid": { @@ -20434,13 +20414,13 @@ } }, "nseventmonitor": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/nseventmonitor/-/nseventmonitor-1.0.4.tgz", - "integrity": "sha512-z4dql4cB2GEzzWgBo9yM10NaHhEg5b0yeSd0niiH2Nde6TUbM6G7EZy5UeSjsaIkkL+LgLgiXXQrNB7ccZ8Wyw==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nseventmonitor/-/nseventmonitor-1.0.5.tgz", + "integrity": "sha512-CP1Qvr3yAY08o+2KpNUMjVTM6KM37sQEgRp+3KvzWCcutzwQwsUy4IkixModqgmxqB3BP281SRlizqOnf7sk0w==", "optional": true, "requires": { "@mapbox/node-pre-gyp": "^1.0.11", - "nan": "^2.18.0" + "nan": "^2.19.0" } }, "number-is-nan": { diff --git a/gui/package.json b/gui/package.json index 84f3f9c81c..c1e740400c 100644 --- a/gui/package.json +++ b/gui/package.json @@ -28,7 +28,7 @@ }, "optionalDependencies": { "grpc-tools": "^1.12.4", - "nseventmonitor": "^1.0.4" + "nseventmonitor": "^1.0.5" }, "devDependencies": { "@playwright/test": "^1.41.1", @@ -54,7 +54,7 @@ "chai-as-promised": "^7.1.1", "chai-spies": "^1.0.0", "cross-env": "^7.0.3", - "electron": "^28.1.3", + "electron": "^30.0.4", "electron-builder": "^24.13.3", "electron-devtools-installer": "^3.2.0", "eslint": "^8.36.0", |
