Skip to content

Commit ebe9682

Browse files
Merge branch 'master' into translation-proposal
2 parents 955f4e9 + d78af39 commit ebe9682

File tree

5 files changed

+24
-11
lines changed

5 files changed

+24
-11
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,21 @@
5858
"editorconfig-tools": "^0.1.1",
5959
"eslint": "^4.19.1 || ^5.3.0",
6060
"eslint-find-rules": "^3.3.1",
61-
"eslint-plugin-import": "^2.14.0",
61+
"eslint-plugin-import": "^2.15.0",
6262
"in-publish": "^2.0.0",
6363
"safe-publish-latest": "^1.1.2",
6464
"tape": "^4.9.1"
6565
},
6666
"peerDependencies": {
6767
"eslint": "^4.19.1 || ^5.3.0",
68-
"eslint-plugin-import": "^2.14.0"
68+
"eslint-plugin-import": "^2.15.0"
6969
},
7070
"engines": {
7171
"node": ">= 4"
7272
},
7373
"dependencies": {
7474
"confusing-browser-globals": "^1.0.5",
7575
"object.assign": "^4.1.0",
76-
"object.entries": "^1.0.4"
76+
"object.entries": "^1.1.0"
7777
}
7878
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,10 @@ module.exports = {
221221
// https://github.com/benmosher/eslint-plugin-import/blob/44a038c06487964394b1e15b64f3bd34e5d40cde/docs/rules/no-default-export.md
222222
'import/no-default-export': 'off',
223223

224+
// Prohibit named exports. this is a terrible rule, do not use it.
225+
// https://github.com/benmosher/eslint-plugin-import/blob/1ec80fa35fa1819e2d35a70e68fb6a149fb57c5e/docs/rules/no-named-export.md
226+
'import/no-named-export': 'off',
227+
224228
// Forbid a module from importing itself
225229
// https://github.com/benmosher/eslint-plugin-import/blob/44a038c06487964394b1e15b64f3bd34e5d40cde/docs/rules/no-self-import.md
226230
'import/no-self-import': 'error',

packages/eslint-config-airbnb/package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,27 +56,27 @@
5656
"dependencies": {
5757
"eslint-config-airbnb-base": "^13.1.0",
5858
"object.assign": "^4.1.0",
59-
"object.entries": "^1.0.4"
59+
"object.entries": "^1.1.0"
6060
},
6161
"devDependencies": {
6262
"babel-preset-airbnb": "^2.5.3",
6363
"babel-tape-runner": "^2.0.1",
6464
"editorconfig-tools": "^0.1.1",
6565
"eslint": "^4.19.1 || ^5.3.0",
6666
"eslint-find-rules": "^3.3.1",
67-
"eslint-plugin-import": "^2.14.0",
68-
"eslint-plugin-jsx-a11y": "^6.1.1",
69-
"eslint-plugin-react": "^7.11.0",
67+
"eslint-plugin-import": "^2.15.0",
68+
"eslint-plugin-jsx-a11y": "^6.2.0",
69+
"eslint-plugin-react": "^7.12.4",
7070
"in-publish": "^2.0.0",
7171
"react": ">= 0.13.0",
7272
"safe-publish-latest": "^1.1.2",
7373
"tape": "^4.9.1"
7474
},
7575
"peerDependencies": {
7676
"eslint": "^4.19.1 || ^5.3.0",
77-
"eslint-plugin-import": "^2.14.0",
78-
"eslint-plugin-jsx-a11y": "^6.1.1",
79-
"eslint-plugin-react": "^7.11.0"
77+
"eslint-plugin-import": "^2.15.0",
78+
"eslint-plugin-jsx-a11y": "^6.2.0",
79+
"eslint-plugin-react": "^7.12.4"
8080
},
8181
"engines": {
8282
"node": ">= 4"

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
const assign = require('object.assign');
2+
const baseStyleRules = require('eslint-config-airbnb-base/rules/style').rules;
3+
4+
const dangleRules = baseStyleRules['no-underscore-dangle'];
5+
16
module.exports = {
27
plugins: [
38
'react',
@@ -12,6 +17,10 @@ module.exports = {
1217
// View link below for react rules documentation
1318
// https://github.com/yannickcr/eslint-plugin-react#list-of-supported-rules
1419
rules: {
20+
'no-underscore-dangle': [dangleRules[0], assign({}, dangleRules[1], {
21+
allow: dangleRules[1].allow.concat(['__REDUX_DEVTOOLS_EXTENSION_COMPOSE__']),
22+
})],
23+
1524
// Specify whether double or single quotes should be used in JSX attributes
1625
// https://eslint.org/docs/rules/jsx-quotes
1726
'jsx-quotes': ['error', 'prefer-double'],

react/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ This style guide is mostly based on the standards that are currently prevalent i
2828
- However, multiple [Stateless, or Pure, Components](https://facebook.github.io/react/docs/reusable-components.html#stateless-functions) are allowed per file. eslint: [`react/no-multi-comp`](https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/no-multi-comp.md#ignorestateless).
2929
- Always use JSX syntax.
3030
- Do not use `React.createElement` unless you’re initializing the app from a file that is not JSX.
31-
- [`react/forbid-prod-types`](https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/forbid-prop-types.md) will allow `arrays` and `objects` only if it is explicitly noted what `array` and `object` contains, using `arrayOf`, `objectOf`, or `shape`.
31+
- [`react/forbid-prop-types`](https://github.com/yannickcr/eslint-plugin-react/blob/master/docs/rules/forbid-prop-types.md) will allow `arrays` and `objects` only if it is explicitly noted what `array` and `object` contains, using `arrayOf`, `objectOf`, or `shape`.
3232

3333
## Class vs `React.createClass` vs stateless
3434

0 commit comments

Comments
 (0)