kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into actions

Browse Source
This commit is contained in:
Michael Teeuw 2022-05-18 09:13:31 +02:00 committed by GitHub
commit 05621c9876
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 1768 additions and 2028 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.eslintrc.json
View File

@ -16,7 +16,7 @@
},
"parserOptions": {
"sourceType": "module",
"ecmaVersion": 2018,
"ecmaVersion": 2020,
"ecmaFeatures": {
"globalReturn": true
}

3
CHANGELOG.md
View File

@ -11,9 +11,12 @@ _This release is scheduled to be released on 2022-07-01._
### Added
- Added the notification emitting from the weather module on infromation updated.
### Updated
- Use latest node 18 when running tests on github actions
- Update `electron` to v18 and other dependencies.
### Fixed

14
fonts/package-lock.json generated
View File

@ -8,7 +8,7 @@
"license": "MIT",
"dependencies": {
"@fontsource/roboto": "^4.5.5",
"@fontsource/roboto-condensed": "^4.5.6"
"@fontsource/roboto-condensed": "^4.5.8"
}
},
"node_modules/@fontsource/roboto": {
@ -17,9 +17,9 @@
"integrity": "sha512-Pe1p+gAO6K0aLxBXlLoJRHVx352tVc/v/7DOnvM3t+FYXb+KUga9aCD1NpnDfd0kKnWXqrZyAXguyyFWDDuphw=="
},
"node_modules/@fontsource/roboto-condensed": {
"version": "4.5.6",
"resolved": "https://registry.npmjs.org/@fontsource/roboto-condensed/-/roboto-condensed-4.5.6.tgz",
"integrity": "sha512-WDN0RlwXa3ADUDJxrB9HEIhrwYdJFLTNw4YemEYSeIPURU5DAHSx2VFXFv69PbM7kV8At5yMTp8bQkL5TBUP3w=="
"version": "4.5.8",
"resolved": "https://registry.npmjs.org/@fontsource/roboto-condensed/-/roboto-condensed-4.5.8.tgz",
"integrity": "sha512-HCuf1rVSOsXnl/KgHNRLCr8XS/Dunzn10BjhliJiEZ5qPynXCWH4RRBFupIODHamhj2Uyp/iZkSQp574luKp6A=="
}
},
"dependencies": {
@ -29,9 +29,9 @@
"integrity": "sha512-Pe1p+gAO6K0aLxBXlLoJRHVx352tVc/v/7DOnvM3t+FYXb+KUga9aCD1NpnDfd0kKnWXqrZyAXguyyFWDDuphw=="
},
"@fontsource/roboto-condensed": {
"version": "4.5.6",
"resolved": "https://registry.npmjs.org/@fontsource/roboto-condensed/-/roboto-condensed-4.5.6.tgz",
"integrity": "sha512-WDN0RlwXa3ADUDJxrB9HEIhrwYdJFLTNw4YemEYSeIPURU5DAHSx2VFXFv69PbM7kV8At5yMTp8bQkL5TBUP3w=="
"version": "4.5.8",
"resolved": "https://registry.npmjs.org/@fontsource/roboto-condensed/-/roboto-condensed-4.5.8.tgz",
"integrity": "sha512-HCuf1rVSOsXnl/KgHNRLCr8XS/Dunzn10BjhliJiEZ5qPynXCWH4RRBFupIODHamhj2Uyp/iZkSQp574luKp6A=="
}
}
}

2
fonts/package.json
View File

@ -11,6 +11,6 @@
},
"dependencies": {
"@fontsource/roboto": "^4.5.5",
"@fontsource/roboto-condensed": "^4.5.6"
"@fontsource/roboto-condensed": "^4.5.8"
}
}

9
modules/default/weather/weather.js
View File

