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

Change-Id: Iad84e0d51929ea23c0b54b2b2c235fc840fa1df2
---
 Gruntfile.js | 14 +++-----------
 package.json |  3 +--
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 04a51f5c..2b4e16c1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -2,7 +2,6 @@
 module.exports = function ( grunt ) {
 	var conf = grunt.file.readJSON( 'extension.json' );
 
-	grunt.loadNpmTasks( 'grunt-jsonlint' );
 	grunt.loadNpmTasks( 'grunt-banana-checker' );
 	grunt.loadNpmTasks( 'grunt-eslint' );
 	grunt.loadNpmTasks( 'grunt-stylelint' );
@@ -11,22 +10,15 @@ module.exports = function ( grunt ) {
 		eslint: {
 			options: {
 				reportUnusedDisableDirectives: true,
+				extensions: [ '.js', '.json' ],
 				cache: true
 			},
 			all: [
-				'**/*.js',
+				'**/*.js{,on}',
 				'!{vendor,node_modules}/**'
 			]
 		},
 		banana: conf.MessagesDirs,
-		jsonlint: {
-			all: [
-				'*.json',
-				'**/*.json',
-				'!node_modules/**',
-				'!vendor/**'
-			]
-		},
 		stylelint: {
 			all: [
 				'**/*.css',
@@ -36,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 3ca727f1..939f6a4e 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,10 @@
 		"test": "grunt test"
 	},
 	"devDependencies": {
-		"eslint-config-wikimedia": "0.11.0",
+		"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"
 	}