From dd90a359e24ce111bd82fb73e935375f421bd4c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= <info@michaeldeboey.be>
Date: Wed, 5 Jan 2022 15:32:04 +0100
Subject: [PATCH] feat: remove deprecated rules

---
 import.js   |  2 --
 jest.js     | 10 ++++++++--
 jsx-a11y.js |  5 -----
 utils.js    | 12 ------------
 4 files changed, 8 insertions(+), 21 deletions(-)
 delete mode 100644 utils.js

diff --git a/import.js b/import.js
index 6f1d062..cf17884 100644
--- a/import.js
+++ b/import.js
@@ -11,8 +11,6 @@ module.exports = {
     'import/ignore': ['node_modules', '.json$', '.(scss|less|css|styl)$'],
   },
   rules: {
-    'global-require': 'off', // disable because no need to have both!
-
     'import/default': 'error',
     'import/dynamic-import-chunkname': 'off',
     'import/export': 'error',
diff --git a/jest.js b/jest.js
index 317f3ba..175f265 100644
--- a/jest.js
+++ b/jest.js
@@ -1,6 +1,13 @@
 const readPkgUp = require('read-pkg-up')
 
-const {disableRules, mapDeprecatedRules} = require('./utils')
+const disableRules = deprecatedRules =>
+  deprecatedRules.reduce(
+    (allRules, rule) => ({
+      ...allRules,
+      [rule]: 'off',
+    }),
+    {},
+  )
 
 let hasJestDom = false
 let hasTestingLibrary = false
@@ -27,7 +34,6 @@ try {
 const rules = {
   'react/display-name': 'off', // we don't need a display name in test files
 
-  ...mapDeprecatedRules(['jest/no-expect-resolves']),
   'jest/consistent-test-it': 'off',
   'jest/expect-expect': 'off',
   'jest/lowercase-name': 'off',
diff --git a/jsx-a11y.js b/jsx-a11y.js
index bf12f99..d2e7edf 100644
--- a/jsx-a11y.js
+++ b/jsx-a11y.js
@@ -1,5 +1,3 @@
-const {mapDeprecatedRules} = require('./utils')
-
 module.exports = {
   env: {
     browser: true,
@@ -11,9 +9,6 @@ module.exports = {
   },
   plugins: ['jsx-a11y'],
   rules: {
-    ...mapDeprecatedRules([
-      'jsx-a11y/label-has-for', // see label-has-associated-control
-    ]),
     'jsx-a11y/accessible-emoji': 'error',
     'jsx-a11y/alt-text': 'warn',
     'jsx-a11y/anchor-has-content': 'error',
diff --git a/utils.js b/utils.js
deleted file mode 100644
index 611cd7d..0000000
--- a/utils.js
+++ /dev/null
@@ -1,12 +0,0 @@
-const disableRules = deprecatedRules =>
-  deprecatedRules.reduce(
-    (allRules, rule) => ({
-      ...allRules,
-      [rule]: 'off',
-    }),
-    {},
-  )
-
-const mapDeprecatedRules = disableRules
-
-module.exports = {disableRules, mapDeprecatedRules}