Skip to content

Commit 7025d2e

Browse files
committed
Start using airbnb + prettier for formatting
1 parent 2e2de04 commit 7025d2e

20 files changed

+4834
-4545
lines changed

.eslintrc.json

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
{
2-
"parser": "babel-eslint",
3-
"extends": "blue-hour",
4-
"env": {
5-
"browser": true,
6-
"jasmine": true
7-
},
8-
"rules": {
9-
"react/jsx-filename-extension": 0,
10-
"react/prefer-stateless-function": 0,
11-
"import/prefer-default-export": 0
12-
}
2+
"extends": ["airbnb", "prettier", "prettier/react"],
3+
"env": {
4+
"browser": true,
5+
"jasmine": true
6+
},
7+
"rules": {
8+
"react/jsx-filename-extension": 0,
9+
"react/prefer-stateless-function": 0
10+
}
1311
}

karma.conf.babel.js

Lines changed: 49 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -8,58 +8,53 @@ import KarmaPhantomjsLauncher from 'karma-phantomjs-launcher';
88
import webpackConfig from './webpack.config.test.babel';
99

1010
export default function setConfig(config) {
11-
config.set({
12-
browsers: ['PhantomJS'],
13-
frameworks: ['jasmine'],
14-
files: ['src/tests.js'],
15-
preprocessors: {
16-
'src/tests.js': ['webpack', 'sourcemap']
17-
},
18-
plugins: [
19-
KarmaJasmine,
20-
KarmaWebpack,
21-
KarmaJasmineDiffReporter,
22-
KarmaJasmineHtmlReporter,
23-
KarmaNotifyReporter,
24-
KarmaSourcemapLoader,
25-
KarmaPhantomjsLauncher,
26-
],
27-
reporters: [
28-
'jasmine-diff',
29-
'progress',
30-
'kjhtml',
31-
'notify',
32-
],
33-
jasmineDiffReporter: {
34-
pretty: 4,
35-
json: true,
36-
multiline: {
37-
before: 2, // 2 newlines
38-
after: 2, // 2 newlines
39-
indent: 4, // 4 spaces
40-
},
41-
color: {
42-
actualFg: 'red',
43-
expectedFg: 'green',
44-
actualBg: 'inverse',
45-
expectedBg: 'inverse',
46-
actualWhitespaceBg: '',
47-
expectedWhitespaceBg: '',
48-
},
49-
},
50-
webpack: webpackConfig,
51-
webpackMiddleware: {
52-
stats: {
53-
chunks: false,
54-
hash: false,
55-
version: false,
56-
assets: false,
57-
children: false,
58-
},
59-
},
60-
notifyReporter: {
61-
reportEachFailure: false, // Default: false, Will notify on every failed spec
62-
reportSuccess: false, // Default: true, Will notify when a suite was successful
63-
},
64-
});
11+
config.set({
12+
browsers: ['PhantomJS'],
13+
frameworks: ['jasmine'],
14+
files: ['src/tests.js'],
15+
preprocessors: {
16+
'src/tests.js': ['webpack', 'sourcemap'],
17+
},
18+
plugins: [
19+
KarmaJasmine,
20+
KarmaWebpack,
21+
KarmaJasmineDiffReporter,
22+
KarmaJasmineHtmlReporter,
23+
KarmaNotifyReporter,
24+
KarmaSourcemapLoader,
25+
KarmaPhantomjsLauncher,
26+
],
27+
reporters: ['jasmine-diff', 'progress', 'kjhtml', 'notify'],
28+
jasmineDiffReporter: {
29+
pretty: 4,
30+
json: true,
31+
multiline: {
32+
before: 2, // 2 newlines
33+
after: 2, // 2 newlines
34+
indent: 4, // 4 spaces
35+
},
36+
color: {
37+
actualFg: 'red',
38+
expectedFg: 'green',
39+
actualBg: 'inverse',
40+
expectedBg: 'inverse',
41+
actualWhitespaceBg: '',
42+
expectedWhitespaceBg: '',
43+
},
44+
},
45+
webpack: webpackConfig,
46+
webpackMiddleware: {
47+
stats: {
48+
chunks: false,
49+
hash: false,
50+
version: false,
51+
assets: false,
52+
children: false,
53+
},
54+
},
55+
notifyReporter: {
56+
reportEachFailure: false, // Default: false, Will notify on every failed spec
57+
reportSuccess: false, // Default: true, Will notify when a suite was successful
58+
},
59+
});
6560
}

package.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,13 @@
5252
"cross-env": "^3.0.0",
5353
"css-loader": "0.x.x",
5454
"enzyme": "^2.6.0",
55-
"eslint": "^3.2.2",
56-
"eslint-config-blue-hour": "0.x.x",
55+
"eslint": "^3.19.0",
56+
"eslint-config-airbnb": "^15.0.1",
57+
"eslint-config-prettier": "^2.2.0",
5758
"eslint-loader": "^1.5.0",
58-
"eslint-plugin-import": "^2.2.0",
59-
"eslint-plugin-jsx-a11y": "^2.0.1",
60-
"eslint-plugin-react": "^6.0.0",
59+
"eslint-plugin-import": "^2.3.0",
60+
"eslint-plugin-jsx-a11y": "^5.0.3",
61+
"eslint-plugin-react": "^7.1.0",
6162
"file-loader": "^0.9.0",
6263
"gh-pages": "^0.12.0",
6364
"html-webpack-plugin": "^2.22.0",
@@ -74,6 +75,7 @@
7475
"karma-webpack": "^1.7.0",
7576
"node-sass": "^4.0.0",
7677
"postcss-loader": "^1.1.1",
78+
"prettier": "^1.4.4",
7779
"react": "^15.3.0",
7880
"react-addons-shallow-compare": "^15.3.0",
7981
"react-addons-test-utils": "^15.4.1",

0 commit comments

Comments
 (0)