Skip to content

Commit c63ada0

Browse files
committed
upgrade eslint
1 parent 71f2261 commit c63ada0

File tree

4 files changed

+6
-43
lines changed

4 files changed

+6
-43
lines changed

Diff for: .eslintrc

+1-19
Original file line numberDiff line numberDiff line change
@@ -41,29 +41,21 @@
4141
"eqeqeq": [2, "allow-null"],
4242
"func-names": 0,
4343
"func-style": 0,
44-
"generator-star": 0,
4544
"generator-star-spacing": [2, { "before": true, "after": true }],
46-
"global-strict": 0,
4745
"guard-for-in": 0,
4846
"handle-callback-err": [2, "^(err|error)$" ],
49-
"indent": [2, 2],
47+
"indent": [2, 2, { "SwitchCase": 1 }],
5048
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
5149
"linebreak-style": 0,
5250
"lines-around-comment": 0,
53-
"max-depth": 0,
54-
"max-len": 0,
5551
"max-nested-callbacks": 0,
56-
"max-params": 0,
57-
"max-statements": 0,
5852
"new-cap": [2, { "newIsCap": true, "capIsNew": false }],
5953
"new-parens": 2,
6054
"newline-after-var": 0,
6155
"no-alert": 0,
6256
"no-array-constructor": 2,
63-
"no-bitwise": 0,
6457
"no-caller": 2,
6558
"no-catch-shadow": 0,
66-
"no-comma-dangle": 0,
6759
"no-cond-assign": 2,
6860
"no-console": 0,
6961
"no-constant-condition": 0,
@@ -78,7 +70,6 @@
7870
"no-else-return": 0,
7971
"no-empty": 0,
8072
"no-empty-character-class": 2,
81-
"no-empty-class": 0,
8273
"no-empty-label": 2,
8374
"no-eq-null": 0,
8475
"no-eval": 2,
@@ -88,7 +79,6 @@
8879
"no-extra-boolean-cast": 2,
8980
"no-extra-parens": 0,
9081
"no-extra-semi": 0,
91-
"no-extra-strict": 0,
9282
"no-fallthrough": 2,
9383
"no-floating-decimal": 2,
9484
"no-func-assign": 2,
@@ -121,21 +111,18 @@
121111
"no-octal-escape": 2,
122112
"no-param-reassign": 0,
123113
"no-path-concat": 0,
124-
"no-plusplus": 0,
125114
"no-process-env": 0,
126115
"no-process-exit": 0,
127116
"no-proto": 0,
128117
"no-redeclare": 2,
129118
"no-regex-spaces": 2,
130-
"no-reserved-keys": 0,
131119
"no-restricted-modules": 0,
132120
"no-return-assign": 2,
133121
"no-script-url": 0,
134122
"no-self-compare": 2,
135123
"no-sequences": 2,
136124
"no-shadow": 0,
137125
"no-shadow-restricted-names": 2,
138-
"no-space-before-semi": 0,
139126
"no-spaced-func": 2,
140127
"no-sparse-arrays": 2,
141128
"no-sync": 0,
@@ -157,7 +144,6 @@
157144
"no-void": 0,
158145
"no-warning-comments": 0,
159146
"no-with": 2,
160-
"no-wrap-func": 2,
161147
"object-curly-spacing": 0,
162148
"object-shorthand": 0,
163149
"one-var": [2, { "initialized": "never" }],
@@ -171,18 +157,14 @@
171157
"semi": [2, "never"],
172158
"semi-spacing": 0,
173159
"sort-vars": 0,
174-
"space-after-function-name": 0,
175160
"space-after-keywords": [2, "always"],
176161
"space-before-blocks": [2, "always"],
177162
"space-before-function-paren": [2, "always"],
178-
"space-before-function-parentheses": 0,
179-
"space-in-brackets": 0,
180163
"space-in-parens": [2, "never"],
181164
"space-infix-ops": 2,
182165
"space-return-throw-case": 2,
183166
"space-unary-ops": [2, { "words": true, "nonwords": false }],
184167
"spaced-comment": [2, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!"] }],
185-
"spaced-line-comment": 0,
186168
"strict": 0,
187169
"use-isnan": 2,
188170
"valid-jsdoc": 0,

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"chromedriver": "2.16.0",
3939
"css-loader": "^0.15.4",
4040
"es6-promise": "^3.0.2",
41-
"eslint": "^0.24.0",
41+
"eslint": "^1.1.0",
4242
"express": "^4.12.3",
4343
"html-loader": "^0.3.0",
4444
"istanbul-instrumenter-loader": "^0.1.3",

Diff for: src/pipeline.js

+3-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@ export function canReuse (view, handler, transition) {
2323
? canReuseFn
2424
: canReuseFn
2525
? canReuseFn.call(component, {
26-
to: transition.to,
27-
from: transition.from
28-
})
29-
: true // defaults to true
26+
to: transition.to,
27+
from: transition.from
28+
}) : true // defaults to true
3029
}
3130

