From: James D. Forrester <jforrester@wikimedia.org>
Date: Tue, 3 Jul 2018 22:22:32 +0000 (-0700)
Subject: build: Upgrade eslint to 5.x
X-Git-Tag: 1.34.0-rc.0~4859^2
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=6450fc980bf4f8a796432f46743e1d6f0ae63c7d;p=lhc%2Fweb%2Fwiklou.git

build: Upgrade eslint to 5.x

Add two exceptions for max-len and no-prototype-builtins.

Change-Id: I5d3f7a3e282a237fb5de9f0eb29b579a08c32652
---

diff --git a/.eslintrc.json b/.eslintrc.json
index 64b5ea7835..e369640751 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -11,6 +11,8 @@
 		"OO": false
 	},
 	"rules": {
-		"dot-notation": 0
+		"dot-notation": 0,
+		"max-len": 0,
+		"no-prototype-builtins": 0
 	}
 }
diff --git a/package.json b/package.json
index 45533aaf66..070fad8f5f 100644
--- a/package.json
+++ b/package.json
@@ -10,14 +10,14 @@
   },
   "devDependencies": {
     "deepmerge": "1.3.2",
-    "eslint": "4.9.0",
-    "eslint-config-wikimedia": "0.5.0",
+    "eslint": "5.0.1",
+    "eslint-config-wikimedia": "0.6.0",
     "eslint-plugin-qunit": "3.2.1",
     "grunt": "1.0.3",
     "grunt-banana-checker": "0.6.0",
     "grunt-contrib-copy": "1.0.0",
     "grunt-contrib-watch": "1.1.0",
-    "grunt-eslint": "20.1.0",
+    "grunt-eslint": "21.0.0",
     "grunt-jsonlint": "1.1.0",
     "grunt-karma": "2.0.0",
     "grunt-stylelint": "0.10.0",
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
index 4afc16b3dd..de593d5039 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
@@ -49,6 +49,7 @@
 			$element.css( 'height' );
 			// eslint-disable-next-line no-unused-expressions
 			el.innerHTML;
+			// eslint-disable-next-line no-self-assign
 			el.className = el.className;
 			// eslint-disable-next-line no-unused-expressions
 			document.documentElement.clientHeight;