From 81eb8a658146864cee531d48a70b8972e0c59455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= <info@michaeldeboey.be>
Date: Sun, 29 Aug 2021 18:32:59 +0200
Subject: [PATCH] feat: support ESLint 8.x

---
 .eslintrc                     |  2 +-
 .github/workflows/node-4+.yml | 29 +++++++++++++++++++++++------
 package.json                  | 14 +++++++-------
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 015177073..b3ebbdc1e 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -3,7 +3,7 @@
     "airbnb-base",
     "plugin:flowtype/recommended"
   ],
-  parser: "babel-eslint",
+  parser: "@babel/eslint-parser",
   plugins: [
     "flowtype"
   ],
diff --git a/.github/workflows/node-4+.yml b/.github/workflows/node-4+.yml
index 493f6d955..12c946540 100644
--- a/.github/workflows/node-4+.yml
+++ b/.github/workflows/node-4+.yml
@@ -24,25 +24,40 @@ jobs:
       fail-fast: false
       matrix:
         node-version: ${{ fromJson(needs.matrix.outputs.latest) }}
-        eslint:
-          - 7
-          - 6
-          - 5
-          - 4
-          - 3
+        eslint: ['^8.0.0-0', 7, 6, 5, 4, 3]
         exclude:
+          - node-version: 15
+            eslint: '^8.0.0-0'
+          - node-version: 13
+            eslint: '^8.0.0-0'
+          - node-version: 11
+            eslint: '^8.0.0-0'
+          - node-version: 11
+            eslint: 7
+          - node-version: 10
+            eslint: '^8.0.0-0'
+          - node-version: 9
+            eslint: '^8.0.0-0'
           - node-version: 9
             eslint: 7
+          - node-version: 8
+            eslint: '^8.0.0-0'
           - node-version: 8
             eslint: 7
+          - node-version: 7
+            eslint: '^8.0.0-0'
           - node-version: 7
             eslint: 7
           - node-version: 7
             eslint: 6
+          - node-version: 6
+            eslint: '^8.0.0-0'
           - node-version: 6
             eslint: 7
           - node-version: 6
             eslint: 6
+          - node-version: 5
+            eslint: '^8.0.0-0'
           - node-version: 5
             eslint: 7
           - node-version: 5
@@ -53,6 +68,8 @@ jobs:
             eslint: 4
           - node-version: 5 # TODO: fix
             eslint: 3
+          - node-version: 4
+            eslint: '^8.0.0-0'
           - node-version: 4
             eslint: 7
           - node-version: 4
diff --git a/package.json b/package.json
index 32722fc0d..e4c56e6e1 100644
--- a/package.json
+++ b/package.json
@@ -31,17 +31,17 @@
     "jest": "jest --coverage __tests__/**/*"
   },
   "devDependencies": {
-    "@babel/cli": "^7.14.5",
-    "@babel/core": "^7.14.6",
+    "@babel/cli": "^7.14.8",
+    "@babel/core": "^7.15.0",
+    "@babel/eslint-parser": "^7.15.0",
     "@babel/plugin-transform-flow-strip-types": "^7.14.5",
     "aud": "^1.1.5",
-    "babel-eslint": "^10.1.0",
     "babel-jest": "^24.9.0",
     "babel-preset-airbnb": "^5.0.0",
-    "eslint": "^3 || ^4 || ^5 || ^6 || ^7",
+    "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8.0.0-0",
     "eslint-config-airbnb-base": "^14.2.1",
-    "eslint-plugin-flowtype": "^5.8.0",
-    "eslint-plugin-import": "^2.23.4",
+    "eslint-plugin-flowtype": "^5.9.1",
+    "eslint-plugin-import": "^2.24.2",
     "estraverse": "^5.2.0",
     "expect": "^24.9.0",
     "flow-bin": "^0.147.0",
@@ -73,7 +73,7 @@
     "minimatch": "^3.0.4"
   },
   "peerDependencies": {
-    "eslint": "^3 || ^4 || ^5 || ^6 || ^7"
+    "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8.0.0-0"
   },
   "jest": {
     "coverageReporters": [