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

Merge branch 'develop' into fetch

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Karsten Hassel 2022-05-27 21:04:07 +02:00
commit ab7934fa98
5 changed files with 1014 additions and 1441 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -18,7 +18,7 @@ _This release is scheduled to be released on 2022-07-01._
### Updated
- Use latest node 18 when running tests on github actions
- Update `electron` to v18 and other dependencies.
- Update `electron` to v19 and other dependencies.
- Use internal fetch function of node instead external `node-fetch` library if node version >= `v18`.
### Fixed

14
fonts/package-lock.json generated
View File

@ -7,14 +7,14 @@
"name": "magicmirror-fonts",
"license": "MIT",
"dependencies": {
"@fontsource/roboto": "^4.5.5",
"@fontsource/roboto": "^4.5.7",
"@fontsource/roboto-condensed": "^4.5.8"
}
},
"node_modules/@fontsource/roboto": {
"version": "4.5.5",
"resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-4.5.5.tgz",
"integrity": "sha512-Pe1p+gAO6K0aLxBXlLoJRHVx352tVc/v/7DOnvM3t+FYXb+KUga9aCD1NpnDfd0kKnWXqrZyAXguyyFWDDuphw=="
"version": "4.5.7",
"resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-4.5.7.tgz",
"integrity": "sha512-m57UMER23Mk6Drg9OjtHW1Y+0KPGyZfE5XJoPTOsLARLar6013kJj4X2HICt+iFLJqIgTahA/QAvSn9lwF1EEw=="
},
"node_modules/@fontsource/roboto-condensed": {
"version": "4.5.8",
@ -24,9 +24,9 @@
},
"dependencies": {
"@fontsource/roboto": {
"version": "4.5.5",
"resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-4.5.5.tgz",
"integrity": "sha512-Pe1p+gAO6K0aLxBXlLoJRHVx352tVc/v/7DOnvM3t+FYXb+KUga9aCD1NpnDfd0kKnWXqrZyAXguyyFWDDuphw=="
"version": "4.5.7",
"resolved": "https://registry.npmjs.org/@fontsource/roboto/-/roboto-4.5.7.tgz",
"integrity": "sha512-m57UMER23Mk6Drg9OjtHW1Y+0KPGyZfE5XJoPTOsLARLar6013kJj4X2HICt+iFLJqIgTahA/QAvSn9lwF1EEw=="
},
"@fontsource/roboto-condensed": {
"version": "4.5.8",

2
fonts/package.json
View File

@ -10,7 +10,7 @@
"url": "https://github.com/MichMich/MagicMirror/issues"
},
"dependencies": {
"@fontsource/roboto": "^4.5.5",
"@fontsource/roboto": "^4.5.7",
"@fontsource/roboto-condensed": "^4.5.8"
}
}

2413
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

24
package.json
View File

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