Skip to content

Commit f3732af

Browse files
author
James Hush
committed
chore(Upgrade eslint, add prettier): Upgrade eslint packages, add prettier, run prettier
1 parent b187381 commit f3732af

File tree

3 files changed

+465
-243
lines changed

3 files changed

+465
-243
lines changed

.eslintrc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,19 @@
88
"import",
99
"react"
1010
],
11+
"rules": {
12+
"prettier/prettier": ["error", {
13+
"printWidth": 80,
14+
"tabWidth": 4,
15+
"singleQuote": false,
16+
"trailingComma": "none",
17+
"bracketSpacing": false,
18+
"semi": true,
19+
"useTabs": false,
20+
"parser": "babylon",
21+
"jsxBracketSameLine": false
22+
}]
23+
},
1124
"env": {
1225
"browser": true,
1326
"mocha": true

package.json

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,19 @@
3333
],
3434
"dependencies": {
3535
"deep-equal": "^1.0.1",
36+
"eslint-config-prettier": "^2.5.0",
37+
"eslint-plugin-prettier": "^2.2.0",
3638
"eventemitter3": "^2.0.2",
3739
"exenv": "^1.2.2",
3840
"hoist-non-react-statics": "^1.0.5",
3941
"invariant": "^2.2.2",
42+
"prettier": "^1.7.0",
4043
"throttle-debounce": "^1.0.1"
4144
},
4245
"devDependencies": {
4346
"babel-cli": "^6.5.1",
4447
"babel-core": "^6.5.1",
45-
"babel-eslint": "^7.0.0",
48+
"babel-eslint": "^8.0.0",
4649
"babel-loader": "^6.2.3",
4750
"babel-plugin-transform-decorators-legacy": "^1.3.4",
4851
"babel-plugin-webpack-alias": "^2.1.1",
@@ -57,11 +60,11 @@
5760
"conventional-changelog-cli": "^1.2.0",
5861
"core-js": "^2.2.2",
5962
"cz-conventional-changelog": "^1.1.6",
60-
"eslint": "3.7.1",
61-
"eslint-config-nfl": "10.0.0",
62-
"eslint-plugin-import": "2.0.1",
63-
"eslint-plugin-mocha": "4.7.0",
64-
"eslint-plugin-react": "6.4.1",
63+
"eslint": "4.7.0",
64+
"eslint-config-nfl": "12.0.0",
65+
"eslint-plugin-import": "2.7.0",
66+
"eslint-plugin-mocha": "4.11.0",
67+
"eslint-plugin-react": "7.3.0",
6568
"express": "^4.13.4",
6669
"history": "^4.3.0",
6770
"isparta-loader": "^2.0.0",
@@ -106,7 +109,7 @@
106109
"clean": "rimraf lib coverage",
107110
"compile": "babel src --out-dir lib",
108111
"examples": "webpack-dev-server --config examples/webpack.config.js --content-base examples/apps --inline",
109-
"lint": "eslint src test examples",
112+
"lint": "eslint --fix src test examples",
110113
"start": "npm run build && env BABEL_ENV=examples node examples/server/index.js",
111114
"pretest": "npm run build",
112115
"prepublish": "npm run build && npm run build:umd && npm run build:umd:min",

0 commit comments

Comments
 (0)