Skip to content

Commit 3cb7576

Browse files
author
Markus Günther
committed
TASK: Add prettier for linting and formating
Use prettier together with eslint to format and lint the code.
1 parent c00a2ae commit 3cb7576

File tree

4 files changed

+565
-383
lines changed

4 files changed

+565
-383
lines changed

Diff for: .eslintrc

+13-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
11
{
2-
"extends": "eslint-config-rackt",
2+
"extends": "prettier",
33
"env": {
44
"browser": true,
55
"mocha": true,
66
"node": true
77
},
8+
"parser": "babel-eslint",
9+
"parserOptions": {
10+
"ecmaVersion": 6,
11+
"sourceType": "module",
12+
"ecmaFeatures": {
13+
"jsx": true,
14+
"modules": true,
15+
"experimentalObjectRestSpread": true
16+
}
17+
},
818
"rules": {
19+
"prettier/prettier": "warn",
920
"valid-jsdoc": 2,
1021
"react/jsx-uses-vars": 1,
1122
"react/jsx-uses-react": 1,
1223
"react/jsx-no-undef": 2
1324
},
14-
"plugins": [
15-
"react"
16-
]
25+
"plugins": ["prettier", "react"]
1726
}

Diff for: .prettierrc

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"trailingComma": "none",
3+
"semi": false,
4+
"singleQuote": true
5+
}

Diff for: package.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,20 @@
2828
"@types/react": "^16.4.7",
2929
"babel-cli": "^6.26.0",
3030
"babel-core": "^6.26.3",
31-
"babel-eslint": "^7.2.3",
31+
"babel-eslint": "^8.2.6",
3232
"babel-plugin-transform-decorators-legacy": "^1.3.5",
3333
"babel-preset-es2015": "^6.24.1",
3434
"babel-preset-react": "^6.24.1",
3535
"babel-preset-stage-0": "^6.24.1",
36-
"eslint": "^3.19.0",
37-
"eslint-config-rackt": "^1.1.1",
38-
"eslint-plugin-babel": "^4.1.1",
36+
"eslint": "^5.3.0",
37+
"eslint-config-prettier": "^2.9.0",
38+
"eslint-plugin-prettier": "^2.6.2",
3939
"eslint-plugin-react": "^7.10.0",
4040
"expect": "^1.18.0",
4141
"fbjs": "^0.8.17",
4242
"jsdom": "^9.8.3",
4343
"mocha": "^3.3.0",
44+
"prettier": "^1.14.0",
4445
"prop-types": "^15.6.2",
4546
"react": "^16.4.2",
4647
"react-dom": "^16.4.2",
@@ -55,6 +56,7 @@
5556
"scripts": {
5657
"build": "babel src --out-dir lib",
5758
"lint": "eslint src test",
59+
"lint-check": "eslint --print-config .eslintrc.js | eslint-config-prettier-check",
5860
"prepublish": "rimraf lib && npm run build",
5961
"test": "mocha --compilers js:babel-core/register --recursive --reporter spec --require ./test/setup.js",
6062
"test:watch": "npm test -- --watch"

0 commit comments

Comments
 (0)