From 331d1327774673bbd556f058bba0400c6ca3f7c5 Mon Sep 17 00:00:00 2001
From: Ed Sanders <ejsanders@gmail.com>
Date: Fri, 3 Apr 2020 12:16:04 +0100
Subject: [PATCH] Update eslint config

---
 .eslintrc.yml                                   | 1 -
 .gitignore                                      | 1 +
 lib/mwUtil.js                                   | 2 --
 maintenance/generate-wikimedia-domain-config.js | 2 --
 maintenance/generate_random_load.js             | 4 ----
 package.json                                    | 9 ++++-----
 6 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/.eslintrc.yml b/.eslintrc.yml
index 67e3cb840..919b07906 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -2,7 +2,6 @@ extends:
   - 'wikimedia/server'
 
 plugins:
-  - json
   - jsdoc
 
 rules:
diff --git a/.gitignore b/.gitignore
index 28f078a34..02b549cb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ config.yaml
 node_modules
 npm-debug.log
 package-lock.json
+.eslintcache
 
 # WebStorm IDE files
 .idea/*
diff --git a/lib/mwUtil.js b/lib/mwUtil.js
index 08094282d..3664aa181 100644
--- a/lib/mwUtil.js
+++ b/lib/mwUtil.js
@@ -347,10 +347,8 @@ mwUtil.createRelativeTitleRedirect = (path, req, options) => {
             mwUtil.getQueryString(req);
     } else if (/#/.test(newReqParams.title)) {
         const titleFragments = encodeURIComponent(newReqParams.title).split(/%23/);
-        /* eslint-disable prefer-template */
         location = backString + titleFragments.shift() + mwUtil.getQueryString(req) +
             '#' + titleFragments.join('%23');
-        /* eslint-enable prefer-template */
     } else {
         location = backString + encodeURIComponent(newReqParams.title) + mwUtil.getQueryString(req);
     }
diff --git a/maintenance/generate-wikimedia-domain-config.js b/maintenance/generate-wikimedia-domain-config.js
index 88b8b1e18..3f8598cd5 100644
--- a/maintenance/generate-wikimedia-domain-config.js
+++ b/maintenance/generate-wikimedia-domain-config.js
@@ -46,10 +46,8 @@ preq.get({
     });
 
     Object.keys(projects).forEach((name) => {
-        // eslint-disable-next-line no-console
         console.log(`\n    # ${name}`);
         projects[name].forEach((domain) => {
-            // eslint-disable-next-line no-console
             console.log(`    /{domain:${domain}}: *wp/default/1.0.0`);
         });
     });
diff --git a/maintenance/generate_random_load.js b/maintenance/generate_random_load.js
index 57b68599a..7f07af363 100644
--- a/maintenance/generate_random_load.js
+++ b/maintenance/generate_random_load.js
@@ -18,19 +18,16 @@ function makeCheck() {
             return preq.get(`${testRestBASEUri}/page/html/${encodeURIComponent(title)}/${revision}`)
             .then((res) => {
                 const tid = res.headers.etag.match(/\/(.+)"$/)[1];
-                // eslint-disable-next-line no-console
                 console.log(`Testing for ${title}/${revision}/${tid}`);
                 P.delay(Math.floor(Math.random() * 86400000))
                 .then(() => {
                     return P.all([
                         preq.get(`${testRestBASEUri}/page/html/${encodeURIComponent(title)}/${revision}/${tid}`)
                         .catch((err) => {
-                            // eslint-disable-next-line no-console
                             console.log(`${new Date()} Failed to fetch HTML ${title}/${revision}/${tid} from test RB: ${err}`);
                         }),
                         preq.get(`${testRestBASEUri}/page/html/${encodeURIComponent(title)}/${revision}/${tid}`)
                         .catch((err) => {
-                            // eslint-disable-next-line no-console
                             console.log(`${new Date()} Failed to fetch Data-Parsoid ${title}/${revision}/${tid} from test RB: ${err}`);
                         })
                     ]);
@@ -38,7 +35,6 @@ function makeCheck() {
 
                 return P.delay(500).then(makeCheck);
             }, (e) => {
-                // eslint-disable-next-line no-console
                 console.log(`${new Date()} Failed to fetch HTML ${title}/${revision} from test RB: ${e}`);
             });
         });
diff --git a/package.json b/package.json
index bb257d352..84dd44dbe 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "postpublish": "git tag -a \"v${npm_package_version}\" -m \"${npm_package_name}@${npm_package_version} release\" && git push upstream \"v${npm_package_version}\"",
     "start": "service-runner",
     "test": "npm run lint && sh test/utils/run_tests.sh test",
-    "lint": "eslint --max-warnings 0 --ext .js --ext .json .",
+    "lint": "eslint --cache --max-warnings 0 --ext .js,.json .",
     "coverage": "sh test/utils/run_tests.sh coverage",
     "coveralls": "cat ./coverage/lcov.info | coveralls"
   },
@@ -51,10 +51,9 @@
     "ajv": "^6.10.2",
     "bunyan": "^1.8.12",
     "coveralls": "^3.0.5",
-    "eslint": "^5.16.0",
-    "eslint-config-wikimedia": "^0.13.1",
-    "eslint-plugin-jsdoc": "^15.8.0",
-    "eslint-plugin-json": "^1.4.0",
+    "eslint": "^6.8.0",
+    "eslint-config-wikimedia": "^0.15.1",
+    "eslint-plugin-jsdoc": "^22.1.0",
     "js-yaml": "^3.13.1",
     "mocha": "^6.2.0",
     "mocha-lcov-reporter": "^1.3.0",