Merge pull request #1981 from rejas/remove_grunt

Remove grunt, use non-grunt linters instead

.eslintignore

@@ -1,5 +1,3 @@
-vendor/*
+modules/default/alert/notificationFx.js
-!/vendor/vendor.js
+modules/default/alert/modernizr.custom.js
-!/modules/default/**
+modules/default/alert/classie.js
-!/modules/node_helper
-!/modules/node_helper/**

.markdownlintrc.json

@@ -0,0 +1,23 @@
+{
+	"default": true,
+	"line-length": false,
+	"blanks-around-headers": false,
+	"no-duplicate-header": false,
+	"no-inline-html": false,
+	"MD010": false,
+	"MD001": false,
+	"MD031": false,
+	"MD040": false,
+	"MD002": false,
+	"MD029": false,
+	"MD041": false,
+	"MD032": false,
+	"MD036": false,
+	"MD037": false,
+	"MD009": false,
+	"MD018": false,
+	"MD012": false,
+	"MD026": false,
+	"MD038": false,
+	"MD047": false
+}

.stylelintrc.json

@@ -1,5 +1,6 @@
 {
 	"extends": "stylelint-config-standard",
 	"font-family-name-quotes": "double-where-recommended",
-	"block-no-empty": false
+	"block-no-empty": false,
+	"ignoreFiles": ["./modules/default/alert/ns-default.css"]
 }

.travis.yml

@@ -8,7 +8,6 @@ before_install:
   - npm i -g npm
 before_script:
   - yarn danger ci
-  - npm install grunt-cli -g
   - "export DISPLAY=:99.0"
   - "export ELECTRON_DISABLE_SANDBOX=1"
   - "sh -e /etc/init.d/xvfb start"

CHANGELOG.md

@@ -12,12 +12,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 
 ### Updated
+Replaced grunt-based linters with their non-grunt equivalents
 
 ### Deleted
 
 ### Fixed
 - The broken modules due to Socket.io change from last release [#1973](https://github.com/MichMich/MagicMirror/issues/1973)
-- Add backward compatibilty for old module code in socketclient.js [#1973](https://github.com/MichMich/MagicMirror/issues/1973)
+- Add backward compatibility for old module code in socketclient.js [#1973](https://github.com/MichMich/MagicMirror/issues/1973)
 
 ## [2.11.0] - 2020-04-01
 

Gruntfile.js

@@ -1,106 +0,0 @@
-module.exports = function(grunt) {
-	require("time-grunt")(grunt);
-	var fix = (grunt.option("env") || "lint") === "lint";
-	grunt.initConfig({
-		eslint: {
-			options: {
-				fix: fix,
-				configFile: ".eslintrc.json"
-			},
-			target: [
-				"js/*.js",
-				"modules/default/*.js",
-				"modules/default/*/*.js",
-				"serveronly/*.js",
-				"clientonly/*.js",
-				"*.js",
-				"tests/**/*.js",
-				"!modules/default/alert/notificationFx.js",
-				"!modules/default/alert/modernizr.custom.js",
-				"!modules/default/alert/classie.js",
-				"config/*",
-				"translations/translations.js",
-				"vendor/vendor.js"
-			]
-		},
-		stylelint: {
-			simple: {
-				options: {
-					fix: fix,
-					configFile: ".stylelintrc.json"
-				},
-				src: [
-					"css/main.css",
-					"modules/default/calendar/calendar.css",
-					"modules/default/clock/clock_styles.css",
-					"modules/default/currentweather/currentweather.css",
-					"modules/default/weatherforcast/weatherforcast.css"
-				]
-			}
-		},
-		jsonlint: {
-			main: {
-				src: [
-					"package.json",
-					".eslintrc.json",
-					".stylelintrc.json",
-					"translations/*.json",
-					"modules/default/*/translations/*.json",
-					"vendor/package.json"
-				],
-				options: {
-					reporter: "jshint"
-				}
-			}
-		},
-		markdownlint: {
-			all: {
-				options: {
-					config: {
-						"default": true,
-						"line-length": false,
-						"blanks-around-headers": false,
-						"no-duplicate-header": false,
-						"no-inline-html": false,
-						"MD010": false,
-						"MD001": false,
-						"MD031": false,
-						"MD040": false,
-						"MD002": false,
-						"MD029": false,
-						"MD041": false,
-						"MD032": false,
-						"MD036": false,
-						"MD037": false,
-						"MD009": false,
-						"MD018": false,
-						"MD012": false,
-						"MD026": false,
-						"MD038": false,
-						"MD047": false
-					}
-				},
-				src: [
-					"README.md",
-					"CHANGELOG.md",
-					"LICENSE.md",
-					"modules/README.md",
-					"modules/default/**/*.md",
-					"!modules/default/calendar/vendor/ical.js/readme.md"
-				]
-			}
-		},
-		yamllint: {
-			all: [
-				".travis.yml"
-			]
-		}
-	});
-	grunt.loadNpmTasks("grunt-eslint");
-	grunt.loadNpmTasks("grunt-stylelint");
-	grunt.loadNpmTasks("grunt-jsonlint");
-	grunt.loadNpmTasks("grunt-yamllint");
-	grunt.loadNpmTasks("grunt-markdownlint");
-
-	grunt.registerTask("default", ["eslint", "stylelint", "jsonlint", "markdownlint", "yamllint"]);
-};

