kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-28 04:02:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into node-version-update

Browse Source
This commit is contained in:
Karsten Hassel 2021-12-23 18:48:40 +01:00
commit 272219eb61
6 changed files with 492 additions and 465 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -17,6 +17,7 @@ _This release is scheduled to be released on 2022-01-01._
- Cleaned up `updatenotification` module and switched to nunjuck template. - Cleaned up `updatenotification` module and switched to nunjuck template.
- Moved calendar tests from category `electron` to `e2e`. - Moved calendar tests from category `electron` to `e2e`.
- Update missed translations for Korean language (ko.json) - Update missed translations for Korean language (ko.json)
- Update missed translations for Dutch language (nl.json)
- Cleaned up `alert` module and switched to nunjuck template. - Cleaned up `alert` module and switched to nunjuck template.
- Moved weather tests from category `electron` to `e2e`. - Moved weather tests from category `electron` to `e2e`.
- Updated github actions. - Updated github actions.
@ -24,6 +25,7 @@ _This release is scheduled to be released on 2022-01-01._
- Added lithuanian language to translations.js - Added lithuanian language to translations.js
- Show info message if newsfeed is empty (fixes #2731) - Show info message if newsfeed is empty (fixes #2731)
- Added dangerouslyDisableAutoEscaping config option for newsfeed templates (fixes #2712) - Added dangerouslyDisableAutoEscaping config option for newsfeed templates (fixes #2712)
- Added missing shebang to `installers/mm.sh`.
- Node versions in templates and github workflows. - Node versions in templates and github workflows.
### Fixed ### Fixed
@ -36,6 +38,7 @@ _This release is scheduled to be released on 2022-01-01._
- Revert node-ical update due to missing luxon package. - Revert node-ical update due to missing luxon package.
- Fixed User-Agent-Header for newsfeed and calendar module (#2729). - Fixed User-Agent-Header for newsfeed and calendar module (#2729).
- Replace broken shields in Readme and use https for links. - Replace broken shields in Readme and use https for links.
- Fixed electron tests with retry.
## [2.17.1] - 2021-10-01 ## [2.17.1] - 2021-10-01

1
installers/mm.sh
View File

@ -1,3 +1,4 @@
#!/bin/bash
# This file is still here to keep PM2 working on older installations. # This file is still here to keep PM2 working on older installations.
cd ~/MagicMirror cd ~/MagicMirror
DISPLAY=:0 npm start DISPLAY=:0 npm start

934
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

12
package.json
View File

@ -48,7 +48,7 @@
"devDependencies": { "devDependencies": {
"eslint-config-prettier": "^8.3.0", "eslint-config-prettier": "^8.3.0",
"eslint-plugin-jest": "^25.3.0", "eslint-plugin-jest": "^25.3.0",
"eslint-plugin-jsdoc": "^37.2.0", "eslint-plugin-jsdoc": "^37.4.0",
"eslint-plugin-prettier": "^4.0.0", "eslint-plugin-prettier": "^4.0.0",
"express-basic-auth": "^1.2.1", "express-basic-auth": "^1.2.1",
"husky": "^7.0.4", "husky": "^7.0.4",
@ -58,23 +58,23 @@
"nyc": "^15.1.0", "nyc": "^15.1.0",
"playwright": "^1.17.1", "playwright": "^1.17.1",
"prettier": "^2.5.1", "prettier": "^2.5.1",
"pretty-quick": "^3.1.2", "pretty-quick": "^3.1.3",
"sinon": "^12.0.1", "sinon": "^12.0.1",
"stylelint": "^14.1.0", "stylelint": "^14.2.0",
"stylelint-config-prettier": "^9.0.3", "stylelint-config-prettier": "^9.0.3",
"stylelint-config-standard": "^24.0.0", "stylelint-config-standard": "^24.0.0",
"stylelint-prettier": "^2.0.0", "stylelint-prettier": "^2.0.0",
"suncalc": "^1.8.0" "suncalc": "^1.8.0"
}, },
"optionalDependencies": { "optionalDependencies": {
"electron": "^16.0.4" "electron": "^16.0.5"
}, },
"dependencies": { "dependencies": {
"colors": "^1.4.0", "colors": "^1.4.0",
"console-stamp": "^3.0.3", "console-stamp": "^3.0.3",
"digest-fetch": "^1.2.1", "digest-fetch": "^1.2.1",
"eslint": "^8.4.1", "eslint": "^8.5.0",
"express": "^4.17.1", "express": "^4.17.2",
"express-ipfilter": "^1.2.0", "express-ipfilter": "^1.2.0",
"feedme": "^2.0.2", "feedme": "^2.0.2",
"helmet": "^4.6.0", "helmet": "^4.6.0",

1
tests/electron/env_spec.js
View File

@ -4,6 +4,7 @@ const { _electron: electron } = require("playwright");
let electronApp = null; let electronApp = null;
process.env.MM_CONFIG_FILE = "tests/configs/modules/display.js"; process.env.MM_CONFIG_FILE = "tests/configs/modules/display.js";
jest.retryTimes(3);
describe("Electron app environment", function () { describe("Electron app environment", function () {
beforeEach(async function () { beforeEach(async function () {

6
translations/nl.json
View File

@ -30,6 +30,12 @@
"MODULE_CONFIG_CHANGED": "De configuratie opties voor de module {MODULE_NAME} zijn gewijzigd.\nControleer de documentatie.", "MODULE_CONFIG_CHANGED": "De configuratie opties voor de module {MODULE_NAME} zijn gewijzigd.\nControleer de documentatie.",
"MODULE_CONFIG_ERROR": "Fout in de {MODULE_NAME} module. {ERROR}", "MODULE_CONFIG_ERROR": "Fout in de {MODULE_NAME} module. {ERROR}",
"MODULE_ERROR_MALFORMED_URL": "Ongeldige url.",
"MODULE_ERROR_NO_CONNECTION": "Geen internet verbinding.",
"MODULE_ERROR_UNAUTHORIZED": "Authenticatie mislukt.",
"MODULE_ERROR_UNSPECIFIED": "Bekijk de logs voor meer informatie.",
"NEWSFEED_NO_ITEMS": "Geen nieuws op dit moment.",
"UPDATE_NOTIFICATION": "MagicMirror² update beschikbaar.", "UPDATE_NOTIFICATION": "MagicMirror² update beschikbaar.",
"UPDATE_NOTIFICATION_MODULE": "Update beschikbaar voor {MODULE_NAME} module.", "UPDATE_NOTIFICATION_MODULE": "Update beschikbaar voor {MODULE_NAME} module.",