Skip to content

Commit 8bc7c57

Browse files
committed
Integrate prettier with ESLint
1 parent 735924f commit 8bc7c57

File tree

3 files changed

+45
-11
lines changed

3 files changed

+45
-11
lines changed

.eslintrc.js

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,20 @@ module.exports = {
77
experimentalObjectRestSpread: true,
88
},
99
},
10-
plugins: ['ember'],
11-
extends: ['eslint:recommended', 'plugin:ember/recommended'],
10+
plugins: ['ember', 'prettier'],
11+
extends: ['eslint:recommended', 'plugin:ember/recommended', 'plugin:prettier/recommended'],
1212
env: {
1313
browser: true,
1414
},
1515
rules: {
16+
'prettier/prettier': 'error',
17+
1618
'arrow-parens': 'off',
1719
'brace-style': 'off',
1820
camelcase: 'off',
1921
'comma-dangle': 'off',
2022
'dot-notation': 'off',
21-
indent: ['error', 4],
2223
'operator-linebreak': 'off',
23-
quotes: [
24-
'error',
25-
'single',
26-
{
27-
allowTemplateLiterals: true,
28-
avoidEscape: true,
29-
},
30-
],
3124
},
3225
overrides: [
3326
// node files

package-lock.json

Lines changed: 39 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@
6868
"ember-test-selectors": "^0.3.7",
6969
"ember-web-app": "^2.2.0",
7070
"emberx-select": "^3.1.1",
71+
"eslint-config-prettier": "^2.9.0",
7172
"eslint-plugin-ember": "^5.1.0",
73+
"eslint-plugin-prettier": "^2.6.0",
7274
"loader.js": "^4.5.1",
7375
"normalize.css": "^7.0.0",
7476
"nyc": "^11.6.0",

0 commit comments

Comments
 (0)