Merge pull request #2133 from rejas/dependencies

Cleanup dependencies

CHANGELOG.md

@@ -5,10 +5,6 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/donate) With your help we can continue to improve the MagicMirror²
 
-### fixed
-
-- 2110, 2111, 2118 recurring full day events should not use timezone adjustment. just compare month/day
-
 ## [2.13.0] - Unreleased (Develop Branch - Please add your contributions to this release.)
 
 _This release is scheduled to be released on 2020-10-01._
@@ -31,6 +27,7 @@ _This release is scheduled to be released on 2020-10-01._
 - Cleaned up newsfeed module.
 - Cleaned up jsdoc comments.
 - Cleaned up clock tests.
+- Move lodash into devDependencies, update other dependencies
 
 ### Deleted
 
@@ -43,6 +40,7 @@ _This release is scheduled to be released on 2020-10-01._
 - Fix incorrect namespace links in svg clockfaces. [#2072](https://github.com/MichMich/MagicMirror/issues/2072)
 - Fix weather/providers/weathergov for API guidelines. [#2045](https://github.com/MichMich/MagicMirror/issues/2045)
 - Fix "undefined" in weather modules header. [#1985](https://github.com/MichMich/MagicMirror/issues/1985)
+- Fix #2110, #2111, #2118: Recurring full day events should not use timezone adjustment. Just compare month/day.
 
 ## [2.12.0] - 2020-07-01
 

package.json

@@ -46,19 +46,20 @@
 		"chai-as-promised": "^7.1.1",
 		"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",
+		"prettier": "^2.1.2",
-		"pretty-quick": "^2.0.1",
+		"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"
@@ -67,24 +68,23 @@
 		"electron": "^6.1.7"
 	},
 	"dependencies": {
-		"colors": "^1.1.2",
+		"colors": "^1.4.0",
 		"console-stamp": "^0.2.9",
-		"eslint": "^7.6.0",
+		"eslint": "^7.9.0",
-		"express": "^4.16.2",
+		"express": "^4.17.1",
-		"express-ipfilter": "^1.0.1",
+		"express-ipfilter": "^1.1.2",
-		"feedme": "latest",
+		"feedme": "^1.2.0",
 		"helmet": "^3.23.3",
 		"ical": "^0.8.0",
-		"iconv-lite": "latest",
+		"iconv-lite": "^0.6.2",
-		"lodash": "^4.17.19",
 		"module-alias": "^2.2.2",
-		"moment": "latest",
+		"moment": "^2.28.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",
+		"socket.io": "^2.3.0",
-		"valid-url": "latest"
+		"valid-url": "^1.0.9"
 	},
 	"_moduleAliases": {
 		"node_helper": "js/node_helper.js"

vendor/package-lock.json

@@ -4,9 +4,9 @@
   "lockfileVersion": 1,
   "dependencies": {
     "@fortawesome/fontawesome-free": {
-      "version": "5.13.1",
+      "version": "5.14.0",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.13.1.tgz",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.14.0.tgz",
-      "integrity": "sha512-D819f34FLHeBN/4xvw0HR0u7U2G7RqjPSggXqf7LktsxWQ48VAfGwvMrhcVuaZV2fF069c/619RdgCCms0DHhw=="
+      "integrity": "sha512-OfdMsF+ZQgdKHP9jUbmDcRrP0eX90XXrsXIdyjLbkmSBzmMXPABB8eobUJtivaupucYaByz6WNe1PI1JuYm3qA=="
     },
     "a-sync-waterfall": {
       "version": "1.0.1",
@@ -44,9 +44,9 @@
       }
     },
     "chokidar": {
-      "version": "3.4.0",
+      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz",
-      "integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ==",
+      "integrity": "sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A==",
       "optional": true,
       "requires": {
         "anymatch": "~3.1.1",
@@ -60,9 +60,9 @@
       }
     },
     "commander": {
-      "version": "3.0.2",
+      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
-      "integrity": "sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow=="
+      "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="
     },
     "fill-range": {
       "version": "7.0.1",
@@ -119,9 +119,9 @@
       "optional": true
     },
     "moment": {
-      "version": "2.27.0",
+      "version": "2.28.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.28.0.tgz",
-      "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
+      "integrity": "sha512-Z5KOjYmnHyd/ukynmFd/WwyXHd7L4J9vTI/nn5Ap9AVUgaAE15VvQ9MOGmJJygEUklupqIrFnor/tjTwRU+tQw=="
     },
     "moment-timezone": {
       "version": "0.5.31",
@@ -138,14 +138,14 @@
       "optional": true
     },
     "nunjucks": {
-      "version": "3.2.1",
+      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.2.tgz",
-      "integrity": "sha512-LYlVuC1ZNSalQQkLNNPvcgPt2M9FTY9bs39mTCuFXtqh7jWbYzhDlmz2M6onPiXEhdZo+b9anRhc+uBGuJZ2bQ==",
+      "integrity": "sha512-KUi85OoF2NMygwODAy28Lh9qHmq5hO3rBlbkYoC8v377h4l8Pt5qFjILl0LWpMbOrZ18CzfVVUvIHUIrtED3sA==",
       "requires": {
         "a-sync-waterfall": "^1.0.0",
         "asap": "^2.0.3",
         "chokidar": "^3.3.0",
-        "commander": "^3.0.2"
+        "commander": "^5.1.0"
       }
     },
     "picomatch": {

vendor/package.json

@@ -10,10 +10,10 @@
     "url": "https://github.com/MichMich/MagicMirror/issues"
   },
   "dependencies": {
-    "@fortawesome/fontawesome-free": "^5.13.1",
+    "@fortawesome/fontawesome-free": "^5.14.0",
-    "moment": "^2.27.0",
+    "moment": "^2.28.0",
     "moment-timezone": "^0.5.31",
-    "nunjucks": "^3.2.1",
+    "nunjucks": "^3.2.2",
     "suncalc": "^1.8.0",
     "weathericons": "^2.1.0"
   }