3231
/**

Diff for: test/unit/.eslintrc

+1-19
Original file line numberDiff line numberDiff line change
@@ -39,29 +39,21 @@
3939
"eqeqeq": [2, "allow-null"],
4040
"func-names": 0,
4141
"func-style": 0,
42-
"generator-star": 0,
4342
"generator-star-spacing": [2, { "before": true, "after": true }],
44-
"global-strict": 0,
4543
"guard-for-in": 0,
4644
"handle-callback-err": [2, "^(err|error)$" ],
47-
"indent": [2, 2],
45+
"indent": [2, 2, { "SwitchCase": 1 }],
4846
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
4947
"linebreak-style": 0,
5048
"lines-around-comment": 0,
51-
"max-depth": 0,
52-
"max-len": 0,
5349
"max-nested-callbacks": 0,
54-
"max-params": 0,
55-
"max-statements": 0,
5650
"new-cap": [2, { "newIsCap": true, "capIsNew": false }],
5751
"new-parens": 2,
5852
"newline-after-var": 0,
5953
"no-alert": 0,
6054
"no-array-constructor": 2,
61-
"no-bitwise": 0,
6255
"no-caller": 2,
6356
"no-catch-shadow": 0,
64-
"no-comma-dangle": 0,
6557
"no-cond-assign": 2,
6658
"no-console": 0,
6759
"no-constant-condition": 0,
@@ -76,7 +68,6 @@
7668
"no-else-return": 0,
7769
"no-empty": 0,
7870
"no-empty-character-class": 2,
79-
"no-empty-class": 0,
8071
"no-empty-label": 2,
8172
"no-eq-null": 0,
8273
"no-eval": 2,
@@ -86,7 +77,6 @@
8677
"no-extra-boolean-cast": 2,
8778
"no-extra-parens": 0,
8879
"no-extra-semi": 0,
89-
"no-extra-strict": 0,
9080
"no-fallthrough": 2,
9181
"no-floating-decimal": 2,
9282
"no-func-assign": 2,
@@ -119,21 +109,18 @@
119109
"no-octal-escape": 2,
120110
"no-param-reassign": 0,
121111
"no-path-concat": 0,
122-
"no-plusplus": 0,
123112
"no-process-env": 0,
124113
"no-process-exit": 0,
125114
"no-proto": 0,
126115
"no-redeclare": 2,
127116
"no-regex-spaces": 2,
128-
"no-reserved-keys": 0,
129117
"no-restricted-modules": 0,
130118
"no-return-assign": 2,
131119
"no-script-url": 0,
132120
"no-self-compare": 2,
133121
"no-sequences": 2,
134122
"no-shadow": 0,
135123
"no-shadow-restricted-names": 2,
136-
"no-space-before-semi": 0,
137124
"no-spaced-func": 2,
138125
"no-sparse-arrays": 2,
139126
"no-sync": 0,
@@ -155,7 +142,6 @@
155142
"no-void": 0,
156143
"no-warning-comments": 0,
157144
"no-with": 2,
158-
"no-wrap-func": 2,
159145
"object-curly-spacing": 0,
160146
"object-shorthand": 0,
161147
"one-var": [2, { "initialized": "never" }],
@@ -169,18 +155,14 @@
169155
"semi": [2, "never"],
170156
"semi-spacing": 0,
171157
"sort-vars": 0,
172-
"space-after-function-name": 0,
173158
"space-after-keywords": [2, "always"],
174159
"space-before-blocks": [2, "always"],
175160
"space-before-function-paren": [2, "always"],
176-
"space-before-function-parentheses": 0,
177-
"space-in-brackets": 0,
178161
"space-in-parens": [2, "never"],
179162
"space-infix-ops": 2,
180163
"space-return-throw-case": 2,
181164
"space-unary-ops": [2, { "words": true, "nonwords": false }],
182165
"spaced-comment": [2, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!"] }],
183-
"spaced-line-comment": 0,
184166
"strict": 0,
185167
"use-isnan": 2,
186168
"valid-jsdoc": 0,

0 commit comments

Comments
 (0)