From 608b0bbb169d2d3d2940310fd2acdb83d6449bf8 Mon Sep 17 00:00:00 2001
From: "James D. Forrester" <jforrester@wikimedia.org>
Date: Mon, 6 May 2019 16:22:12 -0700
Subject: [PATCH] build: Upgrade eslint-config-wikimedia 0.12.0, drop
 grunt-jsonlint

Change-Id: I2799004a68022deb13a068e491c1bdb48fdebe0c
---
 Gruntfile.js | 21 ++++++++-------------
 package.json |  5 ++---
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index a69a4201..fa4958af 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,29 +1,24 @@
 /* eslint-env node */
 module.exports = function ( grunt ) {
 	grunt.loadNpmTasks( 'grunt-eslint' );
-	grunt.loadNpmTasks( 'grunt-jsonlint' );
 	grunt.loadNpmTasks( 'grunt-banana-checker' );
 	grunt.loadNpmTasks( 'grunt-stylelint' );
 
 	grunt.initConfig( {
 		eslint: {
+			options: {
+				reportUnusedDisableDirectives: true,
+				extensions: [ '.js', '.json' ],
+				cache: true
+			},
 			all: [
-				'**/*.js',
-				'!node_modules/**',
-				'!lib/**',
-				'!vendor/**'
+				'**/*.js{,on}',
+				'!{lib,vendor,node_modules}/**'
 			]
 		},
 		banana: {
 			all: 'i18n/'
 		},
-		jsonlint: {
-			all: [
-				'**/*.json',
-				'!node_modules/**',
-				'!vendor/**'
-			]
-		},
 		stylelint: {
 			all: [
 				'**/*.css',
@@ -33,6 +28,6 @@ module.exports = function ( grunt ) {
 		}
 	} );
 
-	grunt.registerTask( 'test', [ 'eslint', 'jsonlint', 'banana', 'stylelint' ] );
+	grunt.registerTask( 'test', [ 'eslint', 'banana', 'stylelint' ] );
 	grunt.registerTask( 'default', 'test' );
 };
diff --git a/package.json b/package.json
index 20b166c0..939f6a4e 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,10 @@
 		"test": "grunt test"
 	},
 	"devDependencies": {
-		"eslint-config-wikimedia": "0.11.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-stylelint": "0.10.1",
 		"stylelint-config-wikimedia": "0.5.0"
 	}