diff --git a/.eslintrc.js b/.eslintrc.js index 7afe0550a..c8818e293 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,12 +1,7 @@ module.exports = { parser: '@typescript-eslint/parser', plugins: ['@typescript-eslint', 'jest', 'simple-import-sort', 'prettier'], - extends: [ - 'eslint:recommended', - 'plugin:@typescript-eslint/recommended', - 'prettier', - 'prettier/@typescript-eslint', - ], + extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'prettier'], parserOptions: { ecmaFeatures: { jsx: true, @@ -16,15 +11,7 @@ module.exports = { project: './tsconfig.eslint.json', }, rules: { - 'prettier/prettier': [ - 'error', - { - trailingComma: 'all', - singleQuote: true, - printWidth: 90, - semi: false, - }, - ], + 'prettier/prettier': ['error'], '@typescript-eslint/no-unused-vars': [ 'error', { diff --git a/package.json b/package.json index 42064d021..e275898c7 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@typescript-eslint/eslint-plugin": "2.34.0", "@typescript-eslint/parser": "2.34.0", "eslint": "6.8.0", - "eslint-config-prettier": "6.15.0", + "eslint-config-prettier": "8.5.0", "eslint-plugin-jest": "26.1.5", "eslint-plugin-prettier": "3.4.1", "eslint-plugin-simple-import-sort": "7.0.0", diff --git a/yarn.lock b/yarn.lock index 31c552f8c..c74e0cf89 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1239,12 +1239,10 @@ escodegen@^1.11.1: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@6.15.0: - version "6.15.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz#7f93f6cb7d45a92f1537a70ecc06366e1ac6fed9" - integrity sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw== - dependencies: - get-stdin "^6.0.0" +eslint-config-prettier@8.5.0: + version "8.5.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1" + integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q== eslint-plugin-jest@26.1.5: version "26.1.5" @@ -1619,11 +1617,6 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -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-stream@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9"