From f2cbf77787696822104e4fcbd342ff2c46caa0b0 Mon Sep 17 00:00:00 2001
From: "James D. Forrester" <jforrester@wikimedia.org>
Date: Tue, 7 May 2019 10:52:09 -0700
Subject: [PATCH] build: Upgrade eslint-config-wikimedia 0.12.0, drop
 grunt-jsonlint

Change-Id: I764c24fcd33a1732bb228fd68cde919f8bd5273e
---
 .gitignore   |  1 +
 Gruntfile.js | 16 ++++++++--------
 package.json |  7 +++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3251b73..37457e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 node_modules/
 /vendor
 composer.lock
+.eslintcache
diff --git a/Gruntfile.js b/Gruntfile.js
index 9ef5474..2063b37 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2,24 +2,24 @@
 module.exports = function ( grunt ) {
 	grunt.loadNpmTasks( 'grunt-banana-checker' );
 	grunt.loadNpmTasks( 'grunt-eslint' );
-	grunt.loadNpmTasks( 'grunt-jsonlint' );
 
 	grunt.initConfig( {
 		banana: {
 			all: 'i18n/'
 		},
 		eslint: {
-			all: '.'
-		},
-		jsonlint: {
+			options: {
+				reportUnusedDisableDirectives: true,
+				extensions: [ '.js', '.json' ],
+				cache: true
+			},
 			all: [
-				'**/*.json',
-				'!node_modules/**',
-				'!vendor/**'
+				'**/*.js{,on}',
+				'!{vendor,node_modules}/**'
 			]
 		}
 	} );
 
-	grunt.registerTask( 'test', [ 'jsonlint', 'banana', 'eslint' ] );
+	grunt.registerTask( 'test', [ 'eslint', 'banana' ] );
 	grunt.registerTask( 'default', 'test' );
 };
diff --git a/package.json b/package.json
index c875803..c7a617e 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,10 @@
 		"test": "grunt test"
 	},
 	"devDependencies": {
-		"eslint-config-wikimedia": "0.9.0",
-		"grunt": "1.0.3",
+		"eslint-config-wikimedia": "0.12.0",
+		"grunt": "1.0.4",
 		"grunt-banana-checker": "0.6.0",
-		"grunt-eslint": "21.0.0",
-		"grunt-jsonlint": "1.1.0"
+		"grunt-eslint": "21.0.0"
 	},
 	"eslintIgnore": [
 		"vendor/**"