Skip to content

Commit 9d1a5be

Browse files
Update to ESLint 2
1 parent b3f2e28 commit 9d1a5be

File tree

2 files changed

+30
-43
lines changed

2 files changed

+30
-43
lines changed

.eslintrc

+26-39
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,45 @@
11
# ESLint has many default rules that are not listed in this file
22
# Documentation for all ESLint rules can be found at http://eslint.org/docs/rules/
33
parser: babel-eslint
4+
parserOptions:
5+
ecmaVersion: 6
6+
plugins:
7+
- react
8+
extends:
9+
- eslint:recommended
10+
- plugin:react/recommended
411
env:
512
browser: true
613
node: true
14+
es6: true
715
rules:
8-
strict: [2, never] # use strict is added by babel
9-
quote-props: [1, as-needed]
10-
vars-on-top: 1
11-
eqeqeq: 1
12-
radix: 1
13-
no-eq-null: 2
14-
no-self-compare: 2
15-
no-void: 2
16-
no-new-object: 2
17-
no-array-constructor: 1
18-
no-inner-declarations: [1, both]
19-
no-shadow-restricted-names: 1
20-
no-unused-vars: 1
21-
no-unreachable: 1
2216
brace-style: 1
23-
semi: [1, always]
2417
camelcase: 2
25-
new-cap:
26-
- 1
2718
comma-style: 2
28-
comma-dangle: [1, never]
2919
consistent-this: [2, self]
30-
no-underscore-dangle: 0
31-
quotes: [2, single]
3220
curly: 1
21+
eqeqeq: 1
3322
indent:
3423
- 2
3524
- 2
3625
- SwitchCase: 1
37-
no-mixed-spaces-and-tabs: 2
38-
space-after-keywords: 2
39-
space-before-blocks: 2
40-
object-curly-spacing: 2
41-
array-bracket-spacing: 2
42-
computed-property-spacing: 2
43-
space-in-parens: 2
44-
spaced-comment: 2
45-
eol-last: 1
4626
max-depth: [1, 4]
4727
max-len: [1, 120]
4828
max-params: [1, 4]
49-
react/jsx-uses-vars: 1
50-
ecmaFeatures:
51-
arrowFunctions: true
52-
destructuring: true
53-
objectLiteralComputedProperties: true
54-
objectLiteralShorthandProperties: true
55-
templateStrings: true
56-
jsx: true
57-
plugins:
58-
- react
29+
new-cap: 1
30+
no-array-constructor: 1
31+
no-console: 0
32+
no-eq-null: 2
33+
no-new-object: 2
34+
no-self-compare: 2
35+
no-shadow-restricted-names: 1
36+
no-underscore-dangle: 0
37+
no-void: 2
38+
quote-props: [1, as-needed]
39+
quotes: [2, single, avoid-escape]
40+
# TODO: Enable the react/prop-types rule.
41+
react/prop-types: 0
42+
radix: 1
43+
spaced-comment: 2
44+
strict: [2, never]
45+
vars-on-top: 1

package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"babel-polyfill": "~6.5.0",
1919
"babel-runtime": "~6.5.0",
2020
"bootstrap": "~3.3.6",
21-
"nested-editor": "git+https://github.com/lumc-nested/nested-editor.git#72b76c1",
21+
"nested-editor": "git+https://github.com/lumc-nested/nested-editor.git#05d7d06",
2222
"react": "~0.14.7",
2323
"react-bootstrap": "~0.28.3",
2424
"react-dom": "~0.14.7",
@@ -33,9 +33,9 @@
3333
"babel-preset-stage-1": "~6.5.0",
3434
"binary-loader": "~0.0.1",
3535
"css-loader": "~0.23.1",
36-
"eslint": "~1.10.3",
37-
"eslint-loader": "~1.1.1",
38-
"eslint-plugin-react": "~3.11.3",
36+
"eslint": "~2.2.0",
37+
"eslint-loader": "~1.3.0",
38+
"eslint-plugin-react": "~4.1.0",
3939
"extract-text-webpack-plugin": "~1.0.1",
4040
"file-loader": "~0.8.5",
4141
"json-loader": "~0.5.1",

0 commit comments

Comments
 (0)