Skip to content

Commit ac11dc4

Browse files
authored
Merge pull request #336 from nblagoev/dependabot/npm_and_yarn/eslint-config-prettier-8.1.0
Bump eslint-config-prettier from 7.2.0 to 8.1.0
2 parents e395ab8 + b48b405 commit ac11dc4

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

.eslintrc.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ module.exports = {
22
parser: "@typescript-eslint/parser",
33
extends: [
44
"plugin:@typescript-eslint/recommended",
5-
"prettier/@typescript-eslint", // Disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
65
"plugin:import/errors",
76
"plugin:import/warnings",
87
"plugin:import/typescript",
9-
"prettier" // Make sure this is always the last configuration in the extends array.
8+
"plugin:prettier/recommended" // Make sure this is always the last configuration in the extends array.
109
],
1110
plugins: ["prettier", "@typescript-eslint", "import"],
1211
parserOptions: {

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"@typescript-eslint/parser": "^3.2.0",
5454
"codecov": "^3.6.1",
5555
"eslint": "^7.2.0",
56-
"eslint-config-prettier": "^7.0.0",
56+
"eslint-config-prettier": "^8.1.0",
5757
"eslint-plugin-import": "^2.20.1",
5858
"eslint-plugin-prettier": "^3.1.2",
5959
"jest": "^26.0.1",

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1800,10 +1800,10 @@ escodegen@^1.14.1:
18001800
optionalDependencies:
18011801
source-map "~0.6.1"
18021802

1803-
eslint-config-prettier@^7.0.0:
1804-
version "7.2.0"
1805-
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz#f4a4bd2832e810e8cc7c1411ec85b3e85c0c53f9"
1806-
integrity sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==
1803+
eslint-config-prettier@^8.1.0:
1804+
version "8.1.0"
1805+
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz#4ef1eaf97afe5176e6a75ddfb57c335121abc5a6"
1806+
integrity sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw==
18071807

18081808
eslint-import-resolver-node@^0.3.4:
18091809
version "0.3.4"

0 commit comments

Comments
 (0)