diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a64ef1d..301deadd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Enabled translation of feelsLike for module currentweather ### Changed +- Use Electron 2 Beta. **Please test!** ### Fixed - Fixed issue where wind chill could not be displayed in Fahrenheit. [#1247](https://github.com/MichMich/MagicMirror/issues/1247) diff --git a/package-lock.json b/package-lock.json index 9dc994e6..3a024bb2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "magicmirror", - "version": "2.3.1", + "version": "2.4.0-dev", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -37,11 +37,6 @@ } } }, - "@types/node": { - "version": "7.0.57", - "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.57.tgz", - "integrity": "sha512-Iikf0IAus1OX++3Jrc1R2bsZggO+m22G5ee56JccYKejx5GNT3nHhY8v6J4OXId1hXXlb0n45hcaVwZwQcZZ6w==" - }, "JSV": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz", @@ -1572,13 +1567,20 @@ "dev": true }, "electron": { - "version": "1.7.13", - "resolved": "https://registry.npmjs.org/electron/-/electron-1.7.13.tgz", - "integrity": "sha1-EIUbrsd9aG2VgS80QlwX5IrBQT8=", + "version": "2.0.0-beta.7", + "resolved": "https://registry.npmjs.org/electron/-/electron-2.0.0-beta.7.tgz", + "integrity": "sha512-DSUHGT2JkZc4pja2JdlG+TJa/nX2tz2I9UHdYPY0iKUrZngmTpP2FUypVt5pK+O9v0set5sL1lu1Y7c2dG4DDQ==", "requires": { - "@types/node": "7.0.57", + "@types/node": "8.10.2", "electron-download": "3.3.0", "extract-zip": "1.6.5" + }, + "dependencies": { + "@types/node": { + "version": "8.10.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.2.tgz", + "integrity": "sha512-A6Uv1anbsCvrRDtaUXS2xZ5tlzD+Kg7yMRlSLFDy3z0r7KlGXDzL14vELXIAgpk2aJbU3XeZZQRcEkLkowT92g==" + } } }, "electron-download": { diff --git a/package.json b/package.json index 65db1913..277e6830 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "dependencies": { "body-parser": "^1.18.2", "colors": "^1.1.2", - "electron": "^1.4.15", + "electron": "beta", "express": "^4.16.2", "express-ipfilter": "0.3.1", "feedme": "latest",