Remove differences from eslint-config-defaults

Author: taion

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

@@ -4,7 +4,7 @@ module.exports = {
     'react'
   ],
   'ecmaFeatures': {
-    'jsx': false
+    'jsx': true
   },
   'rules': {
     // Prevent missing displayName in a React component definition
@@ -48,26 +48,10 @@ module.exports = {
     // Enforce component methods order
     'react/sort-comp': [2, {
       'order': [
-        'displayName',
-        'propTypes',
-        'contextTypes',
-        'childContextTypes',
-        'mixins',
-        'statics',
-        'defaultProps',
-        'constructor',
-        'getDefaultProps',
-        'getInitialState',
-        'getChildContext',
-        'componentWillMount',
-        'componentDidMount',
-        'componentWillReceiveProps',
-        'shouldComponentUpdate',
-        'componentWillUpdate',
-        'componentDidUpdate',
-        'componentWillUnmount',
+        'lifecycle',
         '/^on.+$/',
-        '/^get.+$/',
+        '/^(get|set)(?!(InitialState$|DefaultProps$|ChildContext$)).+$/',
+        'everything-else',
         '/^render.+$/',
         'render'
       ]

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

@@ -21,7 +21,7 @@ module.exports = {
     // enforces use of function declarations or expressions
     'func-style': 0,
     // this option enforces minimum and maximum identifier lengths (variable names, property names etc.)
-    'id-length': 0,
+    'id-length': [2, {'min': 2, 'properties': 'never'}],
     // this option sets a specific tab width for your code
     'indent': [2, 2],
     // enforces spacing between keys and values in object literal properties

packages/eslint-config-airbnb/test/.eslintrc

@@ -2,6 +2,8 @@
   "rules": {
     // disabled because I find it tedious to write tests while following this
     // rule
-    "no-shadow": 0
+    "no-shadow": 0,
+    // tests uses `t` for tape
+    "id-length": [2, {"min": 2, "properties": "never", "exceptions": ["t"]}]
   }
 }

packages/eslint-config-airbnb/test/test-react-order.js

@@ -37,13 +37,13 @@ test('validate react prop order', t => {
   t.test('passes a good component', t => {
     t.plan(3);
     const result = lint(wrapComponent(`
-  componentWillMount() {  }
-  componentDidMount() {  }
-  setFoo() {  }
-  getFoo() {  }
-  setBar() {  }
-  someMethod() {  }
-  renderDogs() {  }
+  componentWillMount() {}
+  componentDidMount() {}
+  setFoo() {}
+  getFoo() {}
+  setBar() {}
+  someMethod() {}
+  renderDogs() {}
   render() { return <div />; }
 `));
 
@@ -55,13 +55,13 @@ test('validate react prop order', t => {
   t.test('order: when random method is first', t => {
     t.plan(2);
     const result = lint(wrapComponent(`
-  someMethod() {  }
-  componentWillMount() {  }
-  componentDidMount() {  }
-  setFoo() {  }
-  getFoo() {  }
-  setBar() {  }
-  renderDogs() {  }
+  someMethod() {}
+  componentWillMount() {}
+  componentDidMount() {}
+  setFoo() {}
+  getFoo() {}
+  setBar() {}
+  renderDogs() {}
   render() { return <div />; }
 `));
 
@@ -72,13 +72,13 @@ test('validate react prop order', t => {
   t.test('order: when random method after lifecycle methods', t => {
     t.plan(2);
     const result = lint(wrapComponent(`
-  componentWillMount() {  }
-  componentDidMount() {  }
-  someMethod() {  }
-  setFoo() {  }
-  getFoo() {  }
-  setBar() {  }
-  renderDogs() {  }
+  componentWillMount() {}
+  componentDidMount() {}
+  someMethod() {}
+  setFoo() {}
+  getFoo() {}
+  setBar() {}
+  renderDogs() {}
   render() { return <div />; }
 `));