Merge branch 'develop' into develop

This commit is contained in:
sam detweiler
2020-09-22 07:49:19 -05:00
committed by GitHub
23 changed files with 1929 additions and 1386 deletions

View File

@@ -42,25 +42,24 @@
},
"homepage": "https://magicmirror.builders",
"devDependencies": {
"@prantlf/jsonlint": "^10.2.0",
"chai": "^4.2.0",
"chai-as-promised": "^7.1.1",
"current-week-number": "^1.0.7",
"danger": "^3.1.3",
"eslint-config-prettier": "^6.11.0",
"eslint-plugin-jsdoc": "^30.1.0",
"eslint-plugin-jsdoc": "^30.5.1",
"eslint-plugin-prettier": "^3.1.4",
"http-auth": "^3.2.3",
"husky": "^4.2.5",
"husky": "^4.3.0",
"jsdom": "^11.6.2",
"lodash": "^4.17.20",
"mocha": "^7.1.2",
"mocha-each": "^2.0.1",
"mocha-logger": "^1.0.6",
"nyc": "^15.1.0",
"prettier": "^2.0.5",
"pretty-quick": "^2.0.1",
"prettier": "^2.1.2",
"pretty-quick": "^3.0.2",
"spectron": "^8.0.0",
"stylelint": "^13.6.1",
"stylelint": "^13.7.1",
"stylelint-config-prettier": "^8.0.2",
"stylelint-config-standard": "^20.0.0",
"stylelint-prettier": "^1.1.2"
@@ -69,24 +68,23 @@
"electron": "^6.1.7"
},
"dependencies": {
"colors": "^1.1.2",
"colors": "^1.4.0",
"console-stamp": "^0.2.9",
"eslint": "^7.5.0",
"express": "^4.16.2",
"express-ipfilter": "^1.0.1",
"feedme": "latest",
"eslint": "^7.9.0",
"express": "^4.17.1",
"express-ipfilter": "^1.1.2",
"feedme": "^1.2.0",
"helmet": "^3.23.3",
"iconv-lite": "latest",
"lodash": "^4.17.19",
"module-alias": "^2.2.2",
"moment": "latest",
"node-ical": "^0.12.0",
"request": "^2.88.2",
"rrule": "^2.6.4",
"rrule": "^2.6.6",
"rrule-alt": "^2.2.8",
"simple-git": "^1.85.0",
"socket.io": "^2.1.1",
"valid-url": "latest"
"socket.io": "^2.3.0",
"valid-url": "^1.0.9"
},
"_moduleAliases": {
"node_helper": "js/node_helper.js"