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

Change-Id: Ie5c456ce74674194fd10b3e05a283f32bac60f2f
---
 Gruntfile.js | 18 ++++++++----------
 package.json |  5 ++---
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index a3ed1f12..829269a9 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -4,7 +4,6 @@ module.exports = function ( grunt ) {
 
 	grunt.loadNpmTasks( 'grunt-banana-checker' );
 	grunt.loadNpmTasks( 'grunt-eslint' );
-	grunt.loadNpmTasks( 'grunt-jsonlint' );
 	grunt.loadNpmTasks( 'grunt-stylelint' );
 	grunt.loadNpmTasks( 'grunt-svgmin' );
 
@@ -12,9 +11,15 @@ module.exports = function ( grunt ) {
 		eslint: {
 			options: {
 				reportUnusedDisableDirectives: true,
+				extensions: [ '.js', '.json' ],
 				cache: true
 			},
-			all: '.'
+			all: [
+				'**/*.js{,on}',
+				'!lib/**',
+				'!resources/js/ext.uls.webfonts.repository.js',
+				'!{vendor,node_modules}/**'
+			]
 		},
 		stylelint: {
 			options: {
@@ -28,13 +33,6 @@ module.exports = function ( grunt ) {
 				'!vendor/**'
 			]
 		},
-		jsonlint: {
-			all: [
-				'**/*.json',
-				'!node_modules/**',
-				'!vendor/**'
-			]
-		},
 		banana: conf.MessagesDirs,
 		// SVG Optimization
 		svgmin: {
@@ -75,6 +73,6 @@ module.exports = function ( grunt ) {
 	} );
 
 	grunt.registerTask( 'minify', 'svgmin' );
-	grunt.registerTask( 'test', [ 'eslint', 'stylelint', 'jsonlint', 'banana' ] );
+	grunt.registerTask( 'test', [ 'eslint', 'stylelint', 'banana' ] );
 	grunt.registerTask( 'default', [ 'minify', 'test' ] );
 };
diff --git a/package.json b/package.json
index 0e2c27d9..69d9ac7a 100644
--- a/package.json
+++ b/package.json
@@ -4,11 +4,10 @@
     "test": "grunt test"
   },
   "devDependencies": {
-    "eslint-config-wikimedia": "0.11.0",
-    "grunt": "^1.0.4",
+    "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",
     "grunt-svgmin": "5.0.0",
     "stylelint-config-wikimedia": "0.5.0"