Skip to content

Commit bb12bcd

Browse files
Merge branch 'master' into shar--always-use-parens-for-arrow-functions
2 parents cf6219d + 685f37b commit bb12bcd

File tree

3 files changed

+16
-8
lines changed

3 files changed

+16
-8
lines changed

packages/eslint-config-airbnb/CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
17.1.0 / 2018-08-13
2+
==================
3+
- [new] add eslint v5 support
4+
- [minor] enable `label-has-associated-control` rule
5+
- [patch] re-enabling `jsx-one-expression-per-line` allowing single children, ignore DOM components on `jsx-no-bind`
6+
- [deps] update `eslint`, `eslint-config-airbnb-base`, `eslint-plugin-react`, `eslint-plugin-import`, `safe-publish-latest`, `eslint-plugin-jsx-a11y`, `eslint-find-rules`
7+
- [docs] fix readme typo (#1855)
8+
19
17.0.0 / 2018-06-21
210
==================
311
- [breaking] update `eslint-config-airbnb-base` to v13

packages/eslint-config-airbnb/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eslint-config-airbnb",
3-
"version": "17.0.0",
3+
"version": "17.1.0",
44
"description": "Airbnb's ESLint config, following our styleguide",
55
"main": "index.js",
66
"scripts": {
@@ -54,7 +54,7 @@
5454
},
5555
"homepage": "https://github.com/airbnb/javascript",
5656
"dependencies": {
57-
"eslint-config-airbnb-base": "^13.0.0",
57+
"eslint-config-airbnb-base": "^13.1.0",
5858
"object.assign": "^4.1.0",
5959
"object.entries": "^1.0.4"
6060
},
@@ -66,7 +66,7 @@
6666
"eslint-find-rules": "^3.3.1",
6767
"eslint-plugin-import": "^2.14.0",
6868
"eslint-plugin-jsx-a11y": "^6.1.1",
69-
"eslint-plugin-react": "^7.10.0",
69+
"eslint-plugin-react": "^7.11.0",
7070
"in-publish": "^2.0.0",
7171
"react": ">= 0.13.0",
7272
"safe-publish-latest": "^1.1.2",
@@ -76,7 +76,7 @@
7676
"eslint": "^4.19.1 || ^5.3.0",
7777
"eslint-plugin-import": "^2.14.0",
7878
"eslint-plugin-jsx-a11y": "^6.1.1",
79-
"eslint-plugin-react": "^7.10.0"
79+
"eslint-plugin-react": "^7.11.0"
8080
},
8181
"engines": {
8282
"node": ">= 4"

packages/eslint-config-airbnb/rules/react.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ module.exports = {
9393
'react/jsx-no-bind': ['error', {
9494
ignoreRefs: true,
9595
allowArrowFunctions: true,
96+
allowFunctions: false,
9697
allowBind: false,
98+
ignoreDOMComponents: true,
9799
}],
98100

99101
// Prevent duplicate props in JSX
@@ -413,13 +415,11 @@ module.exports = {
413415

414416
// One JSX Element Per Line
415417
// https://github.com/yannickcr/eslint-plugin-react/blob/843d71a432baf0f01f598d7cf1eea75ad6896e4b/docs/rules/jsx-one-expression-per-line.md
416-
// TODO: re-enable when an option for text children is available
417-
'react/jsx-one-expression-per-line': 'off',
418+
'react/jsx-one-expression-per-line': ['error', { allow: 'single-child' }],
418419

419420
// Enforce consistent usage of destructuring assignment of props, state, and context
420421
// https://github.com/yannickcr/eslint-plugin-react/blob/843d71a432baf0f01f598d7cf1eea75ad6896e4b/docs/rules/destructuring-assignment.md
421-
// TODO: re-enable when component detection is fixed
422-
'react/destructuring-assignment': ['off', 'always'],
422+
'react/destructuring-assignment': ['error', 'always'],
423423

424424
// Prevent using this.state within a this.setState
425425
// https://github.com/yannickcr/eslint-plugin-react/blob/843d71a432baf0f01f598d7cf1eea75ad6896e4b/docs/rules/no-access-state-in-setstate.md

0 commit comments

Comments
 (0)