Merge pull request #9101 from sebmarkbage/prettier

Use Prettier

.eslintrc.js

@@ -23,7 +23,7 @@ module.exports = {
     'dot-notation': ERROR,
     'eol-last': ERROR,
     'eqeqeq': [ERROR, 'allow-null'],
-    'indent': [ERROR, 2, {SwitchCase: 1}],
+    'indent': OFF,
     'jsx-quotes': [ERROR, 'prefer-double'],
     'keyword-spacing': [ERROR, {after: true, before: true}],
     'no-bitwise': OFF,
@@ -33,9 +33,10 @@ module.exports = {
     'no-shadow': ERROR,
     'no-unused-expressions': ERROR,
     'no-unused-vars': [ERROR, {args: 'none'}],
+    'no-useless-concat': OFF,
     'quotes': [ERROR, 'single', {avoidEscape: true, allowTemplateLiterals: true }],
     'space-before-blocks': ERROR,
-    'space-before-function-paren': [ERROR, {anonymous: 'never', named: 'never'}],
+    'space-before-function-paren': OFF,
 
     // React & JSX
     // Our transforms set this automatically

package.json

@@ -71,6 +71,7 @@
     "merge-stream": "^1.0.0",
     "object-assign": "^4.1.1",
     "platform": "^1.1.0",
+    "prettier": "^0.22.0",
     "run-sequence": "^1.1.4",
     "through2": "^2.0.0",
     "tmp": "~0.0.28",
@@ -92,7 +93,8 @@
     "lint": "grunt lint",
     "postinstall": "node node_modules/fbjs-scripts/node/check-dev-engines.js package.json",
     "test": "jest",
-    "flow": "flow"
+    "flow": "flow",
+    "prettier": "prettier --write --no-bracket-spacing --single-quote --jsx-bracket-same-line --trailing-comma all --print-width 80 \"src/**/!(third_party)/*.js\""
   },
   "jest": {
     "modulePathIgnorePatterns": [

src/__mocks__/InitializeCore.js

@@ -12,3 +12,4 @@
 // Noop
 
 // TODO #10932517: Move all initialization callers back into react-native
+

src/__mocks__/deepDiffer.js

@@ -16,15 +16,15 @@ var deepDiffer = function(one: any, two: any): boolean {
     // Short circuit on identical object references instead of traversing them.
     return false;
   }
-  if ((typeof one === 'function') && (typeof two === 'function')) {
+  if (typeof one === 'function' && typeof two === 'function') {
     // We consider all functions equal
     return false;
   }
-  if ((typeof one !== 'object') || (one === null)) {
+  if (typeof one !== 'object' || one === null) {
     // Primitives can be directly compared
     return one !== two;
   }
-  if ((typeof two !== 'object') || (two === null)) {
+  if (typeof two !== 'object' || two === null) {
     // We know they are different because the previous case would have triggered
     // otherwise.
     return true;

src/__mocks__/deepFreezeAndThrowOnMutationInDev.js

@@ -11,6 +11,6 @@
 
 // TODO: move into react or fbjs
 
-var deepFreezeAndThrowOnMutationInDev = function() { };
+var deepFreezeAndThrowOnMutationInDev = function() {};
 
 module.exports = deepFreezeAndThrowOnMutationInDev;

src/__mocks__/flattenStyle.js

@@ -11,6 +11,6 @@
 
 // TODO: Move flattenStyle into react
 
-var flattenStyle = function() { };
+var flattenStyle = function() {};
 
 module.exports = flattenStyle;

src/addons/ReactFragment.js

@@ -41,23 +41,23 @@ var ReactFragment = {
       warning(
         false,
         'React.addons.createFragment only accepts a single object. Got: %s',
-        object
+        object,
       );
       return object;
     }
     if (ReactElement.isValidElement(object)) {
       warning(
         false,
         'React.addons.createFragment does not accept a ReactElement ' +
-        'without a wrapper object.'
+          'without a wrapper object.',
       );
       return object;
     }
 
     invariant(
       object.nodeType !== 1,
       'React.addons.createFragment(...): Encountered an invalid child; DOM ' +
-      'elements are not valid children of React components.'
+        'elements are not valid children of React components.',
     );
 
     var result = [];
@@ -68,7 +68,7 @@ var ReactFragment = {
           warning(
             false,
             'React.addons.createFragment(...): Child objects should have ' +
-            'non-numeric keys so ordering is preserved.'
+              'non-numeric keys so ordering is preserved.',
           );
           warnedAboutNumeric = true;
         }
@@ -77,7 +77,7 @@ var ReactFragment = {
         object[key],
         result,
         key,
-        emptyFunction.thatReturnsArgument
+        emptyFunction.thatReturnsArgument,
       );
     }
 

src/addons/ReactWithAddons.js

@@ -13,8 +13,7 @@
 
 var React = require('react');
 var ReactAddonsDOMDependencies = require('ReactAddonsDOMDependencies');
-var ReactComponentWithPureRenderMixin =
-  require('ReactComponentWithPureRenderMixin');
+var ReactComponentWithPureRenderMixin = require('ReactComponentWithPureRenderMixin');
 var ReactCSSTransitionGroup = require('ReactCSSTransitionGroup');
 var ReactFragment = require('ReactFragment');
 var ReactTransitionGroup = require('ReactTransitionGroup');

src/addons/__tests__/ReactComponentWithPureRenderMixin-test.js

@@ -16,11 +16,9 @@ var ReactComponentWithPureRenderMixin;
 var ReactTestUtils;
 
 describe('ReactComponentWithPureRenderMixin', () => {
-
   beforeEach(() => {
     React = require('react');
-    ReactComponentWithPureRenderMixin =
-      require('ReactComponentWithPureRenderMixin');
+    ReactComponentWithPureRenderMixin = require('ReactComponentWithPureRenderMixin');
     ReactTestUtils = require('ReactTestUtils');
   });
 
@@ -35,12 +33,7 @@ describe('ReactComponentWithPureRenderMixin', () => {
       }
 
       render() {
-        return (
-          <Apple
-            color={this.state.color}
-            ref="apple"
-          />
-        );
+        return <Apple color={this.state.color} ref="apple" />;
       }
     }
 
@@ -141,5 +134,4 @@ describe('ReactComponentWithPureRenderMixin', () => {
     instance.setState(getInitialState());
     expect(renderCalls).toBe(3);
   });
-
 });

src/addons/__tests__/ReactFragment-test.js

@@ -16,7 +16,6 @@ var ReactDOM;
 var ReactFragment;
 
 describe('ReactFragment', () => {
-
   beforeEach(() => {
     React = require('react');
     ReactDOM = require('react-dom');
@@ -33,9 +32,9 @@ describe('ReactFragment', () => {
     var container = document.createElement('div');
     expect(() => ReactDOM.render(element, container)).toThrowError(
       'Objects are not valid as a React child (found: object with keys ' +
-      '{x, y, z}). If you meant to render a collection of children, use an ' +
-      'array instead or wrap the object using createFragment(object) from ' +
-      'the React add-ons.'
+        '{x, y, z}). If you meant to render a collection of children, use an ' +
+        'array instead or wrap the object using createFragment(object) from ' +
+        'the React add-ons.',
     );
   });
 
@@ -53,9 +52,9 @@ describe('ReactFragment', () => {
     var container = document.createElement('div');
     expect(() => ReactDOM.render(<Foo />, container)).toThrowError(
       'Objects are not valid as a React child (found: object with keys ' +
-      '{a, b, c}). If you meant to render a collection of children, use an ' +
-      'array instead or wrap the object using createFragment(object) from ' +
-      'the React add-ons.\n\nCheck the render method of `Foo`.'
+        '{a, b, c}). If you meant to render a collection of children, use an ' +
+        'array instead or wrap the object using createFragment(object) from ' +
+        'the React add-ons.\n\nCheck the render method of `Foo`.',
     );
   });
 
@@ -66,7 +65,7 @@ describe('ReactFragment', () => {
 
     expectDev(console.error.calls.count()).toBe(1);
     expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'Child objects should have non-numeric keys so ordering is preserved.'
+      'Child objects should have non-numeric keys so ordering is preserved.',
     );
   });
 
@@ -75,7 +74,7 @@ describe('ReactFragment', () => {
     ReactFragment.create(null);
     expectDev(console.error.calls.count()).toBe(1);
     expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'React.addons.createFragment only accepts a single object.'
+      'React.addons.createFragment only accepts a single object.',
     );
   });
 
@@ -84,7 +83,7 @@ describe('ReactFragment', () => {
     ReactFragment.create([]);
     expectDev(console.error.calls.count()).toBe(1);
     expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'React.addons.createFragment only accepts a single object.'
+      'React.addons.createFragment only accepts a single object.',
     );
   });
 
@@ -94,8 +93,7 @@ describe('ReactFragment', () => {
     expectDev(console.error.calls.count()).toBe(1);
     expectDev(console.error.calls.argsFor(0)[0]).toContain(
       'React.addons.createFragment does not accept a ReactElement without a ' +
-      'wrapper object.'
+        'wrapper object.',
     );
   });
-
 });

src/addons/__tests__/renderSubtreeIntoContainer-test.js

@@ -17,7 +17,6 @@ var ReactTestUtils = require('ReactTestUtils');
 var renderSubtreeIntoContainer = require('renderSubtreeIntoContainer');
 
 describe('renderSubtreeIntoContainer', () => {
-
   it('should pass context when rendering subtree elsewhere', () => {
     var portal = document.createElement('div');
 
@@ -47,9 +46,11 @@ describe('renderSubtreeIntoContainer', () => {
       }
 
       componentDidMount() {
-        expect(function() {
-          renderSubtreeIntoContainer(this, <Component />, portal);
-        }.bind(this)).not.toThrow();
+        expect(
+          function() {
+            renderSubtreeIntoContainer(this, <Component />, portal);
+          }.bind(this),
+        ).not.toThrow();
       }
     }
 
@@ -296,5 +297,4 @@ describe('renderSubtreeIntoContainer', () => {
     ReactDOM.render(<Parent value="foo" />, container);
     expect(portal2.textContent).toBe('foo');
   });
-
 });