Merge branch 'master' of https://github.com/reactjs/reactjs.org into defer-babel-loading

Author: renanpvaz

.eslintrc

@@ -1,7 +1,18 @@
 {
+  "extends": [
+    "fbjs"
+  ],
   "plugins": [
     "prettier",
     "react"
   ],
   "parser": "babel-eslint",
-}
+  "rules": {
+    "relay/graphql-naming": 0,
+    "max-len": 0
+  },
+  "env": {
+    "node": true,
+    "browser": true
+  }
+}

LICENSE.md

@@ -15,7 +15,7 @@ This repo contains the source code and documentation powering [reactjs.org](http
 ### Installation
 
 1. `cd reactjs.org` to go into the project root
-1. `yarn` to install the website's NPM dependencies
+1. `yarn` to install the website's npm dependencies
 
 ### Running locally
 

README.md

@@ -113,8 +113,8 @@ We're discontinuing active maintenance of React Addons packages. In truth, most
 - **react-addons-create-fragment** – React 16 will have first-class support for fragments, at which point this package won't be necessary. We recommend using arrays of keyed elements instead.
 - **react-addons-css-transition-group** - Use [react-transition-group/CSSTransitionGroup](https://github.com/reactjs/react-transition-group) instead. Version 1.1.1 provides a drop-in replacement.
 - **react-addons-linked-state-mixin** - Explicitly set the `value` and `onChange` handler instead.
-- **react-addons-pure-render-mixin** - Use [`React.PureComponent`](/docs/react-api.html#react.purecomponent) instead.
-- **react-addons-shallow-compare** - Use [`React.PureComponent`](/docs/react-api.html#react.purecomponent) instead.
+- **react-addons-pure-render-mixin** - Use [`React.PureComponent`](/docs/react-api.html#reactpurecomponent) instead.
+- **react-addons-shallow-compare** - Use [`React.PureComponent`](/docs/react-api.html#reactpurecomponent) instead.
 - **react-addons-transition-group** - Use [react-transition-group/TransitionGroup](https://github.com/reactjs/react-transition-group) instead. Version 1.1.1 provides a drop-in replacement.
 - **react-addons-update** - Use [immutability-helper](https://github.com/kolodny/immutability-helper) instead, a drop-in replacement.
 - **react-linked-input** - Explicitly set the `value` and `onChange` handler instead.

content/blog/2017-04-07-react-v15.5.0.md

@@ -163,7 +163,7 @@ Below is a detailed list of them.
     ```
 
     React 15: Converts `NaN`s to strings and passes them through.  
-    React 16: Warns and ignores them.
+    React 16: Converts `NaN`s to strings and passes them through with a warning.
 
 While testing this release, we have also [created an automatically generated table](https://github.com/facebook/react/blob/master/fixtures/attribute-behavior/AttributeTableSnapshot.md) for all known attributes to track potential regressions.
 

content/blog/2017-09-08-dom-attributes-in-react-16.md

@@ -151,7 +151,7 @@ Refer to the previous announcement for [suggestions on how to migrate](/blog/201
 React 16 includes a number of small breaking changes. These only affect uncommon use cases and we don't expect them to break most apps.
 
 * React 15 had limited, undocumented support for error boundaries using `unstable_handleError`. This method has been renamed to `componentDidCatch`. You can use a codemod to [automatically migrate to the new API](https://github.com/reactjs/react-codemod#error-boundaries).
-* `ReactDOM.render` and `ReactDOM.unstable_renderIntoContainer` now return null if called from inside a lifecycle method. To work around this, you can use [portals](https://github.com/facebook/react/issues/10309#issuecomment-318433235) or [refs](https://github.com/facebook/react/issues/10309#issuecomment-318434635).
+* `ReactDOM.render` and `ReactDOM.unstable_renderSubtreeIntoContainer` now return null if called from inside a lifecycle method. To work around this, you can use [portals](https://github.com/facebook/react/issues/10309#issuecomment-318433235) or [refs](https://github.com/facebook/react/issues/10309#issuecomment-318434635).
 * `setState`:
   * Calling `setState` with null no longer triggers an update. This allows you to decide in an updater function if you want to re-render.
   * Calling `setState` directly in render always causes an update. This was not previously the case. Regardless, you should not be calling setState from render.

content/blog/2017-09-26-react-v16.0.md

@@ -263,7 +263,7 @@ VoiceOver is an integrated screen reader on Apple devices.
 Refer to the following guides on how activate and use VoiceOver:
 
 - [WebAIM - Using VoiceOver to Evaluate Web Accessibility](http://webaim.org/articles/voiceover/)
-- [Deque - VoiceOver for OSX Keyboard Shortcuts](https://dequeuniversity.com/screenreaders/voiceover-keyboard-shortcuts)
+- [Deque - VoiceOver for OS X Keyboard Shortcuts](https://dequeuniversity.com/screenreaders/voiceover-keyboard-shortcuts)
 - [Deque - VoiceOver for iOS Shortcuts](https://dequeuniversity.com/screenreaders/voiceover-ios-shortcuts)
 
 #### JAWS in Internet Explorer

content/docs/accessibility.md

@@ -8,7 +8,7 @@ category: Add-Ons
 
 > Note:
 >
-> `PureRenderMixin` is a legacy add-on. Use [`React.PureComponent`](/docs/react-api.html#react.purecomponent) instead.
+> `PureRenderMixin` is a legacy add-on. Use [`React.PureComponent`](/docs/react-api.html#reactpurecomponent) instead.
 
 **Importing**
 

content/docs/addons-pure-render-mixin.md

@@ -8,7 +8,7 @@ category: Reference
 
 > Note:
 >
-> `shallowCompare` is a legacy add-on. Use [`React.PureComponent`](/docs/react-api.html#react.purecomponent) instead.
+> `shallowCompare` is a legacy add-on. Use [`React.PureComponent`](/docs/react-api.html#reactpurecomponent) instead.
 
 **Importing**
 
@@ -19,7 +19,7 @@ var shallowCompare = require('react-addons-shallow-compare'); // ES5 with npm
 
 ## Overview
 
-Before [`React.PureComponent`](/docs/react-api.html#react.purecomponent) was introduced, `shallowCompare` was commonly used to achieve the same functionality as [`PureRenderMixin`](pure-render-mixin.html) while using ES6 classes with React.
+Before [`React.PureComponent`](/docs/react-api.html#reactpurecomponent) was introduced, `shallowCompare` was commonly used to achieve the same functionality as [`PureRenderMixin`](pure-render-mixin.html) while using ES6 classes with React.
 
 If your React component's render function is "pure" (in other words, it renders the same result given the same props and state), you can use this helper function for a performance boost in some cases.
 

content/docs/addons-shallow-compare.md

@@ -112,6 +112,10 @@ mockComponent(
 
 Pass a mocked component module to this method to augment it with useful methods that allow it to be used as a dummy React component. Instead of rendering as usual, the component will become a simple `<div>` (or other tag if `mockTagName` is provided) containing any provided children.
 
+> Note:
+>
+> `mockComponent()` is a legacy API. We recommend using [shallow rendering](/docs/test-utils.html#shallow-rendering) or [`jest.mock()`](https://facebook.github.io/jest/docs/en/tutorial-react-native.html#mock-native-modules-using-jestmock) instead.
+
 * * *
 
 ### `isElement()`