Skip to content

Commit f514149

Browse files
greenkeeperio-botglebec
authored andcommitted
Update eslint to version 3.1.0 🚀 (#6)
* chore(package): update eslint to version 3.1.0 https://greenkeeper.io/ * update eslintrc to match 3.1.0
1 parent 6512a43 commit f514149

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.eslintrc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ rules: # http://eslint.org/docs/rules/
9999
no-proto: 2 # disallow the use of the `__proto__` property
100100
no-redeclare: [1, {builtinGlobals: true}] # disallow `var` redeclaration
101101
no-return-assign: [1, 'always'] # disallow assignment operators in `return` statements
102-
no-script-url: 2 # disallow `javascript:` urls
102+
no-script-url: 2 # disallow `javascript` urls
103103
no-self-assign: 2 # disallow assignments where both sides are exactly the same
104104
no-self-compare: 2 # disallow comparisons where both sides are exactly the same
105105
no-sequences: 1 # disallow comma operators
@@ -136,7 +136,7 @@ rules: # http://eslint.org/docs/rules/
136136
no-use-before-define: [1, 'nofunc'] # disallow the use of variables before they are defined
137137

138138
# Node.js and CommonJS
139-
callback-return: 1 # require `return` statements after callbacks
139+
callback-return: 0 # require `return` statements after callbacks
140140
global-require: 1 # require `require()` calls to be placed at top-level module scope
141141
handle-callback-err: [2, '^(err|error|.+Error$)'] # require error handling in max-nested-callbacks
142142
no-mixed-requires: 1 # disallow `require` calls to be mixed with regular `var` declarations
@@ -164,7 +164,7 @@ rules: # http://eslint.org/docs/rules/
164164
id-match: 0 # require identifiers to match a specified regular expression
165165
indent: [0, 2, {SwitchCase: 1, VariableDeclarator: {var: 2, let: 2, const: 3}}] # enforce consistent indentation
166166
jsx-quotes: [1, 'prefer-double'] # enforce the consistent use of either double or single quotes in JSX attributes
167-
key-spacing: [0, {align: 'value'}] # enforce consistent spacing between keys and values in object literal properties
167+
key-spacing: [1, {mode: 'minimum'}] # enforce consistent spacing between keys and values in object literal properties
168168
keyword-spacing: 1 # enforce consistent spacing before and after keywords
169169
linebreak-style: 1 # enforce consistent linebreak style
170170
lines-around-comment: 0 # require empty lines around comments

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
},
3737
"devDependencies": {
3838
"chai": "^3.5.0",
39-
"eslint": "~3.0.0",
39+
"eslint": "~3.1.0",
4040
"mocha": "^2.5.3"
4141
}
4242
}

0 commit comments

Comments
 (0)