From 923ef2f3c4461bd79afddf3edac97f724849532a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Mar 2021 16:31:23 -0500
Subject: [PATCH] chore(deps-dev): bump eslint-config-prettier from 6.12.0 to
 8.1.0 (#2918)

* chore(deps-dev): bump eslint-config-prettier from 6.12.0 to 8.1.0

Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.12.0 to 8.1.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.12.0...v8.1.0)

Signed-off-by: dependabot[bot] <support@github.com>

* fix(eslintrc): remove prettier/@typescript extend

Removed by upstream in v8.0.

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Akash Satheesan <akash@coder.com>
---
 .eslintrc.yaml |  1 -
 package.json   |  2 +-
 yarn.lock      | 15 ++++-----------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.eslintrc.yaml b/.eslintrc.yaml
index edb20bfe1..c9261cef9 100644
--- a/.eslintrc.yaml
+++ b/.eslintrc.yaml
@@ -16,7 +16,6 @@ extends:
   - plugin:import/typescript
   - plugin:prettier/recommended
   - prettier # Removes eslint rules that conflict with prettier.
-  - prettier/@typescript-eslint # Remove conflicts again.
 
 rules:
   # Sometimes you need to add args to implement a function signature even
diff --git a/package.json b/package.json
index 615f604c8..823af3d95 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "@typescript-eslint/parser": "^4.7.0",
     "doctoc": "^2.0.0",
     "eslint": "^7.7.0",
-    "eslint-config-prettier": "^6.0.0",
+    "eslint-config-prettier": "^8.1.0",
     "eslint-import-resolver-alias": "^1.1.2",
     "eslint-plugin-import": "^2.18.2",
     "eslint-plugin-prettier": "^3.1.0",
diff --git a/yarn.lock b/yarn.lock
index 7d075c221..0263aa661 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3088,12 +3088,10 @@ escodegen@~1.9.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-config-prettier@^6.0.0:
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.12.0.tgz#9eb2bccff727db1c52104f0b49e87ea46605a0d2"
-  integrity sha512-9jWPlFlgNwRUYVoujvWTQ1aMO8o6648r+K7qU7K5Jmkbyqav1fuEZC0COYpGBxyiAJb65Ra9hrmFx19xRGwXWw==
-  dependencies:
-    get-stdin "^6.0.0"
+eslint-config-prettier@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz#4ef1eaf97afe5176e6a75ddfb57c335121abc5a6"
+  integrity sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw==
 
 eslint-import-resolver-alias@^1.1.2:
   version "1.1.2"
@@ -3646,11 +3644,6 @@ get-port@^3.2.0:
   resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc"
   integrity sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=
 
-get-stdin@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
-  integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
-
 get-stdin@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53"