Skip to content

Commit 58c7be3

Browse files
rgrovergrove
committed
Upgrade ESLint to 3.1.1 and revamp the rules.
1 parent 28c6420 commit 58c7be3

File tree

2 files changed

+168
-106
lines changed

2 files changed

+168
-106
lines changed

‎.eslintrc.yml‎

Lines changed: 167 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,175 @@
11
env:
2+
es6: true
23
node: true
34

45
parserOptions:
56
ecmaVersion: 6
67
sourceType: module
78

89
rules:
9-
accessor-pairs: 1
10-
arrow-spacing: [1, {after: true, before: true}]
11-
block-scoped-var: 2
12-
brace-style: [1, 1tbs, {allowSingleLine: true}]
13-
callback-return: [1, [callback, cb, next]]
14-
constructor-super: 2
15-
curly: [2, all]
16-
dot-location: [1, property]
17-
dot-notation: 1
18-
eol-last: 1
19-
eqeqeq: [1, allow-null]
20-
handle-callback-err: [1, "^(err|error)$"]
21-
jsx-quotes: [1, prefer-double]
22-
keyword-spacing: 1
23-
linebreak-style: [2, unix]
24-
indent: [1, 2, {SwitchCase: 1}]
25-
new-parens: 1
26-
no-alert: 1
27-
no-caller: 2
28-
no-case-declarations: 1
29-
no-class-assign: 1
30-
no-cond-assign: [1, except-parens]
31-
no-confusing-arrow: [1, allowParens: true]
32-
no-const-assign: 2
33-
no-constant-condition: 1
34-
no-debugger: 2
35-
no-delete-var: 1
36-
no-dupe-args: 2
37-
no-dupe-class-members: 2
38-
no-dupe-keys: 2
39-
no-empty: 1
40-
no-empty-character-class: 1
41-
no-empty-function: [1, allow: [arrowFunctions]]
42-
no-empty-pattern: 1
43-
no-eval: 2
44-
no-ex-assign: 1
45-
no-extend-native: 2
46-
no-extra-bind: 1
47-
no-extra-boolean-cast: 1
48-
no-extra-label: 1
49-
no-extra-semi: 1
50-
no-fallthrough: 1
51-
no-floating-decimal: 1
52-
no-func-assign: 1
53-
no-implicit-globals: 1
54-
no-implied-eval: 2
55-
no-inner-declarations: 1
56-
no-invalid-regexp: 2
57-
no-irregular-whitespace: 2
58-
no-label-var: 1
59-
no-labels: 1
60-
no-mixed-spaces-and-tabs: 2
61-
no-native-reassign: 2
62-
no-negated-condition: 1
63-
no-negated-in-lhs: 2
64-
no-nested-ternary: 1
65-
no-new-func: 2
66-
no-new-object: 1
67-
no-new-require: 1
68-
no-new-symbol: 2
69-
no-new-wrappers: 1
70-
no-obj-calls: 2
71-
no-octal: 2
72-
no-octal-escape: 1
73-
no-path-concat: 1
74-
no-process-exit: 1
75-
no-proto: 2
76-
no-redeclare: 1
77-
no-regex-spaces: 1
78-
no-script-url: 2
79-
no-self-assign: 1
80-
no-self-compare: 1
81-
no-sequences: 1
82-
no-shadow-restricted-names: 2
83-
no-spaced-func: 1
84-
no-sparse-arrays: 1
85-
no-this-before-super: 2
86-
no-throw-literal: 2
87-
no-undef: 2
88-
no-undef-init: 1
89-
no-unexpected-multiline: 2
90-
no-unmodified-loop-condition: 1
91-
no-unneeded-ternary: 1
92-
no-unreachable: 1
93-
no-unused-labels: 1
94-
no-unused-vars: 1
95-
no-use-before-define: [2, nofunc]
96-
no-useless-call: 1
97-
no-useless-constructor: 1
98-
no-var: 1
99-
no-warning-comments: [1, {location: start, terms: [fixme, xxx]}]
100-
no-whitespace-before-property: 1
101-
no-with: 2
102-
object-shorthand: [1, methods]
103-
one-var: [1, never]
104-
prefer-rest-params: 1
105-
prefer-spread: 1
106-
quotes: 0
107-
radix: 2
108-
semi: 1
109-
space-infix-ops: 1
110-
space-unary-ops: [1, {words: true, nonwords: false}]
111-
use-isnan: 1
112-
valid-typeof: 1
113-
wrap-iife: [1, any]
10+
accessor-pairs: warn
11+
arrow-spacing:
12+
- warn
13+
- after: true
14+
before: true
15+
block-scoped-var: error
16+
brace-style:
17+
- warn
18+
- 1tbs
19+
- allowSingleLine: true
20+
callback-return:
21+
- warn
22+
- [callback, cb, next]
23+
constructor-super: error
24+
curly:
25+
- error
26+
- all
27+
dot-location:
28+
- warn
29+
- property
30+
dot-notation: warn
31+
eol-last: warn
32+
eqeqeq:
33+
- warn
34+
- allow-null
35+
handle-callback-err:
36+
- warn
37+
- "^(err|error)$"
38+
keyword-spacing: warn
39+
linebreak-style:
40+
- error
41+
- unix
42+
indent:
43+
- warn
44+
- 2
45+
- SwitchCase: 1
46+
max-lines:
47+
- warn
48+
- max: 2000
49+
skipBlankLines: true
50+
skipComments: true
51+
max-statements-per-line:
52+
- warn
53+
- max: 2
54+
new-parens: warn
55+
no-alert: warn
56+
no-caller: error
57+
no-case-declarations: warn
58+
no-class-assign: warn
59+
no-cond-assign:
60+
- warn
61+
- except-parens
62+
no-confusing-arrow:
63+
- warn
64+
- allowParens: true
65+
no-const-assign: error
66+
no-constant-condition: warn
67+
no-debugger: error
68+
no-delete-var: warn
69+
no-dupe-args: error
70+
no-dupe-class-members: error
71+
no-dupe-keys: error
72+
no-duplicate-imports: warn
73+
no-empty: warn
74+
no-empty-character-class: warn
75+
no-empty-function:
76+
- warn
77+
- allow:
78+
- arrowFunctions
79+
no-empty-pattern: warn
80+
no-eval: error
81+
no-ex-assign: warn
82+
no-extend-native: error
83+
no-extra-bind: warn
84+
no-extra-boolean-cast: warn
85+
no-extra-label: warn
86+
no-extra-semi: warn
87+
no-fallthrough: warn
88+
no-floating-decimal: warn
89+
no-func-assign: warn
90+
no-implicit-globals: warn
91+
no-implied-eval: error
92+
no-inner-declarations: warn
93+
no-invalid-regexp: error
94+
no-irregular-whitespace: error
95+
no-label-var: warn
96+
no-labels: warn
97+
no-mixed-operators: warn
98+
no-mixed-spaces-and-tabs: error
99+
no-native-reassign: error
100+
no-negated-condition: warn
101+
no-negated-in-lhs: error
102+
no-nested-ternary: warn
103+
no-new-func: error
104+
no-new-object: warn
105+
no-new-require: warn
106+
no-new-symbol: error
107+
no-new-wrappers: warn
108+
no-obj-calls: error
109+
no-octal: error
110+
no-octal-escape: warn
111+
no-path-concat: warn
112+
no-process-exit: warn
113+
no-proto: error
114+
no-prototype-builtins: warn
115+
no-redeclare: warn
116+
no-regex-spaces: warn
117+
no-script-url: error
118+
no-self-assign: warn
119+
no-self-compare: warn
120+
no-sequences: warn
121+
no-shadow-restricted-names: error
122+
no-spaced-func: warn
123+
no-sparse-arrays: warn
124+
no-this-before-super: error
125+
no-throw-literal: error
126+
no-undef: error
127+
no-undef-init: warn
128+
no-unexpected-multiline: error
129+
no-unmodified-loop-condition: warn
130+
no-unneeded-ternary: warn
131+
no-unreachable: warn
132+
no-unsafe-finally: warn
133+
no-unused-labels: warn
134+
no-unused-vars: warn
135+
no-use-before-define:
136+
- error
137+
- nofunc
138+
no-useless-call: warn
139+
no-useless-computed-key: warn
140+
no-useless-constructor: warn
141+
no-useless-escape: warn
142+
no-useless-rename: warn
143+
no-var: warn
144+
no-warning-comments:
145+
- warn
146+
- location: start
147+
terms:
148+
- fixme
149+
- xxx
150+
no-whitespace-before-property: warn
151+
no-with: error
152+
one-var:
153+
- warn
154+
- never
155+
prefer-rest-params: warn
156+
prefer-spread: warn
157+
quotes: off
158+
radix: error
159+
rest-spread-spacing:
160+
- warn
161+
- never
162+
semi: warn
163+
space-infix-ops: warn
164+
space-unary-ops:
165+
- warn
166+
- words: true
167+
nonwords: false
168+
unicode-bom:
169+
- error
170+
- never
171+
use-isnan: warn
172+
valid-typeof: warn
173+
wrap-iife:
174+
- warn
175+
- any

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"devDependencies": {
1313
"chai": "^3.5.0",
14-
"eslint": "^2.4.0",
14+
"eslint": "^3.1.1",
1515
"mocha": "^2.2.5",
1616
"morgan": "^1.7.0",
1717
"nock": "^2.7.0",

0 commit comments

Comments
 (0)