Skip to content

Commit 76cac41

Browse files
committed
adapt eslint rules, adding prettier
1 parent 63bc2fb commit 76cac41

3 files changed

Lines changed: 261 additions & 148 deletions

File tree

.eslintrc

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,22 @@
33
"rules": {
44
"strict": 0,
55
"no-fallthrough": 0,
6-
"react/prop-types": 0
6+
"react/prop-types": 0,
7+
"prettier/prettier": ["error", {
8+
"printWidth": 120,
9+
"singleQuote": true,
10+
"trailingComma": "none",
11+
"bracketSpacing": false,
12+
"jsxBracketSameLine": true,
13+
"arrowParens": "avoid",
14+
"semi": false,
15+
"tabWidth": 2,
16+
"useTabs": false
17+
}]
718
},
8-
"extends": ["standard", "standard-react"],
19+
"extends": ["standard", "standard-react", "plugin:prettier/recommended"],
920
"env": {
1021
"browser": true,
1122
"node": true
1223
}
13-
}
24+
}

package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,13 @@
6363
"css-loader": "^0.28.4",
6464
"cz-conventional-changelog": "^2.0.0",
6565
"enzyme": "^2.8.2",
66-
"eslint": "^3.19.0",
66+
"eslint": "^4.14.0",
67+
"eslint-config-prettier": "^2.9.0",
6768
"eslint-config-standard": "^10.2.1",
6869
"eslint-config-standard-react": "^5.0.0",
6970
"eslint-plugin-import": "^2.3.0",
7071
"eslint-plugin-node": "^5.0.0",
72+
"eslint-plugin-prettier": "^2.4.0",
7173
"eslint-plugin-promise": "^3.5.0",
7274
"eslint-plugin-react": "^7.0.1",
7375
"eslint-plugin-standard": "^3.0.1",
@@ -80,6 +82,7 @@
8082
"jsdom": "^9.12.0",
8183
"mocha": "^3.4.2",
8284
"node-sass": "^4.5.3",
85+
"prettier": "1.10.2",
8386
"react": "^16.0.0",
8487
"react-addons-test-utils": "^15.5.1",
8588
"react-dom": "^16.0.0",

0 commit comments

Comments
 (0)