Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/renderers/dom/shared/CSSProperty.js

.eslintignore

@@ -1,19 +1,9 @@
 # We can probably lint these later but not important at this point
-src/vendor
-# eslint uses JSX* node types to determine if using JSX. esprima-fb still uses
-# XJS* nodes. When we fix that (https://github.com/facebook/esprima/pull/85) we
-# can enable linting the tests and fix those errors.
-src/**/__tests__/**
-# This should be enabled but that folder has too much in it that doesn't belong
-src/test
-test/the-files-to-test.generated.js
-# This is synced with a different file internally, don't want to lint it yet
-vendor/fbtransform/syntax.js
-vendor/jasmine/
-vendor/jasmine-jsreporter/
+src/shared/vendor
 # But not in docs/_js/examples/*
 docs/_js/*.js
 docs/js/
+docs/_site/
 # gems
 docs/vendor/bundle/
 # This should be more like examples/**/thirdparty/** but
@@ -22,7 +12,7 @@ examples/
 # Ignore built files.
 build/
 # react-codemod
-npm-react-codemod/test/
-npm-react-codemod/scripts/
-npm-react-codemod/build/
-npm-react-codemod/node_modules/
+packages/react-codemod/test/
+packages/react-codemod/scripts/
+packages/react-codemod/build/
+packages/react-codemod/node_modules/

.eslintrc

@@ -1,51 +1,59 @@
 ---
-parser: esprima-fb
+parser: babel-eslint
 
-env:
-  browser: true
-  node: true
+extends:
+  - ./node_modules/fbjs-scripts/eslint/.eslintrc
 
-globals:
-  __DEV__: true
+plugins:
+  - react
+  - react-internal
 
+# We're stricter than the default config, mostly. We'll override a few rules and
+# then enable some React specific ones.
 rules:
-  # ERRORS
-  space-before-blocks: 2
-  indent: [2, 2, indentSwitchCase: true]
-  brace-style: 2
-  space-after-keywords: 2
-  strict: 2
-  # We actually have a transform to support this and we fix this for bundled
-  # releases but not for the npm package, so enforce it strictly
-  no-comma-dangle: 2
-  # Make this a warning for now. We do this in a few places so we might need to
-  # disable
-  no-unused-expressions: 2
-  block-scoped-var: 2
-  eol-last: 2
-  dot-notation: 2
+  accessor-pairs: 0
+  brace-style: [2, 1tbs]
+  comma-dangle: [2, always-multiline]
   consistent-return: 2
-  no-unused-vars: [2, args: none]
-  quotes: [2, 'single']
-
-  # WARNINGS
-  # This is the only one that's hard to track since we don't lint just changes.
-  max-len: [1, 80]
-
-  # WISHLIST. One day...
-  # We'll need a custom version of this that does a subset of the whole rule.
-  # Otherwise this is just too noisy.
-  # valid-jsdoc: 1
+  dot-location: [2, property]
+  dot-notation: 2
+  eol-last: 2
+  indent: [2, 2, {SwitchCase: 1}]
+  no-bitwise: 0
+  no-multi-spaces: 2
+  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
+  strict: [2, global]
 
-  # DISABLED. These aren't compatible with our style
-  # We use this for private/internal variables
-  no-underscore-dangle: 0
-  # We pass constructors around / access them from members
-  new-cap: 0
-  # We do this a lot.
-  no-use-before-define: 0
-  # We do this in a few places to align values
-  key-spacing: 0
+  # JSX
+  # Our transforms set this automatically
+  react/display-name: 0
+  react/jsx-boolean-value: [2, always]
+  react/jsx-no-undef: 2
+  react/jsx-quotes: [2, double]
+  # 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}]
 
-  # DISABLED. These currently cause errors when running.
-  no-multi-spaces: 0
+  # CUSTOM RULES
+  # the second argument of warning/invariant should be a literal string
+  react-internal/warning-and-invariant-args: 2

.gitignore

@@ -20,3 +20,7 @@ examples/shared/*.js
 test/the-files-to-test.generated.js
 *.log*
 chrome-user-data
+*.sublime-project
+*.sublime-workspace
+.idea
+*.iml

.travis.yml

@@ -15,6 +15,7 @@ before_install:
       echo "Only docs were updated, stopping build process."
       exit
     fi
+    npm install -g npm
 script:
 - |
     if [ "$TEST_TYPE" = build_website ]; then
@@ -41,35 +42,34 @@ script:
         fi
         popd
       fi
+    elif [ "$TEST_TYPE" = build ]; then
+      if [ "$SERVER" ]; then
+        set -e
+        ./node_modules/.bin/grunt build
+        curl \
+          -F "react=@build/react.js" \
+          -F "react.min=@build/react.min.js" \
+          -F "transformer=@build/JSXTransformer.js" \
+          -F "react-with-addons=@build/react-with-addons.js" \
+          -F "react-with-addons.min=@build/react-with-addons.min.js" \
+          -F "npm-react=@build/packages/react.tgz" \
+          -F "npm-react-dom=@build/packages/react-dom.tgz" \
+          -F "commit=$TRAVIS_COMMIT" \
+          -F "date=`git log --format='%ct' -1`" \
+          -F "pull_request=$TRAVIS_PULL_REQUEST" \
+          -F "token=$SECRET_TOKEN" \
+          -F "branch=$TRAVIS_BRANCH" \
+          $SERVER
+      fi
     else
-      grunt $TEST_TYPE
-    fi
-after_script:
-- |
-    if [ "$TEST_TYPE" = test ] && [ "$SERVER" ]; then
-      grunt build
-      curl \
-        -F "react=@build/react.js" \
-        -F "react.min=@build/react.min.js" \
-        -F "transformer=@build/JSXTransformer.js" \
-        -F "react-with-addons=@build/react-with-addons.js" \
-        -F "react-with-addons.min=@build/react-with-addons.min.js" \
-        -F "npm-react=@build/react.tgz" \
-        -F "npm-react-tools=@build/react-tools.tgz" \
-        -F "commit=$TRAVIS_COMMIT" \
-        -F "date=`git log --format='%ct' -1`" \
-        -F "pull_request=$TRAVIS_PULL_REQUEST" \
-        -F "token=$SECRET_TOKEN" \
-        -F "branch=$TRAVIS_BRANCH" \
-        $SERVER
+      ./node_modules/.bin/grunt $TEST_TYPE
     fi
 env:
   matrix:
-  - TEST_TYPE=test
+  - TEST_TYPE=build
   - TEST_TYPE=jest
   - TEST_TYPE=lint
   - TEST_TYPE=build_website
-  - TEST_TYPE=test:webdriver:saucelabs:modern
   global:
   # SERVER
   - secure: qPvsJ46XzGrdIuPA70b55xQNGF8jcK7N1LN5CCQYYocXLa+fBrl+fTE77QvehOPhqwJXcj6kOxI+sY0KrVwV7gmq2XY2HZGWUSCxTN0SZlNIzqPA80Y7G/yOjA4PUt8LKgP+8tptyhTAY56qf+hgW8BoLiKOdztYF2p+3zXOLuA=
@@ -79,15 +79,6 @@ env:
   - secure: EHCyCSKMwKlLHNtcj9nmkRzmiiPE3aDGlPcnEyrDJeRI0SeN/iCXHXfFivR0vFq3vr+9naMBczAR2AEidtps5KbJrKqdZnjPFRbmfVtzWr/LlvVCub3u13Pub6TdKIVBTny1PuZ5X8GvdxMNVig89jGjvzhhWuQRaz3VhJnTra4=
 matrix:
   fast_finish: true
-  allow_failures:
-    - env: TEST_TYPE=test:coverage
-    - env: TEST_TYPE=test:webdriver:saucelabs:modern
-    - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie11
-    - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10
-    - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie9
-    - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie8
-    - env: TEST_TYPE=test:webdriver:saucelabs:ios
-    - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=safari
 notifications:
   irc:
     use_notice: true

CHANGELOG.md

@@ -1,3 +1,25 @@
+## 0.13.3 (May 8, 2015)
+
+### React Core
+
+#### New Features
+
+* Added `clipPath` element and attribute for SVG
+* Improved warnings for deprecated methods in plain JS classes
+
+#### Bug Fixes
+
+* Loosened `dangerouslySetInnerHTML` restrictions so `{__html: undefined}` will no longer throw
+* Fixed extraneous context warning with non-pure `getChildContext`
+* Ensure `replaceState(obj)` retains prototype of `obj`
+
+### React with Add-ons
+
+### Bug Fixes
+
+* Test Utils: Ensure that shallow rendering works when components define `contextTypes`
+
+
 ## 0.13.2 (April 18, 2015)
 
 ### React Core

CONTRIBUTING.md

@@ -1,6 +1,10 @@
 # Contributing to React
 
-React is one of Facebook's first open source projects that is both under very active development and is also being used to ship code to everybody on [facebook.com](https://www.facebook.com). We're still working out the kinks to make contributing to this project as easy and transparent as possible, but we're not quite there yet. Hopefully this document makes the process for contributing clear and preempts some questions you may have.
+React is one of Facebook's first open source projects that is both under very active development and is also being used to ship code to everybody on [facebook.com](https://www.facebook.com). We're still working out the kinks to make contributing to this project as easy and transparent as possible, but we're not quite there yet. Hopefully this document makes the process for contributing clear and answers some questions that you may have.
+
+## [Code of Conduct](https://code.facebook.com/codeofconduct)
+
+Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please read [the full text](https://code.facebook.com/codeofconduct) so that you can understand what actions will and will not be tolerated.
 
 ## Our Development Process
 
@@ -23,11 +27,11 @@ The core team will be monitoring for pull requests. When we get one, we'll run s
 5. Make sure your code lints (`grunt lint`) - we've done our best to make sure these rules match our internal linting guidelines.
 6. If you haven't already, complete the CLA.
 
-### Contributor License Agreement ("CLA")
+### Contributor License Agreement (CLA)
 
 In order to accept your pull request, we need you to submit a CLA. You only need to do this once, so if you've done this for another Facebook open source project, you're good to go. If you are submitting a pull request for the first time, just let us know that you have completed the CLA and we can cross-check with your GitHub username.
 
-[Complete your CLA here](https://code.facebook.com/cla)
+[Complete your CLA here.](https://code.facebook.com/cla)
 
 ## Bugs
 
@@ -46,19 +50,24 @@ Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe
 ## How to Get in Touch
 
 * IRC - [#reactjs on freenode](https://webchat.freenode.net/?channels=reactjs)
-* Mailing list - [reactjs on Google Groups](https://groups.google.com/group/reactjs)
+* Discussion forum - [discuss.reactjs.org](https://discuss.reactjs.org/)
 
 ## Style Guide
 
-### Code
+Our linter will catch most styling issues that may exist in your code.
+You can check the status of your code styling by simply running: `grunt lint`
+
+However, there are still some styles that the linter cannot pick up. If you are unsure about something, looking at [Airbnb's Style Guide](https://github.com/airbnb/javascript) will guide you in the right direction.
+
+### Code Conventions
 
-* Use semicolons;
-* Commas last,
+* Use semicolons `;`
+* Commas last `,`
 * 2 spaces for indentation (no tabs)
 * Prefer `'` over `"`
 * `'use strict';`
 * 80 character line length
-* "Attractive"
+* Write "attractive" code
 * Do not use the optional parameters of `setTimeout` and `setInterval`
 
 ### Documentation