From f67fbc1394feff632c2f8de80fa559aaa1bfb77b Mon Sep 17 00:00:00 2001
From: Umherirrender <umherirrender_de.wp@web.de>
Date: Fri, 11 Sep 2020 23:49:03 +0200
Subject: [PATCH] build: Use existing eslint also for json linting

Bug: T220036
Change-Id: I7e9c43ea56366785b8cb94c9c6863b87841a6135
---
 Gruntfile.js      | 13 ++-------
 package-lock.json | 73 -----------------------------------------------
 package.json      |  3 +-
 3 files changed, 3 insertions(+), 86 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index f17e039..ee539b0 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,7 +1,6 @@
 /* eslint-env node, es6 */
 module.exports = function ( grunt ) {
 	grunt.loadNpmTasks( 'grunt-eslint' );
-	grunt.loadNpmTasks( 'grunt-jsonlint' );
 	grunt.loadNpmTasks( 'grunt-banana-checker' );
 
 	grunt.initConfig( {
@@ -10,24 +9,16 @@ module.exports = function ( grunt ) {
 				cache: true
 			},
 			all: [
-				'**/*.js',
+				'**/*.{js,json}',
 				'!node_modules/**',
 				'!vendor/**'
 			]
 		},
 		banana: {
 			all: 'i18n/'
-		},
-		jsonlint: {
-			all: [
-				'*.json',
-				'**/*.json',
-				'!node_modules/**',
-				'!vendor/**'
-			]
 		}
 	} );
 
-	grunt.registerTask( 'test', [ 'eslint', 'jsonlint', 'banana' ] );
+	grunt.registerTask( 'test', [ 'eslint', 'banana' ] );
 	grunt.registerTask( 'default', 'test' );
 };
diff --git a/package-lock.json b/package-lock.json
index 8c81ae3..f735066 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -80,12 +80,6 @@
 			"resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
 			"integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="
 		},
-		"JSV": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz",
-			"integrity": "sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=",
-			"dev": true
-		},
 		"abbrev": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
@@ -1484,16 +1478,6 @@
 				}
 			}
 		},
-		"grunt-jsonlint": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/grunt-jsonlint/-/grunt-jsonlint-1.1.0.tgz",
-			"integrity": "sha1-ox7pckCu4/NDyiY8Rb1TIGMSfbI=",
-			"dev": true,
-			"requires": {
-				"jsonlint": "1.6.2",
-				"strip-json-comments": "^2.0.0"
-			}
-		},
 		"grunt-known-options": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.1.tgz",
@@ -1597,12 +1581,6 @@
 				}
 			}
 		},
-		"has-color": {
-			"version": "0.1.7",
-			"resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz",
-			"integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=",
-			"dev": true
-		},
 		"has-flag": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
@@ -1914,16 +1892,6 @@
 			"integrity": "sha512-b0EBt8SWFNnixVdvoR2ZtEGa9ZqLhbJnOjezn+WP+8kspFm+PFYDN8Z4Bc7pRlDjvuVcADSUkroIuTWWn/YiIA==",
 			"dev": true
 		},
-		"jsonlint": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz",
-			"integrity": "sha1-VzcEUIX1XrRVxosf9OvAG9UOiDA=",
-			"dev": true,
-			"requires": {
-				"JSV": ">= 4.0.x",
-				"nomnom": ">= 1.5.x"
-			}
-		},
 		"kind-of": {
 			"version": "6.0.3",
 			"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
@@ -2099,41 +2067,6 @@
 			"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
 			"integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc="
 		},
-		"nomnom": {
-			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz",
-			"integrity": "sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=",
-			"dev": true,
-			"requires": {
-				"chalk": "~0.4.0",
-				"underscore": "~1.6.0"
-			},
-			"dependencies": {
-				"ansi-styles": {
-					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz",
-					"integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=",
-					"dev": true
-				},
-				"chalk": {
-					"version": "0.4.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz",
-					"integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "~1.0.0",
-						"has-color": "~0.1.0",
-						"strip-ansi": "~0.1.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "0.1.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz",
-					"integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=",
-					"dev": true
-				}
-			}
-		},
 		"nopt": {
 			"version": "3.0.6",
 			"resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
@@ -2826,12 +2759,6 @@
 			"integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
 			"dev": true
 		},
-		"underscore": {
-			"version": "1.6.0",
-			"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
-			"integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=",
-			"dev": true
-		},
 		"underscore.string": {
 			"version": "3.3.5",
 			"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.5.tgz",
diff --git a/package.json b/package.json
index e016470..8a2e3e9 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,6 @@
 		"eslint-config-wikimedia": "0.17.0",
 		"grunt": "1.3.0",
 		"grunt-banana-checker": "0.9.0",
-		"grunt-eslint": "23.0.0",
-		"grunt-jsonlint": "1.1.0"
+		"grunt-eslint": "23.0.0"
 	}
 }