Skip to content

Commit

Permalink
Merge pull request #336 from nblagoev/dependabot/npm_and_yarn/eslint-…
Browse files Browse the repository at this point in the history
…config-prettier-8.1.0

Bump eslint-config-prettier from 7.2.0 to 8.1.0
  • Loading branch information
nblagoev committed Mar 17, 2021
2 parents e395ab8 + b48b405 commit ac11dc4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
3 changes: 1 addition & 2 deletions .eslintrc.js
Expand Up @@ -2,11 +2,10 @@ module.exports = {
parser: "@typescript-eslint/parser",
extends: [
"plugin:@typescript-eslint/recommended",
"prettier/@typescript-eslint", // Disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
"plugin:import/errors",
"plugin:import/warnings",
"plugin:import/typescript",
"prettier" // Make sure this is always the last configuration in the extends array.
"plugin:prettier/recommended" // Make sure this is always the last configuration in the extends array.
],
plugins: ["prettier", "@typescript-eslint", "import"],
parserOptions: {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -53,7 +53,7 @@
"@typescript-eslint/parser": "^3.2.0",
"codecov": "^3.6.1",
"eslint": "^7.2.0",
"eslint-config-prettier": "^7.0.0",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-import": "^2.20.1",
"eslint-plugin-prettier": "^3.1.2",
"jest": "^26.0.1",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Expand Up @@ -1800,10 +1800,10 @@ escodegen@^1.14.1:
optionalDependencies:
source-map "~0.6.1"

eslint-config-prettier@^7.0.0:
version "7.2.0"
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-7.2.0.tgz#f4a4bd2832e810e8cc7c1411ec85b3e85c0c53f9"
integrity sha512-rV4Qu0C3nfJKPOAhFujFxB7RMP+URFyQqqOZW9DMRD7ZDTFyjaIlETU3xzHELt++4ugC0+Jm084HQYkkJe+Ivg==
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-node@^0.3.4:
version "0.3.4"
Expand Down

0 comments on commit ac11dc4

Please sign in to comment.