{"patch":"diff --git a\/.editorconfig b\/.editorconfig\nindex 7734a2a814..d7638731d0 100644\n--- a\/.editorconfig\n+++ b\/.editorconfig\n@@ -6,6 +6,7 @@ charset = utf-8\n end_of_line = lf\n indent_size = 2\n indent_style = space\n+insert_final_newline = true\n max_line_length = 80\n trim_trailing_whitespace = true\n \ndiff --git a\/.eslintignore b\/.eslintignore\nindex 31e4551dee..ae12f3bce5 100644\n--- a\/.eslintignore\n+++ b\/.eslintignore\n@@ -1,19 +1,9 @@\n # We can probably lint these later but not important at this point\n src\/shared\/vendor\n-# eslint uses JSX* node types to determine if using JSX. esprima-fb still uses\n-# XJS* nodes. When we fix that (https:\/\/github.com\/facebook\/esprima\/pull\/85) we\n-# can enable linting the tests and fix those errors.\n-src\/**\/__tests__\/**\n-# This should be enabled but that folder has too much in it that doesn't belong\n-src\/test\n-test\/the-files-to-test.generated.js\n-# This is synced with a different file internally, don't want to lint it yet\n-vendor\/fbtransform\/syntax.js\n-vendor\/jasmine\/\n-vendor\/jasmine-jsreporter\/\n # But not in docs\/_js\/examples\/*\n docs\/_js\/*.js\n docs\/js\/\n+docs\/_site\/\n # gems\n docs\/vendor\/bundle\/\n # This should be more like examples\/**\/thirdparty\/** but\n@@ -21,8 +11,5 @@ docs\/vendor\/bundle\/\n examples\/\n # Ignore built files.\n build\/\n-# react-codemod\n-npm-react-codemod\/test\/\n-npm-react-codemod\/scripts\/\n-npm-react-codemod\/build\/\n-npm-react-codemod\/node_modules\/\n+scripts\/bench\/bench-*.js\n+vendor\/*\ndiff --git a\/.eslintrc b\/.eslintrc\nindex 347734de88..e3cb38fac0 100644\n--- a\/.eslintrc\n+++ b\/.eslintrc\n@@ -1,51 +1,64 @@\n ---\n-parser: esprima-fb\n+parser: babel-eslint\n \n-env:\n- browser: true\n- node: true\n+extends:\n+ - .\/node_modules\/fbjs-scripts\/eslint\/.eslintrc\n \n-globals:\n- __DEV__: true\n+plugins:\n+ - react\n+ - react-internal\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, indentSwitchCase: true]\n- brace-style: 2\n- space-after-keywords: 2\n- strict: 2\n- # We actually have a transform to support this and we fix this for bundled\n- # releases but not for the npm package, so enforce it strictly\n- no-comma-dangle: 2\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- block-scoped-var: 2\n- eol-last: 2\n- dot-notation: 2\n+ accessor-pairs: 0\n+ brace-style: [2, 1tbs]\n+ comma-dangle: [2, always-multiline]\n consistent-return: 2\n- no-unused-vars: [2, args: none]\n- quotes: [2, 'single']\n-\n- # WARNINGS\n- # This is the only one that's hard to track since we don't lint just changes.\n- max-len: [1, 80]\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+ dot-location: [2, property]\n+ dot-notation: 2\n+ eol-last: 2\n+ eqeqeq: [2, allow-null]\n+ indent: [2, 2, {SwitchCase: 1}]\n+ jsx-quotes: [2, prefer-double]\n+ no-bitwise: 0\n+ no-dupe-class-members: 2\n+ no-multi-spaces: 2\n+ no-restricted-syntax: [2, WithStatement]\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+ # TODO: enable this rule after https:\/\/github.com\/eslint\/eslint\/pull\/3768 lands\n+ space-before-keywords: 0\n+ strict: [2, global]\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+ # JSX\n+ # Our transforms set this automatically\n+ react\/display-name: 0\n+ react\/jsx-boolean-value: [2, always]\n+ react\/jsx-no-undef: 2\n+ # We don't care to do this\n+ react\/jsx-sort-prop-types: 0\n+ react\/jsx-sort-props: 0\n+ react\/jsx-uses-react: 2\n+ react\/jsx-uses-vars: 2\n+ # It's easier to test some things this way\n+ react\/no-did-mount-set-state: 0\n+ react\/no-did-update-set-state: 0\n+ # We define multiple components in test files\n+ react\/no-multi-comp: 0\n+ react\/no-unknown-property: 2\n+ # This isn't useful in our test code\n+ react\/prop-types: 0\n+ react\/react-in-jsx-scope: 2\n+ react\/self-closing-comp: 2\n+ # We don't care to do this\n+ react\/sort-comp: 0\n+ react\/wrap-multilines: [2, {declaration: false, assignment: false}]\n \n- # DISABLED. These currently cause errors when running.\n- no-multi-spaces: 0\n+ # CUSTOM RULES\n+ # the second argument of warning\/invariant should be a literal string\n+ react-internal\/warning-and-invariant-args: 2\ndiff --git a\/.gitignore b\/.gitignore\nindex f4dcfd6a95..348b88dc41 100644\n--- a\/.gitignore\n+++ b\/.gitignore\n@@ -7,6 +7,7 @@ static\n _SpecRunner.html\n __benchmarks__\n build\/\n+coverage\/\n .module-cache\n *.gem\n docs\/.bundle\n@@ -20,3 +21,8 @@ examples\/shared\/*.js\n test\/the-files-to-test.generated.js\n *.log*\n chrome-user-data\n+*.sublime-project\n+*.sublime-workspace\n+.idea\n+*.iml\n+.vscode\ndiff --git a\/.mailmap b\/.mailmap\nindex 2af3667688..a55c1fd7a3 100644\n--- a\/.mailmap\n+++ b\/.mailmap\n@@ -1,10 +1,20 @@\n+Adam Timberlake \n Alex Mykyta \n+Alex Pien \n+Alex Pien

\n+Alex Pien

\n+Andreas Savvides \n+Andreas Savvides \n Andreas Svensson \n Andres Suarez \n+Andrew Sokolov \n+Baraa Hamodi \n Ben Alpert \n Ben Alpert \n Ben Newman \n+Benjamin Woodruff \n Bill Fisher \n+Blaine Kasten \n Brandon Tilley \n Cheng Lou \n Christian Oliff \n@@ -15,6 +25,8 @@ Dan Schafer \n Daniel Gasienica \n Daniel Gasienica \n Daniel Lo Nigro \n+Dmitry Blues \n+Erik Harper \n Evan Coonrod \n Fabio M. Costa \n Felix Kling \n@@ -22,41 +34,63 @@ François-Xavier Bois \n Gabe Levi \n Geert Pasteels \n George A Sisco III \n+Georgii Dolzhykov \n Harry Hull \n Hendrik Swanepoel \n Ian Obermiller \n+Ilyá Belsky \n Ingvar Stepanyan \n Irae Carvalho \n Ivan Vergiliev \n+Jae Hun Ro \n Jaime Mingo \n James Brantly \n Jan Hancic \n Jan Kassens \n Jason Bonta \n Jason Trill \n+Jeff Chan \n Jeff Morrison \n Jeff Morrison \n Jeff Morrison \n Jeffrey Lin \n Jim Sproch \n Jim Sproch \n+Jiyeon Seo \n+Jon Chester \n Jon Madison \n Jonathan Hsu \n Jordan Walke \n Jordan Walke \n+Joseph Savona \n Josh Duck \n Juan Serrano \n Jun Wu \n+Justin Robison \n Keito Uchiyama \n+Kevin Coughlin \n Kunal Mehta \n Laurence Rowe \n+Marcin K. \n+Mark Anderson \n Martin Andert \n Mathieu M-Gosselin \n+Matsunoki \n+Matt Brookes \n+Matt Dunn-Rankin \n Matt Zabriskie \n+Matthew Johnston \n+Max Heiber \n Michal Srb xixixao \n+Michelle Todd \n+Mihai Parparita \n Minwe LUO \n+Murray M. Moss \n+Murray M. Moss \n+Neri Marschik \n Nick Gavalas \n Nick Thompson \n+Patrick Stapleton \n Paul O’Shannessy \n Paul Shen \n Pete Hunt \n@@ -76,14 +110,18 @@ Scott Feeney \n Sebastian Markbåge \n Sergey Rubanov \n Steven Luscher \n+Steven Luscher \n Steven Luscher \n Steven Luscher \n Stoyan Stefanov \n Thomas Aylott \n Timothy Yung \n+Vasiliy Loginevskiy \n+Vasiliy Loginevskiy

\n Vjeux \n Vjeux \n Volkan Unsal \n+Xavier Morel \n YouBao Nong

\n Zach Bruggeman \n 张敏 \ndiff --git a\/.travis.yml b\/.travis.yml\nindex bcda3b5915..9444619a56 100644\n--- a\/.travis.yml\n+++ b\/.travis.yml\n@@ -1,7 +1,7 @@\n ---\n language: node_js\n node_js:\n-- '0.10'\n+- 4\n sudo: false\n cache:\n directories:\n@@ -15,7 +15,8 @@ before_install:\n echo \"Only docs were updated, stopping build process.\"\n exit\n fi\n- npm install -g npm\n+ npm install -g npm@latest-2\n+ npm --version\n script:\n - |\n if [ \"$TEST_TYPE\" = build_website ]; then\n@@ -42,35 +43,45 @@ script:\n fi\n popd\n fi\n+ elif [ \"$TEST_TYPE\" = build ]; then\n+ if [ \"$SERVER\" ]; then\n+ set -e\n+ .\/node_modules\/.bin\/grunt build\n+ curl \\\n+ -F \"react=@build\/react.js\" \\\n+ -F \"react.min=@build\/react.min.js\" \\\n+ -F \"react-with-addons=@build\/react-with-addons.js\" \\\n+ -F \"react-with-addons.min=@build\/react-with-addons.min.js\" \\\n+ -F \"react-dom=@build\/react-dom.js\" \\\n+ -F \"react-dom.min=@build\/react-dom.min.js\" \\\n+ -F \"react-dom-server=@build\/react-dom-server.js\" \\\n+ -F \"react-dom-server.min=@build\/react-dom-server.min.js\" \\\n+ -F \"npm-react=@build\/packages\/react.tgz\" \\\n+ -F \"npm-react-dom=@build\/packages\/react-dom.tgz\" \\\n+ -F \"commit=$TRAVIS_COMMIT\" \\\n+ -F \"date=`git log --format='%ct' -1`\" \\\n+ -F \"pull_request=$TRAVIS_PULL_REQUEST\" \\\n+ -F \"token=$SECRET_TOKEN\" \\\n+ -F \"branch=$TRAVIS_BRANCH\" \\\n+ $SERVER\n+ fi\n+ elif [ \"$TEST_TYPE\" = test ]; then\n+ if [ \"$TRAVIS_PULL_REQUEST\" = false ]; then\n+ set -e\n+ .\/node_modules\/.bin\/grunt jest:coverage\n+ cat .\/coverage\/lcov.info | .\/node_modules\/.bin\/coveralls\n+ else\n+ .\/node_modules\/.bin\/grunt jest:normal\n+ fi\n else\n .\/node_modules\/.bin\/grunt $TEST_TYPE\n fi\n-after_script:\n-- |\n- if [ \"$TEST_TYPE\" = test ] && [ \"$SERVER\" ]; then\n- .\/node_modules\/.bin\/grunt build\n- curl \\\n- -F \"react=@build\/react.js\" \\\n- -F \"react.min=@build\/react.min.js\" \\\n- -F \"transformer=@build\/JSXTransformer.js\" \\\n- -F \"react-with-addons=@build\/react-with-addons.js\" \\\n- -F \"react-with-addons.min=@build\/react-with-addons.min.js\" \\\n- -F \"npm-react=@build\/react.tgz\" \\\n- -F \"npm-react-tools=@build\/react-tools.tgz\" \\\n- -F \"commit=$TRAVIS_COMMIT\" \\\n- -F \"date=`git log --format='%ct' -1`\" \\\n- -F \"pull_request=$TRAVIS_PULL_REQUEST\" \\\n- -F \"token=$SECRET_TOKEN\" \\\n- -F \"branch=$TRAVIS_BRANCH\" \\\n- $SERVER\n- fi\n env:\n matrix:\n+ - TEST_TYPE=build\n - TEST_TYPE=test\n- - TEST_TYPE=jest\n - TEST_TYPE=lint\n - TEST_TYPE=build_website\n- - TEST_TYPE=test:webdriver:saucelabs:modern\n global:\n # SERVER\n - secure: qPvsJ46XzGrdIuPA70b55xQNGF8jcK7N1LN5CCQYYocXLa+fBrl+fTE77QvehOPhqwJXcj6kOxI+sY0KrVwV7gmq2XY2HZGWUSCxTN0SZlNIzqPA80Y7G\/yOjA4PUt8LKgP+8tptyhTAY56qf+hgW8BoLiKOdztYF2p+3zXOLuA=\n@@ -78,17 +89,8 @@ env:\n - secure: dkpPW+VnoqC\/okhRdV90m36NcyBFhcwEKL3bNFExAwi0dXnFao8RoFlvnwiPlA23h2faROkMIetXlti6Aju08BgUFV+f9aL6vLyU7gUent4Nd3413zf2fwDtXIWIETg6uLnOpSykGKgCAT\/hY3Q2oPLqOoY0OxfgnbqwxkxljrE=\n # GITHUB_TOKEN\n - secure: EHCyCSKMwKlLHNtcj9nmkRzmiiPE3aDGlPcnEyrDJeRI0SeN\/iCXHXfFivR0vFq3vr+9naMBczAR2AEidtps5KbJrKqdZnjPFRbmfVtzWr\/LlvVCub3u13Pub6TdKIVBTny1PuZ5X8GvdxMNVig89jGjvzhhWuQRaz3VhJnTra4=\n-matrix:\n- fast_finish: true\n- allow_failures:\n- - env: TEST_TYPE=test:coverage\n- - env: TEST_TYPE=test:webdriver:saucelabs:modern\n- - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie11\n- - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10\n- - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie9\n- - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie8\n- - env: TEST_TYPE=test:webdriver:saucelabs:ios\n- - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=safari\n+ # COVERALLS_TOKEN\n+ - secure: h\/cUq+TrUMZOQmkFD7CvuwX0uAwmjIfKZ4qSUzY+QzUtDzOzA0L\/XF84xTBq1Q5YYsEiaoF6GxxGCdrLQiBA\/ZTd+88UHgeZPMRvi0xG9Q+PeePVOsZMTxy4\/WWFgOfSQCk49Mj9zizGgO78i6vxq+SDXMtFHnZ+TpPJIEW6\/m0=\n notifications:\n irc:\n use_notice: true\ndiff --git a\/AUTHORS b\/AUTHORS\nindex 871ce08411..71fbe03e26 100644\n--- a\/AUTHORS\n+++ b\/AUTHORS\n@@ -1,43 +1,74 @@\n+839 <8398a7@gmail.com>\n Aaron Franks \n+Aaron Gelter \n Adam Krebs \n Adam Mark \n Adam Solove \n+Adam Timberlake \n+Adam Zapletal \n+Ahmad Wali Sidiqi \n+Alan Souza \n Alan deLevie \n+Alastair Hole \n+Alex \n Alex Boyd \n+Alex Lopatin \n Alex Mykyta \n+Alex Pien \n+Alex Smith \n Alex Zelenskiy \n+Alexander Shtuchkin \n Alexander Solovyov \n Alexander Tseung \n Alexandre Gaudencio \n Alexey Raspopov \n Alexey Shamrin \n Andre Z Sanchez \n+Andreas Savvides \n Andreas Svensson \n+Andres Kalle \n Andres Suarez \n Andrew Cobby \n Andrew Davey \n Andrew Rasmussen \n+Andrew Sokolov \n Andrew Zich \n Andrey Popp <8mayday@gmail.com>\n Anthony van der Hoorn \n+Antonio Ruberto \n Antti Ahti \n+Anuj Tomar \n+AoDev \n Areeb Malik \n Aria Buckles \n+Aria Stewart \n+Arian Faurtosh \n Artem Nezvigin \n+Austin Wright \n Ayman Osman \n+Baraa Hamodi \n Bartosz Kaszubowski \n+Basarat Ali Syed \n+Battaile Fauber \n Beau Smith \n Ben Alpert \n+Ben Anderson \n Ben Foxall \n+Ben Jaffe \n+Ben Moss \n Ben Newman \n Ben Ripkens \n Benjamin Keen \n Benjamin Leiken \n+Benjamin Woodruff \n Bill Fisher \n Blaine Hatab \n+Blaine Kasten \n Bob Eagan \n Bob Ralian \n+Bob Renwick \n Bojan Mihelac \n+Bradley Spaulding \n Brandon Bloom \n Brandon Tilley \n Brian Cooke \n@@ -50,103 +81,166 @@ Brian Rue \n Bruno Škvorc \n Cam Song \n Cam Spiers \n+Carter Chung \n Cassus Adam Banko \n Cat Chen \n Cedric Sohrauer \n Charles Marsh \n+Chase Adams \n Cheng Lou \n Chitharanjan Das \n+Chris Grovers \n+Chris Ha \n+Chris Rebert \n Chris Sciolla \n-Christian \n Christian Alfoni \n+Christian Oliff \n Christian Roman \n Christoph Pojer \n Christopher Monsanto \n Clay Allsopp \n Connor McSheffrey \n+Cory House \n Cotton Hou \n+Cristovao Verstraeten \n+Damien Pellier \n Dan Abramov \n Dan Fox \n Dan Schafer \n Daniel Carlsson \n+Daniel Cousens \n+Daniel Friesen \n Daniel Gasienica \n+Daniel Hejl \n Daniel Lo Nigro \n Daniel Mané \n Daniel Miladinov \n+Daniel Rodgers-Pryor \n Daniel Schonfeld \n Danny Ben-David \n+Darcy \n Daryl Lau \n+Darío Javier Cravero \n+David Baker \n+David Goldberg \n+David Greenspan \n David Hellsing \n David Hu \n+David Mininger \n+David Neubauer \n+David Percy \n Denis Sokolov \n Dennis Johnson \n Devon Blandin \n+Devon Harvey \n Dmitrii Abramov \n+Dmitry Blues \n Dmitry Mazuro \n+Domenico Matteo \n+Don Abrams \n Dustan Kasten \n Dustin Getz \n Dylan Harrington \n+Eduardo Garcia \n+Edvin Erikson \n+Elaine Fang \n Enguerran \n Eric Clemmons \n+Eric Eastwood \n Eric Florenzano \n+Eric O'Connell \n Eric Schoffstall \n+Erik Harper \n+Espen Hovlandsdal \n Evan Coonrod \n Fabio M. Costa \n+Federico Rampazzo \n Felipe Oliveira Carvalho \n Felix Gnass \n Felix Kling \n Fernando Correia \n+Frankie Bagnardi \n François-Xavier Bois \n Fred Zhao \n G Scott Olson \n G. Kay Lee \n Gabe Levi \n+Gareth Nicholson \n Garren Smith \n Geert Pasteels \n Geert-Jan Brits \n George A Sisco III \n+Georgii Dolzhykov \n Gilbert \n Glen Mailer \n+Grant Timmerman \n Greg Hurrell \n+Greg Perkins \n Greg Roodt \n+Gregory \n Guangqiang Dong \n Guido Bouman \n Harry Hull \n Harry Marr \n Harry Moreno \n Harshad Sabne \n+Hekar Khani \n Hendrik Swanepoel \n+Henrik Nyh \n Henry Zhu \n Hou Chia \n Hugo Jobling \n Héliton Nordt \n Ian Obermiller \n+Ignacio Carbajo \n+Igor Scekic \n+Ilya Shuklin \n+Ilyá Belsky \n Ingvar Stepanyan \n Irae Carvalho \n Isaac Salier-Hellendag \n Ivan Kozik \n Ivan Krechetov \n Ivan Vergiliev \n+J. Andrew Brassington \n+J. Renée Beach \n+JD Isaacks \n+JW \n+Jack Zhang \n Jacob Gable \n Jacob Greenleaf \n+Jae Hun Ro \n Jaime Mingo \n Jakub Malinowski \n+James \n James Brantly \n+James Burnett \n James Ide \n+James Long \n+James Pearce \n James Seppi \n+James South \n Jamie Wong \n+Jamis Charles \n Jamison Dance \n Jan Hancic \n Jan Kassens \n+Jan Raasch \n Jared Forsyth \n+Jason \n Jason Bonta \n Jason Ly \n+Jason Miller \n+Jason Quense \n Jason Trill \n+Jason Webster \n+Jay Jaeho Lee \n Jean Lauliac

dillon1000/react

Files changed