From 8ea37a5a455319310c5787586e4e4656496733f5 Mon Sep 17 00:00:00 2001 From: veeck Date: Sun, 28 Mar 2021 10:48:12 +0200 Subject: [PATCH 1/3] Fix left over self reference --- modules/default/calendar/calendarfetcher.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/default/calendar/calendarfetcher.js b/modules/default/calendar/calendarfetcher.js index d43e2304..9673fa31 100644 --- a/modules/default/calendar/calendarfetcher.js +++ b/modules/default/calendar/calendarfetcher.js @@ -87,7 +87,7 @@ const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEn maximumNumberOfDays }); } catch (error) { - fetchFailedCallback(self, error.message); + fetchFailedCallback(this, error.message); scheduleTimer(); return; } From b210fcdcf377126b827cb5864b4916a16f6ff7af Mon Sep 17 00:00:00 2001 From: veeck Date: Sun, 28 Mar 2021 10:48:21 +0200 Subject: [PATCH 2/3] Update dependencies --- package-lock.json | 26 +++++++++++++------------- package.json | 4 ++-- vendor/package-lock.json | 6 +++--- vendor/package.json | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4424efaf..e59307ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2218,9 +2218,9 @@ } }, "eslint": { - "version": "7.22.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.22.0.tgz", - "integrity": "sha512-3VawOtjSJUQiiqac8MQc+w457iGLfuNGLFn8JmF051tTKbh5/x/0vlcEj8OgDCaw7Ysa2Jn8paGshV7x2abKXg==", + "version": "7.23.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.23.0.tgz", + "integrity": "sha512-kqvNVbdkjzpFy0XOszNwjkKzZ+6TcwCQ/h+ozlcIWwaimBBuhlQ4nN6kbiM2L+OjDcznkTJxzYfRFH92sx4a0Q==", "requires": { "@babel/code-frame": "7.12.11", "@eslint/eslintrc": "^0.4.0", @@ -2262,9 +2262,9 @@ }, "dependencies": { "semver": { - "version": "7.3.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.4.tgz", - "integrity": "sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==", + "version": "7.3.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", + "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==", "requires": { "lru-cache": "^6.0.0" } @@ -2996,9 +2996,9 @@ } }, "globals": { - "version": "13.6.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.6.0.tgz", - "integrity": "sha512-YFKCX0SiPg7l5oKYCJ2zZGxcXprVXHcSnVuvzrT3oSENQonVLqM5pf9fN5dLGZGyCjhw8TN8Btwe/jKnZ0pjvQ==", + "version": "13.7.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.7.0.tgz", + "integrity": "sha512-Aipsz6ZKRxa/xQkZhNg0qIWXT6x6rD46f6x/PCnBomlttdIyAPak4YD9jTmKpZ72uROSMU87qJtcgpgHaVchiA==", "requires": { "type-fest": "^0.20.2" }, @@ -5876,16 +5876,16 @@ } }, "sinon": { - "version": "9.2.4", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-9.2.4.tgz", - "integrity": "sha512-zljcULZQsJxVra28qIAL6ow1Z9tpattkCTEJR4RBP3TGc00FcttsP5pK284Nas5WjMZU5Yzy3kAIp3B3KRf5Yg==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-10.0.0.tgz", + "integrity": "sha512-XAn5DxtGVJBlBWYrcYKEhWCz7FLwZGdyvANRyK06419hyEpdT0dMc5A8Vcxg5SCGHc40CsqoKsc1bt1CbJPfNw==", "dev": true, "requires": { "@sinonjs/commons": "^1.8.1", "@sinonjs/fake-timers": "^6.0.1", "@sinonjs/samsam": "^5.3.1", "diff": "^4.0.2", - "nise": "^4.0.4", + "nise": "^4.1.0", "supports-color": "^7.1.0" }, "dependencies": { diff --git a/package.json b/package.json index c00c3935..ee39a58a 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "nyc": "^15.1.0", "prettier": "^2.2.1", "pretty-quick": "^3.1.0", - "sinon": "^9.2.4", + "sinon": "^10.0.0", "spectron": "^13.0.0", "stylelint": "^13.12.0", "stylelint-config-prettier": "^8.0.2", @@ -72,7 +72,7 @@ "colors": "^1.4.0", "console-stamp": "^3.0.0-rc4.2", "digest-fetch": "^1.1.6", - "eslint": "^7.22.0", + "eslint": "^7.23.0", "express": "^4.17.1", "express-ipfilter": "^1.1.2", "feedme": "^2.0.2", diff --git a/vendor/package-lock.json b/vendor/package-lock.json index d3f051c1..3a83c562 100644 --- a/vendor/package-lock.json +++ b/vendor/package-lock.json @@ -4,9 +4,9 @@ "lockfileVersion": 1, "dependencies": { "@fortawesome/fontawesome-free": { - "version": "5.15.2", - "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.2.tgz", - "integrity": "sha512-7l/AX41m609L/EXI9EKH3Vs3v0iA8tKlIOGtw+kgcoanI7p+e4I4GYLqW3UXWiTnjSFymKSmTTPKYrivzbxxqA==" + "version": "5.15.3", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.3.tgz", + "integrity": "sha512-rFnSUN/QOtnOAgqFRooTA3H57JLDm0QEG/jPdk+tLQNL/eWd+Aok8g3qCI+Q1xuDPWpGW/i9JySpJVsq8Q0s9w==" }, "a-sync-waterfall": { "version": "1.0.1", diff --git a/vendor/package.json b/vendor/package.json index f8e0f9d2..a52af548 100755 --- a/vendor/package.json +++ b/vendor/package.json @@ -10,7 +10,7 @@ "url": "https://github.com/MichMich/MagicMirror/issues" }, "dependencies": { - "@fortawesome/fontawesome-free": "^5.15.2", + "@fortawesome/fontawesome-free": "^5.15.3", "moment": "^2.29.1", "moment-timezone": "^0.5.33", "nunjucks": "^3.2.3", From f15972c823eab5dfeb60ceddc8b8d7de16679e9d Mon Sep 17 00:00:00 2001 From: veeck Date: Sun, 28 Mar 2021 10:50:26 +0200 Subject: [PATCH 3/3] Update CHANGELOG just to please the action and my inner OCD ;-) --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dbc13a59..c6db889b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,7 +58,7 @@ _This release is scheduled to be released on 2021-04-01._ - Fix Issue with weather forecast icons unit tests with different timezones (#2221) - Fix issue with unencoded characters in translated strings when using nunjuck template (`Loading …` as an example) - Fix socket.io backward compatibility with socket v2 clients -- 3rd party module language loading if language is English +- Fix 3rd party module language loading if language is English - Fix e2e tests after spectron update - Fix updatenotification creating zombie processes by setting a timeout for the git process - Fix weather module openweathermap not loading if lat and lon set without onecall.