Skip to content

Commit 7b1ced2

Browse files
committed
[eslint config] [base] [deps] update eslint
1 parent 262b07b commit 7b1ced2

File tree

2 files changed

+18
-4
lines changed

2 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
@@ -51,15 +51,15 @@
5151
"babel-preset-airbnb": "^2.4.0",
5252
"babel-tape-runner": "^2.0.1",
5353
"editorconfig-tools": "^0.1.1",
54-
"eslint": "^4.15.0",
54+
"eslint": "^4.16.0",
5555
"eslint-find-rules": "^3.1.1",
5656
"eslint-plugin-import": "^2.8.0",
5757
"in-publish": "^2.0.0",
5858
"safe-publish-latest": "^1.1.1",
5959
"tape": "^4.8.0"
6060
},
6161
"peerDependencies": {
62-
"eslint": "^4.15.0",
62+
"eslint": "^4.16.0",
6363
"eslint-plugin-import": "^2.8.0"
6464
},
6565
"engines": {

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,21 @@ module.exports = {
5151
'comma-spacing': ['error', { before: false, after: true }],
5252

5353
// enforce one true comma style
54-
'comma-style': ['error', 'last'],
54+
'comma-style': ['error', 'last', {
55+
exceptions: {
56+
ArrayExpression: false,
57+
ArrayPattern: false,
58+
ArrowFunctionExpression: false,
59+
CallExpression: false,
60+
FunctionDeclaration: false,
61+
FunctionExpression: false,
62+
ImportDeclaration: false,
63+
ObjectExpression: false,
64+
ObjectPattern: false,
65+
VariableDeclaration: false,
66+
NewExpression: false,
67+
}
68+
}],
5569

5670
// disallow padding inside computed properties
5771
'computed-property-spacing': ['error', 'never'],
@@ -375,7 +389,7 @@ module.exports = {
375389
// enforce "same line" or "multiple line" on object properties.
376390
// https://eslint.org/docs/rules/object-property-newline
377391
'object-property-newline': ['error', {
378-
allowMultiplePropertiesPerLine: true,
392+
allowAllPropertiesOnSameLine: true,
379393
}],
380394

381395
// allow just one var statement per function

0 commit comments

Comments
 (0)