diff --git a/.prettierignore b/.prettierignore
index b829fa7c..eeaa248d 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,5 +1,8 @@
-package-lock.json
-/config/**/*
-/vendor/**/*
+/config
+/coverage
+/vendor
!/vendor/vendor.js
-.github/**/*
+.github
+.nyc_output
+package-lock.json
+*.ts
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d14a78d2..f6e5df9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@ Special thanks to the following contributors: @B1gG, @codac, @ezeholz, @khassel,
- Fix module updatenotification which did not work for repos with many refs (#1907)
- Fix config check failing when encountering let syntax ("Parsing error: Unexpected token config")
- Fix calendar debug check
+- Really run prettier over all files
## [2.15.0] - 2021-04-01
diff --git a/index.html b/index.html
index 5a46bb72..c9f2239c 100644
--- a/index.html
+++ b/index.html
@@ -1,55 +1,57 @@
-
- MagicMirror²
-
-
+
+ MagicMirror²
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/modules/default/weather/weather.js b/modules/default/weather/weather.js
index 556c68a4..3386277c 100644
--- a/modules/default/weather/weather.js
+++ b/modules/default/weather/weather.js
@@ -33,7 +33,7 @@ Module.register("weather", {
showIndoorHumidity: false,
maxNumberOfDays: 5,
maxEntries: 5,
- ignoreToday: false,
+ ignoreToday: false,
fade: true,
fadePoint: 0.25, // Start on 1/4th of the list.
initialLoadDelay: 0, // 0 seconds delay
@@ -130,12 +130,12 @@ Module.register("weather", {
// Add all the data to the template.
getTemplateData: function () {
- const forecast = this.weatherProvider.weatherForecast()
+ const forecast = this.weatherProvider.weatherForecast();
+
+ if (this.config.ignoreToday) {
+ forecast.splice(0, 1);
+ }
- if (this.config.ignoreToday) {
- forecast.splice(0, 1)
- }
-
return {
config: this.config,
current: this.weatherProvider.currentWeather(),
@@ -268,7 +268,7 @@ Module.register("weather", {
this.nunjucksEnvironment().addFilter(
"calcNumEntries",
- function (dataArray) {
+ function (dataArray) {
return Math.min(dataArray.length, this.config.maxEntries);
}.bind(this)
);
diff --git a/package.json b/package.json
index 622c3fd1..098b6efb 100644
--- a/package.json
+++ b/package.json
@@ -14,12 +14,12 @@
"test:coverage": "NODE_ENV=test nyc --reporter=lcov --reporter=text mocha tests --recursive --timeout=3000",
"test:e2e": "NODE_ENV=test mocha tests/e2e --recursive",
"test:unit": "NODE_ENV=test mocha tests/unit --recursive",
- "test:prettier": "prettier --check **/*.{js,css,json,md,yml}",
+ "test:prettier": "prettier . --check",
"test:js": "eslint js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --quiet",
"test:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json",
"test:calendar": "node ./modules/default/calendar/debug.js",
"config:check": "node js/check_config.js",
- "lint:prettier": "prettier --write **/*.{js,css,json,md,yml}",
+ "lint:prettier": "prettier . --write",
"lint:js": "eslint js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --fix",
"lint:css": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json --fix",
"lint:staged": "pretty-quick --staged",