Merge branch 'develop' into new-e2e

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Karsten Hassel
2021-09-28 21:12:04 +02:00
7 changed files with 541 additions and 489 deletions

View File

@@ -47,12 +47,12 @@
"homepage": "https://magicmirror.builders",
"devDependencies": {
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-jest": "^24.4.0",
"eslint-plugin-jest": "^24.4.2",
"eslint-plugin-jsdoc": "^36.1.0",
"eslint-plugin-prettier": "^4.0.0",
"express-basic-auth": "^1.2.0",
"husky": "^7.0.2",
"jest": "^27.2.0",
"jest": "^27.2.2",
"jsdom": "^17.0.0",
"lodash": "^4.17.21",
"nyc": "^15.1.0",
@@ -67,7 +67,7 @@
"suncalc": "^1.8.0"
},
"optionalDependencies": {
"electron": "^13.4.0"
"electron": "^13.5.0"
},
"dependencies": {
"colors": "^1.4.0",
@@ -81,7 +81,7 @@
"iconv-lite": "^0.6.3",
"module-alias": "^2.2.2",
"moment": "^2.29.1",
"node-fetch": "^2.6.2",
"node-fetch": "^2.6.5",
"node-ical": "^0.13.0",
"socket.io": "^4.2.0"
},