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

Change-Id: I4510c552189ae7b0f458cb82f389dff7f14a0a96
---
 Gruntfile.js | 15 ++++-----------
 package.json |  5 ++---
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 7b91771f..08821945 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -11,18 +11,18 @@ 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-stylelint' );
 
 	grunt.initConfig( {
 		eslint: {
 			options: {
 				reportUnusedDisableDirectives: true,
+				extensions: [ '.js', '.json' ],
 				cache: true
 			},
 			all: [
-				'modules/**/*.js',
-				'tests/**/*.js'
+				'**/*.js{,on}',
+				'!{lib,vendor,node_modules}/**'
 			]
 		},
 		stylelint: {
@@ -31,13 +31,6 @@ module.exports = function ( grunt ) {
 				'resources/*.css'
 			]
 		},
-		jsonlint: {
-			all: [
-				'**/*.json',
-				'!node_modules/**',
-				'!vendor/**'
-			]
-		},
 		banana: conf.MessagesDirs,
 		watch: {
 			files: [
@@ -49,6 +42,6 @@ module.exports = function ( grunt ) {
 		}
 	} );
 
-	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 ba1f0538..b1947bd8 100644
--- a/package.json
+++ b/package.json
@@ -5,12 +5,11 @@
 		"doc": "jsduck"
 	},
 	"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-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"
 	}