mirror of
https://github.com/MichMich/MagicMirror.git
synced 2025-06-27 03:39:55 +00:00
Merge branch 'develop' into jest
# Conflicts: # package-lock.json # package.json
This commit is contained in:
commit
1d8af5835d
4
.github/ISSUE_TEMPLATE.md
vendored
4
.github/ISSUE_TEMPLATE.md
vendored
@ -1,3 +1,7 @@
|
||||
Hello and thank you for opening an issue.
|
||||
|
||||
**Please make sure that you have read the following lines before submitting your Issue:**
|
||||
|
||||
## I'm not sure if this is a bug
|
||||
|
||||
If you're not sure if it's a real bug or if it's just you, please open a topic on the forum: [https://forum.magicmirror.builders/category/15/bug-hunt](https://forum.magicmirror.builders/category/15/bug-hunt)
|
||||
|
@ -33,6 +33,7 @@ Special thanks to the following contributors: @B1gG, @codac, @ezeholz, @khassel,
|
||||
- Update dependencies in package.json, require node >= v12, remove `rrule-alt` and `rrule`
|
||||
- Update dependencies in package.json and migrate husky to v6, fix husky setup in prod environment
|
||||
- Cleaned up error handling in newsfeed and calendar modules for real
|
||||
- Update documentation
|
||||
|
||||
### Removed
|
||||
|
||||
|
@ -4,8 +4,8 @@
|
||||
* MIT Licensed.
|
||||
*
|
||||
* For more information on how you can configure this file
|
||||
* See https://github.com/MichMich/MagicMirror#configuration
|
||||
*
|
||||
* see https://docs.magicmirror.builders/getting-started/configuration.html#general
|
||||
* and https://docs.magicmirror.builders/modules/configuration.html
|
||||
*/
|
||||
let config = {
|
||||
address: "localhost", // Address to listen on, can be:
|
||||
|
1285
package-lock.json
generated
1285
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
10
package.json
10
package.json
@ -46,7 +46,7 @@
|
||||
"homepage": "https://magicmirror.builders",
|
||||
"devDependencies": {
|
||||
"eslint-config-prettier": "^8.3.0",
|
||||
"eslint-plugin-jsdoc": "^35.0.0",
|
||||
"eslint-plugin-jsdoc": "^35.2.0",
|
||||
"eslint-plugin-prettier": "^3.4.0",
|
||||
"eslint-plugin-jest": "^24.3.6",
|
||||
"express-basic-auth": "^1.2.0",
|
||||
@ -55,7 +55,7 @@
|
||||
"jsdom": "^16.6.0",
|
||||
"lodash": "^4.17.21",
|
||||
"nyc": "^15.1.0",
|
||||
"prettier": "^2.3.0",
|
||||
"prettier": "^2.3.1",
|
||||
"pretty-quick": "^3.1.0",
|
||||
"sinon": "^11.1.1",
|
||||
"spectron": "^13.0.0",
|
||||
@ -65,13 +65,13 @@
|
||||
"stylelint-prettier": "^1.2.0"
|
||||
},
|
||||
"optionalDependencies": {
|
||||
"electron": "^11.4.7"
|
||||
"electron": "^11.4.8"
|
||||
},
|
||||
"dependencies": {
|
||||
"colors": "^1.4.0",
|
||||
"console-stamp": "^3.0.2",
|
||||
"digest-fetch": "^1.2.0",
|
||||
"eslint": "^7.27.0",
|
||||
"eslint": "^7.28.0",
|
||||
"express": "^4.17.1",
|
||||
"express-ipfilter": "^1.2.0",
|
||||
"feedme": "^2.0.2",
|
||||
@ -81,7 +81,7 @@
|
||||
"moment": "^2.29.1",
|
||||
"node-fetch": "^2.6.1",
|
||||
"node-ical": "^0.13.0",
|
||||
"simple-git": "^2.39.0",
|
||||
"simple-git": "^2.40.0",
|
||||
"socket.io": "^4.1.2"
|
||||
},
|
||||
"_moduleAliases": {
|
||||
|
Loading…
x
Reference in New Issue
Block a user