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

Change-Id: I4c82af69580292b91177fb1021908613292de5da
---
 Gruntfile.js | 22 +++++++---------------
 package.json |  5 ++---
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index ad15a5ca..06aa2be2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,21 +1,21 @@
 /* eslint-env node */
 module.exports = function ( grunt ) {
 	var conf = grunt.file.readJSON( 'extension.json' );
+
 	grunt.loadNpmTasks( 'grunt-banana-checker' );
 	grunt.loadNpmTasks( 'grunt-eslint' );
-	grunt.loadNpmTasks( 'grunt-jsonlint' );
 	grunt.loadNpmTasks( 'grunt-stylelint' );
 
 	grunt.initConfig( {
 		eslint: {
 			options: {
 				reportUnusedDisableDirectives: true,
+				extensions: [ '.js', '.json' ],
 				cache: true
 			},
 			all: [
-				'**/*.js',
-				'!node_modules/**',
-				'!vendor/**'
+				'**/*.js{,on}',
+				'!{vendor,node_modules}/**'
 			]
 		},
 		stylelint: {
@@ -24,20 +24,12 @@ module.exports = function ( grunt ) {
 			},
 			all: [
 				'**/*.less',
-				'!node_modules/**',
-				'!vendor/**'
+				'!{vendor,node_modules}/**'
 			]
 		},
-		banana: conf.MessagesDirs,
-		jsonlint: {
-			all: [
-				'**/*.json',
-				'!node_modules/**',
-				'!vendor/**'
-			]
-		}
+		banana: conf.MessagesDirs
 	} );
 
-	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 b0ef98ec..3a4b0f34 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.7.0",
     "grunt-eslint": "21.0.0",
-    "grunt-jsonlint": "1.1.0",
     "grunt-stylelint": "0.10.1",
     "stylelint-config-wikimedia": "0.5.0"
   }