mirror of
https://github.com/facebook/react.git
synced 2026-11-18 20:15:56 +00:00
Merge pull request #6175 from zpao/eslintrc-fixes
ESLint upgrade & fixes
This commit is contained in:
commit
b89e7d25d5
6 files changed
+110
-95
No files matched your search
@@ -1,66 +0,0 @@
|
||||
---
|
||||
parser: babel-eslint
|
||||
|
||||
extends:
|
||||
- ./node_modules/fbjs-scripts/eslint/.eslintrc.js
|
||||
|
||||
plugins:
|
||||
- react
|
||||
- react-internal
|
||||
|
||||
ecmaFeatures:
|
||||
modules: false
|
||||
|
||||
# We're stricter than the default config, mostly. We'll override a few rules and
|
||||
# then enable some React specific ones.
|
||||
rules:
|
||||
accessor-pairs: 0
|
||||
brace-style: [2, 1tbs]
|
||||
comma-dangle: [2, always-multiline]
|
||||
consistent-return: 2
|
||||
dot-location: [2, property]
|
||||
dot-notation: 2
|
||||
eol-last: 2
|
||||
eqeqeq: [2, allow-null]
|
||||
indent: [2, 2, {SwitchCase: 1}]
|
||||
jsx-quotes: [2, prefer-double]
|
||||
no-bitwise: 0
|
||||
no-dupe-class-members: 2
|
||||
no-multi-spaces: 2
|
||||
no-restricted-syntax: [2, WithStatement]
|
||||
no-shadow: 2
|
||||
no-unused-expressions: 2
|
||||
no-unused-vars: [2, {args: none}]
|
||||
quotes: [2, single, avoid-escape]
|
||||
space-after-keywords: 2
|
||||
space-before-blocks: 2
|
||||
space-before-keywords: 2
|
||||
strict: [2, global]
|
||||
|
||||
# JSX
|
||||
# Our transforms set this automatically
|
||||
react/display-name: 0
|
||||
react/jsx-boolean-value: [2, always]
|
||||
react/jsx-no-undef: 2
|
||||
# We don't care to do this
|
||||
react/jsx-sort-prop-types: 0
|
||||
react/jsx-sort-props: 0
|
||||
react/jsx-uses-react: 2
|
||||
react/jsx-uses-vars: 2
|
||||
# It's easier to test some things this way
|
||||
react/no-did-mount-set-state: 0
|
||||
react/no-did-update-set-state: 0
|
||||
# We define multiple components in test files
|
||||
react/no-multi-comp: 0
|
||||
react/no-unknown-property: 2
|
||||
# This isn't useful in our test code
|
||||
react/prop-types: 0
|
||||
react/react-in-jsx-scope: 2
|
||||
react/self-closing-comp: 2
|
||||
# We don't care to do this
|
||||
react/sort-comp: 0
|
||||
react/wrap-multilines: [2, {declaration: false, assignment: false}]
|
||||
|
||||
# CUSTOM RULES
|
||||
# the second argument of warning/invariant should be a literal string
|
||||
react-internal/warning-and-invariant-args: 2
|
||||
@@ -0,0 +1,73 @@
|
||||
const OFF = 0;
|
||||
const WARNING = 1;
|
||||
const ERROR = 2;
|
||||
|
||||
module.exports = {
|
||||
parser: 'babel-eslint',
|
||||
|
||||
extends: './node_modules/fbjs-scripts/eslint/.eslintrc.js',
|
||||
|
||||
plugins: [
|
||||
'react',
|
||||
'react-internal',
|
||||
],
|
||||
|
||||
ecmaFeatures: {
|
||||
modules: false
|
||||
},
|
||||
|
||||
// We're stricter than the default config, mostly. We'll override a few rules
|
||||
// and then enable some React specific ones.
|
||||
rules: {
|
||||
'accessor-pairs': OFF,
|
||||
'brace-style': [ERROR, '1tbs'],
|
||||
'comma-dangle': [ERROR, 'always-multiline'],
|
||||
'consistent-return': ERROR,
|
||||
'dot-location': [ERROR, 'property'],
|
||||
'dot-notation': ERROR,
|
||||
'eol-last': ERROR,
|
||||
'eqeqeq': [ERROR, 'allow-null'],
|
||||
'indent': [ERROR, 2, {SwitchCase: 1}],
|
||||
'jsx-quotes': [ERROR, 'prefer-double'],
|
||||
'no-bitwise': OFF,
|
||||
'no-multi-spaces': ERROR,
|
||||
'no-restricted-syntax': [ERROR, 'WithStatement'],
|
||||
'no-shadow': ERROR,
|
||||
'no-unused-expressions': ERROR,
|
||||
'no-unused-vars': [ERROR, {args: 'none'}],
|
||||
'quotes': [ERROR, 'single', 'avoid-escape'],
|
||||
'space-after-keywords': ERROR,
|
||||
'space-before-blocks': ERROR,
|
||||
'space-before-function-paren': [ERROR, {anonymous: 'never', named: 'never'}],
|
||||
'space-before-keywords': ERROR,
|
||||
'strict': [ERROR, 'global'],
|
||||
|
||||
// React & JSX
|
||||
// Our transforms set this automatically
|
||||
'react/display-name': OFF,
|
||||
'react/jsx-boolean-value': [ERROR, 'always'],
|
||||
'react/jsx-no-undef': ERROR,
|
||||
// We don't care to do this
|
||||
'react/jsx-sort-prop-types': OFF,
|
||||
'react/jsx-sort-props': OFF,
|
||||
'react/jsx-uses-react': ERROR,
|
||||
'react/jsx-uses-vars': ERROR,
|
||||
// It's easier to test some things this way
|
||||
'react/no-did-mount-set-state': OFF,
|
||||
'react/no-did-update-set-state': OFF,
|
||||
// We define multiple components in test files
|
||||
'react/no-multi-comp': OFF,
|
||||
'react/no-unknown-property': OFF,
|
||||
// This isn't useful in our test code
|
||||
'react/prop-types': OFF,
|
||||
'react/react-in-jsx-scope': ERROR,
|
||||
'react/self-closing-comp': ERROR,
|
||||
// We don't care to do this
|
||||
'react/sort-comp': OFF,
|
||||
'react/wrap-multilines': [ERROR, {declaration: false, assignment: false}],
|
||||
|
||||
// CUSTOM RULES
|
||||
// the second argument of warning/invariant should be a literal string
|
||||
'react-internal/warning-and-invariant-args': ERROR,
|
||||
}
|
||||
};
|
||||
+2
-2
@@ -32,8 +32,8 @@
|
||||
"del": "^2.0.2",
|
||||
"derequire": "^2.0.3",
|
||||
"envify": "^3.0.0",
|
||||
"eslint": "1.9.0",
|
||||
"eslint-plugin-react": "3.8.0",
|
||||
"eslint": "1.10.3",
|
||||
"eslint-plugin-react": "4.1.0",
|
||||
"eslint-plugin-react-internal": "file:eslint-rules",
|
||||
"fbjs": "^0.6.1",
|
||||
"fbjs-scripts": "0.6.0-alpha.2",
|
||||
|
||||
@@ -86,11 +86,14 @@ describe('SyntheticEvent', function() {
|
||||
expect(syntheticEvent.type).toBe(null);
|
||||
expect(syntheticEvent.nativeEvent).toBe(null);
|
||||
expect(syntheticEvent.target).toBe(null);
|
||||
expect(console.error.calls.length).toBe(3); // once for each property accessed
|
||||
expect(console.error.argsForCall[0][0]).toBe( // assert the first warning for accessing `type`
|
||||
'Warning: This synthetic event is reused for performance reasons. If you\'re seeing this, ' +
|
||||
'you\'re accessing the property `type` on a released/nullified synthetic event. This is set to null. ' +
|
||||
'If you must keep the original synthetic event around, use event.persist(). ' +
|
||||
// once for each property accessed
|
||||
expect(console.error.calls.length).toBe(3);
|
||||
// assert the first warning for accessing `type`
|
||||
expect(console.error.argsForCall[0][0]).toBe(
|
||||
'Warning: This synthetic event is reused for performance reasons. If ' +
|
||||
'you\'re seeing this, you\'re accessing the property `type` on a ' +
|
||||
'released/nullified synthetic event. This is set to null. If you must ' +
|
||||
'keep the original synthetic event around, use event.persist(). ' +
|
||||
'See https://fb.me/react-event-pooling for more information.'
|
||||
);
|
||||
});
|
||||
@@ -103,10 +106,11 @@ describe('SyntheticEvent', function() {
|
||||
expect(syntheticEvent.type = 'MouseEvent').toBe('MouseEvent');
|
||||
expect(console.error.calls.length).toBe(1);
|
||||
expect(console.error.argsForCall[0][0]).toBe(
|
||||
'Warning: This synthetic event is reused for performance reasons. If you\'re seeing this, ' +
|
||||
'you\'re setting the property `type` on a released/nullified synthetic event. This is ' +
|
||||
'effectively a no-op. If you must keep the original synthetic event around, use ' +
|
||||
'event.persist(). See https://fb.me/react-event-pooling for more information.'
|
||||
'Warning: This synthetic event is reused for performance reasons. If ' +
|
||||
'you\'re seeing this, you\'re setting the property `type` on a ' +
|
||||
'released/nullified synthetic event. This is effectively a no-op. If you must ' +
|
||||
'keep the original synthetic event around, use event.persist(). ' +
|
||||
'See https://fb.me/react-event-pooling for more information.'
|
||||
);
|
||||
});
|
||||
|
||||
@@ -117,10 +121,11 @@ describe('SyntheticEvent', function() {
|
||||
syntheticEvent.preventDefault();
|
||||
expect(console.error.calls.length).toBe(1);
|
||||
expect(console.error.argsForCall[0][0]).toBe(
|
||||
'Warning: This synthetic event is reused for performance reasons. If you\'re seeing this, ' +
|
||||
'you\'re accessing the method `preventDefault` on a released/nullified synthetic event. ' +
|
||||
'This is a no-op function. If you must keep the original synthetic event around, ' +
|
||||
'use event.persist(). See https://fb.me/react-event-pooling for more information.'
|
||||
'Warning: This synthetic event is reused for performance reasons. If ' +
|
||||
'you\'re seeing this, you\'re accessing the method `preventDefault` on a ' +
|
||||
'released/nullified synthetic event. This is a no-op function. If you must ' +
|
||||
'keep the original synthetic event around, use event.persist(). ' +
|
||||
'See https://fb.me/react-event-pooling for more information.'
|
||||
);
|
||||
});
|
||||
|
||||
@@ -131,10 +136,11 @@ describe('SyntheticEvent', function() {
|
||||
syntheticEvent.stopPropagation();
|
||||
expect(console.error.calls.length).toBe(1);
|
||||
expect(console.error.argsForCall[0][0]).toBe(
|
||||
'Warning: This synthetic event is reused for performance reasons. If you\'re seeing this, ' +
|
||||
'you\'re accessing the method `stopPropagation` on a released/nullified synthetic event. ' +
|
||||
'This is a no-op function. If you must keep the original synthetic event around, ' +
|
||||
'use event.persist(). See https://fb.me/react-event-pooling for more information.'
|
||||
'Warning: This synthetic event is reused for performance reasons. If ' +
|
||||
'you\'re seeing this, you\'re accessing the method `stopPropagation` on a ' +
|
||||
'released/nullified synthetic event. This is a no-op function. If you must ' +
|
||||
'keep the original synthetic event around, use event.persist(). ' +
|
||||
'See https://fb.me/react-event-pooling for more information.'
|
||||
);
|
||||
});
|
||||
|
||||
@@ -154,9 +160,10 @@ describe('SyntheticEvent', function() {
|
||||
|
||||
expect(console.error.calls.length).toBe(1);
|
||||
expect(console.error.argsForCall[0][0]).toBe(
|
||||
'Warning: This synthetic event is reused for performance reasons. If you\'re seeing this, ' +
|
||||
'you\'re accessing the property `nativeEvent` on a released/nullified synthetic event. ' +
|
||||
'This is set to null. If you must keep the original synthetic event around, use event.persist(). ' +
|
||||
'Warning: This synthetic event is reused for performance reasons. If ' +
|
||||
'you\'re seeing this, you\'re accessing the property `nativeEvent` on a ' +
|
||||
'released/nullified synthetic event. This is set to null. If you must ' +
|
||||
'keep the original synthetic event around, use event.persist(). ' +
|
||||
'See https://fb.me/react-event-pooling for more information.'
|
||||
);
|
||||
});
|
||||
@@ -170,9 +177,10 @@ describe('SyntheticEvent', function() {
|
||||
if (typeof Proxy === 'function') {
|
||||
expect(console.error.calls.length).toBe(1);
|
||||
expect(console.error.argsForCall[0][0]).toBe(
|
||||
'Warning: This synthetic event is reused for performance reasons. If you\'re ' +
|
||||
'seeing this, you\'re adding a new property in the synthetic event object. ' +
|
||||
'The property is never released. See https://fb.me/react-event-pooling for more information.'
|
||||
'Warning: This synthetic event is reused for performance reasons. If ' +
|
||||
'you\'re seeing this, you\'re adding a new property in the synthetic ' +
|
||||
'event object. The property is never released. ' +
|
||||
'See https://fb.me/react-event-pooling for more information.'
|
||||
);
|
||||
} else {
|
||||
expect(console.error.calls.length).toBe(0);
|
||||
|
||||
@@ -18,8 +18,9 @@ var ReactPerf = require('ReactPerf');
|
||||
var quoteAttributeValueForBrowser = require('quoteAttributeValueForBrowser');
|
||||
var warning = require('warning');
|
||||
|
||||
var VALID_ATTRIBUTE_NAME_REGEX = new RegExp('^[' + DOMProperty.ATTRIBUTE_NAME_START_CHAR +
|
||||
'][' + DOMProperty.ATTRIBUTE_NAME_CHAR + ']*$');
|
||||
var VALID_ATTRIBUTE_NAME_REGEX = new RegExp(
|
||||
'^[' + DOMProperty.ATTRIBUTE_NAME_START_CHAR + '][' + DOMProperty.ATTRIBUTE_NAME_CHAR + ']*$'
|
||||
);
|
||||
var illegalAttributeNameCache = {};
|
||||
var validatedAttributeNameCache = {};
|
||||
|
||||
|
||||
@@ -206,8 +206,7 @@ describe('ReactTestUtils', function() {
|
||||
ref={() => {}}
|
||||
onClick={this.handleUserClick}
|
||||
className={this.state.clicked ? 'clicked' : ''}
|
||||
>
|
||||
</div>
|
||||
/>
|
||||
);
|
||||
},
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user