Merge "build: Upgrade eslint to 5.x"

diff --git a/.eslintrc.json b/.eslintrc.json
index 64b5ea7..e369640 100644 (file)
--- 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 45533aa..070fad8 100644 (file)
--- 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 4afc16b..de593d5 100644 (file)
--- 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;