modules/default/weatherforecast/weatherforecast.css

@@ -19,9 +19,9 @@
 }
 
 .weatherforecast tr.colored .min-temp {
-  color: #BCDDFF;
+  color: #bcddff;
 }
 
 .weatherforecast tr.colored .max-temp {
-  color: #FF8E99;
+  color: #ff8e99;
 }

package.json

@@ -12,9 +12,16 @@
     "test": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests --recursive",
     "test:unit": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/unit --recursive",
     "test:e2e": "NODE_ENV=test ./node_modules/mocha/bin/mocha tests/e2e --recursive",
-    "test:lint": "grunt --env=test",
+    "test:lint": "npm run test:js && npm run test:style",
+    "test:js": "eslint *.js js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json",
+    "test:style": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json",
     "config:check": "node tests/configs/check_config.js",
-    "lint": "grunt --env=lint"
+    "lint": "npm run lint:js && npm run lint:json && npm run lint:markdown && npm run lint:style && npm run lint:yaml",
+    "lint:js": "eslint *.js js/**/*.js modules/default/**/*.js clientonly/*.js serveronly/*.js translations/*.js vendor/*.js tests/**/*.js config/* --config .eslintrc.json --fix",
+    "lint:json": "jsonlint -q package.json .eslintrc.json .markdownlintrc.json .stylelintrc.json modules/default/*/translations/*.json translations/*.json vendor/package.json",
+    "lint:markdown": "markdownlint *.md modules/README.md modules/default/**/*.md --config .markdownlintrc.json",
+    "lint:style": "stylelint css/main.css modules/default/**/*.css --config .stylelintrc.json --fix",
+    "lint:yaml": "yamllint .travis.yml"
   },
   "repository": {
     "type": "git",
@@ -36,25 +43,23 @@
   },
   "homepage": "https://magicmirror.builders",
   "devDependencies": {
+    "@prantlf/jsonlint": "^10.2.0",
     "chai": "^4.1.2",
     "chai-as-promised": "^7.1.1",
     "current-week-number": "^1.0.7",
     "danger": "^3.1.3",
-    "grunt": "latest",
+    "eslint": "^6.8.0",
-    "grunt-eslint": "latest",
-    "grunt-jsonlint": "latest",
-    "grunt-markdownlint": "latest",
-    "grunt-stylelint": "latest",
-    "grunt-yamllint": "latest",
     "http-auth": "^3.2.3",
     "jsdom": "^11.6.2",
+    "markdownlint": "^0.19.0",
+    "markdownlint-cli": "^0.22.0",
     "mocha": "^7.0.0",
     "mocha-each": "^1.1.0",
     "mocha-logger": "^1.0.6",
     "spectron": "^8.0.0",
-    "stylelint": "latest",
+    "stylelint": "^13.3.1",
-    "stylelint-config-standard": "latest",
+    "stylelint-config-standard": "^20.0.0",
-    "time-grunt": "latest"
+    "yaml-lint": "^1.2.4"
   },
   "optionalDependencies": {
     "electron": "^6.1.7"