Merge pull request #151 from screendriver/renovate/eslint-config-pret…

…tier-8.x
screendriver · Feb 24, 2021 · f5ea4c5 · f5ea4c5
2 parents 9776fb3 + 8098679
commit f5ea4c5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -7,11 +7,11 @@
   },
   "extends": [
     "eslint:recommended",
+    "prettier",
     "plugin:@typescript-eslint/eslint-recommended",
     "plugin:@typescript-eslint/recommended",
     "plugin:@typescript-eslint/recommended-requiring-type-checking",
     "plugin:prettier/recommended",
-    "prettier/@typescript-eslint",
     "plugin:mocha/recommended"
   ],
   "plugins": ["@typescript-eslint", "mocha"],

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -52,7 +52,7 @@
     "c8": "7.6.0",
     "chai": "4.3.0",
     "eslint": "7.20.0",
-    "eslint-config-prettier": "7.2.0",
+    "eslint-config-prettier": "8.0.0",
     "eslint-plugin-mocha": "8.0.0",
     "eslint-plugin-prettier": "3.3.1",
     "got": "9.6.0",