{"files":[{"status":"M","path":".eslintrc"},{"status":"M","path":"grunt\/config\/browserify.js"},{"status":"M","path":"packages\/react-codemod\/transforms\/class.js"},{"status":"M","path":"packages\/react-codemod\/transforms\/utils\/ReactUtils.js"},{"status":"M","path":"src\/addons\/__tests__\/renderSubtreeIntoContainer.js"},{"status":"M","path":"src\/isomorphic\/classic\/class\/__tests__\/ReactBindOptout-test.js"},{"status":"M","path":"src\/isomorphic\/classic\/element\/__tests__\/ReactElement-test.js"},{"status":"M","path":"src\/isomorphic\/classic\/element\/__tests__\/ReactElementValidator-test.js"},{"status":"M","path":"src\/isomorphic\/modern\/element\/__tests__\/ReactJSXElement-test.js"},{"status":"M","path":"src\/isomorphic\/modern\/element\/__tests__\/ReactJSXElementValidator-test.js"},{"status":"M","path":"src\/renderers\/dom\/client\/__tests__\/ReactMount-test.js"},{"status":"M","path":"src\/renderers\/dom\/client\/wrappers\/LinkedValueUtils.js"},{"status":"M","path":"src\/renderers\/shared\/event\/eventPlugins\/__tests__\/ResponderEventPlugin-test.js"},{"status":"M","path":"src\/renderers\/shared\/reconciler\/__tests__\/ReactComponent-test.js"},{"status":"M","path":"src\/renderers\/shared\/reconciler\/__tests__\/ReactComponentLifeCycle-test.js"},{"status":"M","path":"src\/renderers\/shared\/reconciler\/__tests__\/ReactMultiChildReconcile-test.js"},{"status":"M","path":"src\/shared\/utils\/__tests__\/adler32-test.js"},{"status":"M","path":"src\/shared\/utils\/traverseAllChildren.js"}],"body":"Use eslintrc from fbjs","parents":["2d63dfd73c5258e683d394d9ea0b922be21c65d8","7645c077200ab34ee403f43987479bf1d2a365c0"],"patch":"diff --git a\/.eslintrc b\/.eslintrc\nindex 2d7db17147..c5e2030bdb 100644\n--- a\/.eslintrc\n+++ b\/.eslintrc\n@@ -1,76 +1,33 @@\n ---\n parser: babel-eslint\n \n+extends:\n+ - .\/node_modules\/fbjs-scripts\/eslint\/.eslintrc\n+\n plugins:\n - react\n - react-internal\n \n-env:\n- browser: true\n- node: true\n-\n-globals:\n- __DEV__: true\n- # Jest \/ Jasmine\n- describe: false\n- xdescribe: false\n- beforeEach: false\n- afterEach: false\n- it: false\n- xit: false\n- jest: false\n- pit: false\n- expect: false\n- spyOn: false\n- jasmine: false\n-\n+# We're stricter than the default config, mostly. We'll override a few rules and\n+# then enable some React specific ones.\n rules:\n- # ERRORS\n- space-before-blocks: 2\n- indent: [2, 2, {SwitchCase: 1}]\n- brace-style: 2\n- space-after-keywords: 2\n- strict: [2, global]\n+ accessor-pairs: 0\n+ brace-style: [2, 1tbs]\n comma-dangle: [2, always-multiline]\n- # Make this a warning for now. We do this in a few places so we might need to\n- # disable\n- no-unused-expressions: 2\n- eol-last: 2\n- dot-notation: 2\n- dot-location: [2, property]\n consistent-return: 2\n- no-unused-vars: [2, args: none]\n- quotes: [2, single, avoid-escape]\n- no-shadow: 2\n+ dot-location: [2, property]\n+ dot-notation: 2\n+ eol-last: 2\n+ indent: [2, 2, {SwitchCase: 1}]\n+ no-bitwise: 0\n no-multi-spaces: 2\n- no-undef: 2\n-\n- # WISHLIST. One day...\n- # We'll need a custom version of this that does a subset of the whole rule.\n- # Otherwise this is just too noisy.\n- # valid-jsdoc: 1\n- # Ideally, we could just warn when *new* lines are added that exceed 80 chars\n- # while not warning about existing ones (often URLs, etc. which are\n- # necessarily long), but we don't have a good way to do so.\n- # max-len: [0, 80]\n-\n- # DISABLED. These aren't compatible with our style\n- # We use this for private\/internal variables\n- no-underscore-dangle: 0\n- # We pass constructors around \/ access them from members\n- new-cap: 0\n- # We do this a lot.\n- no-use-before-define: 0\n- # We do this in a few places to align values\n- key-spacing: 0\n- # It's nice to be able to leave catch blocks empty\n- no-empty: 0\n- # It makes code more readable to make this explicit sometimes\n- no-undef-init: 0\n-\n- # BROKEN. We'd like to turn these back on.\n- # causes a ton of noise, eslint is too picky?\n- block-scoped-var: 0\n+ no-shadow: 2\n+ no-unused-expressions: 2\n+ no-unused-vars: [2, {args: none}]\n+ quotes: [2, single, avoid-escape]\n+ space-after-keywords: 2\n+ space-before-blocks: 2\n+ strict: [2, global]\n \n # JSX\n # Our transforms set this automatically\ndiff --git a\/grunt\/config\/browserify.js b\/grunt\/config\/browserify.js\nindex 59c9fe7bd1..ac84b9beb8 100644\n--- a\/grunt\/config\/browserify.js\n+++ b\/grunt\/config\/browserify.js\n@@ -80,7 +80,7 @@ var min = {\n \/\/ No need to derequire because the minifier will mangle\n \/\/ the \"require\" calls.\n \n- after: [\/*derequire,*\/ minify, bannerify],\n+ after: [minify, bannerify],\n };\n \n var transformer = {\n@@ -126,7 +126,7 @@ var addonsMin = {\n \/\/ No need to derequire because the minifier will mangle\n \/\/ the \"require\" calls.\n \n- after: [\/*derequire,*\/ minify, bannerify],\n+ after: [minify, bannerify],\n };\n \n module.exports = {\ndiff --git a\/packages\/react-codemod\/transforms\/class.js b\/packages\/react-codemod\/transforms\/class.js\nindex 79dd8801cd..f300cd6e3b 100644\n--- a\/packages\/react-codemod\/transforms\/class.js\n+++ b\/packages\/react-codemod\/transforms\/class.js\n@@ -521,4 +521,4 @@ module.exports = (file, api, options) => {\n }\n \n return null;\n-}\n+};\ndiff --git a\/packages\/react-codemod\/transforms\/utils\/ReactUtils.js b\/packages\/react-codemod\/transforms\/utils\/ReactUtils.js\nindex b08f5f19b2..7dab7ca4e7 100644\n--- a\/packages\/react-codemod\/transforms\/utils\/ReactUtils.js\n+++ b\/packages\/react-codemod\/transforms\/utils\/ReactUtils.js\n@@ -36,7 +36,7 @@ module.exports = function(j) {\n },\n })\n .filter(declarator => declarator.value.source.value === module)\n- .size() === 1\n+ .size() === 1;\n \n const hasReact = path => (\n hasModule(path, 'React') ||\ndiff --git a\/src\/addons\/__tests__\/renderSubtreeIntoContainer.js b\/src\/addons\/__tests__\/renderSubtreeIntoContainer.js\nindex c66d170152..8f5228d3fa 100644\n--- a\/src\/addons\/__tests__\/renderSubtreeIntoContainer.js\n+++ b\/src\/addons\/__tests__\/renderSubtreeIntoContainer.js\n@@ -17,7 +17,7 @@ var renderSubtreeIntoContainer = require('renderSubtreeIntoContainer');\n \n describe('renderSubtreeIntoContainer', function() {\n \n- it('should pass context when rendering subtree elsewhere', function () {\n+ it('should pass context when rendering subtree elsewhere', function() {\n \n var portal = document.createElement('div');\n \n@@ -57,7 +57,7 @@ describe('renderSubtreeIntoContainer', function() {\n expect(portal.firstChild.innerHTML).toBe('bar');\n });\n \n- it('should throw if parentComponent is invalid', function () {\n+ it('should throw if parentComponent is invalid', function() {\n var portal = document.createElement('div');\n \n var Component = React.createClass({\ndiff --git a\/src\/isomorphic\/classic\/class\/__tests__\/ReactBindOptout-test.js b\/src\/isomorphic\/classic\/class\/__tests__\/ReactBindOptout-test.js\nindex cf410eb4e9..cb416258bc 100644\n--- a\/src\/isomorphic\/classic\/class\/__tests__\/ReactBindOptout-test.js\n+++ b\/src\/isomorphic\/classic\/class\/__tests__\/ReactBindOptout-test.js\n@@ -83,7 +83,7 @@ describe('autobind optout', function() {\n });\n \n it('should not hold reference to instance', function() {\n- var mouseDidClick = function () {\n+ var mouseDidClick = function() {\n void this.state.something;\n };\n \n@@ -129,11 +129,11 @@ describe('autobind optout', function() {\n \n expect(mountedInstance1.onClick).toBe(mountedInstance2.onClick);\n \n- expect(function () {\n+ expect(function() {\n ReactTestUtils.Simulate.click(rendered1);\n }).toThrow();\n \n- expect(function () {\n+ expect(function() {\n ReactTestUtils.Simulate.click(rendered2);\n }).toThrow();\n });\ndiff --git a\/src\/isomorphic\/classic\/element\/__tests__\/ReactElement-test.js b\/src\/isomorphic\/classic\/element\/__tests__\/ReactElement-test.js\nindex 433e4c8021..f7f8114ede 100644\n--- a\/src\/isomorphic\/classic\/element\/__tests__\/ReactElement-test.js\n+++ b\/src\/isomorphic\/classic\/element\/__tests__\/ReactElement-test.js\n@@ -142,7 +142,9 @@ describe('ReactElement', function() {\n \n it('merges rest arguments onto the children prop in an array', function() {\n spyOn(console, 'error');\n- var a = 1, b = 2, c = 3;\n+ var a = 1;\n+ var b = 2;\n+ var c = 3;\n var element = React.createFactory(ComponentClass)(null, a, b, c);\n expect(element.props.children).toEqual([1, 2, 3]);\n expect(console.error.argsForCall.length).toBe(0);\ndiff --git a\/src\/isomorphic\/classic\/element\/__tests__\/ReactElementValidator-test.js b\/src\/isomorphic\/classic\/element\/__tests__\/ReactElementValidator-test.js\nindex 480d87c494..4bcb4085fc 100644\n--- a\/src\/isomorphic\/classic\/element\/__tests__\/ReactElementValidator-test.js\n+++ b\/src\/isomorphic\/classic\/element\/__tests__\/ReactElementValidator-test.js\n@@ -212,7 +212,7 @@ describe('ReactElementValidator', function() {\n spyOn(console, 'error');\n var Component = React.createFactory(ComponentClass);\n \n- Component(null, [ {}, {} ]);\n+ Component(null, [{}, {}]);\n \n expect(console.error.argsForCall.length).toBe(0);\n });\ndiff --git a\/src\/isomorphic\/modern\/element\/__tests__\/ReactJSXElement-test.js b\/src\/isomorphic\/modern\/element\/__tests__\/ReactJSXElement-test.js\nindex ab7a105f37..21348a241a 100644\n--- a\/src\/isomorphic\/modern\/element\/__tests__\/ReactJSXElement-test.js\n+++ b\/src\/isomorphic\/modern\/element\/__tests__\/ReactJSXElement-test.js\n@@ -119,7 +119,9 @@ describe('ReactJSXElement', function() {\n \n it('merges JSX children onto the children prop in an array', function() {\n spyOn(console, 'error');\n- var a = 1, b = 2, c = 3;\n+ var a = 1;\n+ var b = 2;\n+ var c = 3;\n var element = {a}{b}{c}<\/Component>;\n expect(element.props.children).toEqual([1, 2, 3]);\n expect(console.error.argsForCall.length).toBe(0);\ndiff --git a\/src\/isomorphic\/modern\/element\/__tests__\/ReactJSXElementValidator-test.js b\/src\/isomorphic\/modern\/element\/__tests__\/ReactJSXElementValidator-test.js\nindex 97b86d4902..bb4e01a595 100644\n--- a\/src\/isomorphic\/modern\/element\/__tests__\/ReactJSXElementValidator-test.js\n+++ b\/src\/isomorphic\/modern\/element\/__tests__\/ReactJSXElementValidator-test.js\n@@ -168,7 +168,7 @@ describe('ReactJSXElementValidator', function() {\n it('does not warn when the child array contains non-elements', function() {\n spyOn(console, 'error');\n \n- void {[ {}, {} ]}<\/Component>;\n+ void {[{}, {}]}<\/Component>;\n \n expect(console.error.argsForCall.length).toBe(0);\n });\ndiff --git a\/src\/renderers\/dom\/client\/__tests__\/ReactMount-test.js b\/src\/renderers\/dom\/client\/__tests__\/ReactMount-test.js\nindex 83b647d2ca..c698d53841 100644\n--- a\/src\/renderers\/dom\/client\/__tests__\/ReactMount-test.js\n+++ b\/src\/renderers\/dom\/client\/__tests__\/ReactMount-test.js\n@@ -145,7 +145,7 @@ describe('ReactMount', function() {\n expect(console.error.calls.length).toBe(0);\n });\n \n- it('should warn when mounting into document.body', function () {\n+ it('should warn when mounting into document.body', function() {\n var iFrame = document.createElement('iframe');\n document.body.appendChild(iFrame);\n spyOn(console, 'error');\n@@ -158,7 +158,7 @@ describe('ReactMount', function() {\n );\n });\n \n- it('should account for escaping on a checksum mismatch', function () {\n+ it('should account for escaping on a checksum mismatch', function() {\n var div = document.createElement('div');\n var markup = ReactDOMServer.renderToString(\n

This markup contains an nbsp entity: server text<\/div>);\ndiff --git a\/src\/renderers\/dom\/client\/wrappers\/LinkedValueUtils.js b\/src\/renderers\/dom\/client\/wrappers\/LinkedValueUtils.js\nindex 49b746e107..a77e62a514 100644\n--- a\/src\/renderers\/dom\/client\/wrappers\/LinkedValueUtils.js\n+++ b\/src\/renderers\/dom\/client\/wrappers\/LinkedValueUtils.js\n@@ -103,7 +103,7 @@ function getDeclarationErrorAddendum(owner) {\n * this outside of the ReactDOM controlled form components.\n *\/\n var LinkedValueUtils = {\n- checkPropTypes: function (tagName, props, owner) {\n+ checkPropTypes: function(tagName, props, owner) {\n for (var propName in propTypes) {\n if (propTypes.hasOwnProperty(propName)) {\n var error = propTypes[propName](\ndiff --git a\/src\/renderers\/shared\/event\/eventPlugins\/__tests__\/ResponderEventPlugin-test.js b\/src\/renderers\/shared\/event\/eventPlugins\/__tests__\/ResponderEventPlugin-test.js\nindex 42bda43818..25c5e49ecc 100644\n--- a\/src\/renderers\/shared\/event\/eventPlugins\/__tests__\/ResponderEventPlugin-test.js\n+++ b\/src\/renderers\/shared\/event\/eventPlugins\/__tests__\/ResponderEventPlugin-test.js\n@@ -216,7 +216,7 @@ var oneEventLoopTestConfig = function(readableIDToID) {\n *\/\n var registerTestHandlers = function(eventTestConfig, readableIDToID) {\n var runs = {dispatchCount: 0};\n- var neverFire = function (readableID, registrationName) {\n+ var neverFire = function(readableID, registrationName) {\n runs.dispatchCount++;\n expect('').toBe(\n 'Event type: ' + registrationName +\ndiff --git a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactComponent-test.js b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactComponent-test.js\nindex 96d8d43f22..09aa26af65 100644\n--- a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactComponent-test.js\n+++ b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactComponent-test.js\n@@ -51,7 +51,8 @@ describe('ReactComponent', function() {\n });\n \n it('should support refs on owned components', function() {\n- var innerObj = {}, outerObj = {};\n+ var innerObj = {};\n+ var outerObj = {};\n \n var Wrapper = React.createClass({\n \n@@ -101,7 +102,8 @@ describe('ReactComponent', function() {\n });\n \n it('should support new-style refs', function() {\n- var innerObj = {}, outerObj = {};\n+ var innerObj = {};\n+ var outerObj = {};\n \n var Wrapper = React.createClass({\n getObject: function() {\ndiff --git a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactComponentLifeCycle-test.js b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactComponentLifeCycle-test.js\nindex 1e574bbad1..0eb6687562 100644\n--- a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactComponentLifeCycle-test.js\n+++ b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactComponentLifeCycle-test.js\n@@ -285,7 +285,7 @@ describe('ReactComponentLifeCycle', function() {\n );\n });\n \n- it('isMounted should return false when unmounted', function () {\n+ it('isMounted should return false when unmounted', function() {\n var Component = React.createClass({\n render: function() {\n return ;\ndiff --git a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactMultiChildReconcile-test.js b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactMultiChildReconcile-test.js\nindex c1bc3f59f9..bc61e9a638 100644\n--- a\/src\/renderers\/shared\/reconciler\/__tests__\/ReactMultiChildReconcile-test.js\n+++ b\/src\/renderers\/shared\/reconciler\/__tests__\/ReactMultiChildReconcile-test.js\n@@ -283,7 +283,7 @@ describe('ReactMultiChildReconcile', function() {\n bob: 'bobStatus',\n };\n \n- testPropsSequence([ {usernameToStatus: usernameToStatus} ]);\n+ testPropsSequence([{usernameToStatus: usernameToStatus}]);\n });\n \n it('should preserve order if children order has not changed', function() {\ndiff --git a\/src\/shared\/utils\/__tests__\/adler32-test.js b\/src\/shared\/utils\/__tests__\/adler32-test.js\nindex c7cbb9fa17..8df2427cce 100644\n--- a\/src\/shared\/utils\/__tests__\/adler32-test.js\n+++ b\/src\/shared\/utils\/__tests__\/adler32-test.js\n@@ -29,7 +29,7 @@ describe('adler32', function() {\n it('doesn\\'t barf on large inputs', function() {\n var str = '';\n for (var i = 0; i < 100000; i++) {\n- str = str + 'This will be repeated to be very large indeed. ';\n+ str += 'This will be repeated to be very large indeed. ';\n }\n expect(adler32(str)).toBe(692898118);\n });\ndiff --git a\/src\/shared\/utils\/traverseAllChildren.js b\/src\/shared\/utils\/traverseAllChildren.js\nindex 55eb2a0fc7..011f7a094a 100644\n--- a\/src\/shared\/utils\/traverseAllChildren.js\n+++ b\/src\/shared\/utils\/traverseAllChildren.js\n@@ -184,7 +184,7 @@ function traverseAllChildrenImpl(\n if (ReactCurrentOwner.current) {\n var name = ReactCurrentOwner.current.getName();\n if (name) {\n- addendum = ' Check the render method of `' + name + '`.'\n+ addendum = ' Check the render method of `' + name + '`.';\n }\n }\n }\n","commit":{"authoredAt":"2015-08-31T23:21:29-07:00","subject":"Merge pull request #4746 from zpao\/use-fbjs-lint","shortRevision":"9400b34363","authorName":"Paul O’Shannessy","revision":"9400b3436359287cd4ae1a0c32dfb21aca9d7244","authorEmail":"paul@oshannessy.com"}}

dillon1000/react

Files changed