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

Change-Id: Iae12ae140e1e10d97016bca5cf329d80da640343
---
 Gruntfile.js | 16 ++++------------
 package.json |  3 +--
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index fb98b1a..5fe2c8c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,19 +4,11 @@ module.exports = function ( grunt ) {
 
 	grunt.loadNpmTasks( 'grunt-banana-checker' );
 	grunt.loadNpmTasks( 'grunt-eslint' );
-	grunt.loadNpmTasks( 'grunt-jsonlint' );
 	grunt.loadNpmTasks( 'grunt-contrib-watch' );
 	grunt.loadNpmTasks( 'grunt-stylelint' );
 
 	grunt.initConfig( {
 		banana: conf.MessagesDirs,
-		jsonlint: {
-			all: [
-				'**/*.json',
-				'!node_modules/**',
-				'!vendor/**'
-			]
-		},
 		stylelint: {
 			all: [
 				'**/*.css',
@@ -35,16 +27,16 @@ module.exports = function ( grunt ) {
 		eslint: {
 			options: {
 				reportUnusedDisableDirectives: true,
+				extensions: [ '.js', '.json' ],
 				cache: true
 			},
 			all: [
-				'**/*.js',
-				'!**/node_modules/**',
-				'!vendor/**'
+				'**/*.js{,on}',
+				'!{vendor,node_modules}/**'
 			]
 		}
 	} );
 
-	grunt.registerTask( 'test', [ 'eslint', 'stylelint', 'jsonlint', 'banana' ] );
+	grunt.registerTask( 'test', [ 'eslint', 'stylelint', 'banana' ] );
 	grunt.registerTask( 'default', 'test' );
 };
diff --git a/package.json b/package.json
index f784d59..c94b189 100644
--- a/package.json
+++ b/package.json
@@ -6,12 +6,11 @@
 		"selenium-test": "wdio tests/selenium/wdio.conf.js"
 	},
 	"devDependencies": {
-		"eslint-config-wikimedia": "0.11.0",
+		"eslint-config-wikimedia": "0.12.0",
 		"grunt": "1.0.3",
 		"grunt-banana-checker": "0.6.0",
 		"grunt-contrib-watch": "1.1.0",
 		"grunt-eslint": "21.0.0",
-		"grunt-jsonlint": "1.1.0",
 		"grunt-stylelint": "0.10.1",
 		"stylelint-config-wikimedia": "0.5.0",
 		"wdio-mediawiki": "0.1.7",