@ -154,6 +154,15 @@ Module.register("weather", {
if (this.weatherProvider.currentWeather()) {
this.sendNotification("CURRENTWEATHER_TYPE", { type: this.weatherProvider.currentWeather().weatherType.replace("-", "_") });
}
const notificationPayload = {
currentWeather: this.weatherProvider?.currentWeatherObject?.simpleClone() ?? null,
forecastArray: this.weatherProvider?.weatherForecastArray?.map((ar) => ar.simpleClone()) ?? [],
hourlyArray: this.weatherProvider?.weatherHourlyArray?.map((ar) => ar.simpleClone()) ?? [],
locationName: this.weatherProvider?.fetchedLocationName,
providerName: this.weatherProvider.providerName
};
this.sendNotification("WEATHER_UPDATED", notificationPayload);
},
scheduleUpdate: function (delay = null) {

17
modules/default/weather/weatherobject.js
View File

@ -146,6 +146,23 @@ class WeatherObject {
this.sunrise = moment(times.sunrise, "X");
this.sunset = moment(times.sunset, "X");
}
/**
* Clone to simple object to prevent mutating and deprecation of legacy library.
*
* Before being handed to other modules, mutable values must be cloned safely.
* Especially 'moment' object is not immutable, so original 'date', 'sunrise', 'sunset' could be corrupted or changed by other modules.
*
* @returns {object} plained object clone of original weatherObject
*/
simpleClone() {
const toFlat = ["date", "sunrise", "sunset"];
let clone = { ...this };
for (const prop of toFlat) {
clone[prop] = clone?.[prop]?.valueOf() ?? clone?.[prop];
}
return clone;
}
}
/*************** DO NOT EDIT THE LINE BELOW ***************/

3707
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

26
package.json
View File

@ -48,44 +48,44 @@
"homepage": "https://magicmirror.builders",
"devDependencies": {
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-jest": "^26.1.3",
"eslint-plugin-jsdoc": "^38.1.3",
"eslint-plugin-jest": "^26.1.5",
"eslint-plugin-jsdoc": "^38.1.6",
"eslint-plugin-prettier": "^4.0.0",
"express-basic-auth": "^1.2.1",
"husky": "^7.0.4",
"jest": "^27.5.1",
"jest": "^28.0.3",
"jsdom": "^19.0.0",
"lodash": "^4.17.21",
"nyc": "^15.1.0",
"playwright": "^1.20.1",
"prettier": "^2.6.1",
"playwright": "^1.21.1",
"prettier": "^2.6.2",
"pretty-quick": "^3.1.3",
"sinon": "^13.0.1",
"stylelint": "^14.6.1",
"sinon": "^13.0.2",
"stylelint": "^14.8.1",
"stylelint-config-prettier": "^9.0.3",
"stylelint-config-standard": "^25.0.0",
"stylelint-prettier": "^2.0.0",
"suncalc": "^1.9.0"
},
"optionalDependencies": {
"electron": "^17.2.0"
"electron": "^18.2.0"
},
"dependencies": {
"colors": "^1.4.0",
"console-stamp": "^3.0.4",
"digest-fetch": "^1.2.1",
"eslint": "^8.12.0",
"express": "^4.17.3",
"eslint": "^8.14.0",
"express": "^4.18.1",
"express-ipfilter": "^1.2.0",
"feedme": "^2.0.2",
"helmet": "^5.0.2",
"iconv-lite": "^0.6.3",
"luxon": "^1.21.3",
"luxon": "^1.28.0",
"module-alias": "^2.2.2",
"moment": "^2.29.1",
"moment": "^2.29.3",
"node-fetch": "^2.6.7",
"node-ical": "^0.15.1",
"socket.io": "^4.4.1"
"socket.io": "^4.5.0"
},
"_moduleAliases": {
"node_helper": "js/node_helper.js",

14
vendor/package-lock.json generated vendored
View File

@ -8,7 +8,7 @@
"license": "MIT",
"dependencies": {
"@fortawesome/fontawesome-free": "^6.1.1",
"moment": "^2.29.1",
"moment": "^2.29.3",
"moment-timezone": "^0.5.34",
"nunjucks": "^3.2.3",
"suncalc": "^1.9.0",
@ -43,9 +43,9 @@
}
},
"node_modules/moment": {
"version": "2.29.1",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
"integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==",
"version": "2.29.3",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz",
"integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw==",
"engines": {
"node": "*"
}
@ -118,9 +118,9 @@
"integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="
},
"moment": {
"version": "2.29.1",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
"integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
"version": "2.29.3",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz",
"integrity": "sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw=="
},
"moment-timezone": {
"version": "0.5.34",

2
vendor/package.json vendored
View File

@ -11,7 +11,7 @@
},
"dependencies": {
"@fortawesome/fontawesome-free": "^6.1.1",
"moment": "^2.29.1",
"moment": "^2.29.3",
"moment-timezone": "^0.5.34",
"nunjucks": "^3.2.3",
"suncalc": "^1.9.0",