Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit ce16e4e

Browse filesBrowse files
yyx990803yyx990803
committed
Merge pull request vuejs#1113 from kazupon/upgrade-eslint
upgrade eslint v1.0.0
2 parents 094e355 + 6a4237d commit ce16e4e
Copy full SHA for ce16e4e

File tree

Expand file treeCollapse file tree

4 files changed

+5
-41
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+5
-41
lines changed

‎.eslintrc

Copy file name to clipboardExpand all lines: .eslintrc
+1-19Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,29 +30,21 @@
3030
"eqeqeq": [2, "allow-null"],
3131
"func-names": 0,
3232
"func-style": 0,
33-
"generator-star": 0,
3433
"generator-star-spacing": [2, { "before": true, "after": true }],
35-
"global-strict": 0,
3634
"guard-for-in": 0,
3735
"handle-callback-err": [2, "^(err|error)$" ],
38-
"indent": [2, 2],
36+
"indent": [2, 2, { "SwitchCase": 1 }],
3937
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
4038
"linebreak-style": 0,
4139
"lines-around-comment": 0,
42-
"max-depth": 0,
43-
"max-len": 0,
4440
"max-nested-callbacks": 0,
45-
"max-params": 0,
46-
"max-statements": 0,
4741
"new-cap": [2, { "newIsCap": true, "capIsNew": false }],
4842
"new-parens": 2,
4943
"newline-after-var": 0,
5044
"no-alert": 0,
5145
"no-array-constructor": 2,
52-
"no-bitwise": 0,
5346
"no-caller": 2,
5447
"no-catch-shadow": 0,
55-
"no-comma-dangle": 0,
5648
"no-cond-assign": 2,
5749
"no-console": 0,
5850
"no-constant-condition": 0,
@@ -67,7 +59,6 @@
6759
"no-else-return": 0,
6860
"no-empty": 0,
6961
"no-empty-character-class": 2,
70-
"no-empty-class": 0,
7162
"no-empty-label": 2,
7263
"no-eq-null": 0,
7364
"no-eval": 2,
@@ -77,7 +68,6 @@
7768
"no-extra-boolean-cast": 2,
7869
"no-extra-parens": 0,
7970
"no-extra-semi": 0,
80-
"no-extra-strict": 0,
8171
"no-fallthrough": 2,
8272
"no-floating-decimal": 2,
8373
"no-func-assign": 2,
@@ -110,21 +100,18 @@
110100
"no-octal-escape": 2,
111101
"no-param-reassign": 0,
112102
"no-path-concat": 0,
113-
"no-plusplus": 0,
114103
"no-process-env": 0,
115104
"no-process-exit": 0,
116105
"no-proto": 0,
117106
"no-redeclare": 2,
118107
"no-regex-spaces": 2,
119-
"no-reserved-keys": 0,
120108
"no-restricted-modules": 0,
121109
"no-return-assign": 2,
122110
"no-script-url": 0,
123111
"no-self-compare": 2,
124112
"no-sequences": 2,
125113
"no-shadow": 0,
126114
"no-shadow-restricted-names": 2,
127-
"no-space-before-semi": 0,
128115
"no-spaced-func": 2,
129116
"no-sparse-arrays": 2,
130117
"no-sync": 0,
@@ -146,7 +133,6 @@
146133
"no-void": 0,
147134
"no-warning-comments": 0,
148135
"no-with": 2,
149-
"no-wrap-func": 2,
150136
"object-curly-spacing": 0,
151137
"object-shorthand": 0,
152138
"one-var": [2, { "initialized": "never" }],
@@ -160,18 +146,14 @@
160146
"semi": [2, "never"],
161147
"semi-spacing": 0,
162148
"sort-vars": 0,
163-
"space-after-function-name": 0,
164149
"space-after-keywords": [2, "always"],
165150
"space-before-blocks": [2, "always"],
166151
"space-before-function-paren": [2, "always"],
167-
"space-before-function-parentheses": 0,
168-
"space-in-brackets": 0,
169152
"space-in-parens": [2, "never"],
170153
"space-infix-ops": 2,
171154
"space-return-throw-case": 2,
172155
"space-unary-ops": [2, { "words": true, "nonwords": false }],
173156
"spaced-comment": [2, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!"] }],
174-
"spaced-line-comment": 0,
175157
"strict": 0,
176158
"use-isnan": 2,
177159
"valid-jsdoc": 0,

‎package.json

Copy file name to clipboardExpand all lines: package.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"casperjs": "^1.1.0-beta3",
3333
"codecov.io": "^0.1.2",
3434
"grunt": "^0.4.5",
35-
"grunt-eslint": "^16.0.0",
35+
"grunt-eslint": "^17.0.0",
3636
"grunt-karma": "^0.8.3",
3737
"jasmine-core": "^2.3.4",
3838
"karma": "^0.12.31",

‎test/.eslintrc

Copy file name to clipboardExpand all lines: test/.eslintrc
+1-19Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,29 +40,21 @@
4040
"eqeqeq": [2, "allow-null"],
4141
"func-names": 0,
4242
"func-style": 0,
43-
"generator-star": 0,
4443
"generator-star-spacing": [2, { "before": true, "after": true }],
45-
"global-strict": 0,
4644
"guard-for-in": 0,
4745
"handle-callback-err": [2, "^(err|error)$" ],
48-
"indent": [2, 2],
46+
"indent": [2, 2, { "SwitchCase": 1 }],
4947
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
5048
"linebreak-style": 0,
5149
"lines-around-comment": 0,
52-
"max-depth": 0,
53-
"max-len": 0,
5450
"max-nested-callbacks": 0,
55-
"max-params": 0,
56-
"max-statements": 0,
5751
"new-cap": [2, { "newIsCap": true, "capIsNew": false }],
5852
"new-parens": 2,
5953
"newline-after-var": 0,
6054
"no-alert": 0,
6155
"no-array-constructor": 2,
62-
"no-bitwise": 0,
6356
"no-caller": 2,
6457
"no-catch-shadow": 0,
65-
"no-comma-dangle": 0,
6658
"no-cond-assign": 2,
6759
"no-console": 0,
6860
"no-constant-condition": 0,
@@ -77,7 +69,6 @@
7769
"no-else-return": 0,
7870
"no-empty": 0,
7971
"no-empty-character-class": 2,
80-
"no-empty-class": 0,
8172
"no-empty-label": 2,
8273
"no-eq-null": 0,
8374
"no-eval": 2,
@@ -87,7 +78,6 @@
8778
"no-extra-boolean-cast": 2,
8879
"no-extra-parens": 0,
8980
"no-extra-semi": 0,
90-
"no-extra-strict": 0,
9181
"no-fallthrough": 2,
9282
"no-floating-decimal": 2,
9383
"no-func-assign": 2,
@@ -120,21 +110,18 @@
120110
"no-octal-escape": 2,
121111
"no-param-reassign": 0,
122112
"no-path-concat": 0,
123-
"no-plusplus": 0,
124113
"no-process-env": 0,
125114
"no-process-exit": 0,
126115
"no-proto": 0,
127116
"no-redeclare": 2,
128117
"no-regex-spaces": 2,
129-
"no-reserved-keys": 0,
130118
"no-restricted-modules": 0,
131119
"no-return-assign": 2,
132120
"no-script-url": 0,
133121
"no-self-compare": 2,
134122
"no-sequences": 2,
135123
"no-shadow": 0,
136124
"no-shadow-restricted-names": 2,
137-
"no-space-before-semi": 0,
138125
"no-spaced-func": 2,
139126
"no-sparse-arrays": 2,
140127
"no-sync": 0,
@@ -156,7 +143,6 @@
156143
"no-void": 0,
157144
"no-warning-comments": 0,
158145
"no-with": 2,
159-
"no-wrap-func": 2,
160146
"object-curly-spacing": 0,
161147
"object-shorthand": 0,
162148
"one-var": [2, { "initialized": "never" }],
@@ -170,18 +156,14 @@
170156
"semi": [2, "never"],
171157
"semi-spacing": 0,
172158
"sort-vars": 0,
173-
"space-after-function-name": 0,
174159
"space-after-keywords": [2, "always"],
175160
"space-before-blocks": [2, "always"],
176161
"space-before-function-paren": [2, "always"],
177-
"space-before-function-parentheses": 0,
178-
"space-in-brackets": 0,
179162
"space-in-parens": [2, "never"],
180163
"space-infix-ops": 2,
181164
"space-return-throw-case": 2,
182165
"space-unary-ops": [2, { "words": true, "nonwords": false }],
183166
"spaced-comment": [2, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!"] }],
184-
"spaced-line-comment": 0,
185167
"strict": 0,
186168
"use-isnan": 2,
187169
"valid-jsdoc": 0,

‎test/unit/specs/misc_spec.js

Copy file name to clipboardExpand all lines: test/unit/specs/misc_spec.js
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,8 +195,8 @@ describe('Misc', function () {
195195
},
196196
watch: {
197197
obj: {
198-
handler: spy1,
199-
deep: true
198+
handler: spy1,
199+
deep: true
200200
},
201201
arr: spy2,
202202
// if the watcher is watching the added value,

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.