Skip to content

Commit 638b312

Browse files
committed
[eslint config] [base] update eslint
1 parent 4ac8aed commit 638b312

File tree

4 files changed

+18
-4
lines changed

4 files changed

+18
-4
lines changed

packages/eslint-config-airbnb-base/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@
4444
"homepage": "https://github.com/airbnb/javascript",
4545
"devDependencies": {
4646
"babel-tape-runner": "^1.3.1",
47-
"eslint": "^2.9.0",
47+
"eslint": "^2.10.1",
4848
"eslint-find-rules": "^1.9.2",
4949
"eslint-plugin-import": "^1.8.0",
5050
"tape": "^4.5.1"
5151
},
5252
"peerDependencies": {
53-
"eslint": "^2.9.0",
53+
"eslint": "^2.10.1",
5454
"eslint-plugin-import": "^1.8.0"
5555
}
5656
}

packages/eslint-config-airbnb-base/rules/errors.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ module.exports = {
4141
'no-extra-parens': [0, 'all', {
4242
'conditionalAssign': true,
4343
'nestedBinaryExpressions': false,
44+
'returnAssign': false,
4445
}],
4546

4647
// disallow unnecessary semicolons

packages/eslint-config-airbnb-base/rules/es6.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,10 @@ module.exports = {
8383

8484
// require method and property shorthand syntax for object literals
8585
// http://eslint.org/docs/rules/object-shorthand
86-
'object-shorthand': [2, 'always'],
86+
'object-shorthand': [2, 'always', {
87+
'ignoreConstructors': false,
88+
'avoidQuotes': false, // TODO: enable
89+
}],
8790

8891
// suggest using arrow functions as callbacks
8992
'prefer-arrow-callback': [2, {
@@ -92,7 +95,10 @@ module.exports = {
9295
}],
9396

9497
// suggest using of const declaration for variables that are never modified after declared
95-
'prefer-const': 2,
98+
'prefer-const': [2, {
99+
'destructuring': 'any',
100+
'ignoreReadBeforeAssign': false, // TODO: make true
101+
}],
96102

97103
// suggest using the spread operator instead of .apply()
98104
'prefer-spread': 0,

packages/eslint-config-airbnb-base/rules/style.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,13 @@ module.exports = {
149149
// require padding inside curly braces
150150
'object-curly-spacing': [2, 'always'],
151151

152+
// enforce "same line" or "multiple line" on object properties.
153+
// http://eslint.org/docs/rules/object-property-newline
154+
// TODO: enable when https://github.com/eslint/eslint/issues/5667#issuecomment-219334864 is resolved
155+
'object-property-newline': [0, {
156+
'allowMultiplePropertiesPerLine': true,
157+
}],
158+
152159
// allow just one var statement per function
153160
'one-var': [2, 'never'],
154161

0 commit comments

Comments
 (0)