From 724971ac5634720d8525443681a7459109b051d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20De=20Boey?= <info@michaeldeboey.be>
Date: Sat, 16 May 2020 18:08:38 +0200
Subject: [PATCH] feat: Support ESLint 7.x

BREAKING CHANGE: Requires Node@^10.12.x || 12.x
BREAKING CHANGE: Requires ESLint@^7.x
---
 .github/workflows/CI.yml | 25 ++++++++++++++++++++-----
 package.json             | 22 +++++++++++-----------
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 1d61214..0e7812e 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -10,15 +10,30 @@ on:
 jobs:
   test:
     name: Test
-    runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [12.x, 10.x, 8.x]
+        os: [ubuntu-latest]
+        eslint: [7]
+        node: [14]
+        include:
+          # On other platforms
+          - eslint: 7
+            node: 14
+            os: windows-latest
+          - eslint: 7
+            node: 14
+            os: macos-latest
+          # On old Node.js versions
+          - eslint: 7
+            node: 12
+            os: ubuntu-latest
+          - eslint: 7
+            node: 10
+            os: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v1
-        with:
-          fetch-depth: 1
+        uses: actions/checkout@v2
       - name: Install Node.js ${{ matrix.node }}
         uses: actions/setup-node@v1
         with:
diff --git a/package.json b/package.json
index 65aad32..646d079 100644
--- a/package.json
+++ b/package.json
@@ -3,30 +3,30 @@
   "version": "13.0.0",
   "description": "Additional ESLint rules.",
   "engines": {
-    "node": ">=8.10.0"
+    "node": "^10.12.0 || >=12.0.0"
   },
   "main": "index.js",
   "files": [
     "lib"
   ],
   "peerDependencies": {
-    "eslint": ">=6.6.0"
+    "eslint": "^7.0.0"
   },
   "dependencies": {
-    "@typescript-eslint/eslint-plugin": "~2.6.1",
-    "@typescript-eslint/parser": "~2.6.1",
-    "eslint-plugin-eslint-comments": "~3.1.2",
-    "eslint-plugin-eslint-plugin": "~2.1.0",
-    "eslint-plugin-node": "~10.0.0",
-    "eslint-plugin-prettier": "~3.1.1",
-    "eslint-plugin-vue": "~6.0.0",
+    "@typescript-eslint/eslint-plugin": "^3.0.0-alpha.25",
+    "@typescript-eslint/parser": "^3.0.0-alpha.25",
+    "eslint-plugin-eslint-comments": "^3.1.2",
+    "eslint-plugin-eslint-plugin": "^2.2.1",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^3.1.3",
+    "eslint-plugin-vue": "^6.2.2",
     "prettier": "~1.19.1",
     "vue-eslint-parser": "^7.0.0"
   },
   "devDependencies": {
     "@mysticatea/eslint-plugin": "file:.",
     "codecov": "^3.6.1",
-    "eslint": "~6.6.0",
+    "eslint": "^7.0.0",
     "fs-extra": "^8.1.0",
     "globals": "^12.1.1",
     "mocha": "^6.2.2",
@@ -34,7 +34,7 @@
     "nyc": "^14.1.1",
     "opener": "^1.5.1",
     "rimraf": "^3.0.0",
-    "typescript": "~3.7.2"
+    "typescript": "^3.9.2"
   },
   "scripts": {
     "clean": "rimraf .nyc_output coverage",