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

Bug: T220036
Change-Id: I7088f9eeb9468b14efb2773fde5f55fd5c95a489
---
 Gruntfile.js | 14 ++++----------
 package.json |  3 +--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 765fe55a07..f3950f6f50 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -9,7 +9,6 @@ module.exports = function ( grunt ) {
 	grunt.loadNpmTasks( 'grunt-banana-checker' );
 	grunt.loadNpmTasks( 'grunt-contrib-copy' );
 	grunt.loadNpmTasks( 'grunt-eslint' );
-	grunt.loadNpmTasks( 'grunt-jsonlint' );
 	grunt.loadNpmTasks( 'grunt-karma' );
 	grunt.loadNpmTasks( 'grunt-stylelint' );
 	grunt.loadNpmTasks( 'grunt-svgmin' );
@@ -23,10 +22,11 @@ module.exports = function ( grunt ) {
 		eslint: {
 			options: {
 				reportUnusedDisableDirectives: true,
+				extensions: [ '.js', '.json' ],
 				cache: true
 			},
 			all: [
-				'**/*.js',
+				'**/*.js{,on}',
 				'!docs/**',
 				'!node_modules/**',
 				'!resources/lib/**',
@@ -36,14 +36,8 @@ module.exports = function ( grunt ) {
 				'!tests/coverage/**',
 				'!vendor/**',
 				// Explicitly say "**/*.js" here in case of symlinks
-				'!extensions/**/*.js',
-				'!skins/**/*.js'
-			]
-		},
-		jsonlint: {
-			all: [
-				'**/*.json',
-				'!{docs/js,extensions,node_modules,skins,vendor}/**'
+				'!extensions/**/*.js{,on}',
+				'!skins/**/*.js{,on}'
 			]
 		},
 		banana: {
diff --git a/package.json b/package.json
index 2105e0f4d6..b8ac75e7e9 100644
--- a/package.json
+++ b/package.json
@@ -11,13 +11,12 @@
     "selenium-test": "wdio ./tests/selenium/wdio.conf.js"
   },
   "devDependencies": {
-    "eslint-config-wikimedia": "0.11.0",
+    "eslint-config-wikimedia": "0.12.0",
     "grunt": "1.0.4",
     "grunt-banana-checker": "0.7.0",
     "grunt-contrib-copy": "1.0.0",
     "grunt-contrib-watch": "1.1.0",
     "grunt-eslint": "21.0.0",
-    "grunt-jsonlint": "1.1.0",
     "grunt-karma": "3.0.0",
     "grunt-stylelint": "0.10.1",
     "grunt-svgmin": "5.0.0",
-- 
2.20.1