Skip to content

Commit 5954725

Browse files
committed
Fix Prettier-ESLint integration
1 parent 4bf1d3f commit 5954725

File tree

3 files changed

+7
-20
lines changed

3 files changed

+7
-20
lines changed

.eslintrc

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"extends": [
88
"airbnb",
99
"plugin:react/recommended",
10-
"plugin:prettier/recommended",
10+
"prettier",
1111
"prettier/react"
1212
],
1313
"globals": {
@@ -30,18 +30,7 @@
3030
}
3131
],
3232
"rules": {
33-
"arrow-parens": ["error", "as-needed"],
3433
"class-methods-use-this": "off",
35-
"comma-dangle": ["error", {
36-
"arrays": "always-multiline",
37-
"objects": "always-multiline",
38-
"imports": "always-multiline",
39-
"exports": "always-multiline",
40-
"functions": "ignore"
41-
}],
42-
"indent": ["error", 2, {
43-
"SwitchCase": 1
44-
}],
4534
"global-require": "off",
4635
"no-console": ["error", {
4736
"allow": ["warn", "error"]
@@ -52,9 +41,6 @@
5241
"no-use-before-define": ["error", {
5342
"variables": false
5443
}],
55-
"object-curly-newline": "off",
56-
"operator-linebreak": "off",
57-
"radix": "off",
5844

5945
"import/extensions": ["error", {
6046
"js": "never",

.prettierrc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parser": "flow",
3+
"printWidth": 100,
4+
"singleQuote": true,
5+
"trailingComma": "es5"
6+
}

extension.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,5 @@
1717
"yarn test",
1818
"git add"
1919
]
20-
},
21-
"prettier": {
22-
"printWidth": 100,
23-
"singleQuote": true,
24-
"trailingComma": "es5"
2520
}
2621
}

0 commit comments

Comments
 (0)