From 7bf345669a65c0c7619d4a5c0d8dc98807b2667d Mon Sep 17 00:00:00 2001
From: Ed Sanders <esanders@wikimedia.org>
Date: Mon, 10 Dec 2018 14:24:24 +0000
Subject: [PATCH] build: Update linters
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 eslint-config-wikimedia      0.8.1  →   0.9.0
 stylelint-config-wikimedia   0.4.3  →   0.5.0

Change-Id: I0f55e743c2f38bb8910931c3989a6516e0527703
---
 .eslintrc.json                              | 9 ++++-----
 Gruntfile.js                                | 2 +-
 package.json                                | 6 ++----
 resources/css/ext.uls.languagesettings.less | 2 --
 resources/css/ext.uls.less                  | 1 +
 resources/css/ext.uls.mixins.less           | 4 ++++
 resources/js/ext.uls.compactlinks.js        | 7 ++++---
 7 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.eslintrc.json b/.eslintrc.json
index 51f9613a..9769a95f 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,10 +1,9 @@
 {
-	"extends": "wikimedia",
-	"env": {
-		"browser": true
-	},
+	"extends": [
+		"wikimedia/client",
+		"wikimedia/jquery"
+	],
 	"globals": {
-		"$": false,
 		"mw": false,
 		"OO": false
 	},
diff --git a/Gruntfile.js b/Gruntfile.js
index 4d11aeb9..738cfaef 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -36,7 +36,7 @@ module.exports = function ( grunt ) {
 		svgmin: {
 			options: {
 				js2svg: {
-					indent: '	',
+					indent: '\t',
 					pretty: true
 				},
 				multipass: true,
diff --git a/package.json b/package.json
index 5ba73de7..dd6db1ea 100644
--- a/package.json
+++ b/package.json
@@ -4,16 +4,14 @@
     "test": "grunt test"
   },
   "devDependencies": {
-    "eslint-config-wikimedia": "0.8.1",
-    "eslint-plugin-qunit": "3.3.1",
+    "eslint-config-wikimedia": "0.9.0",
     "grunt": "1.0.3",
     "grunt-banana-checker": "0.6.0",
     "grunt-eslint": "21.0.0",
     "grunt-jsonlint": "1.1.0",
     "grunt-stylelint": "0.10.1",
     "grunt-svgmin": "5.0.0",
-    "stylelint": "9.2.0",
-    "stylelint-config-wikimedia": "0.4.3"
+    "stylelint-config-wikimedia": "0.5.0"
   },
   "eslintIgnore": [
     "lib/**",
diff --git a/resources/css/ext.uls.languagesettings.less b/resources/css/ext.uls.languagesettings.less
index 9996e480..ae720531 100644
--- a/resources/css/ext.uls.languagesettings.less
+++ b/resources/css/ext.uls.languagesettings.less
@@ -34,13 +34,11 @@
 		width: 100%;
 		/* Using border instead of outline for focus (outline doesn't have enough space) */
 		outline: 0;
-
 		color: #222;
 		padding: 5px 0 5px 42px;
 		border: 1px solid transparent;
 		background: left 15px top 6px transparent no-repeat;
 		background-size: 20px auto;
-
 		cursor: pointer;
 
 		// Remove the dotted border for Firefox
diff --git a/resources/css/ext.uls.less b/resources/css/ext.uls.less
index 1bd0bdce..4aece6ee 100644
--- a/resources/css/ext.uls.less
+++ b/resources/css/ext.uls.less
@@ -60,6 +60,7 @@
 	.uls-no-found-more {
 		background-color: #fff;
 	}
+
 	h3 {
 		padding: 0 28px;
 		margin: 0;
diff --git a/resources/css/ext.uls.mixins.less b/resources/css/ext.uls.mixins.less
index 1e2d17ef..32894871 100644
--- a/resources/css/ext.uls.mixins.less
+++ b/resources/css/ext.uls.mixins.less
@@ -11,6 +11,7 @@
 		position: absolute;
 		content: '';
 	}
+
 	&.selector-right {
 		&:before {
 			/* @noflip */
@@ -18,6 +19,7 @@
 			/* @noflip */
 			right: -11px;
 		}
+
 		&:after {
 			/* @noflip */
 			border-left: 10px solid #fff;
@@ -25,6 +27,7 @@
 			right: -10px;
 		}
 	}
+
 	&.selector-left {
 		&:before {
 			/* @noflip */
@@ -32,6 +35,7 @@
 			/* @noflip */
 			left: -11px;
 		}
+
 		&:after {
 			/* @noflip */
 			border-right: 10px solid #fff;
diff --git a/resources/js/ext.uls.compactlinks.js b/resources/js/ext.uls.compactlinks.js
index 432cf7ca..104562da 100644
--- a/resources/js/ext.uls.compactlinks.js
+++ b/resources/js/ext.uls.compactlinks.js
@@ -217,6 +217,7 @@
 			self = this,
 			ulsLanguageList = {};
 
+		// eslint-disable-next-line jquery/no-each-util
 		$.each( this.interlanguageList, function ( languageCode, el ) {
 			ulsLanguageList[ languageCode ] = el.textContent;
 		} );
@@ -408,7 +409,7 @@
 	 */
 	CompactInterlanguageList.prototype.getLangsInText = function () {
 		var languagesInText = [];
-		$.each( document.querySelectorAll( '#mw-content-text [lang]' ), function ( i, el ) {
+		Array.prototype.forEach.call( document.querySelectorAll( '#mw-content-text [lang]' ), function ( el ) {
 			var lang = convertMediaWikiLanguageCodeToULS( el.lang );
 			if ( languagesInText.indexOf( lang ) === -1 ) {
 				languagesInText.push( lang );
@@ -425,7 +426,7 @@
 	 * @return {string[]} Language codes
 	 */
 	CompactInterlanguageList.prototype.getLangsWithBadges = function () {
-		return $.map(
+		return Array.prototype.map.call(
 			document.querySelectorAll( '#p-lang [class*="badge"]' ),
 			function ( el ) {
 				return convertMediaWikiLanguageCodeToULS(
@@ -443,7 +444,7 @@
 	CompactInterlanguageList.prototype.getInterlanguageList = function () {
 		var interlanguageList = {};
 
-		$.each( this.listElement.querySelectorAll( '.interlanguage-link-target' ), function ( i, el ) {
+		Array.prototype.forEach.call( this.listElement.querySelectorAll( '.interlanguage-link-target' ), function ( el ) {
 			var langCode = convertMediaWikiLanguageCodeToULS( el.lang );
 			interlanguageList[ langCode ] = el;
 		} );