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

Bug: T220036
Change-Id: Ia081ff5429547cf1c7e6d6e8b0cae94e8ca3e0ba
---
 Gruntfile.js | 15 +++------------
 package.json |  3 +--
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index dff4a0f..1b53e92 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -5,7 +5,6 @@ module.exports = function ( grunt ) {
 	grunt.loadNpmTasks( 'grunt-banana-checker' );
 	grunt.loadNpmTasks( 'grunt-contrib-watch' );
 	grunt.loadNpmTasks( 'grunt-eslint' );
-	grunt.loadNpmTasks( 'grunt-jsonlint' );
 	grunt.loadNpmTasks( 'grunt-notify' );
 	grunt.loadNpmTasks( 'grunt-stylelint' );
 
@@ -13,11 +12,12 @@ module.exports = function ( grunt ) {
 		eslint: {
 			options: {
 				cache: true,
+				extensions: [ '.js', '.json' ],
 				maxWarnings: 0,
 				reportUnusedDisableDirectives: true
 			},
 			all: [
-				'**/*.js',
+				'**/*.js{,on}',
 				'!docs/**',
 				'!libs/**',
 				'!node_modules/**',
@@ -39,15 +39,6 @@ module.exports = function ( grunt ) {
 				'!vendor/**'
 			]
 		},
-		jsonlint: {
-			all: [
-				'**/*.json',
-				'!docs/**',
-				'!libs/**',
-				'!node_modules/**',
-				'!vendor/**'
-			]
-		},
 		banana: conf.MessagesDirs,
 		watch: {
 			lint: {
@@ -67,7 +58,7 @@ module.exports = function ( grunt ) {
 		}
 	} );
 
-	grunt.registerTask( 'lint', [ 'eslint', 'stylelint', 'jsonlint', 'banana' ] );
+	grunt.registerTask( 'lint', [ 'eslint', 'stylelint', 'banana' ] );
 	grunt.registerTask( 'test', [ 'lint' ] );
 
 	grunt.registerTask( 'default', [ 'test' ] );
diff --git a/package.json b/package.json
index ab1aed7..f8331b2 100644
--- a/package.json
+++ b/package.json
@@ -9,12 +9,11 @@
 	},
 	"dependencies": {},
 	"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-notify": "0.4.5",
 		"grunt-stylelint": "0.10.1",
 		"jsdoc": "3.5.5",