diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d65fc3f..3815d6f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,22 +2,27 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [2.2.3] - 2018-01-03 +## [2.3.0] - Unreleased ### Added - Add system notification `MODULE_DOM_CREATED` for notifying each module when their Dom has been fully loaded. +*This release is scheduled to be released on 2018-04-01.* + ## [2.2.2] - 2018-01-02 ### Added - Add missing `package-lock.json`. +### Changed + +- Changed Electron dependency to v1.7.10. + ## [2.2.1] - 2018-01-01 ### Fixed - - Fixed linting errors. ## [2.2.0] - 2018-01-01 diff --git a/package-lock.json b/package-lock.json index 0a68929a..639dbb6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,9 +1,14 @@ { "name": "magicmirror", - "version": "2.2.2", + "version": "2.3.0-dev", "lockfileVersion": 1, "requires": true, "dependencies": { + "@types/node": { + "version": "7.0.51", + "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.51.tgz", + "integrity": "sha512-h5u7FnEnG+Fn44HfknTTvu199FzFWVSo97ToSRWvXl1F11UfN6wGnE7exUy23pFfDn+CeluvEoCoe4l2eCVC3g==" + }, "JSV": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz", @@ -1335,10 +1340,11 @@ "dev": true }, "electron": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/electron/-/electron-1.4.15.tgz", - "integrity": "sha1-6syv4/Va3gKnRrcGrBS0PbbHzPg=", + "version": "1.7.10", + "resolved": "https://registry.npmjs.org/electron/-/electron-1.7.10.tgz", + "integrity": "sha1-Oj6D2WX9f6/kc76N349HJWG2JT0=", "requires": { + "@types/node": "7.0.51", "electron-download": "3.3.0", "extract-zip": "1.6.5" } @@ -1456,9 +1462,9 @@ } }, "es6-promise": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.1.1.tgz", - "integrity": "sha512-OaU1hHjgJf+b0NzsxCg7NdIYERD6Hy/PEmFLTjw+b65scuisG3Kt4QoTvJ66BBkPZ581gr0kpoVzKnxniM8nng==" + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.2.tgz", + "integrity": "sha512-LSas5vsuA6Q4nEdf9wokY5/AJYXry98i0IzXsv49rYsgDGDNDPbqAYR1Pe23iFxygfbGZNR/5VrHXBCh2BhvUQ==" }, "escape-html": { "version": "1.0.3", @@ -5823,7 +5829,7 @@ "integrity": "sha1-ebs7RFbdBPGOvbwNcDodHa7FEF0=", "requires": { "debug": "2.6.7", - "es6-promise": "4.1.1" + "es6-promise": "4.2.2" } }, "supports-color": { diff --git a/package.json b/package.json index 61fbcb61..4c42c44c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "magicmirror", - "version": "2.2.2", + "version": "2.3.0-dev", "description": "The open source modular smart mirror platform.", "main": "js/electron.js", "scripts": { @@ -54,7 +54,7 @@ "dependencies": { "body-parser": "^1.18.2", "colors": "^1.1.2", - "electron": "1.4.15", + "electron": "^1.7.10", "express": "^4.16.2", "express-ipfilter": "0.3.1", "feedme": "latest",