Skip to content

Commit 38f5aeb

Browse files
authored
Merge pull request #377 from bash-lsp/renovate/eslint-config-prettier-8.x
Update dependency eslint-config-prettier to v8
2 parents 8c7c267 + 5995584 commit 38f5aeb

File tree

3 files changed

+7
-27
lines changed

3 files changed

+7
-27
lines changed

.eslintrc.js

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
module.exports = {
22
parser: '@typescript-eslint/parser',
33
plugins: ['@typescript-eslint', 'jest', 'simple-import-sort', 'prettier'],
4-
extends: [
5-
'eslint:recommended',
6-
'plugin:@typescript-eslint/recommended',
7-
'prettier',
8-
'prettier/@typescript-eslint',
9-
],
4+
extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended', 'prettier'],
105
parserOptions: {
116
ecmaFeatures: {
127
jsx: true,
@@ -16,15 +11,7 @@ module.exports = {
1611
project: './tsconfig.eslint.json',
1712
},
1813
rules: {
19-
'prettier/prettier': [
20-
'error',
21-
{
22-
trailingComma: 'all',
23-
singleQuote: true,
24-
printWidth: 90,
25-
semi: false,
26-
},
27-
],
14+
'prettier/prettier': ['error'],
2815
'@typescript-eslint/no-unused-vars': [
2916
'error',
3017
{

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@typescript-eslint/eslint-plugin": "2.34.0",
2222
"@typescript-eslint/parser": "2.34.0",
2323
"eslint": "6.8.0",
24-
"eslint-config-prettier": "6.15.0",
24+
"eslint-config-prettier": "8.5.0",
2525
"eslint-plugin-jest": "26.1.5",
2626
"eslint-plugin-prettier": "3.4.1",
2727
"eslint-plugin-simple-import-sort": "7.0.0",

yarn.lock

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,12 +1239,10 @@ escodegen@^1.11.1:
12391239
optionalDependencies:
12401240
source-map "~0.6.1"
12411241

1242-
eslint-config-prettier@6.15.0:
1243-
version "6.15.0"
1244-
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz#7f93f6cb7d45a92f1537a70ecc06366e1ac6fed9"
1245-
integrity sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw==
1246-
dependencies:
1247-
get-stdin "^6.0.0"
1242+
eslint-config-prettier@8.5.0:
1243+
version "8.5.0"
1244+
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1"
1245+
integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q==
12481246

12491247
eslint-plugin-jest@26.1.5:
12501248
version "26.1.5"
@@ -1619,11 +1617,6 @@ get-caller-file@^2.0.1:
16191617
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
16201618
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
16211619

1622-
get-stdin@^6.0.0:
1623-
version "6.0.0"
1624-
resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
1625-
integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
1626-
16271620
get-stream@^5.0.0:
16281621
version "5.1.0"
16291622
resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9"

0 commit comments

Comments
 (0)