From c8897f8382f10ac390f8f7f4f15c8ffaeccb6a8c Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Thu, 23 Mar 2017 08:16:52 -0700
Subject: [PATCH 001/153] Updated ReactNative findNodeHandle() to handle number
 case (#9238)

---
 src/renderers/native/ReactNativeFiber.js | 5 ++++-
 src/renderers/native/ReactNativeStack.js | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/renderers/native/ReactNativeFiber.js b/src/renderers/native/ReactNativeFiber.js
index 783ae91397dfa..014b4dfa85de8 100644
--- a/src/renderers/native/ReactNativeFiber.js
+++ b/src/renderers/native/ReactNativeFiber.js
@@ -382,7 +382,10 @@ const ReactNative = {
   // See NativeMethodsMixin#setNativeProps for more info on why this is done.
   findNodeHandle(componentOrHandle: any): ?number {
     const instance: any = findNodeHandle(componentOrHandle);
-    return instance ? instance._nativeTag : null;
+    if (instance == null || typeof instance === 'number') {
+      return instance;
+    }
+    return instance._nativeTag;
   },
 
   render(element: Element<any>, containerTag: any, callback: ?Function) {
diff --git a/src/renderers/native/ReactNativeStack.js b/src/renderers/native/ReactNativeStack.js
index 37d8b89f561eb..2a5b8f509b707 100644
--- a/src/renderers/native/ReactNativeStack.js
+++ b/src/renderers/native/ReactNativeStack.js
@@ -37,7 +37,11 @@ var ReactNative = {
   // The injected findNodeHandle() strategy returns the instance wrapper though.
   // See NativeMethodsMixin#setNativeProps for more info on why this is done.
   findNodeHandle(componentOrHandle: any): ?number {
-    return findNodeHandle(componentOrHandle).getHostNode();
+    const nodeHandle = findNodeHandle(componentOrHandle);
+    if (nodeHandle == null || typeof nodeHandle === 'number') {
+      return nodeHandle;
+    }
+    return nodeHandle.getHostNode();
   },
 
   render: render,

From 1c9dcd53d5a5e194afc0d953a3341ad32fe311dc Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 23 Mar 2017 18:45:38 +0000
Subject: [PATCH 002/153] Add dynamic injection to ReactErrorUtils (#9246)

---
 src/renderers/shared/utils/ReactErrorUtils.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/renderers/shared/utils/ReactErrorUtils.js b/src/renderers/shared/utils/ReactErrorUtils.js
index b3910a0dd8953..b57db95527abb 100644
--- a/src/renderers/shared/utils/ReactErrorUtils.js
+++ b/src/renderers/shared/utils/ReactErrorUtils.js
@@ -12,6 +12,8 @@
 
 'use strict';
 
+const invariant = require('invariant');
+
 let caughtError = null;
 
 /**
@@ -24,6 +26,21 @@ let caughtError = null;
  * @param {...*} args Arguments for function
  */
 const ReactErrorUtils = {
+  injection: {
+    injectErrorUtils(injectedErrorUtils: Object) {
+      invariant(
+        typeof injectedErrorUtils.invokeGuardedCallback === 'function',
+        'Injected invokeGuardedCallback() must be a function.',
+      );
+      invariant(
+        typeof injectedErrorUtils.rethrowCaughtError === 'function',
+        'Injected rethrowCaughtError() must be a function.',
+      );
+      ReactErrorUtils.invokeGuardedCallback = injectedErrorUtils.invokeGuardedCallback;
+      ReactErrorUtils.rethrowCaughtError = injectedErrorUtils.rethrowCaughtError;
+    },
+  },
+
   invokeGuardedCallback: function<A, B, C, D, E, F, Context>(
     name: string | null,
     func: (a: A, b: B, c: C, d: D, e: E, f: F) => void,

From d6a2c669d22e0bf0bc839493b863673df09c99c9 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 23 Mar 2017 19:13:07 +0000
Subject: [PATCH 003/153] Fix ReactErrorUtils injection (#9247)

---
 src/renderers/shared/utils/ReactErrorUtils.js | 130 +++++++++---------
 1 file changed, 64 insertions(+), 66 deletions(-)

diff --git a/src/renderers/shared/utils/ReactErrorUtils.js b/src/renderers/shared/utils/ReactErrorUtils.js
index b57db95527abb..fe3017bbc9fcc 100644
--- a/src/renderers/shared/utils/ReactErrorUtils.js
+++ b/src/renderers/shared/utils/ReactErrorUtils.js
@@ -16,6 +16,66 @@ const invariant = require('invariant');
 
 let caughtError = null;
 
+let invokeGuardedCallback = function(name, func, context, a, b, c, d, e, f) {
+  const funcArgs = Array.prototype.slice.call(arguments, 3);
+  try {
+    func.apply(context, funcArgs);
+  } catch (error) {
+    return error;
+  }
+  return null;
+};
+
+if (__DEV__) {
+  /**
+   * To help development we can get better devtools integration by simulating a
+   * real browser event.
+   */
+  if (
+    typeof window !== 'undefined' &&
+    typeof window.dispatchEvent === 'function' &&
+    typeof document !== 'undefined' &&
+    typeof document.createEvent === 'function'
+  ) {
+    const fakeNode = document.createElement('react');
+    let depth = 0;
+
+    invokeGuardedCallback = function(name, func, context, a, b, c, d, e, f) {
+      depth++;
+      const thisDepth = depth;
+      const funcArgs = Array.prototype.slice.call(arguments, 3);
+      const boundFunc = function() {
+        func.apply(context, funcArgs);
+      };
+      let fakeEventError = null;
+      const onFakeEventError = function(event) {
+        // Don't capture nested errors
+        if (depth === thisDepth) {
+          fakeEventError = event.error;
+        }
+      };
+      const evtType = `react-${name ? name : 'invokeguardedcallback'}-${depth}`;
+      window.addEventListener('error', onFakeEventError);
+      fakeNode.addEventListener(evtType, boundFunc, false);
+      const evt = document.createEvent('Event');
+      evt.initEvent(evtType, false, false);
+      fakeNode.dispatchEvent(evt);
+      fakeNode.removeEventListener(evtType, boundFunc, false);
+      window.removeEventListener('error', onFakeEventError);
+      depth--;
+      return fakeEventError;
+    };
+  }
+}
+
+let rethrowCaughtError = function() {
+  if (caughtError) {
+    const error = caughtError;
+    caughtError = null;
+    throw error;
+  }
+};
+
 /**
  * Call a function while guarding against errors that happens within it.
  * Returns an error if it throws, otherwise null.
@@ -36,8 +96,8 @@ const ReactErrorUtils = {
         typeof injectedErrorUtils.rethrowCaughtError === 'function',
         'Injected rethrowCaughtError() must be a function.',
       );
-      ReactErrorUtils.invokeGuardedCallback = injectedErrorUtils.invokeGuardedCallback;
-      ReactErrorUtils.rethrowCaughtError = injectedErrorUtils.rethrowCaughtError;
+      invokeGuardedCallback = injectedErrorUtils.invokeGuardedCallback;
+      rethrowCaughtError = injectedErrorUtils.rethrowCaughtError;
     },
   },
 
@@ -52,13 +112,7 @@ const ReactErrorUtils = {
     e: E,
     f: F,
   ): Error | null {
-    const funcArgs = Array.prototype.slice.call(arguments, 3);
-    try {
-      func.apply(context, funcArgs);
-    } catch (error) {
-      return error;
-    }
-    return null;
+    return invokeGuardedCallback.apply(this, arguments);
   },
 
   /**
@@ -92,64 +146,8 @@ const ReactErrorUtils = {
    * we will rethrow to be handled by the top level error handler.
    */
   rethrowCaughtError: function() {
-    if (caughtError) {
-      const error = caughtError;
-      caughtError = null;
-      throw error;
-    }
+    return rethrowCaughtError.apply(this, arguments);
   },
 };
 
-if (__DEV__) {
-  /**
-   * To help development we can get better devtools integration by simulating a
-   * real browser event.
-   */
-  if (
-    typeof window !== 'undefined' &&
-    typeof window.dispatchEvent === 'function' &&
-    typeof document !== 'undefined' &&
-    typeof document.createEvent === 'function'
-  ) {
-    const fakeNode = document.createElement('react');
-    let depth = 0;
-
-    ReactErrorUtils.invokeGuardedCallback = function(
-      name,
-      func,
-      context,
-      a,
-      b,
-      c,
-      d,
-      e,
-      f,
-    ) {
-      depth++;
-      const thisDepth = depth;
-      const funcArgs = Array.prototype.slice.call(arguments, 3);
-      const boundFunc = function() {
-        func.apply(context, funcArgs);
-      };
-      let fakeEventError = null;
-      const onFakeEventError = function(event) {
-        // Don't capture nested errors
-        if (depth === thisDepth) {
-          fakeEventError = event.error;
-        }
-      };
-      const evtType = `react-${name ? name : 'invokeguardedcallback'}-${depth}`;
-      window.addEventListener('error', onFakeEventError);
-      fakeNode.addEventListener(evtType, boundFunc, false);
-      const evt = document.createEvent('Event');
-      evt.initEvent(evtType, false, false);
-      fakeNode.dispatchEvent(evt);
-      fakeNode.removeEventListener(evtType, boundFunc, false);
-      window.removeEventListener('error', onFakeEventError);
-      depth--;
-      return fakeEventError;
-    };
-  }
-}
-
 module.exports = ReactErrorUtils;

From f082e35b36ece6bf301051296380aa15897d7431 Mon Sep 17 00:00:00 2001
From: Dan Abramov <gaearon@fb.com>
Date: Thu, 23 Mar 2017 19:45:10 +0000
Subject: [PATCH 004/153] Fix up invariant import to be from fbjs/lib/

---
 src/renderers/shared/utils/ReactErrorUtils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderers/shared/utils/ReactErrorUtils.js b/src/renderers/shared/utils/ReactErrorUtils.js
index fe3017bbc9fcc..71ed3063cdf97 100644
--- a/src/renderers/shared/utils/ReactErrorUtils.js
+++ b/src/renderers/shared/utils/ReactErrorUtils.js
@@ -12,7 +12,7 @@
 
 'use strict';
 
-const invariant = require('invariant');
+const invariant = require('fbjs/lib/invariant');
 
 let caughtError = null;
 

From 38d8f3ee6b4493fb1cce78e2a4e54fcc87724703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Tingl=C3=B6f?= <karljohantinglof@gmail.com>
Date: Fri, 24 Mar 2017 15:37:32 +0100
Subject: [PATCH 005/153] Updated Router import for example (#9233)

Updated import in order to be a correct working example as in accordance with the docs
---
 docs/docs/context.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/context.md b/docs/docs/context.md
index c5703d3545254..cfe86556f599d 100644
--- a/docs/docs/context.md
+++ b/docs/docs/context.md
@@ -111,7 +111,7 @@ If `contextTypes` is not defined, then `context` will be an empty object.
 Context can also let you build an API where parents and children communicate. For example, one library that works this way is [React Router V4](https://reacttraining.com/react-router):
 
 ```javascript
-import { Router, Route, Link } from 'react-router-dom';
+import { BrowserRouter as Router, Route, Link } from 'react-router-dom';
 
 const BasicExample = () => (
   <Router>

From 0a41890eaa018a3509912c12df6c4f24fc0a3200 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Fri, 24 Mar 2017 18:19:12 +0000
Subject: [PATCH 006/153] Remove rethrowCaughtError injection (#9252)

---
 src/renderers/shared/utils/ReactErrorUtils.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/renderers/shared/utils/ReactErrorUtils.js b/src/renderers/shared/utils/ReactErrorUtils.js
index 71ed3063cdf97..2a08fb1124f18 100644
--- a/src/renderers/shared/utils/ReactErrorUtils.js
+++ b/src/renderers/shared/utils/ReactErrorUtils.js
@@ -92,12 +92,7 @@ const ReactErrorUtils = {
         typeof injectedErrorUtils.invokeGuardedCallback === 'function',
         'Injected invokeGuardedCallback() must be a function.',
       );
-      invariant(
-        typeof injectedErrorUtils.rethrowCaughtError === 'function',
-        'Injected rethrowCaughtError() must be a function.',
-      );
       invokeGuardedCallback = injectedErrorUtils.invokeGuardedCallback;
-      rethrowCaughtError = injectedErrorUtils.rethrowCaughtError;
     },
   },
 

From 25deff6203d4cce3e8a9e557c84590052455e22d Mon Sep 17 00:00:00 2001
From: Sasha Aickin <xander76@yahoo.com>
Date: Fri, 24 Mar 2017 13:31:15 -0700
Subject: [PATCH 007/153] Add more SSR unit tests for elements and children.
 (#9221)

* Adding more SSR unit tests for elements and children.

* Some of my SSR tests were testing for react-text and react-empty elements that no longer exist in Fiber. Fixed the tests so that they expect correct markup in Fiber.

* Tweaked some test names after @gaearon review comment https://github.com/facebook/react/pull/9221#discussion_r107045673 . Also realized that one of the tests was essentially a direct copy of another, so deleted it.

* Responding to code review https://github.com/facebook/react/pull/9221#pullrequestreview-28996315 . Thanks @spicyj!
---
 scripts/fiber/tests-failing.txt               |  56 ++
 scripts/fiber/tests-passing-except-dev.txt    |  48 ++
 scripts/fiber/tests-passing.txt               |  88 +++
 .../ReactDOMServerIntegration-test.js         | 586 ++++++++++++++++++
 4 files changed, 778 insertions(+)

diff --git a/scripts/fiber/tests-failing.txt b/scripts/fiber/tests-failing.txt
index 4a4444a784390..c583af694fb07 100644
--- a/scripts/fiber/tests-failing.txt
+++ b/scripts/fiber/tests-failing.txt
@@ -46,6 +46,62 @@ src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
 * renders unknown attributes for custom elements with client render on top of good server markup
 * renders unknown attributes for custom elements using is with client render on top of good server markup
 * renders no HTML events with client render on top of good server markup
+* renders a div with text with client render on top of good server markup
+* renders a div with text with flanking whitespace with client render on top of good server markup
+* renders a div with an empty text child with client render on top of good server markup
+* renders a div with multiple empty text children with server string render
+* renders a div with multiple empty text children with client render on top of good server markup
+* renders a div with multiple whitespace children with server string render
+* renders a div with multiple whitespace children with client render on top of good server markup
+* renders a div with text sibling to a node with server string render
+* renders a div with text sibling to a node with client render on top of good server markup
+* renders a non-standard element with text with client render on top of good server markup
+* renders a custom element with text with client render on top of good server markup
+* renders a leading blank child with a text sibling with server string render
+* renders a leading blank child with a text sibling with client render on top of good server markup
+* renders a trailing blank child with a text sibling with server string render
+* renders a trailing blank child with a text sibling with client render on top of good server markup
+* renders an element with two text children with server string render
+* renders an element with two text children with client render on top of good server markup
+* renders a number as single child with client render on top of good server markup
+* renders zero as single child with client render on top of good server markup
+* renders an element with number and text children with server string render
+* renders an element with number and text children with client render on top of good server markup
+* renders null single child as blank with client render on top of good server markup
+* renders false single child as blank with client render on top of good server markup
+* renders undefined single child as blank with client render on top of good server markup
+* renders a null component children as empty with server string render
+* renders a null component children as empty with client render on top of good server markup
+* renders null children as blank with server string render
+* renders null children as blank with client render on top of good server markup
+* renders false children as blank with server string render
+* renders false children as blank with client render on top of good server markup
+* renders null and false children together as blank with server string render
+* renders null and false children together as blank with client render on top of good server markup
+* renders only null and false children as blank with client render on top of good server markup
+* renders an svg element with client render on top of good server markup
+* renders svg element with an xlink with client render on top of good server markup
+* renders a math element with client render on top of good server markup
+* renders an img with client render on top of good server markup
+* renders a button with client render on top of good server markup
+* renders a div with dangerouslySetInnerHTML with client render on top of good server markup
+* renders a newline-eating tag with content not starting with \n with client render on top of good server markup
+* renders a newline-eating tag with content starting with \n with client render on top of good server markup
+* renders a normal tag with content starting with \n with client render on top of good server markup
+* renders stateless components with client render on top of good server markup
+* renders ES6 class components with client render on top of good server markup
+* renders factory components with client render on top of good server markup
+* renders single child hierarchies of components with client render on top of good server markup
+* renders multi-child hierarchies of components with client render on top of good server markup
+* renders a div with a child with client render on top of good server markup
+* renders a div with multiple children with client render on top of good server markup
+* renders a div with multiple children separated by whitespace with server string render
+* renders a div with multiple children separated by whitespace with client render on top of good server markup
+* renders a div with a single child surrounded by whitespace with server string render
+* renders a div with a single child surrounded by whitespace with client render on top of good server markup
+* renders >,<, and & as single child with client render on top of good server markup
+* renders >,<, and & as multiple children with server string render
+* renders >,<, and & as multiple children with client render on top of good server markup
 
 src/renderers/dom/shared/__tests__/ReactDOMTextComponent-test.js
 * can reconcile text merged by Node.normalize() alongside other elements
diff --git a/scripts/fiber/tests-passing-except-dev.txt b/scripts/fiber/tests-passing-except-dev.txt
index 98dda4bba0127..4ab8bafc5e95d 100644
--- a/scripts/fiber/tests-passing-except-dev.txt
+++ b/scripts/fiber/tests-passing-except-dev.txt
@@ -47,6 +47,54 @@ src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
 * renders unknown attributes for custom elements with client render on top of bad server markup
 * renders unknown attributes for custom elements using is with client render on top of bad server markup
 * renders no HTML events with client render on top of bad server markup
+* renders a div with text with client render on top of bad server markup
+* renders a div with text with flanking whitespace with client render on top of bad server markup
+* renders a div with an empty text child with client render on top of bad server markup
+* renders a div with multiple empty text children with client render on top of bad server markup
+* renders a div with multiple whitespace children with client render on top of bad server markup
+* renders a div with text sibling to a node with client render on top of bad server markup
+* renders a non-standard element with text with client render on top of bad server markup
+* renders a custom element with text with client render on top of bad server markup
+* renders a leading blank child with a text sibling with client render on top of bad server markup
+* renders a trailing blank child with a text sibling with client render on top of bad server markup
+* renders an element with two text children with client render on top of bad server markup
+* renders a number as single child with client render on top of bad server markup
+* renders zero as single child with client render on top of bad server markup
+* renders an element with number and text children with client render on top of bad server markup
+* renders null single child as blank with client render on top of bad server markup
+* renders false single child as blank with client render on top of bad server markup
+* renders undefined single child as blank with client render on top of bad server markup
+* renders a null component children as empty with client render on top of bad server markup
+* renders null children as blank with client render on top of bad server markup
+* renders false children as blank with client render on top of bad server markup
+* renders null and false children together as blank with client render on top of bad server markup
+* renders only null and false children as blank with client render on top of bad server markup
+* renders an svg element with client render on top of bad server markup
+* renders svg element with an xlink with client render on top of bad server markup
+* renders a math element with client render on top of bad server markup
+* renders an img with client render on top of bad server markup
+* renders a button with client render on top of bad server markup
+* renders a div with dangerouslySetInnerHTML with client render on top of bad server markup
+* renders a newline-eating tag with content not starting with \n with client render on top of bad server markup
+* renders a newline-eating tag with content starting with \n with client render on top of bad server markup
+* renders a normal tag with content starting with \n with client render on top of bad server markup
+* renders stateless components with client render on top of bad server markup
+* renders ES6 class components with client render on top of bad server markup
+* renders factory components with client render on top of bad server markup
+* renders single child hierarchies of components with client render on top of bad server markup
+* renders multi-child hierarchies of components with client render on top of bad server markup
+* renders a div with a child with client render on top of bad server markup
+* renders a div with multiple children with client render on top of bad server markup
+* renders a div with multiple children separated by whitespace with client render on top of bad server markup
+* renders a div with a single child surrounded by whitespace with client render on top of bad server markup
+* renders >,<, and & as single child with client render on top of bad server markup
+* renders >,<, and & as multiple children with client render on top of bad server markup
+* throws when rendering a string component with clean client render
+* throws when rendering a string component with client render on top of bad server markup
+* throws when rendering an undefined component with clean client render
+* throws when rendering an undefined component with client render on top of bad server markup
+* throws when rendering a number component with clean client render
+* throws when rendering a number component with client render on top of bad server markup
 
 src/renderers/dom/shared/__tests__/ReactMount-test.js
 * should warn if mounting into dirty rendered markup
diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index 6a88c7cf95c86..16aab7d56eaaf 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -1066,6 +1066,94 @@ src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
 * renders unknown attributes for custom elements using is with clean client render
 * renders no HTML events with server string render
 * renders no HTML events with clean client render
+* renders a div with text with server string render
+* renders a div with text with clean client render
+* renders a div with text with flanking whitespace with server string render
+* renders a div with text with flanking whitespace with clean client render
+* renders a div with an empty text child with server string render
+* renders a div with an empty text child with clean client render
+* renders a div with multiple empty text children with clean client render
+* renders a div with multiple whitespace children with clean client render
+* renders a div with text sibling to a node with clean client render
+* renders a non-standard element with text with server string render
+* renders a non-standard element with text with clean client render
+* renders a custom element with text with server string render
+* renders a custom element with text with clean client render
+* renders a leading blank child with a text sibling with clean client render
+* renders a trailing blank child with a text sibling with clean client render
+* renders an element with two text children with clean client render
+* renders a number as single child with server string render
+* renders a number as single child with clean client render
+* renders zero as single child with server string render
+* renders zero as single child with clean client render
+* renders an element with number and text children with clean client render
+* renders null single child as blank with server string render
+* renders null single child as blank with clean client render
+* renders false single child as blank with server string render
+* renders false single child as blank with clean client render
+* renders undefined single child as blank with server string render
+* renders undefined single child as blank with clean client render
+* renders a null component children as empty with clean client render
+* renders null children as blank with clean client render
+* renders false children as blank with clean client render
+* renders null and false children together as blank with clean client render
+* renders only null and false children as blank with server string render
+* renders only null and false children as blank with clean client render
+* renders an svg element with server string render
+* renders an svg element with clean client render
+* renders svg element with an xlink with server string render
+* renders svg element with an xlink with clean client render
+* renders a math element with server string render
+* renders a math element with clean client render
+* renders an img with server string render
+* renders an img with clean client render
+* renders a button with server string render
+* renders a button with clean client render
+* renders a div with dangerouslySetInnerHTML with server string render
+* renders a div with dangerouslySetInnerHTML with clean client render
+* renders a newline-eating tag with content not starting with \n with server string render
+* renders a newline-eating tag with content not starting with \n with clean client render
+* renders a newline-eating tag with content starting with \n with server string render
+* renders a newline-eating tag with content starting with \n with clean client render
+* renders a normal tag with content starting with \n with server string render
+* renders a normal tag with content starting with \n with clean client render
+* renders stateless components with server string render
+* renders stateless components with clean client render
+* renders ES6 class components with server string render
+* renders ES6 class components with clean client render
+* renders factory components with server string render
+* renders factory components with clean client render
+* renders single child hierarchies of components with server string render
+* renders single child hierarchies of components with clean client render
+* renders multi-child hierarchies of components with server string render
+* renders multi-child hierarchies of components with clean client render
+* renders a div with a child with server string render
+* renders a div with a child with clean client render
+* renders a div with multiple children with server string render
+* renders a div with multiple children with clean client render
+* renders a div with multiple children separated by whitespace with clean client render
+* renders a div with a single child surrounded by whitespace with clean client render
+* renders >,<, and & as single child with server string render
+* renders >,<, and & as single child with clean client render
+* renders >,<, and & as multiple children with clean client render
+* throws when rendering a string component with server string render
+* throws when rendering an undefined component with server string render
+* throws when rendering a number component with server string render
+* throws when rendering null with server string render
+* throws when rendering null with clean client render
+* throws when rendering null with client render on top of bad server markup
+* throws when rendering false with server string render
+* throws when rendering false with clean client render
+* throws when rendering false with client render on top of bad server markup
+* throws when rendering undefined with server string render
+* throws when rendering undefined with clean client render
+* throws when rendering undefined with client render on top of bad server markup
+* throws when rendering number with server string render
+* throws when rendering number with clean client render
+* throws when rendering number with client render on top of bad server markup
+* throws when rendering string with server string render
+* throws when rendering string with clean client render
+* throws when rendering string with client render on top of bad server markup
 
 src/renderers/dom/shared/__tests__/ReactDOMTextComponent-test.js
 * updates a mounted text component in place
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js b/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
index f3aa90ce904c3..eb3c5e25b1592 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
@@ -15,6 +15,7 @@ let ExecutionEnvironment;
 let React;
 let ReactDOM;
 let ReactDOMServer;
+let ReactDOMFeatureFlags;
 
 // Helper functions for rendering tests
 // ====================================
@@ -148,6 +149,31 @@ function itClientRenders(desc, testFn) {
     testFn(clientRenderOnBadMarkup));
 }
 
+function itThrows(desc, testFn) {
+  it(`throws ${desc}`, () => {
+    return testFn()
+      .then(() =>
+        expect(false).toBe('The promise resolved and should not have.'))
+      .catch(() => {});
+  });
+}
+
+function itThrowsWhenRendering(desc, testFn) {
+  itThrows(`when rendering ${desc} with server string render`, () =>
+    testFn(serverRender));
+  itThrows(`when rendering ${desc} with clean client render`, () =>
+    testFn(clientCleanRender));
+
+  // we subtract one from the warning count here because the throw means that it won't
+  // get the usual markup mismatch warning.
+  itThrows(
+    `when rendering ${desc} with client render on top of bad server markup`,
+    () =>
+      testFn((element, warningCount = 0) =>
+        clientRenderOnBadMarkup(element, warningCount - 1)),
+  );
+}
+
 // When there is a test that renders on server and then on client and expects a logged
 // error, you want to see the error show up both on server and client. Unfortunately,
 // React refuses to issue the same error twice to avoid clogging up the console.
@@ -157,6 +183,7 @@ function resetModules() {
   React = require('React');
   ReactDOM = require('ReactDOM');
   ReactDOMServer = require('ReactDOMServer');
+  ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
   ExecutionEnvironment = require('ExecutionEnvironment');
 }
 
@@ -410,4 +437,563 @@ describe('ReactDOMServerIntegration', () => {
       expect(e.getAttribute('click')).toBe(null);
     });
   });
+
+  describe('elements and children', function() {
+    // helper functions.
+    const TEXT_NODE_TYPE = 3;
+    const COMMENT_NODE_TYPE = 8;
+
+    function expectNode(node, type, value) {
+      expect(node).not.toBe(null);
+      expect(node.nodeType).toBe(type);
+      expect(node.nodeValue).toMatch(value);
+    }
+
+    function expectTextNode(node, text) {
+      if (ReactDOMFeatureFlags.useFiber) {
+        // with Fiber, a React text node is just a DOM text node.
+        expectNode(node, TEXT_NODE_TYPE, text);
+      } else {
+        // with Stack, a React text node is a DOM text node surrounded by
+        // react-text comment nodes.
+        expectNode(node, COMMENT_NODE_TYPE, / react-text: [0-9]+ /);
+        if (text.length > 0) {
+          node = node.nextSibling;
+          expectNode(node, TEXT_NODE_TYPE, text);
+        }
+        expectNode(node.nextSibling, COMMENT_NODE_TYPE, / \/react-text /);
+      }
+    }
+
+    function expectEmptyNode(node) {
+      expectNode(node, COMMENT_NODE_TYPE, / react-empty: [0-9]+ /);
+    }
+
+    describe('text children', function() {
+      itRenders('a div with text', async render => {
+        const e = await render(<div>Text</div>);
+        expect(e.tagName).toBe('DIV');
+        expect(e.childNodes.length).toBe(1);
+        expectNode(e.firstChild, TEXT_NODE_TYPE, 'Text');
+      });
+
+      itRenders('a div with text with flanking whitespace', async render => {
+        // prettier-ignore
+        const e = await render(<div>  Text </div>);
+        expect(e.childNodes.length).toBe(1);
+        expectNode(e.childNodes[0], TEXT_NODE_TYPE, '  Text ');
+      });
+
+      itRenders('a div with an empty text child', async render => {
+        const e = await render(<div>{''}</div>);
+        expect(e.childNodes.length).toBe(0);
+      });
+
+      itRenders('a div with multiple empty text children', async render => {
+        const e = await render(<div>{''}{''}{''}</div>);
+        if (ReactDOMFeatureFlags.useFiber) {
+          // with Fiber, there are just three separate text node children,
+          // each of which is blank.
+          expect(e.childNodes.length).toBe(3);
+          expectTextNode(e.childNodes[0], '');
+          expectTextNode(e.childNodes[1], '');
+          expectTextNode(e.childNodes[2], '');
+        } else {
+          // with Stack, there are six react-text comment nodes.
+          expect(e.childNodes.length).toBe(6);
+          expectTextNode(e.childNodes[0], '');
+          expectTextNode(e.childNodes[2], '');
+          expectTextNode(e.childNodes[4], '');
+        }
+      });
+
+      itRenders('a div with multiple whitespace children', async render => {
+        const e = await render(<div>{' '}{' '}{' '}</div>);
+        if (ReactDOMFeatureFlags.useFiber) {
+          // with Fiber, there are just three text nodes.
+          expect(e.childNodes.length).toBe(3);
+          expectTextNode(e.childNodes[0], ' ');
+          expectTextNode(e.childNodes[1], ' ');
+          expectTextNode(e.childNodes[2], ' ');
+        } else {
+          // with Stack, each of the text nodes is surrounded by react-text
+          // comment nodes, making 9 nodes in total.
+          expect(e.childNodes.length).toBe(9);
+          expectTextNode(e.childNodes[0], ' ');
+          expectTextNode(e.childNodes[3], ' ');
+          expectTextNode(e.childNodes[6], ' ');
+        }
+      });
+
+      itRenders('a div with text sibling to a node', async render => {
+        const e = await render(<div>Text<span>More Text</span></div>);
+        let spanNode;
+        if (ReactDOMFeatureFlags.useFiber) {
+          // with Fiber, there are only two children, the "Text" text node and
+          // the span element.
+          expect(e.childNodes.length).toBe(2);
+          spanNode = e.childNodes[1];
+        } else {
+          // with Stack, there are four children, a "Text" text node surrounded
+          // by react-text comment nodes, and the span element.
+          expect(e.childNodes.length).toBe(4);
+          spanNode = e.childNodes[3];
+        }
+        expectTextNode(e.childNodes[0], 'Text');
+        expect(spanNode.tagName).toBe('SPAN');
+        expect(spanNode.childNodes.length).toBe(1);
+        expectNode(spanNode.firstChild, TEXT_NODE_TYPE, 'More Text');
+      });
+
+      itRenders('a non-standard element with text', async render => {
+        const e = await render(<nonstandard>Text</nonstandard>);
+        expect(e.tagName).toBe('NONSTANDARD');
+        expect(e.childNodes.length).toBe(1);
+        expectNode(e.firstChild, TEXT_NODE_TYPE, 'Text');
+      });
+
+      itRenders('a custom element with text', async render => {
+        const e = await render(<custom-element>Text</custom-element>);
+        expect(e.tagName).toBe('CUSTOM-ELEMENT');
+        expect(e.childNodes.length).toBe(1);
+        expectNode(e.firstChild, TEXT_NODE_TYPE, 'Text');
+      });
+
+      itRenders('a leading blank child with a text sibling', async render => {
+        const e = await render(<div>{''}foo</div>);
+        if (ReactDOMFeatureFlags.useFiber) {
+          // with Fiber, there are just two text nodes.
+          expect(e.childNodes.length).toBe(2);
+          expectTextNode(e.childNodes[0], '');
+          expectTextNode(e.childNodes[1], 'foo');
+        } else {
+          // with Stack, there are five nodes: two react-text comment nodes
+          // without any text between them, and the text node foo surrounded
+          // by react-text comment nodes.
+          expect(e.childNodes.length).toBe(5);
+          expectTextNode(e.childNodes[0], '');
+          expectTextNode(e.childNodes[2], 'foo');
+        }
+      });
+
+      itRenders('a trailing blank child with a text sibling', async render => {
+        const e = await render(<div>foo{''}</div>);
+        if (ReactDOMFeatureFlags.useFiber) {
+          // with Fiber, there are just two text nodes.
+          expect(e.childNodes.length).toBe(2);
+          expectTextNode(e.childNodes[0], 'foo');
+          expectTextNode(e.childNodes[1], '');
+        } else {
+          // with Stack, there are five nodes: the text node foo surrounded
+          // by react-text comment nodes, and two react-text comment nodes
+          // without any text between them.
+          expect(e.childNodes.length).toBe(5);
+          expectTextNode(e.childNodes[0], 'foo');
+          expectTextNode(e.childNodes[3], '');
+        }
+      });
+
+      itRenders('an element with two text children', async render => {
+        const e = await render(<div>{'foo'}{'bar'}</div>);
+        if (ReactDOMFeatureFlags.useFiber) {
+          // with Fiber, there are just two text nodes.
+          expect(e.childNodes.length).toBe(2);
+          expectTextNode(e.childNodes[0], 'foo');
+          expectTextNode(e.childNodes[1], 'bar');
+        } else {
+          // with Stack, there are six nodes: two text nodes, each surrounded
+          // by react-text comment nodes.
+          expect(e.childNodes.length).toBe(6);
+          expectTextNode(e.childNodes[0], 'foo');
+          expectTextNode(e.childNodes[3], 'bar');
+        }
+      });
+    });
+
+    describe('number children', function() {
+      itRenders('a number as single child', async render => {
+        const e = await render(<div>{3}</div>);
+        expect(e.textContent).toBe('3');
+      });
+
+      // zero is falsey, so it could look like no children if the code isn't careful.
+      itRenders('zero as single child', async render => {
+        const e = await render(<div>{0}</div>);
+        expect(e.textContent).toBe('0');
+      });
+
+      itRenders('an element with number and text children', async render => {
+        const e = await render(<div>{'foo'}{40}</div>);
+        if (ReactDOMFeatureFlags.useFiber) {
+          // with Fiber, there are just two text nodes.
+          expect(e.childNodes.length).toBe(2);
+          expectTextNode(e.childNodes[0], 'foo');
+          expectTextNode(e.childNodes[1], '40');
+        } else {
+          // with Stack, there are six nodes: two text nodes, each surrounded
+          // by react-text comment nodes.
+          expect(e.childNodes.length).toBe(6);
+          expectTextNode(e.childNodes[0], 'foo');
+          expectTextNode(e.childNodes[3], '40');
+        }
+      });
+    });
+
+    describe('null, false, and undefined children', function() {
+      itRenders('null single child as blank', async render => {
+        const e = await render(<div>{null}</div>);
+        expect(e.childNodes.length).toBe(0);
+      });
+
+      itRenders('false single child as blank', async render => {
+        const e = await render(<div>{false}</div>);
+        expect(e.childNodes.length).toBe(0);
+      });
+
+      itRenders('undefined single child as blank', async render => {
+        const e = await render(<div>{undefined}</div>);
+        expect(e.childNodes.length).toBe(0);
+      });
+
+      itRenders('a null component children as empty', async render => {
+        const NullComponent = () => null;
+        const e = await render(<div><NullComponent /></div>);
+        if (ReactDOMFeatureFlags.useFiber) {
+          // with Fiber, an empty component results in no markup.
+          expect(e.childNodes.length).toBe(0);
+        } else {
+          // with Stack, an empty component results in one react-empty comment
+          // node.
+          expect(e.childNodes.length).toBe(1);
+          expectEmptyNode(e.firstChild);
+        }
+      });
+
+      itRenders('null children as blank', async render => {
+        const e = await render(<div>{null}foo</div>);
+        if (ReactDOMFeatureFlags.useFiber) {
+          // with Fiber, there is just one text node.
+          expect(e.childNodes.length).toBe(1);
+        } else {
+          // with Stack, there's a text node surronded by react-text comment nodes.
+          expect(e.childNodes.length).toBe(3);
+        }
+        expectTextNode(e.childNodes[0], 'foo');
+      });
+
+      itRenders('false children as blank', async render => {
+        const e = await render(<div>{false}foo</div>);
+        if (ReactDOMFeatureFlags.useFiber) {
+          // with Fiber, there is just one text node.
+          expect(e.childNodes.length).toBe(1);
+        } else {
+          // with Stack, there's a text node surronded by react-text comment nodes.
+          expect(e.childNodes.length).toBe(3);
+        }
+        expectTextNode(e.childNodes[0], 'foo');
+      });
+
+      itRenders('null and false children together as blank', async render => {
+        const e = await render(<div>{false}{null}foo{null}{false}</div>);
+        if (ReactDOMFeatureFlags.useFiber) {
+          // with Fiber, there is just one text node.
+          expect(e.childNodes.length).toBe(1);
+        } else {
+          // with Stack, there's a text node surronded by react-text comment nodes.
+          expect(e.childNodes.length).toBe(3);
+        }
+        expectTextNode(e.childNodes[0], 'foo');
+      });
+
+      itRenders('only null and false children as blank', async render => {
+        const e = await render(<div>{false}{null}{null}{false}</div>);
+        expect(e.childNodes.length).toBe(0);
+      });
+    });
+
+    describe('elements with implicit namespaces', function() {
+      itRenders('an svg element', async render => {
+        const e = await render(<svg />);
+        expect(e.childNodes.length).toBe(0);
+        expect(e.tagName).toBe('svg');
+        expect(e.namespaceURI).toBe('http://www.w3.org/2000/svg');
+      });
+
+      itRenders('svg element with an xlink', async render => {
+        let e = await render(
+          <svg><image xlinkHref="http://i.imgur.com/w7GCRPb.png" /></svg>,
+        );
+        e = e.firstChild;
+        expect(e.childNodes.length).toBe(0);
+        expect(e.tagName).toBe('image');
+        expect(e.namespaceURI).toBe('http://www.w3.org/2000/svg');
+        expect(e.getAttributeNS('http://www.w3.org/1999/xlink', 'href')).toBe(
+          'http://i.imgur.com/w7GCRPb.png',
+        );
+      });
+
+      itRenders('a math element', async render => {
+        const e = await render(<math />);
+        expect(e.childNodes.length).toBe(0);
+        expect(e.tagName).toBe('math');
+        expect(e.namespaceURI).toBe('http://www.w3.org/1998/Math/MathML');
+      });
+    });
+    // specially wrapped components
+    // (see the big switch near the beginning ofReactDOMComponent.mountComponent)
+    itRenders('an img', async render => {
+      const e = await render(<img />);
+      expect(e.childNodes.length).toBe(0);
+      expect(e.nextSibling).toBe(null);
+      expect(e.tagName).toBe('IMG');
+    });
+
+    itRenders('a button', async render => {
+      const e = await render(<button />);
+      expect(e.childNodes.length).toBe(0);
+      expect(e.nextSibling).toBe(null);
+      expect(e.tagName).toBe('BUTTON');
+    });
+
+    itRenders('a div with dangerouslySetInnerHTML', async render => {
+      const e = await render(
+        <div dangerouslySetInnerHTML={{__html: "<span id='child'/>"}} />,
+      );
+      expect(e.childNodes.length).toBe(1);
+      expect(e.firstChild.tagName).toBe('SPAN');
+      expect(e.firstChild.getAttribute('id')).toBe('child');
+      expect(e.firstChild.childNodes.length).toBe(0);
+    });
+
+    describe('newline-eating elements', function() {
+      itRenders(
+        'a newline-eating tag with content not starting with \\n',
+        async render => {
+          const e = await render(<pre>Hello</pre>);
+          expect(e.textContent).toBe('Hello');
+        },
+      );
+      itRenders(
+        'a newline-eating tag with content starting with \\n',
+        async render => {
+          const e = await render(<pre>{'\nHello'}</pre>);
+          expect(e.textContent).toBe('\nHello');
+        },
+      );
+      itRenders('a normal tag with content starting with \\n', async render => {
+        const e = await render(<div>{'\nHello'}</div>);
+        expect(e.textContent).toBe('\nHello');
+      });
+    });
+
+    describe('different component implementations', function() {
+      function checkFooDiv(e) {
+        expect(e.childNodes.length).toBe(1);
+        expectNode(e.firstChild, TEXT_NODE_TYPE, 'foo');
+      }
+
+      itRenders('stateless components', async render => {
+        const StatelessComponent = () => <div>foo</div>;
+        checkFooDiv(await render(<StatelessComponent />));
+      });
+
+      itRenders('ES6 class components', async render => {
+        class ClassComponent extends React.Component {
+          render() {
+            return <div>foo</div>;
+          }
+        }
+        checkFooDiv(await render(<ClassComponent />));
+      });
+
+      itRenders('factory components', async render => {
+        const FactoryComponent = () => {
+          return {
+            render: function() {
+              return <div>foo</div>;
+            },
+          };
+        };
+        checkFooDiv(await render(<FactoryComponent />));
+      });
+    });
+
+    describe('component hierarchies', async function() {
+      itRenders('single child hierarchies of components', async render => {
+        const Component = props => <div>{props.children}</div>;
+        let e = await render(
+          <Component>
+            <Component>
+              <Component>
+                <Component />
+              </Component>
+            </Component>
+          </Component>,
+        );
+        for (var i = 0; i < 3; i++) {
+          expect(e.tagName).toBe('DIV');
+          expect(e.childNodes.length).toBe(1);
+          e = e.firstChild;
+        }
+        expect(e.tagName).toBe('DIV');
+        expect(e.childNodes.length).toBe(0);
+      });
+
+      itRenders('multi-child hierarchies of components', async render => {
+        const Component = props => <div>{props.children}</div>;
+        const e = await render(
+          <Component>
+            <Component>
+              <Component /><Component />
+            </Component>
+            <Component>
+              <Component /><Component />
+            </Component>
+          </Component>,
+        );
+        expect(e.tagName).toBe('DIV');
+        expect(e.childNodes.length).toBe(2);
+        for (var i = 0; i < 2; i++) {
+          var child = e.childNodes[i];
+          expect(child.tagName).toBe('DIV');
+          expect(child.childNodes.length).toBe(2);
+          for (var j = 0; j < 2; j++) {
+            var grandchild = child.childNodes[j];
+            expect(grandchild.tagName).toBe('DIV');
+            expect(grandchild.childNodes.length).toBe(0);
+          }
+        }
+      });
+
+      itRenders('a div with a child', async render => {
+        const e = await render(<div id="parent"><div id="child" /></div>);
+        expect(e.id).toBe('parent');
+        expect(e.childNodes.length).toBe(1);
+        expect(e.childNodes[0].id).toBe('child');
+        expect(e.childNodes[0].childNodes.length).toBe(0);
+      });
+
+      itRenders('a div with multiple children', async render => {
+        const e = await render(
+          <div id="parent"><div id="child1" /><div id="child2" /></div>,
+        );
+        expect(e.id).toBe('parent');
+        expect(e.childNodes.length).toBe(2);
+        expect(e.childNodes[0].id).toBe('child1');
+        expect(e.childNodes[0].childNodes.length).toBe(0);
+        expect(e.childNodes[1].id).toBe('child2');
+        expect(e.childNodes[1].childNodes.length).toBe(0);
+      });
+
+      itRenders(
+        'a div with multiple children separated by whitespace',
+        async render => {
+          const e = await render(
+            <div id="parent"><div id="child1" /> <div id="child2" /></div>,
+          );
+          expect(e.id).toBe('parent');
+          let child1, child2, textNode;
+          if (ReactDOMFeatureFlags.useFiber) {
+            // with Fiber, there are three children: the child1 element, a
+            // single space text node, and the child2 element.
+            expect(e.childNodes.length).toBe(3);
+            child1 = e.childNodes[0];
+            textNode = e.childNodes[1];
+            child2 = e.childNodes[2];
+          } else {
+            // with Stack, there are five children: the child1 element, a single
+            // space surrounded by react-text comments, and the child2 element.
+            expect(e.childNodes.length).toBe(5);
+            child1 = e.childNodes[0];
+            textNode = e.childNodes[1];
+            child2 = e.childNodes[4];
+          }
+          expect(child1.id).toBe('child1');
+          expect(child1.childNodes.length).toBe(0);
+          expectTextNode(textNode, ' ');
+          expect(child2.id).toBe('child2');
+          expect(child2.childNodes.length).toBe(0);
+        },
+      );
+
+      itRenders(
+        'a div with a single child surrounded by whitespace',
+        async render => {
+          // prettier-ignore
+          const e = await render(<div id="parent">  <div id="child" />   </div>); // eslint-disable-line no-multi-spaces
+          let textNode1, child, textNode2;
+          if (ReactDOMFeatureFlags.useFiber) {
+            // with Fiber, there are three children: a one-space text node, the
+            // child element, and a two-space text node.
+            expect(e.childNodes.length).toBe(3);
+            textNode1 = e.childNodes[0];
+            child = e.childNodes[1];
+            textNode2 = e.childNodes[2];
+          } else {
+            // with Stack, there are 7 children: a one-space text node surrounded
+            // by react-text comments, the child element, and a two-space text node
+            // surrounded by react-text comments.
+            expect(e.childNodes.length).toBe(7);
+            textNode1 = e.childNodes[0];
+            child = e.childNodes[3];
+            textNode2 = e.childNodes[4];
+          }
+          expect(e.id).toBe('parent');
+          expectTextNode(textNode1, '  ');
+          expect(child.id).toBe('child');
+          expect(child.childNodes.length).toBe(0);
+          expectTextNode(textNode2, '   ');
+        },
+      );
+    });
+
+    describe('escaping >, <, and &', function() {
+      itRenders('>,<, and & as single child', async render => {
+        const e = await render(<div>{'<span>Text&quot;</span>'}</div>);
+        expect(e.childNodes.length).toBe(1);
+        expectNode(e.firstChild, TEXT_NODE_TYPE, '<span>Text&quot;</span>');
+      });
+
+      itRenders('>,<, and & as multiple children', async render => {
+        const e = await render(
+          <div>{'<span>Text1&quot;</span>'}{'<span>Text2&quot;</span>'}</div>,
+        );
+        if (ReactDOMFeatureFlags.useFiber) {
+          // with Fiber, there are just two text nodes.
+          expect(e.childNodes.length).toBe(2);
+          expectTextNode(e.childNodes[0], '<span>Text1&quot;</span>');
+          expectTextNode(e.childNodes[1], '<span>Text2&quot;</span>');
+        } else {
+          // with Stack there are six nodes: two text nodes each surrounded by
+          // two react-text comment nodes.
+          expect(e.childNodes.length).toBe(6);
+          expectTextNode(e.childNodes[0], '<span>Text1&quot;</span>');
+          expectTextNode(e.childNodes[3], '<span>Text2&quot;</span>');
+        }
+      });
+    });
+
+    describe('components that throw errors', function() {
+      itThrowsWhenRendering('a string component', async render => {
+        const StringComponent = () => 'foo';
+        await render(<StringComponent />, 1);
+      });
+
+      itThrowsWhenRendering('an undefined component', async render => {
+        const UndefinedComponent = () => undefined;
+        await render(<UndefinedComponent />, 1);
+      });
+
+      itThrowsWhenRendering('a number component', async render => {
+        const NumberComponent = () => 54;
+        await render(<NumberComponent />, 1);
+      });
+
+      itThrowsWhenRendering('null', render => render(null));
+      itThrowsWhenRendering('false', render => render(false));
+      itThrowsWhenRendering('undefined', render => render(undefined));
+      itThrowsWhenRendering('number', render => render(30));
+      itThrowsWhenRendering('string', render => render('foo'));
+    });
+  });
 });

From 1acf949240f30a9492838e39a9112dc1d7a50e77 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Fri, 24 Mar 2017 15:37:21 -0700
Subject: [PATCH 008/153] ReactElementValidator uses temporary ReactNative View
 propTypes getter (#9256)

---
 .../classic/element/ReactElementValidator.js        | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/isomorphic/classic/element/ReactElementValidator.js b/src/isomorphic/classic/element/ReactElementValidator.js
index dbe09c81549ac..ab606a5a41900 100644
--- a/src/isomorphic/classic/element/ReactElementValidator.js
+++ b/src/isomorphic/classic/element/ReactElementValidator.js
@@ -181,8 +181,17 @@ function validatePropTypes(element) {
     return;
   }
   var name = componentClass.displayName || componentClass.name;
-  if (componentClass.propTypes) {
-    checkReactTypeSpec(componentClass.propTypes, element.props, 'prop', name);
+
+  // ReactNative `View.propTypes` have been deprecated in favor of `ViewPropTypes`.
+  // In their place a temporary getter has been added with a deprecated warning message.
+  // Avoid triggering that warning during validation using the temporary workaround, __propTypesSecretDontUseThesePlease.
+  // TODO (bvaughn) Revert this particular change any time after April 1 ReactNative RC is tagged.
+  var propTypes = typeof componentClass.__propTypesSecretDontUseThesePlease === 'object'
+    ? componentClass.__propTypesSecretDontUseThesePlease
+    : componentClass.propTypes;
+
+  if (propTypes) {
+    checkReactTypeSpec(propTypes, element.props, 'prop', name);
   }
   if (typeof componentClass.getDefaultProps === 'function') {
     warning(

From 1a29b4e2a3c778025d571daafe0e12a53eee18d1 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Fri, 24 Mar 2017 15:44:09 -0700
Subject: [PATCH 009/153] Updating packages for 16.0.0-alpha.6 release

---
 package.json                                | 2 +-
 packages/react-dom/package.json             | 4 ++--
 packages/react-native-renderer/package.json | 4 ++--
 packages/react-noop-renderer/package.json   | 2 +-
 packages/react-test-renderer/package.json   | 4 ++--
 packages/react/package.json                 | 2 +-
 src/ReactVersion.js                         | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 933e805a73ecd..f31ffb1a07787 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-build",
   "private": true,
-  "version": "16.0.0-alpha.5",
+  "version": "16.0.0-alpha.6",
   "devDependencies": {
     "aliasify": "^2.0.0",
     "art": "^0.10.1",
diff --git a/packages/react-dom/package.json b/packages/react-dom/package.json
index babfd1425e297..8689445209741 100644
--- a/packages/react-dom/package.json
+++ b/packages/react-dom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-dom",
-  "version": "16.0.0-alpha.5",
+  "version": "16.0.0-alpha.6",
   "description": "React package for working with the DOM.",
   "main": "index.js",
   "repository": "facebook/react",
@@ -18,7 +18,7 @@
     "object-assign": "^4.1.0"
   },
   "peerDependencies": {
-    "react": "^16.0.0-alpha.5"
+    "react": "^16.0.0-alpha.6"
   },
   "files": [
     "LICENSE",
diff --git a/packages/react-native-renderer/package.json b/packages/react-native-renderer/package.json
index e3573b4413106..88ada47e84556 100644
--- a/packages/react-native-renderer/package.json
+++ b/packages/react-native-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-renderer",
-  "version": "16.0.0-alpha.5",
+  "version": "16.0.0-alpha.6",
   "description": "React package for use inside react-native.",
   "main": "index.js",
   "repository": "facebook/react",
@@ -18,7 +18,7 @@
     "object-assign": "^4.1.0"
   },
   "peerDependencies": {
-    "react": "^16.0.0-alpha.5"
+    "react": "^16.0.0-alpha.6"
   },
   "files": [
     "LICENSE",
diff --git a/packages/react-noop-renderer/package.json b/packages/react-noop-renderer/package.json
index 0261508407cc6..271b4070372b4 100644
--- a/packages/react-noop-renderer/package.json
+++ b/packages/react-noop-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-noop-renderer",
-  "version": "16.0.0-alpha.5",
+  "version": "16.0.0-alpha.6",
   "private": true,
   "description": "React package for testing the Fiber reconciler.",
   "main": "index.js",
diff --git a/packages/react-test-renderer/package.json b/packages/react-test-renderer/package.json
index a6e4c2510ca50..9d01a6b79eabe 100644
--- a/packages/react-test-renderer/package.json
+++ b/packages/react-test-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-test-renderer",
-  "version": "16.0.0-alpha.5",
+  "version": "16.0.0-alpha.6",
   "description": "React package for snapshot testing.",
   "main": "index.js",
   "repository": "facebook/react",
@@ -19,7 +19,7 @@
     "object-assign": "^4.1.0"
   },
   "peerDependencies": {
-    "react": "^16.0.0-alpha.5"
+    "react": "^16.0.0-alpha.6"
   },
   "files": [
     "LICENSE",
diff --git a/packages/react/package.json b/packages/react/package.json
index fbbabe7e3b161..82614dcab0a15 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react",
   "description": "React is a JavaScript library for building user interfaces.",
-  "version": "16.0.0-alpha.5",
+  "version": "16.0.0-alpha.6",
   "keywords": [
     "react"
   ],
diff --git a/src/ReactVersion.js b/src/ReactVersion.js
index bac0802f4aa4c..6bf2d3b1bba84 100644
--- a/src/ReactVersion.js
+++ b/src/ReactVersion.js
@@ -11,4 +11,4 @@
 
 'use strict';
 
-module.exports = '16.0.0-alpha.5';
+module.exports = '16.0.0-alpha.6';

From cb585229bcc76ce35ea6d068c2510a86438798ea Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Fri, 24 Mar 2017 19:59:05 -0700
Subject: [PATCH 010/153] Ran yarn and fixed line-length lint issue

---
 src/isomorphic/classic/element/ReactElementValidator.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/isomorphic/classic/element/ReactElementValidator.js b/src/isomorphic/classic/element/ReactElementValidator.js
index ab606a5a41900..324433338385b 100644
--- a/src/isomorphic/classic/element/ReactElementValidator.js
+++ b/src/isomorphic/classic/element/ReactElementValidator.js
@@ -184,9 +184,11 @@ function validatePropTypes(element) {
 
   // ReactNative `View.propTypes` have been deprecated in favor of `ViewPropTypes`.
   // In their place a temporary getter has been added with a deprecated warning message.
-  // Avoid triggering that warning during validation using the temporary workaround, __propTypesSecretDontUseThesePlease.
-  // TODO (bvaughn) Revert this particular change any time after April 1 ReactNative RC is tagged.
-  var propTypes = typeof componentClass.__propTypesSecretDontUseThesePlease === 'object'
+  // Avoid triggering that warning during validation using the temporary workaround,
+  // __propTypesSecretDontUseThesePlease.
+  // TODO (bvaughn) Revert this particular change any time after April 1 ReactNative tag.
+  var propTypes = typeof componentClass.__propTypesSecretDontUseThesePlease ===
+    'object'
     ? componentClass.__propTypesSecretDontUseThesePlease
     : componentClass.propTypes;
 

From c47f334ac9c77e930f4fbb2dee83a488132a2880 Mon Sep 17 00:00:00 2001
From: najisawas <naji_sawas@gmx.com>
Date: Sat, 25 Mar 2017 18:57:28 -0700
Subject: [PATCH 011/153] Fixed typo on implementation notes page (#9258)

Added paren to "mountComponent()" for consistency
---
 docs/contributing/implementation-notes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contributing/implementation-notes.md b/docs/contributing/implementation-notes.md
index 6fb6ed8310016..2252a006cac71 100644
--- a/docs/contributing/implementation-notes.md
+++ b/docs/contributing/implementation-notes.md
@@ -875,7 +875,7 @@ This document is simplified compared to the real codebase. There are a few impor
 * [`ReactCompositeComponent`](https://github.com/facebook/react/blob/83381c1673d14cd16cf747e34c945291e5518a86/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js) is the equivalent of `CompositeComponent` in this tutorial. It handles calling user-defined components and maintaining their state.
 * [`instantiateReactComponent`](https://github.com/facebook/react/blob/83381c1673d14cd16cf747e34c945291e5518a86/src/renderers/shared/stack/reconciler/instantiateReactComponent.js) contains the switch that picks the right internal instance class to construct for an element. It is equivalent to `instantiateComponent()` in this tutorial.
 
-* [`ReactReconciler`](https://github.com/facebook/react/blob/83381c1673d14cd16cf747e34c945291e5518a86/src/renderers/shared/stack/reconciler/ReactReconciler.js) is a wrapper with `mountComponent`, `receiveComponent()`, and `unmountComponent()` methods. It calls the underlying implementations on the internal instances, but also includes some code around them that is shared by all internal instance implementations.
+* [`ReactReconciler`](https://github.com/facebook/react/blob/83381c1673d14cd16cf747e34c945291e5518a86/src/renderers/shared/stack/reconciler/ReactReconciler.js) is a wrapper with `mountComponent()`, `receiveComponent()`, and `unmountComponent()` methods. It calls the underlying implementations on the internal instances, but also includes some code around them that is shared by all internal instance implementations.
 
 * [`ReactChildReconciler`](https://github.com/facebook/react/blob/83381c1673d14cd16cf747e34c945291e5518a86/src/renderers/shared/stack/reconciler/ReactChildReconciler.js) implements the logic for mounting, updating, and unmounting children according to the `key` of their elements.
 

From b62f851e64066770e7e7929372ced460a1784364 Mon Sep 17 00:00:00 2001
From: Giamir Buoncristiani <giamir@thoughtworks.com>
Date: Sun, 26 Mar 2017 17:24:26 +0100
Subject: [PATCH 012/153] Add a button to switch from Fiber with time-slicing
 to Fiber without it

---
 examples/fiber/index.html | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/examples/fiber/index.html b/examples/fiber/index.html
index 7a56ca0b9da22..a62f2bfcaf6e9 100644
--- a/examples/fiber/index.html
+++ b/examples/fiber/index.html
@@ -126,16 +126,29 @@ <h1>Fiber Example</h1>
       class ExampleApplication extends React.Component {
         constructor() {
           super();
-          this.state = { seconds: 0 };
+          this.state = {
+            seconds: 0,
+            useTimeSlicing: true
+          };
           this.tick = this.tick.bind(this);
+          this.toogleTimeSlicing = this.toogleTimeSlicing.bind(this);
         }
         componentDidMount() {
           this.intervalID = setInterval(this.tick, 1000);
         }
         tick() {
-          ReactDOMFiber.unstable_deferredUpdates(() =>
-            this.setState(state => ({ seconds: (state.seconds % 10) + 1 }))
-          );
+          if (this.state.useTimeSlicing) {
+            // Update is time-sliced.
+            ReactDOMFiber.unstable_deferredUpdates(() => {
+              this.setState(state => ({ ...state, seconds: (state.seconds % 10) + 1 }));
+            });
+          } else {
+            // Update is not time-sliced. Causes demo to stutter.
+            this.setState(state => ({ ...state, seconds: (state.seconds % 10) + 1 }));
+          }
+        }
+        toogleTimeSlicing() {
+          this.setState(state => ({ ...state, useTimeSlicing: !state.useTimeSlicing}));
         }
         componentWillUnmount() {
           clearInterval(this.intervalID);
@@ -147,11 +160,14 @@ <h1>Fiber Example</h1>
           const scale = 1 + (t > 5 ? 10 - t : t) / 10;
           const transform = 'scaleX(' + (scale / 2.1) + ') scaleY(0.7) translateZ(0.1px)';
           return (
-            <div style={{ ...containerStyle, transform }}>
-              <div>
-                <SierpinskiTriangle x={0} y={0} s={1000}>
-                  {this.state.seconds}
-                </SierpinskiTriangle>
+            <div>
+              <button onClick={this.toogleTimeSlicing}>Turn { this.state.useTimeSlicing ? 'OFF' : 'ON' } Time Slicing</button>
+              <div style={{ ...containerStyle, transform }}>
+                <div>
+                  <SierpinskiTriangle x={0} y={0} s={1000}>
+                    {this.state.seconds}
+                  </SierpinskiTriangle>
+                </div>
               </div>
             </div>
           );

From c51411c812d60072a1e5f1b654d7408727093821 Mon Sep 17 00:00:00 2001
From: Sasha Aickin <xander76@yahoo.com>
Date: Sun, 26 Mar 2017 13:32:23 -0700
Subject: [PATCH 013/153] Adding new SSR tests for context, refs, and reviving
 markup. (#9257)

---
 scripts/fiber/tests-failing.txt               |  11 +
 scripts/fiber/tests-passing-except-dev.txt    |  29 ++
 scripts/fiber/tests-passing.txt               |  40 ++
 .../ReactDOMServerIntegration-test.js         | 469 ++++++++++++++++++
 4 files changed, 549 insertions(+)

diff --git a/scripts/fiber/tests-failing.txt b/scripts/fiber/tests-failing.txt
index c583af694fb07..b99355d063d4e 100644
--- a/scripts/fiber/tests-failing.txt
+++ b/scripts/fiber/tests-failing.txt
@@ -102,6 +102,17 @@ src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
 * renders >,<, and & as single child with client render on top of good server markup
 * renders >,<, and & as multiple children with server string render
 * renders >,<, and & as multiple children with client render on top of good server markup
+* renders class child with context with client render on top of good server markup
+* renders stateless child with context with client render on top of good server markup
+* renders class child without context with client render on top of good server markup
+* renders stateless child without context with client render on top of good server markup
+* renders class child with wrong context with client render on top of good server markup
+* renders stateless child with wrong context with client render on top of good server markup
+* renders with context passed through to a grandchild with client render on top of good server markup
+* renders a child context overriding a parent context with client render on top of good server markup
+* renders a child context merged with a parent context with client render on top of good server markup
+* renders with a call to componentWillMount before getChildContext with client render on top of good server markup
+* should send the correct element to ref functions on client
 
 src/renderers/dom/shared/__tests__/ReactDOMTextComponent-test.js
 * can reconcile text merged by Node.normalize() alongside other elements
diff --git a/scripts/fiber/tests-passing-except-dev.txt b/scripts/fiber/tests-passing-except-dev.txt
index 4ab8bafc5e95d..5b7ce16d9231d 100644
--- a/scripts/fiber/tests-passing-except-dev.txt
+++ b/scripts/fiber/tests-passing-except-dev.txt
@@ -95,6 +95,35 @@ src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
 * throws when rendering an undefined component with client render on top of bad server markup
 * throws when rendering a number component with clean client render
 * throws when rendering a number component with client render on top of bad server markup
+* renders class child with context with client render on top of bad server markup
+* renders stateless child with context with client render on top of bad server markup
+* renders class child without context with client render on top of bad server markup
+* renders stateless child without context with client render on top of bad server markup
+* renders class child with wrong context with client render on top of bad server markup
+* renders stateless child with wrong context with client render on top of bad server markup
+* renders with context passed through to a grandchild with client render on top of bad server markup
+* renders a child context overriding a parent context with client render on top of bad server markup
+* renders a child context merged with a parent context with client render on top of bad server markup
+* renders with a call to componentWillMount before getChildContext with client render on top of bad server markup
+* should error reconnecting different element types
+* should error reconnecting missing attributes
+* should error reconnecting added attributes
+* should error reconnecting different attribute values
+* should error reconnecting different text
+* should error reconnecting different numbers
+* should error reconnecting different number from text
+* should error reconnecting different text in two code blocks
+* should error reconnecting missing children
+* should error reconnecting added children
+* should error reconnecting more children
+* should error reconnecting fewer children
+* should error reconnecting reordered children
+* should error reconnecting a div with children separated by whitespace on the client
+* should error reconnecting a div with children separated by different whitespace on the server
+* should error reconnecting a div with children separated by different whitespace
+* can distinguish an empty component from a dom node
+* can distinguish an empty component from an empty text component
+* should error reconnecting a div with different dangerouslySetInnerHTML
 
 src/renderers/dom/shared/__tests__/ReactMount-test.js
 * should warn if mounting into dirty rendered markup
diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index 16aab7d56eaaf..05ca4a1b2bf44 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -1154,6 +1154,46 @@ src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
 * throws when rendering string with server string render
 * throws when rendering string with clean client render
 * throws when rendering string with client render on top of bad server markup
+* renders class child with context with server string render
+* renders class child with context with clean client render
+* renders stateless child with context with server string render
+* renders stateless child with context with clean client render
+* renders class child without context with server string render
+* renders class child without context with clean client render
+* renders stateless child without context with server string render
+* renders stateless child without context with clean client render
+* renders class child with wrong context with server string render
+* renders class child with wrong context with clean client render
+* renders stateless child with wrong context with server string render
+* renders stateless child with wrong context with clean client render
+* renders with context passed through to a grandchild with server string render
+* renders with context passed through to a grandchild with clean client render
+* renders a child context overriding a parent context with server string render
+* renders a child context overriding a parent context with clean client render
+* renders a child context merged with a parent context with server string render
+* renders a child context merged with a parent context with clean client render
+* renders with a call to componentWillMount before getChildContext with server string render
+* renders with a call to componentWillMount before getChildContext with clean client render
+* throws when rendering if getChildContext exists without childContextTypes with server string render
+* throws when rendering if getChildContext exists without childContextTypes with clean client render
+* throws when rendering if getChildContext exists without childContextTypes with client render on top of bad server markup
+* throws when rendering if getChildContext returns a value not in childContextTypes with server string render
+* throws when rendering if getChildContext returns a value not in childContextTypes with clean client render
+* throws when rendering if getChildContext returns a value not in childContextTypes with client render on top of bad server markup
+* should not run ref code on server
+* should run ref code on client
+* should have string refs on client when rendered over server markup
+* should reconnect ES6 Class to ES6 Class
+* should reconnect Pure Component to ES6 Class
+* should reconnect Bare Element to ES6 Class
+* should reconnect ES6 Class to Pure Component
+* should reconnect Pure Component to Pure Component
+* should reconnect Bare Element to Pure Component
+* should reconnect ES6 Class to Bare Element
+* should reconnect Pure Component to Bare Element
+* should reconnect Bare Element to Bare Element
+* should reconnect a div with a number and string version of number
+* should reconnect if component trees differ but resulting markup is the same
 
 src/renderers/dom/shared/__tests__/ReactDOMTextComponent-test.js
 * updates a mounted text component in place
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js b/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
index eb3c5e25b1592..2eda9c38fc87a 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
@@ -174,6 +174,31 @@ function itThrowsWhenRendering(desc, testFn) {
   );
 }
 
+// renders serverElement to a string, sticks it into a DOM element, and then
+// tries to render clientElement on top of it. shouldMatch is a boolean
+// telling whether we should expect the markup to match or not.
+async function testMarkupMatch(serverElement, clientElement, shouldMatch) {
+  const domElement = await serverRender(serverElement);
+  resetModules();
+  return renderIntoDom(
+    clientElement,
+    domElement.parentNode,
+    shouldMatch ? 0 : 1,
+  );
+}
+
+// expects that rendering clientElement on top of a server-rendered
+// serverElement does NOT raise a markup mismatch warning.
+function expectMarkupMatch(serverElement, clientElement) {
+  return testMarkupMatch(serverElement, clientElement, true);
+}
+
+// expects that rendering clientElement on top of a server-rendered
+// serverElement DOES raise a markup mismatch warning.
+function expectMarkupMismatch(serverElement, clientElement) {
+  return testMarkupMatch(serverElement, clientElement, false);
+}
+
 // When there is a test that renders on server and then on client and expects a logged
 // error, you want to see the error show up both on server and client. Unfortunately,
 // React refuses to issue the same error twice to avoid clogging up the console.
@@ -996,4 +1021,448 @@ describe('ReactDOMServerIntegration', () => {
       itThrowsWhenRendering('string', render => render('foo'));
     });
   });
+
+  describe('context', function() {
+    let PurpleContext, RedContext;
+    beforeEach(() => {
+      class Parent extends React.Component {
+        getChildContext() {
+          return {text: this.props.text};
+        }
+        render() {
+          return this.props.children;
+        }
+      }
+      Parent.childContextTypes = {text: React.PropTypes.string};
+
+      PurpleContext = props => <Parent text="purple">{props.children}</Parent>;
+      RedContext = props => <Parent text="red">{props.children}</Parent>;
+    });
+
+    itRenders('class child with context', async render => {
+      class ClassChildWithContext extends React.Component {
+        render() {
+          return <div>{this.context.text}</div>;
+        }
+      }
+      ClassChildWithContext.contextTypes = {text: React.PropTypes.string};
+
+      const e = await render(
+        <PurpleContext><ClassChildWithContext /></PurpleContext>,
+      );
+      expect(e.textContent).toBe('purple');
+    });
+
+    itRenders('stateless child with context', async render => {
+      function StatelessChildWithContext(props, context) {
+        return <div>{context.text}</div>;
+      }
+      StatelessChildWithContext.contextTypes = {text: React.PropTypes.string};
+
+      const e = await render(
+        <PurpleContext><StatelessChildWithContext /></PurpleContext>,
+      );
+      expect(e.textContent).toBe('purple');
+    });
+
+    itRenders('class child without context', async render => {
+      class ClassChildWithoutContext extends React.Component {
+        render() {
+          // this should render blank; context isn't passed to this component.
+          return <div>{this.context.text}</div>;
+        }
+      }
+
+      const e = await render(
+        <PurpleContext><ClassChildWithoutContext /></PurpleContext>,
+      );
+      expect(e.textContent).toBe('');
+    });
+
+    itRenders('stateless child without context', async render => {
+      function StatelessChildWithoutContext(props, context) {
+        // this should render blank; context isn't passed to this component.
+        return <div>{context.text}</div>;
+      }
+
+      const e = await render(
+        <PurpleContext><StatelessChildWithoutContext /></PurpleContext>,
+      );
+      expect(e.textContent).toBe('');
+    });
+
+    itRenders('class child with wrong context', async render => {
+      class ClassChildWithWrongContext extends React.Component {
+        render() {
+          // this should render blank; context.text isn't passed to this component.
+          return <div id="classWrongChild">{this.context.text}</div>;
+        }
+      }
+      ClassChildWithWrongContext.contextTypes = {foo: React.PropTypes.string};
+
+      const e = await render(
+        <PurpleContext><ClassChildWithWrongContext /></PurpleContext>,
+      );
+      expect(e.textContent).toBe('');
+    });
+
+    itRenders('stateless child with wrong context', async render => {
+      function StatelessChildWithWrongContext(props, context) {
+        // this should render blank; context.text isn't passed to this component.
+        return <div id="statelessWrongChild">{context.text}</div>;
+      }
+      StatelessChildWithWrongContext.contextTypes = {
+        foo: React.PropTypes.string,
+      };
+
+      const e = await render(
+        <PurpleContext><StatelessChildWithWrongContext /></PurpleContext>,
+      );
+      expect(e.textContent).toBe('');
+    });
+
+    itRenders('with context passed through to a grandchild', async render => {
+      function Grandchild(props, context) {
+        return <div>{context.text}</div>;
+      }
+      Grandchild.contextTypes = {text: React.PropTypes.string};
+
+      const Child = props => <Grandchild />;
+
+      const e = await render(<PurpleContext><Child /></PurpleContext>);
+      expect(e.textContent).toBe('purple');
+    });
+
+    itRenders('a child context overriding a parent context', async render => {
+      const Grandchild = (props, context) => {
+        return <div>{context.text}</div>;
+      };
+      Grandchild.contextTypes = {text: React.PropTypes.string};
+
+      const e = await render(
+        <PurpleContext><RedContext><Grandchild /></RedContext></PurpleContext>,
+      );
+      expect(e.textContent).toBe('red');
+    });
+
+    itRenders('a child context merged with a parent context', async render => {
+      class Parent extends React.Component {
+        getChildContext() {
+          return {text1: 'purple'};
+        }
+        render() {
+          return <Child />;
+        }
+      }
+      Parent.childContextTypes = {text1: React.PropTypes.string};
+
+      class Child extends React.Component {
+        getChildContext() {
+          return {text2: 'red'};
+        }
+        render() {
+          return <Grandchild />;
+        }
+      }
+      Child.childContextTypes = {text2: React.PropTypes.string};
+
+      const Grandchild = (props, context) => {
+        return (
+          <div>
+            <div id="first">{context.text1}</div>
+            <div id="second">{context.text2}</div>
+          </div>
+        );
+      };
+      Grandchild.contextTypes = {
+        text1: React.PropTypes.string,
+        text2: React.PropTypes.string,
+      };
+
+      const e = await render(<Parent />);
+      expect(e.querySelector('#first').textContent).toBe('purple');
+      expect(e.querySelector('#second').textContent).toBe('red');
+    });
+
+    itRenders(
+      'with a call to componentWillMount before getChildContext',
+      async render => {
+        class WillMountContext extends React.Component {
+          getChildContext() {
+            return {text: this.state.text};
+          }
+          componentWillMount() {
+            this.setState({text: 'foo'});
+          }
+          render() {
+            return <Child />;
+          }
+        }
+        WillMountContext.childContextTypes = {text: React.PropTypes.string};
+
+        const Child = (props, context) => {
+          return <div>{context.text}</div>;
+        };
+        Child.contextTypes = {text: React.PropTypes.string};
+
+        const e = await render(<WillMountContext />);
+        expect(e.textContent).toBe('foo');
+      },
+    );
+
+    itThrowsWhenRendering(
+      'if getChildContext exists without childContextTypes',
+      render => {
+        class Component extends React.Component {
+          render() {
+            return <div />;
+          }
+          getChildContext() {
+            return {foo: 'bar'};
+          }
+        }
+        return render(<Component />);
+      },
+    );
+
+    itThrowsWhenRendering(
+      'if getChildContext returns a value not in childContextTypes',
+      render => {
+        class Component extends React.Component {
+          render() {
+            return <div />;
+          }
+          getChildContext() {
+            return {value1: 'foo', value2: 'bar'};
+          }
+        }
+        Component.childContextTypes = {value1: React.PropTypes.string};
+        return render(<Component />);
+      },
+    );
+  });
+
+  describe('refs', function() {
+    it('should not run ref code on server', async () => {
+      let refCount = 0;
+      class RefsComponent extends React.Component {
+        render() {
+          return <div ref={e => refCount++} />;
+        }
+      }
+      await expectMarkupMatch(<RefsComponent />, <div />);
+      expect(refCount).toBe(0);
+    });
+
+    it('should run ref code on client', async () => {
+      let refCount = 0;
+      class RefsComponent extends React.Component {
+        render() {
+          return <div ref={e => refCount++} />;
+        }
+      }
+      await expectMarkupMatch(<div />, <RefsComponent />);
+      expect(refCount).toBe(1);
+    });
+
+    it('should send the correct element to ref functions on client', async () => {
+      let refElement = null;
+      class RefsComponent extends React.Component {
+        render() {
+          return <div ref={e => refElement = e} />;
+        }
+      }
+      const e = await clientRenderOnServerString(<RefsComponent />);
+      expect(refElement).not.toBe(null);
+      expect(refElement).toBe(e);
+    });
+
+    it('should have string refs on client when rendered over server markup', async () => {
+      class RefsComponent extends React.Component {
+        render() {
+          return <div ref="myDiv" />;
+        }
+      }
+
+      const markup = ReactDOMServer.renderToString(<RefsComponent />);
+      const root = document.createElement('div');
+      root.innerHTML = markup;
+      let component = null;
+      resetModules();
+      await asyncReactDOMRender(
+        <RefsComponent ref={e => component = e} />,
+        root,
+      );
+      expect(component.refs.myDiv).toBe(root.firstChild);
+    });
+  });
+
+  describe('reconnecting to server markup', function() {
+    var EmptyComponent;
+    beforeEach(() => {
+      EmptyComponent = class extends React.Component {
+        render() {
+          return null;
+        }
+      };
+    });
+
+    describe('elements', function() {
+      describe('reconnecting different component implementations', function() {
+        let ES6ClassComponent, PureComponent, bareElement;
+        beforeEach(() => {
+          // try each type of component on client and server.
+          ES6ClassComponent = class extends React.Component {
+            render() {
+              return <div id={this.props.id} />;
+            }
+          };
+          PureComponent = props => <div id={props.id} />;
+          bareElement = <div id="foobarbaz" />;
+        });
+
+        it('should reconnect ES6 Class to ES6 Class', () =>
+          expectMarkupMatch(
+            <ES6ClassComponent id="foobarbaz" />,
+            <ES6ClassComponent id="foobarbaz" />,
+          ));
+
+        it('should reconnect Pure Component to ES6 Class', () =>
+          expectMarkupMatch(
+            <ES6ClassComponent id="foobarbaz" />,
+            <PureComponent id="foobarbaz" />,
+          ));
+
+        it('should reconnect Bare Element to ES6 Class', () =>
+          expectMarkupMatch(<ES6ClassComponent id="foobarbaz" />, bareElement));
+
+        it('should reconnect ES6 Class to Pure Component', () =>
+          expectMarkupMatch(
+            <PureComponent id="foobarbaz" />,
+            <ES6ClassComponent id="foobarbaz" />,
+          ));
+
+        it('should reconnect Pure Component to Pure Component', () =>
+          expectMarkupMatch(
+            <PureComponent id="foobarbaz" />,
+            <PureComponent id="foobarbaz" />,
+          ));
+
+        it('should reconnect Bare Element to Pure Component', () =>
+          expectMarkupMatch(<PureComponent id="foobarbaz" />, bareElement));
+
+        it('should reconnect ES6 Class to Bare Element', () =>
+          expectMarkupMatch(bareElement, <ES6ClassComponent id="foobarbaz" />));
+
+        it('should reconnect Pure Component to Bare Element', () =>
+          expectMarkupMatch(bareElement, <PureComponent id="foobarbaz" />));
+
+        it('should reconnect Bare Element to Bare Element', () =>
+          expectMarkupMatch(bareElement, bareElement));
+      });
+
+      it('should error reconnecting different element types', () =>
+        expectMarkupMismatch(<div />, <span />));
+
+      it('should error reconnecting missing attributes', () =>
+        expectMarkupMismatch(<div id="foo" />, <div />));
+
+      it('should error reconnecting added attributes', () =>
+        expectMarkupMismatch(<div />, <div id="foo" />));
+
+      it('should error reconnecting different attribute values', () =>
+        expectMarkupMismatch(<div id="foo" />, <div id="bar" />));
+    });
+
+    describe('text nodes', function() {
+      it('should error reconnecting different text', () =>
+        expectMarkupMismatch(<div>Text</div>, <div>Other Text</div>));
+
+      it('should reconnect a div with a number and string version of number', () =>
+        expectMarkupMatch(<div>{2}</div>, <div>2</div>));
+
+      it('should error reconnecting different numbers', () =>
+        expectMarkupMismatch(<div>{2}</div>, <div>{3}</div>));
+
+      it('should error reconnecting different number from text', () =>
+        expectMarkupMismatch(<div>{2}</div>, <div>3</div>));
+
+      it('should error reconnecting different text in two code blocks', () =>
+        expectMarkupMismatch(
+          <div>{'Text1'}{'Text2'}</div>,
+          <div>{'Text1'}{'Text3'}</div>,
+        ));
+    });
+
+    describe('element trees and children', function() {
+      it('should error reconnecting missing children', () =>
+        expectMarkupMismatch(<div><div /></div>, <div />));
+
+      it('should error reconnecting added children', () =>
+        expectMarkupMismatch(<div />, <div><div /></div>));
+
+      it('should error reconnecting more children', () =>
+        expectMarkupMismatch(<div><div /></div>, <div><div /><div /></div>));
+
+      it('should error reconnecting fewer children', () =>
+        expectMarkupMismatch(<div><div /><div /></div>, <div><div /></div>));
+
+      it('should error reconnecting reordered children', () =>
+        expectMarkupMismatch(
+          <div><div /><span /></div>,
+          <div><span /><div /></div>,
+        ));
+
+      it('should error reconnecting a div with children separated by whitespace on the client', () =>
+        expectMarkupMismatch(
+          <div id="parent"><div id="child1" /><div id="child2" /></div>,
+          // prettier-ignore
+          <div id="parent"><div id="child1" />      <div id="child2" /></div>, // eslint-disable-line no-multi-spaces
+        ));
+
+      it('should error reconnecting a div with children separated by different whitespace on the server', () =>
+        expectMarkupMismatch(
+          // prettier-ignore
+          <div id="parent"><div id="child1" />      <div id="child2" /></div>, // eslint-disable-line no-multi-spaces
+          <div id="parent"><div id="child1" /><div id="child2" /></div>,
+        ));
+
+      it('should error reconnecting a div with children separated by different whitespace', () =>
+        expectMarkupMismatch(
+          <div id="parent"><div id="child1" /> <div id="child2" /></div>,
+          // prettier-ignore
+          <div id="parent"><div id="child1" />      <div id="child2" /></div>, // eslint-disable-line no-multi-spaces
+        ));
+
+      it('can distinguish an empty component from a dom node', () =>
+        expectMarkupMismatch(
+          <div><span /></div>,
+          <div><EmptyComponent /></div>,
+        ));
+
+      it('can distinguish an empty component from an empty text component', () =>
+        expectMarkupMismatch(<div><EmptyComponent /></div>, <div>{''}</div>));
+
+      it('should reconnect if component trees differ but resulting markup is the same', () => {
+        class Component1 extends React.Component {
+          render() {
+            return <span id="foobar" />;
+          }
+        }
+        class Component2 extends React.Component {
+          render() {
+            return <span id="foobar" />;
+          }
+        }
+        return expectMarkupMatch(<Component1 />, <Component2 />);
+      });
+    });
+
+    // Markup Mismatches: misc
+    it('should error reconnecting a div with different dangerouslySetInnerHTML', () =>
+      expectMarkupMismatch(
+        <div dangerouslySetInnerHTML={{__html: "<span id='child1'/>"}} />,
+        <div dangerouslySetInnerHTML={{__html: "<span id='child2'/>"}} />,
+      ));
+  });
 });

From 14863c9a8722281b6bf1d0d9fc7b95b44e189354 Mon Sep 17 00:00:00 2001
From: Sasha Aickin <xander76@yahoo.com>
Date: Sun, 26 Mar 2017 20:51:40 -0700
Subject: [PATCH 014/153] Adding SSR test for form fields.

---
 scripts/fiber/tests-failing.txt               |  36 ++
 scripts/fiber/tests-passing-except-dev.txt    |  30 +
 scripts/fiber/tests-passing.txt               |  57 +-
 .../ReactDOMServerIntegration-test.js         | 562 +++++++++++++++++-
 4 files changed, 670 insertions(+), 15 deletions(-)

diff --git a/scripts/fiber/tests-failing.txt b/scripts/fiber/tests-failing.txt
index b99355d063d4e..3bd47469acf98 100644
--- a/scripts/fiber/tests-failing.txt
+++ b/scripts/fiber/tests-failing.txt
@@ -102,6 +102,42 @@ src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
 * renders >,<, and & as single child with client render on top of good server markup
 * renders >,<, and & as multiple children with server string render
 * renders >,<, and & as multiple children with client render on top of good server markup
+* renders an input with a value and an onChange with client render on top of good server markup
+* renders an input with a value and readOnly with client render on top of good server markup
+* renders an input with a value and no onChange/readOnly with client render on top of good server markup
+* renders an input with a defaultValue with client render on top of good server markup
+* renders an input value overriding defaultValue with client render on top of good server markup
+* renders an input value overriding defaultValue no matter the prop order with client render on top of good server markup
+* renders a checkbox that is checked with an onChange with client render on top of good server markup
+* renders a checkbox that is checked with readOnly with client render on top of good server markup
+* renders a checkbox that is checked and no onChange/readOnly with client render on top of good server markup
+* renders a checkbox with defaultChecked with client render on top of good server markup
+* renders a checkbox checked overriding defaultChecked with client render on top of good server markup
+* renders a checkbox checked overriding defaultChecked no matter the prop order with client render on top of good server markup
+* renders a textarea with a value and an onChange with client render on top of good server markup
+* renders a textarea with a value and readOnly with client render on top of good server markup
+* renders a textarea with a value and no onChange/readOnly with client render on top of good server markup
+* renders a textarea with a defaultValue with client render on top of good server markup
+* renders a textarea value overriding defaultValue with client render on top of good server markup
+* renders a textarea value overriding defaultValue no matter the prop order with client render on top of good server markup
+* renders a select with a value and an onChange with client render on top of good server markup
+* renders a select with a value and readOnly with client render on top of good server markup
+* renders a select with a multiple values and an onChange with client render on top of good server markup
+* renders a select with a multiple values and readOnly with client render on top of good server markup
+* renders a select with a value and no onChange/readOnly with client render on top of good server markup
+* renders a select with a defaultValue with client render on top of good server markup
+* renders a select value overriding defaultValue with client render on top of good server markup
+* renders a select value overriding defaultValue no matter the prop order with client render on top of good server markup
+* renders a controlled text input with client render on top of good server markup
+* renders a controlled textarea with client render on top of good server markup
+* renders a controlled checkbox with client render on top of good server markup
+* renders a controlled select with client render on top of good server markup
+* should not blow away user-entered text on successful reconnect to an uncontrolled input
+* should not blow away user-entered text on successful reconnect to a controlled input
+* should not blow away user-entered text on successful reconnect to an uncontrolled checkbox
+* should not blow away user-entered text on successful reconnect to a controlled checkbox
+* should not blow away user-selected value on successful reconnect to an uncontrolled select
+* should not blow away user-selected value on successful reconnect to an controlled select
 * renders class child with context with client render on top of good server markup
 * renders stateless child with context with client render on top of good server markup
 * renders class child without context with client render on top of good server markup
diff --git a/scripts/fiber/tests-passing-except-dev.txt b/scripts/fiber/tests-passing-except-dev.txt
index 5b7ce16d9231d..203bd2f0e59d1 100644
--- a/scripts/fiber/tests-passing-except-dev.txt
+++ b/scripts/fiber/tests-passing-except-dev.txt
@@ -95,6 +95,36 @@ src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
 * throws when rendering an undefined component with client render on top of bad server markup
 * throws when rendering a number component with clean client render
 * throws when rendering a number component with client render on top of bad server markup
+* renders an input with a value and an onChange with client render on top of bad server markup
+* renders an input with a value and readOnly with client render on top of bad server markup
+* renders an input with a value and no onChange/readOnly with client render on top of bad server markup
+* renders an input with a defaultValue with client render on top of bad server markup
+* renders an input value overriding defaultValue with client render on top of bad server markup
+* renders an input value overriding defaultValue no matter the prop order with client render on top of bad server markup
+* renders a checkbox that is checked with an onChange with client render on top of bad server markup
+* renders a checkbox that is checked with readOnly with client render on top of bad server markup
+* renders a checkbox that is checked and no onChange/readOnly with client render on top of bad server markup
+* renders a checkbox with defaultChecked with client render on top of bad server markup
+* renders a checkbox checked overriding defaultChecked with client render on top of bad server markup
+* renders a checkbox checked overriding defaultChecked no matter the prop order with client render on top of bad server markup
+* renders a textarea with a value and an onChange with client render on top of bad server markup
+* renders a textarea with a value and readOnly with client render on top of bad server markup
+* renders a textarea with a value and no onChange/readOnly with client render on top of bad server markup
+* renders a textarea with a defaultValue with client render on top of bad server markup
+* renders a textarea value overriding defaultValue with client render on top of bad server markup
+* renders a textarea value overriding defaultValue no matter the prop order with client render on top of bad server markup
+* renders a select with a value and an onChange with client render on top of bad server markup
+* renders a select with a value and readOnly with client render on top of bad server markup
+* renders a select with a multiple values and an onChange with client render on top of bad server markup
+* renders a select with a multiple values and readOnly with client render on top of bad server markup
+* renders a select with a value and no onChange/readOnly with client render on top of bad server markup
+* renders a select with a defaultValue with client render on top of bad server markup
+* renders a select value overriding defaultValue with client render on top of bad server markup
+* renders a select value overriding defaultValue no matter the prop order with client render on top of bad server markup
+* renders a controlled text input with client render on top of bad server markup
+* renders a controlled textarea with client render on top of bad server markup
+* renders a controlled checkbox with client render on top of bad server markup
+* renders a controlled select with client render on top of bad server markup
 * renders class child with context with client render on top of bad server markup
 * renders stateless child with context with client render on top of bad server markup
 * renders class child without context with client render on top of bad server markup
diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index 05ca4a1b2bf44..79e243d6644fc 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -1154,6 +1154,62 @@ src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
 * throws when rendering string with server string render
 * throws when rendering string with clean client render
 * throws when rendering string with client render on top of bad server markup
+* renders an input with a value and an onChange with server string render
+* renders an input with a value and an onChange with clean client render
+* renders an input with a value and readOnly with server string render
+* renders an input with a value and readOnly with clean client render
+* renders an input with a value and no onChange/readOnly with server string render
+* renders an input with a value and no onChange/readOnly with clean client render
+* renders an input with a defaultValue with server string render
+* renders an input with a defaultValue with clean client render
+* renders an input value overriding defaultValue with server string render
+* renders an input value overriding defaultValue with clean client render
+* renders an input value overriding defaultValue no matter the prop order with server string render
+* renders an input value overriding defaultValue no matter the prop order with clean client render
+* renders a checkbox that is checked with an onChange with server string render
+* renders a checkbox that is checked with an onChange with clean client render
+* renders a checkbox that is checked with readOnly with server string render
+* renders a checkbox that is checked with readOnly with clean client render
+* renders a checkbox that is checked and no onChange/readOnly with server string render
+* renders a checkbox that is checked and no onChange/readOnly with clean client render
+* renders a checkbox with defaultChecked with server string render
+* renders a checkbox with defaultChecked with clean client render
+* renders a checkbox checked overriding defaultChecked with server string render
+* renders a checkbox checked overriding defaultChecked with clean client render
+* renders a checkbox checked overriding defaultChecked no matter the prop order with server string render
+* renders a checkbox checked overriding defaultChecked no matter the prop order with clean client render
+* renders a textarea with a value and an onChange with server string render
+* renders a textarea with a value and an onChange with clean client render
+* renders a textarea with a value and readOnly with server string render
+* renders a textarea with a value and readOnly with clean client render
+* renders a textarea with a value and no onChange/readOnly with server string render
+* renders a textarea with a value and no onChange/readOnly with clean client render
+* renders a textarea with a defaultValue with server string render
+* renders a textarea with a defaultValue with clean client render
+* renders a textarea value overriding defaultValue with server string render
+* renders a textarea value overriding defaultValue with clean client render
+* renders a textarea value overriding defaultValue no matter the prop order with server string render
+* renders a textarea value overriding defaultValue no matter the prop order with clean client render
+* renders a select with a value and an onChange with server string render
+* renders a select with a value and an onChange with clean client render
+* renders a select with a value and readOnly with server string render
+* renders a select with a value and readOnly with clean client render
+* renders a select with a multiple values and an onChange with server string render
+* renders a select with a multiple values and an onChange with clean client render
+* renders a select with a multiple values and readOnly with server string render
+* renders a select with a multiple values and readOnly with clean client render
+* renders a select with a value and no onChange/readOnly with server string render
+* renders a select with a value and no onChange/readOnly with clean client render
+* renders a select with a defaultValue with server string render
+* renders a select with a defaultValue with clean client render
+* renders a select value overriding defaultValue with server string render
+* renders a select value overriding defaultValue with clean client render
+* renders a select value overriding defaultValue no matter the prop order with server string render
+* renders a select value overriding defaultValue no matter the prop order with clean client render
+* renders a controlled text input with clean client render
+* renders a controlled textarea with clean client render
+* renders a controlled checkbox with clean client render
+* renders a controlled select with clean client render
 * renders class child with context with server string render
 * renders class child with context with clean client render
 * renders stateless child with context with server string render
@@ -1193,7 +1249,6 @@ src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
 * should reconnect Pure Component to Bare Element
 * should reconnect Bare Element to Bare Element
 * should reconnect a div with a number and string version of number
-* should reconnect if component trees differ but resulting markup is the same
 
 src/renderers/dom/shared/__tests__/ReactDOMTextComponent-test.js
 * updates a mounted text component in place
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js b/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
index 2eda9c38fc87a..403254c66ff91 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
@@ -16,6 +16,7 @@ let React;
 let ReactDOM;
 let ReactDOMServer;
 let ReactDOMFeatureFlags;
+let ReactTestUtils;
 
 // Helper functions for rendering tests
 // ====================================
@@ -209,6 +210,7 @@ function resetModules() {
   ReactDOM = require('ReactDOM');
   ReactDOMServer = require('ReactDOMServer');
   ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
+  ReactTestUtils = require('ReactTestUtils');
   ExecutionEnvironment = require('ExecutionEnvironment');
 }
 
@@ -1022,6 +1024,552 @@ describe('ReactDOMServerIntegration', () => {
     });
   });
 
+  describe('form controls', function() {
+    describe('inputs', function() {
+      itRenders('an input with a value and an onChange', async render => {
+        const e = await render(<input value="foo" onChange={() => {}} />);
+        expect(e.value).toBe('foo');
+      });
+
+      itRenders('an input with a value and readOnly', async render => {
+        const e = await render(<input value="foo" readOnly={true} />);
+        expect(e.value).toBe('foo');
+      });
+
+      itRenders(
+        'an input with a value and no onChange/readOnly',
+        async render => {
+          // this configuration should raise a dev warning that value without
+          // onChange or readOnly is a mistake.
+          const e = await render(<input value="foo" />, 1);
+          expect(e.value).toBe('foo');
+        },
+      );
+
+      itRenders('an input with a defaultValue', async render => {
+        const e = await render(<input defaultValue="foo" />);
+        expect(e.value).toBe('foo');
+        expect(e.getAttribute('defaultValue')).toBe(null);
+      });
+
+      itRenders('an input value overriding defaultValue', async render => {
+        const e = await render(
+          <input value="foo" defaultValue="bar" readOnly={true} />,
+          1,
+        );
+        expect(e.value).toBe('foo');
+        expect(e.getAttribute('defaultValue')).toBe(null);
+      });
+
+      itRenders(
+        'an input value overriding defaultValue no matter the prop order',
+        async render => {
+          const e = await render(
+            <input defaultValue="bar" value="foo" readOnly={true} />,
+            1,
+          );
+          expect(e.value).toBe('foo');
+          expect(e.getAttribute('defaultValue')).toBe(null);
+        },
+      );
+    });
+
+    describe('checkboxes', function() {
+      itRenders('a checkbox that is checked with an onChange', async render => {
+        const e = await render(
+          <input type="checkbox" checked={true} onChange={() => {}} />,
+        );
+        expect(e.checked).toBe(true);
+      });
+
+      itRenders('a checkbox that is checked with readOnly', async render => {
+        const e = await render(
+          <input type="checkbox" checked={true} readOnly={true} />,
+        );
+        expect(e.checked).toBe(true);
+      });
+
+      itRenders(
+        'a checkbox that is checked and no onChange/readOnly',
+        async render => {
+          // this configuration should raise a dev warning that checked without
+          // onChange or readOnly is a mistake.
+          const e = await render(<input type="checkbox" checked={true} />, 1);
+          expect(e.checked).toBe(true);
+        },
+      );
+
+      itRenders('a checkbox with defaultChecked', async render => {
+        const e = await render(<input type="checkbox" defaultChecked={true} />);
+        expect(e.checked).toBe(true);
+        expect(e.getAttribute('defaultChecked')).toBe(null);
+      });
+
+      itRenders(
+        'a checkbox checked overriding defaultChecked',
+        async render => {
+          const e = await render(
+            <input
+              type="checkbox"
+              checked={true}
+              defaultChecked={false}
+              readOnly={true}
+            />,
+            1,
+          );
+          expect(e.checked).toBe(true);
+          expect(e.getAttribute('defaultChecked')).toBe(null);
+        },
+      );
+
+      itRenders(
+        'a checkbox checked overriding defaultChecked no matter the prop order',
+        async render => {
+          const e = await render(
+            <input
+              type="checkbox"
+              defaultChecked={false}
+              checked={true}
+              readOnly={true}
+            />,
+            1,
+          );
+          expect(e.checked).toBe(true);
+          expect(e.getAttribute('defaultChecked')).toBe(null);
+        },
+      );
+    });
+
+    describe('textareas', function() {
+      // textareas
+      // ---------
+      itRenders('a textarea with a value and an onChange', async render => {
+        const e = await render(<textarea value="foo" onChange={() => {}} />);
+        // textarea DOM elements don't have a value **attribute**, the text is
+        // a child of the element and accessible via the .value **property**.
+        expect(e.getAttribute('value')).toBe(null);
+        expect(e.value).toBe('foo');
+      });
+
+      itRenders('a textarea with a value and readOnly', async render => {
+        const e = await render(<textarea value="foo" readOnly={true} />);
+        // textarea DOM elements don't have a value **attribute**, the text is
+        // a child of the element and accessible via the .value **property**.
+        expect(e.getAttribute('value')).toBe(null);
+        expect(e.value).toBe('foo');
+      });
+
+      itRenders(
+        'a textarea with a value and no onChange/readOnly',
+        async render => {
+          // this configuration should raise a dev warning that value without
+          // onChange or readOnly is a mistake.
+          const e = await render(<textarea value="foo" />, 1);
+          expect(e.getAttribute('value')).toBe(null);
+          expect(e.value).toBe('foo');
+        },
+      );
+
+      itRenders('a textarea with a defaultValue', async render => {
+        const e = await render(<textarea defaultValue="foo" />);
+        expect(e.getAttribute('value')).toBe(null);
+        expect(e.getAttribute('defaultValue')).toBe(null);
+        expect(e.value).toBe('foo');
+      });
+
+      itRenders('a textarea value overriding defaultValue', async render => {
+        const e = await render(
+          <textarea value="foo" defaultValue="bar" readOnly={true} />,
+          1,
+        );
+        expect(e.getAttribute('value')).toBe(null);
+        expect(e.getAttribute('defaultValue')).toBe(null);
+        expect(e.value).toBe('foo');
+      });
+
+      itRenders(
+        'a textarea value overriding defaultValue no matter the prop order',
+        async render => {
+          const e = await render(
+            <textarea defaultValue="bar" value="foo" readOnly={true} />,
+            1,
+          );
+          expect(e.getAttribute('value')).toBe(null);
+          expect(e.getAttribute('defaultValue')).toBe(null);
+          expect(e.value).toBe('foo');
+        },
+      );
+    });
+
+    describe('selects', function() {
+      var options;
+      beforeEach(function() {
+        options = [
+          <option key={1} value="foo" id="foo">Foo</option>,
+          <option key={2} value="bar" id="bar">Bar</option>,
+          <option key={3} value="baz" id="baz">Baz</option>,
+        ];
+      });
+
+      // a helper function to test the selected value of a <select> element.
+      // takes in a <select> DOM element (element) and a value or array of
+      // values that should be selected (selected).
+      const expectSelectValue = (element, selected) => {
+        if (!Array.isArray(selected)) {
+          selected = [selected];
+        }
+        // the select DOM element shouldn't ever have a value or defaultValue
+        // attribute; that is not how select values are expressed in the DOM.
+        expect(element.getAttribute('value')).toBe(null);
+        expect(element.getAttribute('defaultValue')).toBe(null);
+
+        ['foo', 'bar', 'baz'].forEach(value => {
+          const expectedValue = selected.indexOf(value) !== -1;
+          var option = element.querySelector(`#${value}`);
+          expect(option.selected).toBe(expectedValue);
+        });
+      };
+
+      itRenders('a select with a value and an onChange', async render => {
+        const e = await render(
+          <select value="bar" onChange={() => {}}>{options}</select>,
+        );
+        expectSelectValue(e, 'bar');
+      });
+
+      itRenders('a select with a value and readOnly', async render => {
+        const e = await render(
+          <select value="bar" readOnly={true}>{options}</select>,
+        );
+        expectSelectValue(e, 'bar');
+      });
+
+      itRenders(
+        'a select with a multiple values and an onChange',
+        async render => {
+          const e = await render(
+            <select value={['bar', 'baz']} multiple={true} onChange={() => {}}>
+              {options}
+            </select>,
+          );
+          expectSelectValue(e, ['bar', 'baz']);
+        },
+      );
+
+      itRenders(
+        'a select with a multiple values and readOnly',
+        async render => {
+          const e = await render(
+            <select value={['bar', 'baz']} multiple={true} readOnly={true}>
+              {options}
+            </select>,
+          );
+          expectSelectValue(e, ['bar', 'baz']);
+        },
+      );
+
+      itRenders(
+        'a select with a value and no onChange/readOnly',
+        async render => {
+          // this configuration should raise a dev warning that value without
+          // onChange or readOnly is a mistake.
+          const e = await render(<select value="bar">{options}</select>, 1);
+          expectSelectValue(e, 'bar');
+        },
+      );
+
+      itRenders('a select with a defaultValue', async render => {
+        const e = await render(<select defaultValue="bar">{options}</select>);
+        expectSelectValue(e, 'bar');
+      });
+
+      itRenders('a select value overriding defaultValue', async render => {
+        const e = await render(
+          <select value="bar" defaultValue="baz" readOnly={true}>
+            {options}
+          </select>,
+          1,
+        );
+        expectSelectValue(e, 'bar');
+      });
+
+      itRenders(
+        'a select value overriding defaultValue no matter the prop order',
+        async render => {
+          const e = await render(
+            <select defaultValue="baz" value="bar" readOnly={true}>
+              {options}
+            </select>,
+            1,
+          );
+          expectSelectValue(e, 'bar');
+        },
+      );
+    });
+
+    describe('user interaction', function() {
+      let ControlledInput,
+        ControlledTextArea,
+        ControlledCheckbox,
+        ControlledSelect;
+      beforeEach(() => {
+        ControlledInput = class extends React.Component {
+          constructor() {
+            super();
+            this.state = {value: 'Hello'};
+          }
+          handleChange(event) {
+            if (this.props.onChange) {
+              this.props.onChange(event);
+            }
+            this.setState({value: event.target.value});
+          }
+          render() {
+            return (
+              <input
+                value={this.state.value}
+                onChange={this.handleChange.bind(this)}
+              />
+            );
+          }
+        };
+        ControlledTextArea = class extends React.Component {
+          constructor() {
+            super();
+            this.state = {value: 'Hello'};
+          }
+          handleChange(event) {
+            if (this.props.onChange) {
+              this.props.onChange(event);
+            }
+            this.setState({value: event.target.value});
+          }
+          render() {
+            return (
+              <textarea
+                value={this.state.value}
+                onChange={this.handleChange.bind(this)}
+              />
+            );
+          }
+        };
+        ControlledCheckbox = class extends React.Component {
+          constructor() {
+            super();
+            this.state = {value: true};
+          }
+          handleChange(event) {
+            if (this.props.onChange) {
+              this.props.onChange(event);
+            }
+            this.setState({value: event.target.checked});
+          }
+          render() {
+            return (
+              <input
+                type="checkbox"
+                checked={this.state.value}
+                onChange={this.handleChange.bind(this)}
+              />
+            );
+          }
+        };
+        ControlledSelect = class extends React.Component {
+          constructor() {
+            super();
+            this.state = {value: 'Hello'};
+          }
+          handleChange(event) {
+            if (this.props.onChange) {
+              this.props.onChange(event);
+            }
+            this.setState({value: event.target.value});
+          }
+          render() {
+            return (
+              <select
+                value={this.state.value}
+                onChange={this.handleChange.bind(this)}>
+                <option key="1" value="Hello">Hello</option>
+                <option key="2" value="Goodbye">Goodbye</option>
+              </select>
+            );
+          }
+        };
+      });
+
+      describe('user interaction with controlled inputs', function() {
+        itClientRenders('a controlled text input', async render => {
+          let changeCount = 0;
+          const e = await render(
+            <ControlledInput onChange={() => changeCount++} />,
+          );
+          expect(changeCount).toBe(0);
+          expect(e.value).toBe('Hello');
+
+          // simulate a user typing.
+          e.value = 'Goodbye';
+          ReactTestUtils.Simulate.change(e);
+
+          expect(changeCount).toBe(1);
+          expect(e.value).toBe('Goodbye');
+        });
+
+        itClientRenders('a controlled textarea', async render => {
+          let changeCount = 0;
+          const e = await render(
+            <ControlledTextArea onChange={() => changeCount++} />,
+          );
+          expect(changeCount).toBe(0);
+          expect(e.value).toBe('Hello');
+
+          // simulate a user typing.
+          e.value = 'Goodbye';
+          ReactTestUtils.Simulate.change(e);
+
+          expect(changeCount).toBe(1);
+          expect(e.value).toBe('Goodbye');
+        });
+
+        itClientRenders('a controlled checkbox', async render => {
+          let changeCount = 0;
+          const e = await render(
+            <ControlledCheckbox onChange={() => changeCount++} />,
+          );
+          expect(changeCount).toBe(0);
+          expect(e.checked).toBe(true);
+
+          // simulate a user typing.
+          e.checked = false;
+          ReactTestUtils.Simulate.change(e);
+
+          expect(changeCount).toBe(1);
+          expect(e.checked).toBe(false);
+        });
+
+        itClientRenders('a controlled select', async render => {
+          let changeCount = 0;
+          const e = await render(
+            <ControlledSelect onChange={() => changeCount++} />,
+          );
+          expect(changeCount).toBe(0);
+          expect(e.value).toBe('Hello');
+
+          // simulate a user typing.
+          e.value = 'Goodbye';
+          ReactTestUtils.Simulate.change(e);
+
+          expect(changeCount).toBe(1);
+          expect(e.value).toBe('Goodbye');
+        });
+      });
+
+      describe('user interaction with inputs before client render', function() {
+        // renders the element and changes the value **before** the client
+        // code has a chance to render; this simulates what happens when a
+        // user starts to interact with a server-rendered form before
+        // ReactDOM.render is called. the client render should NOT blow away
+        // the changes the user has made.
+        const testUserInteractionBeforeClientRender = async (
+          element,
+          initialValue = 'Hello',
+          changedValue = 'Goodbye',
+          valueKey = 'value',
+        ) => {
+          const field = await serverRender(element);
+          expect(field[valueKey]).toBe(initialValue);
+
+          // simulate a user typing in the field **before** client-side reconnect happens.
+          field[valueKey] = changedValue;
+
+          resetModules();
+          // client render on top of the server markup.
+          const clientField = await renderIntoDom(element, field.parentNode);
+          // verify that the input field was not replaced.
+          // Note that we cannot use expect(clientField).toBe(field) because
+          // of jest bug #1772
+          expect(clientField === field).toBe(true);
+          // confirm that the client render has not changed what the user typed.
+          expect(clientField[valueKey]).toBe(changedValue);
+        };
+
+        it('should not blow away user-entered text on successful reconnect to an uncontrolled input', () =>
+          testUserInteractionBeforeClientRender(
+            <input defaultValue="Hello" />,
+          ));
+
+        it('should not blow away user-entered text on successful reconnect to a controlled input', async () => {
+          let changeCount = 0;
+          await testUserInteractionBeforeClientRender(
+            <ControlledInput onChange={() => changeCount++} />,
+          );
+          // note that there's a strong argument to be made that the DOM revival
+          // algorithm should notice that the user has changed the value and fire
+          // an onChange. however, it does not now, so that's what this tests.
+          expect(changeCount).toBe(0);
+        });
+
+        it('should not blow away user-entered text on successful reconnect to an uncontrolled checkbox', () =>
+          testUserInteractionBeforeClientRender(
+            <input type="checkbox" defaultChecked={true} />,
+            true,
+            false,
+            'checked',
+          ));
+
+        it('should not blow away user-entered text on successful reconnect to a controlled checkbox', async () => {
+          let changeCount = 0;
+          await testUserInteractionBeforeClientRender(
+            <ControlledCheckbox onChange={() => changeCount++} />,
+            true,
+            false,
+            'checked',
+          );
+          expect(changeCount).toBe(0);
+        });
+
+        // skipping this test because React 15 does the wrong thing. it blows
+        // away the user's typing in the textarea.
+        xit(
+          'should not blow away user-entered text on successful reconnect to an uncontrolled textarea',
+          () =>
+            testUserInteractionBeforeClientRender(
+              <textarea defaultValue="Hello" />,
+            ),
+        );
+
+        // skipping this test because React 15 does the wrong thing. it blows
+        // away the user's typing in the textarea.
+        xit(
+          'should not blow away user-entered text on successful reconnect to a controlled textarea',
+          async () => {
+            let changeCount = 0;
+            await testUserInteractionBeforeClientRender(
+              <ControlledTextArea onChange={() => changeCount++} />,
+            );
+            expect(changeCount).toBe(0);
+          },
+        );
+
+        it('should not blow away user-selected value on successful reconnect to an uncontrolled select', () =>
+          testUserInteractionBeforeClientRender(
+            <select defaultValue="Hello">
+              <option key="1" value="Hello">Hello</option>
+              <option key="2" value="Goodbye">Goodbye</option>
+            </select>,
+          ));
+
+        it('should not blow away user-selected value on successful reconnect to an controlled select', async () => {
+          let changeCount = 0;
+          await testUserInteractionBeforeClientRender(
+            <ControlledSelect onChange={() => changeCount++} />,
+          );
+          expect(changeCount).toBe(0);
+        });
+      });
+    });
+  });
+
   describe('context', function() {
     let PurpleContext, RedContext;
     beforeEach(() => {
@@ -1442,20 +1990,6 @@ describe('ReactDOMServerIntegration', () => {
 
       it('can distinguish an empty component from an empty text component', () =>
         expectMarkupMismatch(<div><EmptyComponent /></div>, <div>{''}</div>));
-
-      it('should reconnect if component trees differ but resulting markup is the same', () => {
-        class Component1 extends React.Component {
-          render() {
-            return <span id="foobar" />;
-          }
-        }
-        class Component2 extends React.Component {
-          render() {
-            return <span id="foobar" />;
-          }
-        }
-        return expectMarkupMatch(<Component1 />, <Component2 />);
-      });
     });
 
     // Markup Mismatches: misc

From 29d9710892f773b4d5081f1b77820d40d79f69d3 Mon Sep 17 00:00:00 2001
From: Nathan Hunzaker <nate.hunzaker@gmail.com>
Date: Mon, 27 Mar 2017 12:39:18 -0400
Subject: [PATCH 015/153] Fix Chrome number input backspace and invalid input
 issue (#7359)

* Only re-assign defaultValue if it is different

* Do not set value if it is the same

* Properly cover defaultValue

* Use coercion to be smart about value assignment

* Add explanation of loose type checks in value assignment.

* Add test coverage for setAttribute update.

* Only apply loose value check to text inputs

* Fix case where empty switches to zero

* Handle zero case in controlled input

* Correct mistake with default value assignment after rebase

* Do not assign bad input to number input

* Only trigger number input value attribute updates on blur

* Remove reference to LinkedValueUtils

* Record new fiber tests

* Add tests for blurred number input behavior

* Replace onBlur wrapper with rule in ChangeEventPlugin

* Sift down to only number inputs

* Re-record fiber tests

* Add test case for updating attribute on uncontrolled inputs. Make related correction

* Handle uncontrolled inputs, integrate fiber

* Reorder boolean to mitigate DOM checks

* Only assign value if it is different

* Add number input browser test fixtures

During the course of the number input fix, we uncovered many edge
cases. This commit adds browser test fixtures for each of those instances.

* Address edge case preventing number precision lower than 1 place

0.0 coerces to 0, however they are not the same value when doing
string comparision. This prevented controlled number inputs from
inputing the characters `0.00`.

Also adds test cases.

* Accommodate lack of IE9 number input support

IE9 does not support number inputs. Number inputs in IE9 fallback to
traditional text inputs. This means that accessing `input.value` will
report the raw text, rather than parsing a numeric value.

This commit makes the ReactDOMInput wrapper check to see if the `type`
prop has been configured to `"number"`. In those cases, it will
perform a comparison based upon `parseFloat` instead of the raw input
value.

* Remove footnotes about IE exponent issues

With the recent IE9 fix, IE properly inserts `e` when it produces an
invalid number.

* Address exception in IE9/10 ChangeEventPlugin blur event

On blur, inputs have their values assigned. This is so that number
inputs do not conduct unexpected behavior in
Chrome/Safari. Unfortunately, there are cases where the target
instance might be undefined in IE9/10, raising an exception.

* Migrate over ReactDOMInput.js number input fixes to Fiber

Also re-record tests

* Update number fixtures to use latest components

* Add number input test case for dashes and negative numbers

* Replace trailing dash test case with replace with dash

Also run prettier
---
 fixtures/dom/src/components/Header.js         |   1 +
 fixtures/dom/src/components/fixtures/index.js |   3 +
 .../fixtures/number-inputs/NumberTestCase.js  |  37 ++++
 .../fixtures/number-inputs/index.js           | 167 ++++++++++++++++++
 scripts/fiber/tests-passing.txt               |  11 ++
 .../dom/fiber/wrappers/ReactDOMFiberInput.js  |  28 +--
 .../dom/shared/HTMLDOMPropertyConfig.js       |  28 +++
 .../__tests__/DOMPropertyOperations-test.js   |  29 +++
 .../shared/eventPlugins/ChangeEventPlugin.js  |  25 +++
 .../wrappers/__tests__/ReactDOMInput-test.js  | 126 +++++++++++++
 .../stack/client/wrappers/ReactDOMInput.js    |  28 +--
 11 files changed, 463 insertions(+), 20 deletions(-)
 create mode 100644 fixtures/dom/src/components/fixtures/number-inputs/NumberTestCase.js
 create mode 100644 fixtures/dom/src/components/fixtures/number-inputs/index.js

diff --git a/fixtures/dom/src/components/Header.js b/fixtures/dom/src/components/Header.js
index 83f77eee31c20..5f717d8be12ee 100644
--- a/fixtures/dom/src/components/Header.js
+++ b/fixtures/dom/src/components/Header.js
@@ -44,6 +44,7 @@ const Header = React.createClass({
               <option value="/">Select a Fixture</option>
               <option value="/range-inputs">Range Inputs</option>
               <option value="/text-inputs">Text Inputs</option>
+              <option value="/number-inputs">Number Input</option>
               <option value="/selects">Selects</option>
               <option value="/textareas">Textareas</option>
               <option value="/input-change-events">Input change events</option>
diff --git a/fixtures/dom/src/components/fixtures/index.js b/fixtures/dom/src/components/fixtures/index.js
index ea7cebbde8899..516e8ad3aee27 100644
--- a/fixtures/dom/src/components/fixtures/index.js
+++ b/fixtures/dom/src/components/fixtures/index.js
@@ -4,6 +4,7 @@ import TextInputFixtures from './text-inputs';
 import SelectFixtures from './selects';
 import TextAreaFixtures from './textareas';
 import InputChangeEvents from './input-change-events';
+import NumberInputFixtures from './number-inputs/';
 
 /**
  * A simple routing component that renders the appropriate
@@ -22,6 +23,8 @@ const FixturesPage = React.createClass({
         return <TextAreaFixtures />;
       case '/input-change-events':
         return <InputChangeEvents />;
+      case '/number-inputs':
+        return <NumberInputFixtures />;
       default:
         return <p>Please select a test fixture.</p>;
     }
diff --git a/fixtures/dom/src/components/fixtures/number-inputs/NumberTestCase.js b/fixtures/dom/src/components/fixtures/number-inputs/NumberTestCase.js
new file mode 100644
index 0000000000000..2c072d478ebe4
--- /dev/null
+++ b/fixtures/dom/src/components/fixtures/number-inputs/NumberTestCase.js
@@ -0,0 +1,37 @@
+const React = window.React;
+
+import Fixture from '../../Fixture';
+
+const NumberTestCase = React.createClass({
+  getInitialState() {
+    return { value: '' };
+  },
+  onChange(event) {
+    const parsed = parseFloat(event.target.value, 10)
+    const value = isNaN(parsed) ? '' : parsed
+
+    this.setState({ value })
+  },
+  render() {
+    return (
+      <Fixture>
+        <div>{this.props.children}</div>
+
+        <div className="control-box">
+          <fieldset>
+            <legend>Controlled</legend>
+            <input type="number" value={this.state.value} onChange={this.onChange} />
+            <span className="hint"> Value: {JSON.stringify(this.state.value)}</span>
+          </fieldset>
+
+          <fieldset>
+            <legend>Uncontrolled</legend>
+            <input type="number" defaultValue={0.5} />
+          </fieldset>
+        </div>
+      </Fixture>
+    );
+  },
+});
+
+export default NumberTestCase;
diff --git a/fixtures/dom/src/components/fixtures/number-inputs/index.js b/fixtures/dom/src/components/fixtures/number-inputs/index.js
new file mode 100644
index 0000000000000..2c88c333edeb3
--- /dev/null
+++ b/fixtures/dom/src/components/fixtures/number-inputs/index.js
@@ -0,0 +1,167 @@
+const React = window.React;
+
+import FixtureSet from '../../FixtureSet';
+import TestCase from '../../TestCase';
+import NumberTestCase from './NumberTestCase';
+
+const NumberInputs = React.createClass({
+  render() {
+    return (
+      <FixtureSet
+          title="Number inputs"
+          description="Number inputs inconsistently assign and report the value
+                       property depending on the browser."
+      >
+        <TestCase
+            title="Backspacing"
+            description="The decimal place should not be lost"
+        >
+          <TestCase.Steps>
+            <li>Type "3.1"</li>
+            <li>Press backspace, eliminating the "1"</li>
+          </TestCase.Steps>
+
+          <TestCase.ExpectedResult>
+            The field should read "3.", preserving the decimal place
+          </TestCase.ExpectedResult>
+
+          <NumberTestCase />
+
+          <p className="footnote">
+            <b>Notes:</b> Chrome and Safari clear trailing
+            decimals on blur. React makes this concession so that the
+            value attribute remains in sync with the value property.
+          </p>
+        </TestCase>
+
+        <TestCase
+            title="Decimal precision"
+            description="Supports decimal precision greater than 2 places"
+        >
+          <TestCase.Steps>
+            <li>Type "0.01"</li>
+          </TestCase.Steps>
+
+          <TestCase.ExpectedResult>
+            The field should read "0.01"
+          </TestCase.ExpectedResult>
+
+          <NumberTestCase />
+        </TestCase>
+
+        <TestCase
+            title="Exponent form"
+            description="Supports exponent form ('2e4')"
+        >
+          <TestCase.Steps>
+            <li>Type "2e"</li>
+            <li>Type 4, to read "2e4"</li>
+          </TestCase.Steps>
+
+          <TestCase.ExpectedResult>
+            The field should read "2e4". The parsed value should read "20000"
+          </TestCase.ExpectedResult>
+
+          <NumberTestCase />
+        </TestCase>
+
+        <TestCase
+            title="Exponent Form"
+            description="Pressing 'e' at the end"
+        >
+          <TestCase.Steps>
+            <li>Type "3.14"</li>
+            <li>Press "e", so that the input reads "3.14e"</li>
+          </TestCase.Steps>
+
+          <TestCase.ExpectedResult>
+            The field should read "3.14e", the parsed value should be empty
+          </TestCase.ExpectedResult>
+
+          <NumberTestCase />
+        </TestCase>
+
+        <TestCase
+            title="Exponent Form"
+            description="Supports pressing 'ee' in the middle of a number"
+        >
+          <TestCase.Steps>
+            <li>Type "3.14"</li>
+            <li>Move the text cursor to after the decimal place</li>
+            <li>Press "e" twice, so that the value reads "3.ee14"</li>
+          </TestCase.Steps>
+
+          <TestCase.ExpectedResult>
+            The field should read "3.ee14"
+          </TestCase.ExpectedResult>
+
+          <NumberTestCase />
+        </TestCase>
+
+        <TestCase
+            title="Trailing Zeroes"
+            description="Typing '3.0' preserves the trailing zero"
+        >
+          <TestCase.Steps>
+            <li>Type "3.0"</li>
+          </TestCase.Steps>
+
+          <TestCase.ExpectedResult>
+            The field should read "3.0"
+          </TestCase.ExpectedResult>
+
+          <NumberTestCase />
+        </TestCase>
+
+        <TestCase
+            title="Inserting decimals precision"
+            description="Inserting '.' in to '300' maintains the trailing zeroes"
+        >
+          <TestCase.Steps>
+            <li>Type "300"</li>
+            <li>Move the cursor to after the "3"</li>
+            <li>Type "."</li>
+          </TestCase.Steps>
+
+          <TestCase.ExpectedResult>
+            The field should read "3.00", not "3"
+          </TestCase.ExpectedResult>
+          <NumberTestCase />
+        </TestCase>
+
+        <TestCase
+            title="Replacing numbers with -"
+            description="Replacing a number with the '-' sign should not clear the value"
+        >
+          <TestCase.Steps>
+            <li>Type "3"</li>
+            <li>Select the entire value"</li>
+            <li>Type '-' to replace '3' with '-'</li>
+          </TestCase.Steps>
+
+          <TestCase.ExpectedResult>
+            The field should read "-", not be blank.
+          </TestCase.ExpectedResult>
+          <NumberTestCase />
+        </TestCase>
+
+        <TestCase
+            title="Negative numbers"
+            description="Typing minus when inserting a negative number should work"
+        >
+          <TestCase.Steps>
+            <li>Type "-"</li>
+            <li>Type '3'</li>
+          </TestCase.Steps>
+
+          <TestCase.ExpectedResult>
+            The field should read "-3".
+          </TestCase.ExpectedResult>
+          <NumberTestCase />
+        </TestCase>
+      </FixtureSet>
+    );
+  },
+});
+
+export default NumberInputs;
diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index 05ca4a1b2bf44..7a3dc7ffc62c0 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -837,6 +837,8 @@ src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
 * should set className to empty string instead of null
 * should remove property properly for boolean properties
 * should remove property properly even with different name
+* should update an empty attribute to zero
+* should always assign the value attribute for non-inputs
 * should remove attributes for normal properties
 * should not remove attributes for special properties
 * should not leave all options selected when deleting multiple
@@ -1449,6 +1451,10 @@ src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
 * should allow setting `value` to `objToString`
 * should not incur unnecessary DOM mutations
 * should properly control a value of number `0`
+* should properly control 0.0 for a text input
+* should properly control 0.0 for a number input
+* should properly transition from an empty value to 0
+* should properly transition from 0 to an empty value
 * should have the correct target value
 * should not set a value for submit buttons unnecessarily
 * should control radio buttons
@@ -1482,6 +1488,11 @@ src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
 * sets value properly with type coming later in props
 * does not raise a validation warning when it switches types
 * resets value of date/time input to fix bugs in iOS Safari
+* always sets the attribute when values change on text inputs
+* does not set the value attribute on number inputs if focused
+* sets the value attribute on number inputs on blur
+* an uncontrolled number input will not update the value attribute on blur
+* an uncontrolled text input will not update the value attribute on blur
 
 src/renderers/dom/shared/wrappers/__tests__/ReactDOMOption-test.js
 * should flatten children to a string
diff --git a/src/renderers/dom/fiber/wrappers/ReactDOMFiberInput.js b/src/renderers/dom/fiber/wrappers/ReactDOMFiberInput.js
index f125280c5a12b..f0bbc0adcaef3 100644
--- a/src/renderers/dom/fiber/wrappers/ReactDOMFiberInput.js
+++ b/src/renderers/dom/fiber/wrappers/ReactDOMFiberInput.js
@@ -138,11 +138,8 @@ var ReactDOMInput = {
         ? props.checked
         : props.defaultChecked,
       initialValue: props.value != null ? props.value : defaultValue,
+      controlled: isControlled(props),
     };
-
-    if (__DEV__) {
-      node._wrapperState.controlled = isControlled(props);
-    }
   },
 
   updateWrapper: function(element: Element, props: Object) {
@@ -195,13 +192,24 @@ var ReactDOMInput = {
 
     var value = props.value;
     if (value != null) {
-      // Cast `value` to a string to ensure the value is set correctly. While
-      // browsers typically do this as necessary, jsdom doesn't.
-      var newValue = '' + value;
+      if (value === 0 && node.value === '') {
+        node.value = '0';
+        // Note: IE9 reports a number inputs as 'text', so check props instead.
+      } else if (props.type === 'number') {
+        // Simulate `input.valueAsNumber`. IE9 does not support it
+        var valueAsNumber = parseFloat(node.value, 10) || 0;
 
-      // To avoid side effects (such as losing text selection), only set value if changed
-      if (newValue !== node.value) {
-        node.value = newValue;
+        // eslint-disable-next-line
+        if (value != valueAsNumber) {
+          // Cast `value` to a string to ensure the value is set correctly. While
+          // browsers typically do this as necessary, jsdom doesn't.
+          node.value = '' + value;
+        }
+        // eslint-disable-next-line
+      } else if (value != node.value) {
+        // Cast `value` to a string to ensure the value is set correctly. While
+        // browsers typically do this as necessary, jsdom doesn't.
+        node.value = '' + value;
       }
     } else {
       if (props.value == null && props.defaultValue != null) {
diff --git a/src/renderers/dom/shared/HTMLDOMPropertyConfig.js b/src/renderers/dom/shared/HTMLDOMPropertyConfig.js
index d7d5ddc80c012..ccd92eaf7c95c 100644
--- a/src/renderers/dom/shared/HTMLDOMPropertyConfig.js
+++ b/src/renderers/dom/shared/HTMLDOMPropertyConfig.js
@@ -210,6 +210,34 @@ var HTMLDOMPropertyConfig = {
     httpEquiv: 'http-equiv',
   },
   DOMPropertyNames: {},
+  DOMMutationMethods: {
+    value: function(node, value) {
+      if (value == null) {
+        return node.removeAttribute('value');
+      }
+
+      // Number inputs get special treatment due to some edge cases in
+      // Chrome. Let everything else assign the value attribute as normal.
+      // https://github.com/facebook/react/issues/7253#issuecomment-236074326
+      if (node.type !== 'number' || node.hasAttribute('value') === false) {
+        node.setAttribute('value', '' + value);
+      } else if (
+        node.validity &&
+        !node.validity.badInput &&
+        node.ownerDocument.activeElement !== node
+      ) {
+        // Don't assign an attribute if validation reports bad
+        // input. Chrome will clear the value. Additionally, don't
+        // operate on inputs that have focus, otherwise Chrome might
+        // strip off trailing decimal places and cause the user's
+        // cursor position to jump to the beginning of the input.
+        //
+        // In ReactDOMInput, we have an onBlur event that will trigger
+        // this function again when focus is lost.
+        node.setAttribute('value', '' + value);
+      }
+    },
+  },
 };
 
 module.exports = HTMLDOMPropertyConfig;
diff --git a/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js b/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
index 840841542463f..5fcc92a825aab 100644
--- a/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
+++ b/src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
@@ -296,6 +296,35 @@ describe('DOMPropertyOperations', () => {
     });
   });
 
+  describe('value mutation method', function() {
+    it('should update an empty attribute to zero', function() {
+      var stubNode = document.createElement('input');
+      var stubInstance = {_debugID: 1};
+      ReactDOMComponentTree.precacheNode(stubInstance, stubNode);
+
+      stubNode.setAttribute('type', 'radio');
+
+      DOMPropertyOperations.setValueForProperty(stubNode, 'value', '');
+      spyOn(stubNode, 'setAttribute');
+      DOMPropertyOperations.setValueForProperty(stubNode, 'value', 0);
+
+      expect(stubNode.setAttribute.calls.count()).toBe(1);
+    });
+
+    it('should always assign the value attribute for non-inputs', function() {
+      var stubNode = document.createElement('progress');
+      var stubInstance = {_debugID: 1};
+      ReactDOMComponentTree.precacheNode(stubInstance, stubNode);
+
+      spyOn(stubNode, 'setAttribute');
+
+      DOMPropertyOperations.setValueForProperty(stubNode, 'value', 30);
+      DOMPropertyOperations.setValueForProperty(stubNode, 'value', '30');
+
+      expect(stubNode.setAttribute.calls.count()).toBe(2);
+    });
+  });
+
   describe('deleteValueForProperty', () => {
     var stubNode;
     var stubInstance;
diff --git a/src/renderers/dom/shared/eventPlugins/ChangeEventPlugin.js b/src/renderers/dom/shared/eventPlugins/ChangeEventPlugin.js
index 4a026bcbea57e..1b1d5b95c065a 100644
--- a/src/renderers/dom/shared/eventPlugins/ChangeEventPlugin.js
+++ b/src/renderers/dom/shared/eventPlugins/ChangeEventPlugin.js
@@ -258,6 +258,26 @@ function getTargetInstForInputOrChangeEvent(topLevelType, targetInst) {
   }
 }
 
+function handleControlledInputBlur(inst, node) {
+  // TODO: In IE, inst is occasionally null. Why?
+  if (inst == null) {
+    return;
+  }
+
+  // Fiber and ReactDOM keep wrapper state in separate places
+  let state = inst._wrapperState || node._wrapperState;
+
+  if (!state || !state.controlled || node.type !== 'number') {
+    return;
+  }
+
+  // If controlled, assign the value attribute to the current value on blur
+  let value = '' + node.value;
+  if (node.getAttribute('value') !== value) {
+    node.setAttribute('value', value);
+  }
+}
+
 /**
  * This plugin creates an `onChange` event that normalizes change events
  * across form elements. This event fires at a time when it's possible to
@@ -316,6 +336,11 @@ var ChangeEventPlugin = {
     if (handleEventFunc) {
       handleEventFunc(topLevelType, targetNode, targetInst);
     }
+
+    // When blurring, set the value attribute for number inputs
+    if (topLevelType === 'topBlur') {
+      handleControlledInputBlur(targetInst, targetNode);
+    }
   },
 };
 
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
index c16b2f578a2b0..62df49a453262 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
@@ -423,6 +423,48 @@ describe('ReactDOMInput', () => {
     expect(node.value).toBe('0');
   });
 
+  it('should properly control 0.0 for a text input', () => {
+    var stub = <input type="text" value={0} onChange={emptyFunction} />;
+    stub = ReactTestUtils.renderIntoDocument(stub);
+    var node = ReactDOM.findDOMNode(stub);
+
+    node.value = '0.0';
+    ReactTestUtils.Simulate.change(node, {target: {value: '0.0'}});
+    expect(node.value).toBe('0.0');
+  });
+
+  it('should properly control 0.0 for a number input', () => {
+    var stub = <input type="number" value={0} onChange={emptyFunction} />;
+    stub = ReactTestUtils.renderIntoDocument(stub);
+    var node = ReactDOM.findDOMNode(stub);
+
+    node.value = '0.0';
+    ReactTestUtils.Simulate.change(node, {target: {value: '0.0'}});
+    expect(node.value).toBe('0.0');
+  });
+
+  it('should properly transition from an empty value to 0', function() {
+    var container = document.createElement('div');
+
+    ReactDOM.render(<input type="text" value="" />, container);
+    ReactDOM.render(<input type="text" value={0} />, container);
+
+    var node = container.firstChild;
+
+    expect(node.value).toBe('0');
+  });
+
+  it('should properly transition from 0 to an empty value', function() {
+    var container = document.createElement('div');
+
+    ReactDOM.render(<input type="text" value={0} />, container);
+    ReactDOM.render(<input type="text" value="" />, container);
+
+    var node = container.firstChild;
+
+    expect(node.value).toBe('');
+  });
+
   it('should have the correct target value', () => {
     var handled = false;
     var handler = function(event) {
@@ -1074,4 +1116,88 @@ describe('ReactDOMInput', () => {
       'node.setAttribute("checked", "")',
     ]);
   });
+
+  describe('assigning the value attribute on controlled inputs', function() {
+    function getTestInput() {
+      return React.createClass({
+        getInitialState: function() {
+          return {
+            value: this.props.value == null ? '' : this.props.value,
+          };
+        },
+        onChange: function(event) {
+          this.setState({value: event.target.value});
+        },
+        render: function() {
+          var type = this.props.type;
+          var value = this.state.value;
+
+          return <input type={type} value={value} onChange={this.onChange} />;
+        },
+      });
+    }
+
+    it('always sets the attribute when values change on text inputs', function() {
+      var Input = getTestInput();
+      var stub = ReactTestUtils.renderIntoDocument(<Input type="text" />);
+      var node = ReactDOM.findDOMNode(stub);
+
+      ReactTestUtils.Simulate.change(node, {target: {value: '2'}});
+
+      expect(node.getAttribute('value')).toBe('2');
+    });
+
+    it('does not set the value attribute on number inputs if focused', () => {
+      var Input = getTestInput();
+      var stub = ReactTestUtils.renderIntoDocument(
+        <Input type="number" value="1" />,
+      );
+      var node = ReactDOM.findDOMNode(stub);
+
+      node.focus();
+
+      ReactTestUtils.Simulate.change(node, {target: {value: '2'}});
+
+      expect(node.getAttribute('value')).toBe('1');
+    });
+
+    it('sets the value attribute on number inputs on blur', () => {
+      var Input = getTestInput();
+      var stub = ReactTestUtils.renderIntoDocument(
+        <Input type="number" value="1" />,
+      );
+      var node = ReactDOM.findDOMNode(stub);
+
+      ReactTestUtils.Simulate.change(node, {target: {value: '2'}});
+      ReactTestUtils.SimulateNative.blur(node);
+
+      expect(node.getAttribute('value')).toBe('2');
+    });
+
+    it('an uncontrolled number input will not update the value attribute on blur', () => {
+      var stub = ReactTestUtils.renderIntoDocument(
+        <input type="number" defaultValue="1" />,
+      );
+      var node = ReactDOM.findDOMNode(stub);
+
+      node.value = 4;
+
+      ReactTestUtils.SimulateNative.blur(node);
+
+      expect(node.getAttribute('value')).toBe('1');
+    });
+
+    it('an uncontrolled text input will not update the value attribute on blur', () => {
+      var stub = ReactTestUtils.renderIntoDocument(
+        <input type="text" defaultValue="1" />,
+      );
+      var node = ReactDOM.findDOMNode(stub);
+
+      node.value = 4;
+
+      ReactTestUtils.SimulateNative.blur(node);
+
+      expect(node.getAttribute('value')).toBe('1');
+    });
+  });
 });
diff --git a/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js b/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js
index f1fc6a6068dea..2f30e43a26f5e 100644
--- a/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js
+++ b/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js
@@ -128,11 +128,8 @@ var ReactDOMInput = {
         : props.defaultChecked,
       initialValue: props.value != null ? props.value : defaultValue,
       listeners: null,
+      controlled: isControlled(props),
     };
-
-    if (__DEV__) {
-      inst._wrapperState.controlled = isControlled(props);
-    }
   },
 
   updateWrapper: function(inst) {
@@ -188,13 +185,24 @@ var ReactDOMInput = {
     var node = ReactDOMComponentTree.getNodeFromInstance(inst);
     var value = props.value;
     if (value != null) {
-      // Cast `value` to a string to ensure the value is set correctly. While
-      // browsers typically do this as necessary, jsdom doesn't.
-      var newValue = '' + value;
+      if (value === 0 && node.value === '') {
+        node.value = '0';
+        // Note: IE9 reports a number inputs as 'text', so check props instead.
+      } else if (props.type === 'number') {
+        // Simulate `input.valueAsNumber`. IE9 does not support it
+        var valueAsNumber = parseFloat(node.value, 10) || 0;
 
-      // To avoid side effects (such as losing text selection), only set value if changed
-      if (newValue !== node.value) {
-        node.value = newValue;
+        // eslint-disable-next-line
+        if (value != valueAsNumber) {
+          // Cast `value` to a string to ensure the value is set correctly. While
+          // browsers typically do this as necessary, jsdom doesn't.
+          node.value = '' + value;
+        }
+        // eslint-disable-next-line
+      } else if (value != node.value) {
+        // Cast `value` to a string to ensure the value is set correctly. While
+        // browsers typically do this as necessary, jsdom doesn't.
+        node.value = '' + value;
       }
     } else {
       if (props.value == null && props.defaultValue != null) {

From f6a64cad5dee29b50a2284e52aed353e7e7a5ee4 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Mon, 27 Mar 2017 12:48:05 -0700
Subject: [PATCH 016/153] Use radio buttons for toggle

---
 examples/fiber/index.html | 48 +++++++++++++++++++++++++++++++++------
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/examples/fiber/index.html b/examples/fiber/index.html
index a62f2bfcaf6e9..0d8ac000291c7 100644
--- a/examples/fiber/index.html
+++ b/examples/fiber/index.html
@@ -128,10 +128,10 @@ <h1>Fiber Example</h1>
           super();
           this.state = {
             seconds: 0,
-            useTimeSlicing: true
+            useTimeSlicing: true,
           };
           this.tick = this.tick.bind(this);
-          this.toogleTimeSlicing = this.toogleTimeSlicing.bind(this);
+          this.onTimeSlicingChange = this.onTimeSlicingChange.bind(this);
         }
         componentDidMount() {
           this.intervalID = setInterval(this.tick, 1000);
@@ -140,15 +140,15 @@ <h1>Fiber Example</h1>
           if (this.state.useTimeSlicing) {
             // Update is time-sliced.
             ReactDOMFiber.unstable_deferredUpdates(() => {
-              this.setState(state => ({ ...state, seconds: (state.seconds % 10) + 1 }));
+              this.setState(state => ({ seconds: (state.seconds % 10) + 1 }));
             });
           } else {
             // Update is not time-sliced. Causes demo to stutter.
-            this.setState(state => ({ ...state, seconds: (state.seconds % 10) + 1 }));
+            this.setState(state => ({ seconds: (state.seconds % 10) + 1 }));
           }
         }
-        toogleTimeSlicing() {
-          this.setState(state => ({ ...state, useTimeSlicing: !state.useTimeSlicing}));
+        onTimeSlicingChange(value) {
+          this.setState(() => ({ useTimeSlicing: value }));
         }
         componentWillUnmount() {
           clearInterval(this.intervalID);
@@ -161,7 +161,16 @@ <h1>Fiber Example</h1>
           const transform = 'scaleX(' + (scale / 2.1) + ') scaleY(0.7) translateZ(0.1px)';
           return (
             <div>
-              <button onClick={this.toogleTimeSlicing}>Turn { this.state.useTimeSlicing ? 'OFF' : 'ON' } Time Slicing</button>
+              <div>
+                <h3>Time-slicing</h3>
+                <p>Toggle this and observe the effect</p>
+                <Toggle
+                  onLabel="On"
+                  offLabel="Off"
+                  onChange={this.onTimeSlicingChange}
+                  value={this.state.useTimeSlicing}
+                />
+              </div>
               <div style={{ ...containerStyle, transform }}>
                 <div>
                   <SierpinskiTriangle x={0} y={0} s={1000}>
@@ -174,6 +183,31 @@ <h1>Fiber Example</h1>
         }
       }
 
+      class Toggle extends React.Component {
+        constructor(props) {
+          super();
+          this.onChange = this.onChange.bind(this);
+        }
+        onChange(event) {
+          this.props.onChange(event.target.value === 'on');
+        }
+        render() {
+          const value = this.props.value;
+          return (
+            <label onChange={this.onChange}>
+              <label>
+                {this.props.onLabel}
+                <input type="radio" name="value" value="on" checked={value} />
+              </label>
+              <label>
+                {this.props.offLabel}
+                <input type="radio" name="value" value="off" checked={!value} />
+              </label>
+            </label>
+          );
+        }
+      }
+
       var start = new Date().getTime();
       function update() {
         ReactDOMFiber.render(

From fca5d3ffc5e9288a831770769949349cc8739b4f Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Mon, 27 Mar 2017 14:59:37 -0700
Subject: [PATCH 017/153] Added missing @flow annotation to
 ReactNativeFeatureFlags file (#9267)

---
 src/renderers/native/ReactNativeFeatureFlags.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/renderers/native/ReactNativeFeatureFlags.js b/src/renderers/native/ReactNativeFeatureFlags.js
index 1686eec51aed2..1224b86f7b74b 100644
--- a/src/renderers/native/ReactNativeFeatureFlags.js
+++ b/src/renderers/native/ReactNativeFeatureFlags.js
@@ -7,6 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  *
  * @providesModule ReactNativeFeatureFlags
+ * @flow
  */
 
 'use strict';

From a749f4fb63657a3af1502047a5af876ebabb0e64 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Tue, 28 Mar 2017 11:24:13 -0700
Subject: [PATCH 018/153] Adding fix to EventPropagators that was accidentally
 omitted from PR #9219 (#9274)

---
 src/renderers/shared/shared/event/EventPropagators.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderers/shared/shared/event/EventPropagators.js b/src/renderers/shared/shared/event/EventPropagators.js
index db9537b8338e7..05d6863d3855e 100644
--- a/src/renderers/shared/shared/event/EventPropagators.js
+++ b/src/renderers/shared/shared/event/EventPropagators.js
@@ -93,7 +93,7 @@ function accumulateTwoPhaseDispatchesSingleSkipTarget(event) {
  * requiring that the `dispatchMarker` be the same as the dispatched ID.
  */
 function accumulateDispatches(inst, ignoredDirection, event) {
-  if (event && event.dispatchConfig.registrationName) {
+  if (inst && event && event.dispatchConfig.registrationName) {
     var registrationName = event.dispatchConfig.registrationName;
     var listener = getListener(inst, registrationName);
     if (listener) {

From aaabd655a6961dfa31ef997a020e04a5054af971 Mon Sep 17 00:00:00 2001
From: Sasha Aickin <xander76@yahoo.com>
Date: Tue, 28 Mar 2017 14:55:22 -0700
Subject: [PATCH 019/153] Added jest-cli to the package.json for the Fiber
 record-tests script. (#9270)

---
 scripts/fiber/record-tests | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/fiber/record-tests b/scripts/fiber/record-tests
index b7c57bf18ab9f..99257e92f1dca 100755
--- a/scripts/fiber/record-tests
+++ b/scripts/fiber/record-tests
@@ -8,9 +8,9 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 
-const SearchSource = require('jest-cli').SearchSource;
-const TestRunner = require('jest-cli').TestRunner;
-const TestWatcher = require('jest-cli/build/TestWatcher');
+const SearchSource = require('jest').SearchSource;
+const TestRunner = require('jest').TestRunner;
+const TestWatcher = require('jest').TestWatcher;
 
 const createHasteContext = require('jest-runtime').createHasteContext;
 const readConfig = require('jest-config').readConfig;

From 660306982c43410bb0aa7a275a06389319d86676 Mon Sep 17 00:00:00 2001
From: Dominic Gannaway <dg@domgan.com>
Date: Wed, 29 Mar 2017 13:49:30 +0100
Subject: [PATCH 020/153] added DEV condition around
 getDeclarationErrorAddendum contents

---
 src/renderers/dom/fiber/ReactDOMFiberComponent.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/renderers/dom/fiber/ReactDOMFiberComponent.js b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
index f52a6422cd891..89df93b868b3f 100644
--- a/src/renderers/dom/fiber/ReactDOMFiberComponent.js
+++ b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
@@ -68,10 +68,12 @@ var {
 var DOC_FRAGMENT_TYPE = 11;
 
 function getDeclarationErrorAddendum() {
-  var ownerName = getCurrentFiberOwnerName();
-  if (ownerName) {
-    // TODO: also report the stack.
-    return '\n\nThis DOM node was rendered by `' + ownerName + '`.';
+  if (__DEV__) {
+    var ownerName = getCurrentFiberOwnerName();
+    if (ownerName) {
+      // TODO: also report the stack.
+      return '\n\nThis DOM node was rendered by `' + ownerName + '`.';
+    }
   }
   return '';
 }

From da91e9ebe9b74c8709df678785f8623b90de537f Mon Sep 17 00:00:00 2001
From: Brandon Dail <aweary@users.noreply.github.com>
Date: Wed, 29 Mar 2017 11:17:54 -0500
Subject: [PATCH 021/153] Add DOM fixtures for disabled button click events
 (#9271)

---
 fixtures/dom/src/components/Header.js         |  1 +
 .../src/components/fixtures/buttons/index.js  | 41 +++++++++++++++++++
 fixtures/dom/src/components/fixtures/index.js |  3 ++
 fixtures/dom/src/style.css                    |  6 +++
 4 files changed, 51 insertions(+)
 create mode 100644 fixtures/dom/src/components/fixtures/buttons/index.js

diff --git a/fixtures/dom/src/components/Header.js b/fixtures/dom/src/components/Header.js
index 5f717d8be12ee..511b35e081a7b 100644
--- a/fixtures/dom/src/components/Header.js
+++ b/fixtures/dom/src/components/Header.js
@@ -48,6 +48,7 @@ const Header = React.createClass({
               <option value="/selects">Selects</option>
               <option value="/textareas">Textareas</option>
               <option value="/input-change-events">Input change events</option>
+              <option value="/buttons">Buttons</option>
             </select>
           </label>
           <label htmlFor="react_version">
diff --git a/fixtures/dom/src/components/fixtures/buttons/index.js b/fixtures/dom/src/components/fixtures/buttons/index.js
new file mode 100644
index 0000000000000..4991f4e4d8c6b
--- /dev/null
+++ b/fixtures/dom/src/components/fixtures/buttons/index.js
@@ -0,0 +1,41 @@
+const React = window.React;
+
+import FixtureSet from '../../FixtureSet';
+import TestCase from '../../TestCase';
+
+function onButtonClick() {
+  window.alert(`This shouldn't have happened!`);
+}
+
+export default class ButtonTestCases extends React.Component {
+  render() {
+    return (
+      <FixtureSet title="Buttons">
+        <TestCase
+          title="onClick with disabled buttons"
+          description="The onClick event handler should not be invoked when clicking on a disabled buyaton">
+          <TestCase.Steps>
+            <li>Click on the disabled button</li>
+          </TestCase.Steps>
+          <TestCase.ExpectedResult>
+            Nothing should happen
+          </TestCase.ExpectedResult>
+          <button disabled onClick={onButtonClick}>Click Me</button>
+          </TestCase>
+          <TestCase
+            title="onClick with disabled buttons containing other elements"
+            description="The onClick event handler should not be invoked when clicking on a disabled button that contains other elements">
+          <TestCase.Steps>
+            <li>Click on the disabled button, which contains a span</li>
+          </TestCase.Steps>
+          <TestCase.ExpectedResult>
+            Nothing should happen
+          </TestCase.ExpectedResult>
+          <button disabled onClick={onButtonClick}>
+            <span>Click Me</span>
+          </button>
+        </TestCase>
+      </FixtureSet>
+    );
+  }
+}
diff --git a/fixtures/dom/src/components/fixtures/index.js b/fixtures/dom/src/components/fixtures/index.js
index 516e8ad3aee27..91e1405c77a0a 100644
--- a/fixtures/dom/src/components/fixtures/index.js
+++ b/fixtures/dom/src/components/fixtures/index.js
@@ -5,6 +5,7 @@ import SelectFixtures from './selects';
 import TextAreaFixtures from './textareas';
 import InputChangeEvents from './input-change-events';
 import NumberInputFixtures from './number-inputs/';
+import ButtonFixtures from './buttons';
 
 /**
  * A simple routing component that renders the appropriate
@@ -25,6 +26,8 @@ const FixturesPage = React.createClass({
         return <InputChangeEvents />;
       case '/number-inputs':
         return <NumberInputFixtures />;
+      case '/buttons':
+        return <ButtonFixtures />
       default:
         return <p>Please select a test fixture.</p>;
     }
diff --git a/fixtures/dom/src/style.css b/fixtures/dom/src/style.css
index 032d0c85f68b7..130f365bcbcc7 100644
--- a/fixtures/dom/src/style.css
+++ b/fixtures/dom/src/style.css
@@ -18,6 +18,12 @@ select {
   width: 12rem;
 }
 
+button {
+  margin: 10px;
+  font-size: 18px;
+  padding: 5px;
+}
+
 
 .header {
   background: #222;

From 9a93be0b3318343b28d673520e3ded49b95d0d12 Mon Sep 17 00:00:00 2001
From: Brandon Dail <aweary@users.noreply.github.com>
Date: Wed, 29 Mar 2017 17:37:56 -0500
Subject: [PATCH 022/153] Remove IE8-specific ChangeEventPlugin logic (#9281)

---
 .../shared/eventPlugins/ChangeEventPlugin.js  | 42 +------------------
 1 file changed, 1 insertion(+), 41 deletions(-)

diff --git a/src/renderers/dom/shared/eventPlugins/ChangeEventPlugin.js b/src/renderers/dom/shared/eventPlugins/ChangeEventPlugin.js
index 1b1d5b95c065a..fb56d1408f5ed 100644
--- a/src/renderers/dom/shared/eventPlugins/ChangeEventPlugin.js
+++ b/src/renderers/dom/shared/eventPlugins/ChangeEventPlugin.js
@@ -71,13 +71,6 @@ function shouldUseChangeEvent(elem) {
     (nodeName === 'input' && elem.type === 'file');
 }
 
-var doesChangeEventBubble = false;
-if (ExecutionEnvironment.canUseDOM) {
-  // See `handleChange` comment below
-  doesChangeEventBubble = isEventSupported('change') &&
-    (!document.documentMode || document.documentMode > 8);
-}
-
 function manualDispatchChangeEvent(nativeEvent) {
   var event = createAndAccumulateChangeEvent(
     activeElementInst,
@@ -104,21 +97,6 @@ function runEventInBatch(event) {
   EventPluginHub.processEventQueue(false);
 }
 
-function startWatchingForChangeEventIE8(target, targetInst) {
-  activeElement = target;
-  activeElementInst = targetInst;
-  activeElement.attachEvent('onchange', manualDispatchChangeEvent);
-}
-
-function stopWatchingForChangeEventIE8() {
-  if (!activeElement) {
-    return;
-  }
-  activeElement.detachEvent('onchange', manualDispatchChangeEvent);
-  activeElement = null;
-  activeElementInst = null;
-}
-
 function getInstIfValueChanged(targetInst) {
   if (inputValueTracking.updateValueIfChanged(targetInst)) {
     return targetInst;
@@ -131,17 +109,6 @@ function getTargetInstForChangeEvent(topLevelType, targetInst) {
   }
 }
 
-function handleEventsForChangeEventIE8(topLevelType, target, targetInst) {
-  if (topLevelType === 'topFocus') {
-    // stopWatching() should be a noop here but we call it just in case we
-    // missed a blur event somehow.
-    stopWatchingForChangeEventIE8();
-    startWatchingForChangeEventIE8(target, targetInst);
-  } else if (topLevelType === 'topBlur') {
-    stopWatchingForChangeEventIE8();
-  }
-}
-
 /**
  * SECTION: handle `input` event
  */
@@ -192,9 +159,6 @@ function handlePropertyChange(nativeEvent) {
 
 function handleEventsForInputEventPolyfill(topLevelType, target, targetInst) {
   if (topLevelType === 'topFocus') {
-    // In IE8, we can capture almost all .value changes by adding a
-    // propertychange handler and looking for events with propertyName
-    // equal to 'value'
     // In IE9, propertychange fires for most input events but is buggy and
     // doesn't fire when text is deleted, but conveniently, selectionchange
     // appears to fire in all of the remaining cases so we catch those and
@@ -305,11 +269,7 @@ var ChangeEventPlugin = {
 
     var getTargetInstFunc, handleEventFunc;
     if (shouldUseChangeEvent(targetNode)) {
-      if (doesChangeEventBubble) {
-        getTargetInstFunc = getTargetInstForChangeEvent;
-      } else {
-        handleEventFunc = handleEventsForChangeEventIE8;
-      }
+      getTargetInstFunc = getTargetInstForChangeEvent;
     } else if (isTextInputElement(targetNode)) {
       if (isInputEventSupported) {
         getTargetInstFunc = getTargetInstForInputOrChangeEvent;

From 4c292facc9fa176cd0a8a094b38fc1800650325f Mon Sep 17 00:00:00 2001
From: Nathan Hunzaker <nate.hunzaker@gmail.com>
Date: Thu, 30 Mar 2017 06:01:29 -0400
Subject: [PATCH 023/153] Remove captured scroll feature check (#9283)

* Remove captured scroll feature check

IE8 was the only browser that did not support captured scroll. We no
longer have that constraint.

* Remove WINDOW_HANDLE const
---
 .../dom/shared/ReactBrowserEventEmitter.js     | 18 +++++-------------
 src/renderers/dom/shared/ReactEventListener.js |  3 ---
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/renderers/dom/shared/ReactBrowserEventEmitter.js b/src/renderers/dom/shared/ReactBrowserEventEmitter.js
index 60311a170e568..8af3dff9d6b54 100644
--- a/src/renderers/dom/shared/ReactBrowserEventEmitter.js
+++ b/src/renderers/dom/shared/ReactBrowserEventEmitter.js
@@ -262,19 +262,11 @@ var ReactBrowserEventEmitter = Object.assign({}, ReactEventEmitterMixin, {
             );
           }
         } else if (dependency === 'topScroll') {
-          if (isEventSupported('scroll', true)) {
-            ReactBrowserEventEmitter.ReactEventListener.trapCapturedEvent(
-              'topScroll',
-              'scroll',
-              mountAt,
-            );
-          } else {
-            ReactBrowserEventEmitter.ReactEventListener.trapBubbledEvent(
-              'topScroll',
-              'scroll',
-              ReactBrowserEventEmitter.ReactEventListener.WINDOW_HANDLE,
-            );
-          }
+          ReactBrowserEventEmitter.ReactEventListener.trapCapturedEvent(
+            'topScroll',
+            'scroll',
+            mountAt,
+          );
         } else if (dependency === 'topFocus' || dependency === 'topBlur') {
           if (isEventSupported('focus', true)) {
             ReactBrowserEventEmitter.ReactEventListener.trapCapturedEvent(
diff --git a/src/renderers/dom/shared/ReactEventListener.js b/src/renderers/dom/shared/ReactEventListener.js
index 50f4f10edb573..64a72b381f53e 100644
--- a/src/renderers/dom/shared/ReactEventListener.js
+++ b/src/renderers/dom/shared/ReactEventListener.js
@@ -12,7 +12,6 @@
 'use strict';
 
 var EventListener = require('fbjs/lib/EventListener');
-var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
 var PooledClass = require('PooledClass');
 var ReactDOMComponentTree = require('ReactDOMComponentTree');
 var ReactGenericBatching = require('ReactGenericBatching');
@@ -111,8 +110,6 @@ var ReactEventListener = {
   _enabled: true,
   _handleTopLevel: null,
 
-  WINDOW_HANDLE: ExecutionEnvironment.canUseDOM ? window : null,
-
   setHandleTopLevel: function(handleTopLevel) {
     ReactEventListener._handleTopLevel = handleTopLevel;
   },

From e57ad7f51ebca844d3e86f43b39989fe95f4b6dd Mon Sep 17 00:00:00 2001
From: Ben Alpert <ben@benalpert.com>
Date: Thu, 30 Mar 2017 13:18:39 +0100
Subject: [PATCH 024/153] Allow returning null as host context (#9278)

If your renderer doesn't use host context, you might prefer to return null. This used to give an error:

> Invariant Violation: Expected host context to exist. This error is likely caused by a bug in React. Please file an issue.

I use a sentinel value instead now.

The code in ReactFiberHostContext is a little complicated now. We could probably also just remove the invariants.
---
 scripts/fiber/tests-passing.txt               |  3 +
 .../shared/fiber/ReactFiberHostContext.js     | 54 ++++++++--------
 .../__tests__/ReactFiberHostContext-test.js   | 62 +++++++++++++++++++
 3 files changed, 90 insertions(+), 29 deletions(-)
 create mode 100644 src/renderers/shared/fiber/__tests__/ReactFiberHostContext-test.js

diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index 7a3dc7ffc62c0..bfa8ee1de52af 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -1596,6 +1596,9 @@ src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js
 * should unmount a composite in a coroutine
 * should handle deep updates in coroutine
 
+src/renderers/shared/fiber/__tests__/ReactFiberHostContext-test.js
+* works with null host context
+
 src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
 * should render a simple component
 * should render a simple component, in steps if needed
diff --git a/src/renderers/shared/fiber/ReactFiberHostContext.js b/src/renderers/shared/fiber/ReactFiberHostContext.js
index b6252bbc0fa90..41e4ff15dfb7d 100644
--- a/src/renderers/shared/fiber/ReactFiberHostContext.js
+++ b/src/renderers/shared/fiber/ReactFiberHostContext.js
@@ -16,8 +16,6 @@ import type {Fiber} from 'ReactFiber';
 import type {HostConfig} from 'ReactFiberReconciler';
 import type {StackCursor} from 'ReactFiberStack';
 
-const emptyObject = require('fbjs/lib/emptyObject');
-
 const {
   createCursor,
   pop,
@@ -26,6 +24,9 @@ const {
 
 const invariant = require('fbjs/lib/invariant');
 
+declare class NoContextT {}
+const NO_CONTEXT: NoContextT = ({}: any);
+
 export type HostContext<C, CX> = {
   getHostContext(): CX,
   getRootHostContainer(): C,
@@ -44,19 +45,27 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     getRootHostContext,
   } = config;
 
-  let contextStackCursor: StackCursor<CX | null> = createCursor((null: ?CX));
-  let contextFiberStackCursor: StackCursor<Fiber | null> = createCursor(
-    (null: Fiber | null),
+  let contextStackCursor: StackCursor<CX | NoContextT> = createCursor(
+    NO_CONTEXT,
+  );
+  let contextFiberStackCursor: StackCursor<Fiber | NoContextT> = createCursor(
+    NO_CONTEXT,
+  );
+  let rootInstanceStackCursor: StackCursor<C | NoContextT> = createCursor(
+    NO_CONTEXT,
   );
-  let rootInstanceStackCursor: StackCursor<C | null> = createCursor((null: ?C));
 
-  function getRootHostContainer(): C {
-    const rootInstance = rootInstanceStackCursor.current;
+  function requiredContext<Value>(c: Value | NoContextT): Value {
     invariant(
-      rootInstance !== null,
-      'Expected root container to exist. This error is likely caused by a ' +
-        'bug in React. Please file an issue.',
+      c !== NO_CONTEXT,
+      'Expected host context to exist. This error is likely caused by a bug ' +
+        'in React. Please file an issue.',
     );
+    return (c: any);
+  }
+
+  function getRootHostContainer(): C {
+    const rootInstance = requiredContext(rootInstanceStackCursor.current);
     return rootInstance;
   }
 
@@ -80,26 +89,13 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   }
 
   function getHostContext(): CX {
-    const context = contextStackCursor.current;
-    invariant(
-      context != null,
-      'Expected host context to exist. This error is likely caused by a bug ' +
-        'in React. Please file an issue.',
-    );
+    const context = requiredContext(contextStackCursor.current);
     return context;
   }
 
   function pushHostContext(fiber: Fiber): void {
-    const rootInstance = rootInstanceStackCursor.current;
-    invariant(
-      rootInstance != null,
-      'Expected root host context to exist. This error is likely caused by ' +
-        'a bug in React. Please file an issue.',
-    );
-
-    const context = contextStackCursor.current !== null
-      ? contextStackCursor.current
-      : emptyObject;
+    const rootInstance = requiredContext(rootInstanceStackCursor.current);
+    const context = requiredContext(contextStackCursor.current);
     const nextContext = getChildHostContext(context, fiber.type, rootInstance);
 
     // Don't push this Fiber's context unless it's unique.
@@ -125,8 +121,8 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   }
 
   function resetHostContainer() {
-    contextStackCursor.current = null;
-    rootInstanceStackCursor.current = null;
+    contextStackCursor.current = NO_CONTEXT;
+    rootInstanceStackCursor.current = NO_CONTEXT;
   }
 
   return {
diff --git a/src/renderers/shared/fiber/__tests__/ReactFiberHostContext-test.js b/src/renderers/shared/fiber/__tests__/ReactFiberHostContext-test.js
new file mode 100644
index 0000000000000..b39352987c9e4
--- /dev/null
+++ b/src/renderers/shared/fiber/__tests__/ReactFiberHostContext-test.js
@@ -0,0 +1,62 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @emails react-core
+ */
+
+'use strict';
+
+var React;
+var ReactFiberReconciler;
+
+describe('ReactFiberHostContext', () => {
+  beforeEach(() => {
+    jest.resetModules();
+    React = require('React');
+    ReactFiberReconciler = require('ReactFiberReconciler');
+  });
+
+  it('works with null host context', () => {
+    var creates = 0;
+    var Renderer = ReactFiberReconciler({
+      prepareForCommit: function() {},
+      resetAfterCommit: function() {},
+      getRootHostContext: function() {
+        return null;
+      },
+      getChildHostContext: function() {
+        return null;
+      },
+      shouldSetTextContent: function() {
+        return false;
+      },
+      createInstance: function() {
+        creates++;
+      },
+      finalizeInitialChildren: function() {
+        return null;
+      },
+      appendInitialChild: function() {
+        return null;
+      },
+      appendChild: function() {
+        return null;
+      },
+      useSyncScheduling: true,
+    });
+
+    const container = Renderer.createContainer(/* root: */ null);
+    Renderer.updateContainer(
+      <a><b /></a>,
+      container,
+      /* parentComponent: */ null,
+      /* callback: */ null,
+    );
+    expect(creates).toBe(2);
+  });
+});

From 0c70fb8b18d95db204ded8d36335f7bbc271c16e Mon Sep 17 00:00:00 2001
From: Damian Nicholson <damian.nicholson21@gmail.com>
Date: Thu, 30 Mar 2017 15:55:27 +0100
Subject: [PATCH 025/153] Added semicolons to addons imports examples. (#9287)

---
 docs/docs/addons-animation.md               | 4 ++--
 docs/docs/addons-create-fragment.md         | 8 ++++----
 docs/docs/addons-perf.md                    | 4 ++--
 docs/docs/addons-pure-render-mixin.md       | 4 ++--
 docs/docs/addons-shallow-compare.md         | 4 ++--
 docs/docs/addons-test-utils.md              | 4 ++--
 docs/docs/addons-two-way-binding-helpers.md | 4 ++--
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/docs/addons-animation.md b/docs/docs/addons-animation.md
index 45cc3e6099624..0f684402730b1 100644
--- a/docs/docs/addons-animation.md
+++ b/docs/docs/addons-animation.md
@@ -21,8 +21,8 @@ The [`ReactTransitionGroup`](#low-level-api-reacttransitiongroup) add-on compone
 **Importing**
 
 ```javascript
-import ReactCSSTransitionGroup from 'react-addons-css-transition-group' // ES6
-var ReactCSSTransitionGroup = require('react-addons-css-transition-group') // ES5 with npm
+import ReactCSSTransitionGroup from 'react-addons-css-transition-group'; // ES6
+var ReactCSSTransitionGroup = require('react-addons-css-transition-group'); // ES5 with npm
 var ReactCSSTransitionGroup = React.addons.CSSTransitionGroup; // ES5 with react-with-addons.js
 ```
 
diff --git a/docs/docs/addons-create-fragment.md b/docs/docs/addons-create-fragment.md
index ec3d0457abbbf..527525def5e5a 100644
--- a/docs/docs/addons-create-fragment.md
+++ b/docs/docs/addons-create-fragment.md
@@ -11,8 +11,8 @@ next: perf.html
 **Importing**
 
 ```javascript
-import createFragment from 'react-addons-create-fragment' // ES6
-var createFragment = require('react-addons-create-fragment') // ES5 with npm
+import createFragment from 'react-addons-create-fragment'; // ES6
+var createFragment = require('react-addons-create-fragment'); // ES5 with npm
 var createFragment = React.addons.createFragment; // ES5 with react-with-addons.js
 ```
 
@@ -42,8 +42,8 @@ To solve this problem, you can use the `createFragment` add-on to give keys to t
 
 Instead of creating arrays, we write:
 
-```js
-import createFragment from 'react-addons-create-fragment'
+```javascript
+import createFragment from 'react-addons-create-fragment';
 
 function Swapper(props) {
   let children;
diff --git a/docs/docs/addons-perf.md b/docs/docs/addons-perf.md
index aa5dfd2acc584..26f3f24b8fad6 100644
--- a/docs/docs/addons-perf.md
+++ b/docs/docs/addons-perf.md
@@ -11,8 +11,8 @@ next: test-utils.html
 **Importing**
 
 ```javascript
-import Perf from 'react-addons-perf' // ES6
-var Perf = require('react-addons-perf') // ES5 with npm
+import Perf from 'react-addons-perf'; // ES6
+var Perf = require('react-addons-perf'); // ES5 with npm
 var Perf = React.addons.Perf; // ES5 with react-with-addons.js
 ```
 
diff --git a/docs/docs/addons-pure-render-mixin.md b/docs/docs/addons-pure-render-mixin.md
index 4d741e91b1293..86193c0371949 100644
--- a/docs/docs/addons-pure-render-mixin.md
+++ b/docs/docs/addons-pure-render-mixin.md
@@ -12,8 +12,8 @@ category: Add-Ons
 **Importing**
 
 ```javascript
-import PureRenderMixin from 'react-addons-pure-render-mixin' // ES6
-var PureRenderMixin = require('react-addons-pure-render-mixin') // ES5 with npm
+import PureRenderMixin from 'react-addons-pure-render-mixin'; // ES6
+var PureRenderMixin = require('react-addons-pure-render-mixin'); // ES5 with npm
 var PureRenderMixin = React.addons.PureRenderMixin; // ES5 with react-with-addons.js
 ```
 
diff --git a/docs/docs/addons-shallow-compare.md b/docs/docs/addons-shallow-compare.md
index f123931d2cfa5..453c8581c4cbc 100644
--- a/docs/docs/addons-shallow-compare.md
+++ b/docs/docs/addons-shallow-compare.md
@@ -12,8 +12,8 @@ category: Reference
 **Importing**
 
 ```javascript
-import shallowCompare from 'react-addons-shallow-compare' // ES6
-var shallowCompare = require('react-addons-shallow-compare') // ES5 with npm
+import shallowCompare from 'react-addons-shallow-compare'; // ES6
+var shallowCompare = require('react-addons-shallow-compare'); // ES5 with npm
 var shallowCompare = React.addons.shallowCompare; // ES5 with react-with-addons.js
 ```
 
diff --git a/docs/docs/addons-test-utils.md b/docs/docs/addons-test-utils.md
index 7f4d251e1c3c8..2dd8058d7b157 100644
--- a/docs/docs/addons-test-utils.md
+++ b/docs/docs/addons-test-utils.md
@@ -10,8 +10,8 @@ prev: perf.html
 **Importing**
 
 ```javascript
-import ReactTestUtils from 'react-addons-test-utils' // ES6
-var ReactTestUtils = require('react-addons-test-utils') // ES5 with npm
+import ReactTestUtils from 'react-addons-test-utils'; // ES6
+var ReactTestUtils = require('react-addons-test-utils'); // ES5 with npm
 var ReactTestUtils = React.addons.TestUtils; // ES5 with react-with-addons.js
 ```
 
diff --git a/docs/docs/addons-two-way-binding-helpers.md b/docs/docs/addons-two-way-binding-helpers.md
index c919990ce6f51..1d9591d3251ae 100644
--- a/docs/docs/addons-two-way-binding-helpers.md
+++ b/docs/docs/addons-two-way-binding-helpers.md
@@ -14,8 +14,8 @@ next: update.html
 **Importing**
 
 ```javascript
-import LinkedStateMixin from 'react-addons-linked-state-mixin' // ES6
-var LinkedStateMixin = require('react-addons-linked-state-mixin') // ES5 with npm
+import LinkedStateMixin from 'react-addons-linked-state-mixin'; // ES6
+var LinkedStateMixin = require('react-addons-linked-state-mixin'); // ES5 with npm
 var LinkedStateMixin = React.addons.LinkedStateMixin; // ES5 with react-with-addons.js
 ```
 

From dbeb37fe69e3de7bee43695531d58f761c5633a4 Mon Sep 17 00:00:00 2001
From: Nathan Hunzaker <nate.hunzaker@gmail.com>
Date: Thu, 30 Mar 2017 11:16:36 -0400
Subject: [PATCH 026/153] Add DOM fixture for unmasking passwords (#9269)

IE11 and Edge have a password unmask field that React prevents the
display of for controlled inputs. This commit adds DOM fixture
coverage for this test case.
---
 fixtures/dom/src/components/Header.js         |  1 +
 fixtures/dom/src/components/fixtures/index.js |  5 ++-
 .../password-inputs/PasswordTestCase.js       | 34 +++++++++++++++++++
 .../fixtures/password-inputs/index.js         | 33 ++++++++++++++++++
 4 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 fixtures/dom/src/components/fixtures/password-inputs/PasswordTestCase.js
 create mode 100644 fixtures/dom/src/components/fixtures/password-inputs/index.js

diff --git a/fixtures/dom/src/components/Header.js b/fixtures/dom/src/components/Header.js
index 511b35e081a7b..d9732165c4248 100644
--- a/fixtures/dom/src/components/Header.js
+++ b/fixtures/dom/src/components/Header.js
@@ -45,6 +45,7 @@ const Header = React.createClass({
               <option value="/range-inputs">Range Inputs</option>
               <option value="/text-inputs">Text Inputs</option>
               <option value="/number-inputs">Number Input</option>
+              <option value="/password-inputs">Password Input</option>
               <option value="/selects">Selects</option>
               <option value="/textareas">Textareas</option>
               <option value="/input-change-events">Input change events</option>
diff --git a/fixtures/dom/src/components/fixtures/index.js b/fixtures/dom/src/components/fixtures/index.js
index 91e1405c77a0a..adc5a3d16208e 100644
--- a/fixtures/dom/src/components/fixtures/index.js
+++ b/fixtures/dom/src/components/fixtures/index.js
@@ -4,7 +4,8 @@ import TextInputFixtures from './text-inputs';
 import SelectFixtures from './selects';
 import TextAreaFixtures from './textareas';
 import InputChangeEvents from './input-change-events';
-import NumberInputFixtures from './number-inputs/';
+import NumberInputFixtures from './number-inputs';
+import PasswordInputFixtures from './password-inputs';
 import ButtonFixtures from './buttons';
 
 /**
@@ -26,6 +27,8 @@ const FixturesPage = React.createClass({
         return <InputChangeEvents />;
       case '/number-inputs':
         return <NumberInputFixtures />;
+      case '/password-inputs':
+        return <PasswordInputFixtures />;
       case '/buttons':
         return <ButtonFixtures />
       default:
diff --git a/fixtures/dom/src/components/fixtures/password-inputs/PasswordTestCase.js b/fixtures/dom/src/components/fixtures/password-inputs/PasswordTestCase.js
new file mode 100644
index 0000000000000..76f511776369d
--- /dev/null
+++ b/fixtures/dom/src/components/fixtures/password-inputs/PasswordTestCase.js
@@ -0,0 +1,34 @@
+const React = window.React;
+
+import Fixture from '../../Fixture';
+
+const PasswordTestCase = React.createClass({
+  getInitialState() {
+    return { value: '' };
+  },
+  onChange(event) {
+    this.setState({ value: event.target.value })
+  },
+  render() {
+    return (
+      <Fixture>
+        <div>{this.props.children}</div>
+
+        <div className="control-box">
+          <fieldset>
+            <legend>Controlled</legend>
+            <input type="password" value={this.state.value} onChange={this.onChange} />
+            <span className="hint"> Value: {JSON.stringify(this.state.value)}</span>
+          </fieldset>
+
+          <fieldset>
+            <legend>Uncontrolled</legend>
+            <input type="password" defaultValue="" />
+          </fieldset>
+        </div>
+      </Fixture>
+    );
+  },
+});
+
+export default PasswordTestCase;
diff --git a/fixtures/dom/src/components/fixtures/password-inputs/index.js b/fixtures/dom/src/components/fixtures/password-inputs/index.js
new file mode 100644
index 0000000000000..7c4094534bdad
--- /dev/null
+++ b/fixtures/dom/src/components/fixtures/password-inputs/index.js
@@ -0,0 +1,33 @@
+const React = window.React;
+
+import FixtureSet from '../../FixtureSet';
+import TestCase from '../../TestCase';
+import PasswordTestCase from './PasswordTestCase'
+
+const NumberInputs = React.createClass({
+  render() {
+    return (
+      <FixtureSet title="Password inputs" description="">
+        <TestCase
+          title="The show password icon"
+          description={`
+            Some browsers have an unmask password icon that React accidentally
+            prevents the display of.
+          `}
+          affectedBrowsers="IE Edge, IE 11">
+          <TestCase.Steps>
+            <li>Type any string (not an actual password</li>
+          </TestCase.Steps>
+
+          <TestCase.ExpectedResult>
+            The field should include the "unmasking password" icon.
+          </TestCase.ExpectedResult>
+
+          <PasswordTestCase />
+        </TestCase>
+      </FixtureSet>
+    );
+  },
+});
+
+export default NumberInputs;

From 686010037d10adde53b8ac926a7bfef0ab2ab8b1 Mon Sep 17 00:00:00 2001
From: Brandon Dail <aweary@users.noreply.github.com>
Date: Thu, 30 Mar 2017 11:24:58 -0500
Subject: [PATCH 027/153] Remove IE8-specific setInnerHTML behavior (#9288)

Since IE8 is not supported anymore, lets save those bytes!
---
 src/renderers/dom/shared/setInnerHTML.js | 60 +-----------------------
 1 file changed, 1 insertion(+), 59 deletions(-)

diff --git a/src/renderers/dom/shared/setInnerHTML.js b/src/renderers/dom/shared/setInnerHTML.js
index 70304e1951df3..25c7570071b5d 100644
--- a/src/renderers/dom/shared/setInnerHTML.js
+++ b/src/renderers/dom/shared/setInnerHTML.js
@@ -11,20 +11,14 @@
 
 'use strict';
 
-var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
 var DOMNamespaces = require('DOMNamespaces');
-
-var WHITESPACE_TEST = /^[ \r\n\t\f]/;
-var NONVISIBLE_TEST = /<(!--|link|noscript|meta|script|style)[ \r\n\t\f\/>]/;
-
 var createMicrosoftUnsafeLocalFunction = require('createMicrosoftUnsafeLocalFunction');
 
 // SVG temp container for IE lacking innerHTML
 var reusableSVGContainer;
 
 /**
- * Set the innerHTML property of a node, ensuring that whitespace is preserved
- * even in IE8.
+ * Set the innerHTML property of a node
  *
  * @param {DOMElement} node
  * @param {string} html
@@ -47,56 +41,4 @@ var setInnerHTML = createMicrosoftUnsafeLocalFunction(function(node, html) {
   }
 });
 
-if (ExecutionEnvironment.canUseDOM) {
-  // IE8: When updating a just created node with innerHTML only leading
-  // whitespace is removed. When updating an existing node with innerHTML
-  // whitespace in root TextNodes is also collapsed.
-  // @see quirksmode.org/bugreports/archives/2004/11/innerhtml_and_t.html
-
-  // Feature detection; only IE8 is known to behave improperly like this.
-  var testElement = document.createElement('div');
-  testElement.innerHTML = ' ';
-  if (testElement.innerHTML === '') {
-    setInnerHTML = function(node, html) {
-      // Magic theory: IE8 supposedly differentiates between added and updated
-      // nodes when processing innerHTML, innerHTML on updated nodes suffers
-      // from worse whitespace behavior. Re-adding a node like this triggers
-      // the initial and more favorable whitespace behavior.
-      // TODO: What to do on a detached node?
-      if (node.parentNode) {
-        node.parentNode.replaceChild(node, node);
-      }
-
-      // We also implement a workaround for non-visible tags disappearing into
-      // thin air on IE8, this only happens if there is no visible text
-      // in-front of the non-visible tags. Piggyback on the whitespace fix
-      // and simply check if any non-visible tags appear in the source.
-      if (
-        WHITESPACE_TEST.test(html) ||
-        (html[0] === '<' && NONVISIBLE_TEST.test(html))
-      ) {
-        // Recover leading whitespace by temporarily prepending any character.
-        // \uFEFF has the potential advantage of being zero-width/invisible.
-        // UglifyJS drops U+FEFF chars when parsing, so use String.fromCharCode
-        // in hopes that this is preserved even if "\uFEFF" is transformed to
-        // the actual Unicode character (by Babel, for example).
-        // https://github.com/mishoo/UglifyJS2/blob/v2.4.20/lib/parse.js#L216
-        node.innerHTML = String.fromCharCode(0xfeff) + html;
-
-        // deleteData leaves an empty `TextNode` which offsets the index of all
-        // children. Definitely want to avoid this.
-        var textNode = node.firstChild;
-        if (textNode.data.length === 1) {
-          node.removeChild(textNode);
-        } else {
-          textNode.deleteData(0, 1);
-        }
-      } else {
-        node.innerHTML = html;
-      }
-    };
-  }
-  testElement = null;
-}
-
 module.exports = setInnerHTML;

From 8d6d3e8c05106903b8fb62ac6a6519bf270d48b3 Mon Sep 17 00:00:00 2001
From: Brandon Dail <aweary@users.noreply.github.com>
Date: Thu, 30 Mar 2017 11:43:16 -0500
Subject: [PATCH 028/153] Update JSFiddle for issue template (#9289)

---
 .github/ISSUE_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 4921e268ff53b..31ac431253519 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -2,7 +2,7 @@
 
 **What is the current behavior?**
 
-**If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem via https://jsfiddle.net or similar (template: https://jsfiddle.net/reactjs/69z2wepo/).**
+**If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem via https://jsfiddle.net or similar (template: https://jsfiddle.net/84v837e9/).**
 
 **What is the expected behavior?**
 

From 004c937cb05811910d9d9fc2226932a8f88f3855 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Thu, 30 Mar 2017 13:10:15 -0700
Subject: [PATCH 029/153] Move takeSnapshot from UIManager to ReactNative
 renderer(s) (#9292)

* Move takeSnapshot from UIManager to ReactNative renderer(s)

* Prettier
---
 flow/react-native-host-hooks.js          |  9 ++++
 src/__mocks__/UIManager.js               |  1 +
 src/renderers/native/ReactNativeFiber.js |  3 ++
 src/renderers/native/ReactNativeStack.js |  4 ++
 src/renderers/native/takeSnapshot.js     | 54 ++++++++++++++++++++++++
 5 files changed, 71 insertions(+)
 create mode 100644 src/renderers/native/takeSnapshot.js

diff --git a/flow/react-native-host-hooks.js b/flow/react-native-host-hooks.js
index 0f96747133227..56d725065688e 100644
--- a/flow/react-native-host-hooks.js
+++ b/flow/react-native-host-hooks.js
@@ -58,6 +58,15 @@ declare module 'UIManager' {
     viewName : string,
     props : ?Object,
   ) : void;
+  declare function __takeSnapshot(
+    view ?: 'window' | Element<any> | number,
+    options ?: {
+       width ?: number,
+       height ?: number,
+       format ?: 'png' | 'jpeg',
+       quality ?: number,
+    },
+  ) : Promise<any>;
 }
 declare module 'View' {
   declare var exports : typeof ReactComponent;
diff --git a/src/__mocks__/UIManager.js b/src/__mocks__/UIManager.js
index 1c3088108f644..f2ead9dde794c 100644
--- a/src/__mocks__/UIManager.js
+++ b/src/__mocks__/UIManager.js
@@ -20,6 +20,7 @@ var RCTUIManager = {
   updateView: jest.fn(),
   removeSubviewsFromContainerWithID: jest.fn(),
   replaceExistingNonRootView: jest.fn(),
+  __takeSnapshot: jest.fn(),
   customBubblingEventTypes: {
     topBlur: {
       phasedRegistrationNames: {
diff --git a/src/renderers/native/ReactNativeFiber.js b/src/renderers/native/ReactNativeFiber.js
index 014b4dfa85de8..a43e51f2088c3 100644
--- a/src/renderers/native/ReactNativeFiber.js
+++ b/src/renderers/native/ReactNativeFiber.js
@@ -27,6 +27,7 @@ const deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationI
 const emptyObject = require('fbjs/lib/emptyObject');
 const findNodeHandle = require('findNodeHandle');
 const invariant = require('fbjs/lib/invariant');
+const takeSnapshot = require('takeSnapshot');
 
 const {injectInternals} = require('ReactFiberDevToolsHook');
 
@@ -402,6 +403,8 @@ const ReactNative = {
     return NativeRenderer.getPublicRootInstance(root);
   },
 
+  takeSnapshot,
+
   unmountComponentAtNode(containerTag: number) {
     const root = roots.get(containerTag);
     if (root) {
diff --git a/src/renderers/native/ReactNativeStack.js b/src/renderers/native/ReactNativeStack.js
index 2a5b8f509b707..0d1f323f0237e 100644
--- a/src/renderers/native/ReactNativeStack.js
+++ b/src/renderers/native/ReactNativeStack.js
@@ -18,6 +18,7 @@ var ReactNativeStackInjection = require('ReactNativeStackInjection');
 var ReactUpdates = require('ReactUpdates');
 
 var findNodeHandle = require('findNodeHandle');
+var takeSnapshot = require('takeSnapshot');
 
 ReactNativeInjection.inject();
 ReactNativeStackInjection.inject();
@@ -45,6 +46,9 @@ var ReactNative = {
   },
 
   render: render,
+
+  takeSnapshot,
+
   unmountComponentAtNode: ReactNativeMount.unmountComponentAtNode,
 
   /* eslint-disable camelcase */
diff --git a/src/renderers/native/takeSnapshot.js b/src/renderers/native/takeSnapshot.js
new file mode 100644
index 0000000000000..98608c83e5ff3
--- /dev/null
+++ b/src/renderers/native/takeSnapshot.js
@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule takeSnapshot
+ * @flow
+ */
+'use strict';
+
+var ReactNative = require('ReactNative');
+var UIManager = require('UIManager');
+
+import type {Element} from 'React';
+
+/**
+ * Capture an image of the screen, window or an individual view. The image
+ * will be stored in a temporary file that will only exist for as long as the
+ * app is running.
+ *
+ * The `view` argument can be the literal string `window` if you want to
+ * capture the entire window, or it can be a reference to a specific
+ * React Native component.
+ *
+ * The `options` argument may include:
+ * - width/height (number) - the width and height of the image to capture.
+ * - format (string) - either 'png' or 'jpeg'. Defaults to 'png'.
+ * - quality (number) - the quality when using jpeg. 0.0 - 1.0 (default).
+ *
+ * Returns a Promise.
+ * @platform ios
+ */
+function takeSnapshot(
+  view?: 'window' | Element<any> | number,
+  options?: {
+    width?: number,
+    height?: number,
+    format?: 'png' | 'jpeg',
+    quality?: number,
+  },
+): Promise<any> {
+  if (typeof view !== 'number' && view !== 'window') {
+    view = ReactNative.findNodeHandle(view) || 'window';
+  }
+
+  // Call the hidden '__takeSnapshot' method; the main one throws an error to
+  // prevent accidental backwards-incompatible usage.
+  return UIManager.__takeSnapshot(view, options);
+}
+
+module.exports = takeSnapshot;

From b8857d4f27c08c23553fd5cb02d9d6223068b49d Mon Sep 17 00:00:00 2001
From: Nathan Hunzaker <nate.hunzaker@gmail.com>
Date: Thu, 30 Mar 2017 16:47:14 -0400
Subject: [PATCH 030/153] Remove captured focus feature check (#9285)

IE8 was the only browser that did not support captured focus. We no
longer have that constraint.
---
 .../dom/shared/ReactBrowserEventEmitter.js    | 35 ++++++-------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/src/renderers/dom/shared/ReactBrowserEventEmitter.js b/src/renderers/dom/shared/ReactBrowserEventEmitter.js
index 8af3dff9d6b54..b42e333a0de70 100644
--- a/src/renderers/dom/shared/ReactBrowserEventEmitter.js
+++ b/src/renderers/dom/shared/ReactBrowserEventEmitter.js
@@ -268,31 +268,16 @@ var ReactBrowserEventEmitter = Object.assign({}, ReactEventEmitterMixin, {
             mountAt,
           );
         } else if (dependency === 'topFocus' || dependency === 'topBlur') {
-          if (isEventSupported('focus', true)) {
-            ReactBrowserEventEmitter.ReactEventListener.trapCapturedEvent(
-              'topFocus',
-              'focus',
-              mountAt,
-            );
-            ReactBrowserEventEmitter.ReactEventListener.trapCapturedEvent(
-              'topBlur',
-              'blur',
-              mountAt,
-            );
-          } else if (isEventSupported('focusin')) {
-            // IE has `focusin` and `focusout` events which bubble.
-            // @see http://www.quirksmode.org/blog/archives/2008/04/delegating_the.html
-            ReactBrowserEventEmitter.ReactEventListener.trapBubbledEvent(
-              'topFocus',
-              'focusin',
-              mountAt,
-            );
-            ReactBrowserEventEmitter.ReactEventListener.trapBubbledEvent(
-              'topBlur',
-              'focusout',
-              mountAt,
-            );
-          }
+          ReactBrowserEventEmitter.ReactEventListener.trapCapturedEvent(
+            'topFocus',
+            'focus',
+            mountAt,
+          );
+          ReactBrowserEventEmitter.ReactEventListener.trapCapturedEvent(
+            'topBlur',
+            'blur',
+            mountAt,
+          );
 
           // to make sure blur and focus event listeners are only attached once
           isListening.topBlur = true;

From 224487a0e27f6e8e64ef9504ed93d8d9bfefe249 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Thu, 30 Mar 2017 15:15:33 -0700
Subject: [PATCH 031/153] Show more meanignful stack trace for ReactNative
 errors (#9291)

* Show more meanignful stack trace for ReactNative errors

Clicking on the stack should jump to where the error actually occurred rather than to where it's logged in a redbox component.

* Made showDialog() return type stricter. Added mock and Flow types for ExceptionManager

* Prettier

* Handle null/string thrown errors

* Removed unused reference to emptyFunction
---
 flow/react-native-host-hooks.js               |  6 ++
 src/__mocks__/ExceptionsManager.js            | 14 +++++
 src/renderers/native/ReactNativeFiber.js      |  8 +++
 .../native/ReactNativeFiberErrorDialog.js     | 57 +++++++++++++++++++
 .../shared/fiber/ReactFiberErrorLogger.js     | 23 ++++++--
 5 files changed, 102 insertions(+), 6 deletions(-)
 create mode 100644 src/__mocks__/ExceptionsManager.js
 create mode 100644 src/renderers/native/ReactNativeFiberErrorDialog.js

diff --git a/flow/react-native-host-hooks.js b/flow/react-native-host-hooks.js
index 56d725065688e..bda205a2b607a 100644
--- a/flow/react-native-host-hooks.js
+++ b/flow/react-native-host-hooks.js
@@ -26,6 +26,12 @@ declare module 'TextInputState' {
   declare function blurTextInput(object : any) : void;
   declare function focusTextInput(object : any) : void;
 }
+declare module 'ExceptionsManager' {
+  declare function handleException(
+    error: Error,
+    isFatal: boolean,
+  ) : void;
+}
 declare module 'UIManager' {
   declare var customBubblingEventTypes : Object;
   declare var customDirectEventTypes : Object;
diff --git a/src/__mocks__/ExceptionsManager.js b/src/__mocks__/ExceptionsManager.js
new file mode 100644
index 0000000000000..65aefe639b711
--- /dev/null
+++ b/src/__mocks__/ExceptionsManager.js
@@ -0,0 +1,14 @@
+/**
+ * Copyright 2013-2015, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+'use strict';
+
+module.exports = {
+  handleException: jest.fn(),
+};
diff --git a/src/renderers/native/ReactNativeFiber.js b/src/renderers/native/ReactNativeFiber.js
index a43e51f2088c3..4b0e71d613df8 100644
--- a/src/renderers/native/ReactNativeFiber.js
+++ b/src/renderers/native/ReactNativeFiber.js
@@ -12,10 +12,12 @@
 
 'use strict';
 
+const ReactFiberErrorLogger = require('ReactFiberErrorLogger');
 const ReactFiberReconciler = require('ReactFiberReconciler');
 const ReactGenericBatching = require('ReactGenericBatching');
 const ReactNativeAttributePayload = require('ReactNativeAttributePayload');
 const ReactNativeComponentTree = require('ReactNativeComponentTree');
+const ReactNativeFiberErrorDialog = require('ReactNativeFiberErrorDialog');
 const ReactNativeFiberHostComponent = require('ReactNativeFiberHostComponent');
 const ReactNativeInjection = require('ReactNativeInjection');
 const ReactNativeTagHandles = require('ReactNativeTagHandles');
@@ -377,6 +379,12 @@ findNodeHandle.injection.injectFindNode((fiber: Fiber) =>
   NativeRenderer.findHostInstance(fiber));
 findNodeHandle.injection.injectFindRootNodeID(instance => instance);
 
+// Intercept lifecycle errors and ensure they are shown with the correct stack
+// trace within the native redbox component.
+ReactFiberErrorLogger.injection.injectDialog(
+  ReactNativeFiberErrorDialog.showDialog,
+);
+
 const ReactNative = {
   // External users of findNodeHandle() expect the host tag number return type.
   // The injected findNodeHandle() strategy returns the instance wrapper though.
diff --git a/src/renderers/native/ReactNativeFiberErrorDialog.js b/src/renderers/native/ReactNativeFiberErrorDialog.js
new file mode 100644
index 0000000000000..3d65ac4663039
--- /dev/null
+++ b/src/renderers/native/ReactNativeFiberErrorDialog.js
@@ -0,0 +1,57 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactNativeFiberErrorDialog
+ * @flow
+ */
+
+'use strict';
+
+const ExceptionsManager = require('ExceptionsManager');
+
+import type {CapturedError} from 'ReactFiberScheduler';
+
+/**
+ * Intercept lifecycle errors and ensure they are shown with the correct stack
+ * trace within the native redbox component.
+ */
+function ReactNativeFiberErrorDialog(capturedError: CapturedError): boolean {
+  const {componentStack, error} = capturedError;
+
+  let errorMessage: string;
+  let errorStack: string;
+  let errorType: Class<Error>;
+
+  // Typically Errors are thrown but eg strings or null can be thrown as well.
+  if (error && typeof error === 'object') {
+    const {message, name} = error;
+
+    const summary = message ? `${name}: ${message}` : name;
+
+    errorMessage = `${summary}\n\nThis error is located at:${componentStack}`;
+    errorStack = error.stack;
+    errorType = error.constructor;
+  } else {
+    errorMessage = `Unspecified error at:${componentStack}`;
+    errorStack = '';
+    errorType = Error;
+  }
+
+  const newError = new errorType(errorMessage);
+  newError.stack = errorStack;
+
+  ExceptionsManager.handleException(newError, false);
+
+  // Return false here to prevent ReactFiberErrorLogger default behavior of
+  // logging error details to console.error. Calls to console.error are
+  // automatically routed to the native redbox controller, which we've already
+  // done above by calling ExceptionsManager.
+  return false;
+}
+
+module.exports.showDialog = ReactNativeFiberErrorDialog;
diff --git a/src/renderers/shared/fiber/ReactFiberErrorLogger.js b/src/renderers/shared/fiber/ReactFiberErrorLogger.js
index 4deb6549322a7..7eb1f746b1e60 100644
--- a/src/renderers/shared/fiber/ReactFiberErrorLogger.js
+++ b/src/renderers/shared/fiber/ReactFiberErrorLogger.js
@@ -12,14 +12,23 @@
 
 'use strict';
 
-const emptyFunction = require('fbjs/lib/emptyFunction');
 const invariant = require('fbjs/lib/invariant');
 
 import type {CapturedError} from 'ReactFiberScheduler';
 
-let showDialog = emptyFunction;
+const defaultShowDialog = () => true;
+
+let showDialog = defaultShowDialog;
 
 function logCapturedError(capturedError: CapturedError): void {
+  const logError = showDialog(capturedError);
+
+  // Allow injected showDialog() to prevent default console.error logging.
+  // This enables renderers like ReactNative to better manage redbox behavior.
+  if (logError === false) {
+    return;
+  }
+
   if (__DEV__) {
     const {
       componentName,
@@ -85,14 +94,16 @@ function logCapturedError(capturedError: CapturedError): void {
       `React caught an error thrown by one of your components.\n\n${error.stack}`,
     );
   }
-
-  showDialog(capturedError);
 }
 
 exports.injection = {
-  injectDialog(fn: (e: CapturedError) => void) {
+  /**
+   * Display custom dialog for lifecycle errors.
+   * Return false to prevent default behavior of logging to console.error.
+   */
+  injectDialog(fn: (e: CapturedError) => boolean) {
     invariant(
-      showDialog === emptyFunction,
+      showDialog === defaultShowDialog,
       'The custom dialog was already injected.',
     );
     invariant(

From 4f69474e03bbc5fe8f4282a4790677779dec4a31 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Thu, 30 Mar 2017 15:45:13 -0700
Subject: [PATCH 032/153] Added explicit null return to completeUnitOfWork() to
 resolve Flow error (#9299)

---
 src/renderers/shared/fiber/ReactFiberScheduler.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/renderers/shared/fiber/ReactFiberScheduler.js b/src/renderers/shared/fiber/ReactFiberScheduler.js
index 29b74134ec383..435fe52a6e333 100644
--- a/src/renderers/shared/fiber/ReactFiberScheduler.js
+++ b/src/renderers/shared/fiber/ReactFiberScheduler.js
@@ -684,6 +684,10 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         return null;
       }
     }
+
+    // Without this explicit null return Flow complains of invalid return type
+    // TODO Remove the above while(true) loop
+    return null;
   }
 
   function performUnitOfWork(workInProgress: Fiber): Fiber | null {

From 76c5c6deb562e23bd07d16c0d1e65f766de03363 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Thu, 30 Mar 2017 16:40:45 -0700
Subject: [PATCH 033/153] Disabling a no-unreachable lint error (#9300)

---
 src/renderers/shared/fiber/ReactFiberScheduler.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/renderers/shared/fiber/ReactFiberScheduler.js b/src/renderers/shared/fiber/ReactFiberScheduler.js
index 435fe52a6e333..520b1c895435b 100644
--- a/src/renderers/shared/fiber/ReactFiberScheduler.js
+++ b/src/renderers/shared/fiber/ReactFiberScheduler.js
@@ -687,6 +687,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
 
     // Without this explicit null return Flow complains of invalid return type
     // TODO Remove the above while(true) loop
+    // eslint-disable-next-line no-unreachable
     return null;
   }
 

From 5ad1c76386142fbb4e573ca41cc7fad004de8b95 Mon Sep 17 00:00:00 2001
From: Andrey Marchenko <tom910ru@gmail.com>
Date: Fri, 31 Mar 2017 03:00:12 +0300
Subject: [PATCH 034/153] Deleted a specific code for ie8 - document.selection
 (#9298)

---
 src/renderers/dom/shared/ReactDOMSelection.js | 69 +------------------
 .../dom/shared/ReactInputSelection.js         | 23 -------
 .../shared/eventPlugins/SelectEventPlugin.js  |  8 ---
 3 files changed, 2 insertions(+), 98 deletions(-)

diff --git a/src/renderers/dom/shared/ReactDOMSelection.js b/src/renderers/dom/shared/ReactDOMSelection.js
index 3cd88c00e712c..4aaa9e86dd8f8 100644
--- a/src/renderers/dom/shared/ReactDOMSelection.js
+++ b/src/renderers/dom/shared/ReactDOMSelection.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
-
 var getNodeForCharacterOffset = require('getNodeForCharacterOffset');
 var getTextContentAccessor = require('getTextContentAccessor');
 
@@ -25,39 +23,6 @@ function isCollapsed(anchorNode, anchorOffset, focusNode, focusOffset) {
   return anchorNode === focusNode && anchorOffset === focusOffset;
 }
 
-/**
- * Get the appropriate anchor and focus node/offset pairs for IE.
- *
- * The catch here is that IE's selection API doesn't provide information
- * about whether the selection is forward or backward, so we have to
- * behave as though it's always forward.
- *
- * IE text differs from modern selection in that it behaves as though
- * block elements end with a new line. This means character offsets will
- * differ between the two APIs.
- *
- * @param {DOMElement} node
- * @return {object}
- */
-function getIEOffsets(node) {
-  var selection = document.selection;
-  var selectedRange = selection.createRange();
-  var selectedLength = selectedRange.text.length;
-
-  // Duplicate selection so we can move range without breaking user selection.
-  var fromStart = selectedRange.duplicate();
-  fromStart.moveToElementText(node);
-  fromStart.setEndPoint('EndToStart', selectedRange);
-
-  var startOffset = fromStart.text.length;
-  var endOffset = startOffset + selectedLength;
-
-  return {
-    start: startOffset,
-    end: endOffset,
-  };
-}
-
 /**
  * @param {DOMElement} node
  * @return {?object}
@@ -130,32 +95,6 @@ function getModernOffsets(node) {
   };
 }
 
-/**
- * @param {DOMElement|DOMTextNode} node
- * @param {object} offsets
- */
-function setIEOffsets(node, offsets) {
-  var range = document.selection.createRange().duplicate();
-  var start, end;
-
-  if (offsets.end === undefined) {
-    start = offsets.start;
-    end = start;
-  } else if (offsets.start > offsets.end) {
-    start = offsets.end;
-    end = offsets.start;
-  } else {
-    start = offsets.start;
-    end = offsets.end;
-  }
-
-  range.moveToElementText(node);
-  range.moveStart('character', start);
-  range.setEndPoint('EndToStart', range);
-  range.moveEnd('character', end - start);
-  range.select();
-}
-
 /**
  * In modern non-IE browsers, we can support both forward and backward
  * selections.
@@ -204,21 +143,17 @@ function setModernOffsets(node, offsets) {
   }
 }
 
-var useIEOffsets = ExecutionEnvironment.canUseDOM &&
-  'selection' in document &&
-  !('getSelection' in window);
-
 var ReactDOMSelection = {
   /**
    * @param {DOMElement} node
    */
-  getOffsets: useIEOffsets ? getIEOffsets : getModernOffsets,
+  getOffsets: getModernOffsets,
 
   /**
    * @param {DOMElement|DOMTextNode} node
    * @param {object} offsets
    */
-  setOffsets: useIEOffsets ? setIEOffsets : setModernOffsets,
+  setOffsets: setModernOffsets,
 };
 
 module.exports = ReactDOMSelection;
diff --git a/src/renderers/dom/shared/ReactInputSelection.js b/src/renderers/dom/shared/ReactInputSelection.js
index 317dc370eff12..dae4085f6a78a 100644
--- a/src/renderers/dom/shared/ReactInputSelection.js
+++ b/src/renderers/dom/shared/ReactInputSelection.js
@@ -98,20 +98,6 @@ var ReactInputSelection = {
         start: input.selectionStart,
         end: input.selectionEnd,
       };
-    } else if (
-      document.selection &&
-      (input.nodeName && input.nodeName.toLowerCase() === 'input')
-    ) {
-      // IE8 input.
-      var range = document.selection.createRange();
-      // There can only be one selection per document in IE, so it must
-      // be in our element.
-      if (range.parentElement() === input) {
-        selection = {
-          start: -range.moveStart('character', -input.value.length),
-          end: -range.moveEnd('character', -input.value.length),
-        };
-      }
     } else {
       // Content editable or old IE textarea.
       selection = ReactDOMSelection.getOffsets(input);
@@ -136,15 +122,6 @@ var ReactInputSelection = {
     if ('selectionStart' in input) {
       input.selectionStart = start;
       input.selectionEnd = Math.min(end, input.value.length);
-    } else if (
-      document.selection &&
-      (input.nodeName && input.nodeName.toLowerCase() === 'input')
-    ) {
-      var range = input.createTextRange();
-      range.collapse(true);
-      range.moveStart('character', start);
-      range.moveEnd('character', end - start);
-      range.select();
     } else {
       ReactDOMSelection.setOffsets(input, offsets);
     }
diff --git a/src/renderers/dom/shared/eventPlugins/SelectEventPlugin.js b/src/renderers/dom/shared/eventPlugins/SelectEventPlugin.js
index c4a51ff712f28..1989139b1a0e5 100644
--- a/src/renderers/dom/shared/eventPlugins/SelectEventPlugin.js
+++ b/src/renderers/dom/shared/eventPlugins/SelectEventPlugin.js
@@ -80,14 +80,6 @@ function getSelection(node) {
       focusNode: selection.focusNode,
       focusOffset: selection.focusOffset,
     };
-  } else if (document.selection) {
-    var range = document.selection.createRange();
-    return {
-      parentElement: range.parentElement(),
-      text: range.text,
-      top: range.boundingTop,
-      left: range.boundingLeft,
-    };
   }
 }
 

From bd2802523c3b1587a79d6ac06cb0e9351b3e68d8 Mon Sep 17 00:00:00 2001
From: Nathan Hunzaker <nate.hunzaker@gmail.com>
Date: Thu, 30 Mar 2017 21:20:57 -0400
Subject: [PATCH 035/153] Remove viewport metrics, other pageX/pageY behaviors
 (#9290)

* Remove viewport metrics

event.pageX and event.pageY are in every browser React supports.

* Rerecord tests
---
 scripts/fiber/tests-passing.txt               |  1 -
 .../dom/shared/ReactBrowserEventEmitter.js    | 38 -------------------
 .../ReactBrowserEventEmitter-test.js          | 16 --------
 .../dom/shared/eventPlugins/TapEventPlugin.js |  5 +--
 .../syntheticEvents/SyntheticMouseEvent.js    | 14 +------
 .../dom/shared/utils/ViewportMetrics.js       | 25 ------------
 src/renderers/dom/stack/client/ReactMount.js  |  2 -
 7 files changed, 3 insertions(+), 98 deletions(-)
 delete mode 100644 src/renderers/dom/shared/utils/ViewportMetrics.js

diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index bfa8ee1de52af..951646da67c76 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -868,7 +868,6 @@ src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js
 * should work with event plugins without dependencies
 * should work with event plugins with dependencies
 * should bubble onTouchTap
-* should not crash ensureScrollValueMonitoring when createEvent returns null
 
 src/renderers/dom/shared/__tests__/ReactDOM-test.js
 * allows a DOM element to be used with a string
diff --git a/src/renderers/dom/shared/ReactBrowserEventEmitter.js b/src/renderers/dom/shared/ReactBrowserEventEmitter.js
index b42e333a0de70..07dc3c4a73cb1 100644
--- a/src/renderers/dom/shared/ReactBrowserEventEmitter.js
+++ b/src/renderers/dom/shared/ReactBrowserEventEmitter.js
@@ -13,7 +13,6 @@
 
 var EventPluginRegistry = require('EventPluginRegistry');
 var ReactEventEmitterMixin = require('ReactEventEmitterMixin');
-var ViewportMetrics = require('ViewportMetrics');
 
 var getVendorPrefixedEventName = require('getVendorPrefixedEventName');
 var isEventSupported = require('isEventSupported');
@@ -73,9 +72,7 @@ var isEventSupported = require('isEventSupported');
  *    React Core     .  General Purpose Event Plugin System
  */
 
-var hasEventPageXY;
 var alreadyListeningTo = {};
-var isMonitoringScrollValue = false;
 var reactTopListenersCounter = 0;
 
 // For events like 'submit' which don't consistently bubble (which we trap at a
@@ -344,41 +341,6 @@ var ReactBrowserEventEmitter = Object.assign({}, ReactEventEmitterMixin, {
       handle,
     );
   },
-
-  /**
-   * Protect against document.createEvent() returning null
-   * Some popup blocker extensions appear to do this:
-   * https://github.com/facebook/react/issues/6887
-   */
-  supportsEventPageXY: function() {
-    if (!document.createEvent) {
-      return false;
-    }
-    var ev = document.createEvent('MouseEvent');
-    return ev != null && 'pageX' in ev;
-  },
-
-  /**
-   * Listens to window scroll and resize events. We cache scroll values so that
-   * application code can access them without triggering reflows.
-   *
-   * ViewportMetrics is only used by SyntheticMouse/TouchEvent and only when
-   * pageX/pageY isn't supported (legacy browsers).
-   *
-   * NOTE: Scroll events do not bubble.
-   *
-   * @see http://www.quirksmode.org/dom/events/scroll.html
-   */
-  ensureScrollValueMonitoring: function() {
-    if (hasEventPageXY === undefined) {
-      hasEventPageXY = ReactBrowserEventEmitter.supportsEventPageXY();
-    }
-    if (!hasEventPageXY && !isMonitoringScrollValue) {
-      var refresh = ViewportMetrics.refreshScrollValues;
-      ReactBrowserEventEmitter.ReactEventListener.monitorScrollValue(refresh);
-      isMonitoringScrollValue = true;
-    }
-  },
 });
 
 module.exports = ReactBrowserEventEmitter;
diff --git a/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js b/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js
index 266798bfd47c2..0136b1df6bd4b 100644
--- a/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js
@@ -435,20 +435,4 @@ describe('ReactBrowserEventEmitter', () => {
     expect(idCallOrder[1] === PARENT).toBe(true);
     expect(idCallOrder[2] === GRANDPARENT).toBe(true);
   });
-
-  it('should not crash ensureScrollValueMonitoring when createEvent returns null', () => {
-    var originalCreateEvent = document.createEvent;
-    document.createEvent = function() {
-      return null;
-    };
-    spyOn(document, 'createEvent');
-
-    try {
-      var hasEventPageXY = ReactBrowserEventEmitter.supportsEventPageXY();
-      expect(document.createEvent.calls.count()).toBe(1);
-      expect(hasEventPageXY).toBe(false);
-    } finally {
-      document.createEvent = originalCreateEvent;
-    }
-  });
 });
diff --git a/src/renderers/dom/shared/eventPlugins/TapEventPlugin.js b/src/renderers/dom/shared/eventPlugins/TapEventPlugin.js
index 24a0d2eff6040..e3badd714afb2 100644
--- a/src/renderers/dom/shared/eventPlugins/TapEventPlugin.js
+++ b/src/renderers/dom/shared/eventPlugins/TapEventPlugin.js
@@ -16,7 +16,6 @@ var EventPluginUtils = require('EventPluginUtils');
 var EventPropagators = require('EventPropagators');
 var SyntheticUIEvent = require('SyntheticUIEvent');
 var TouchEventUtils = require('fbjs/lib/TouchEventUtils');
-var ViewportMetrics = require('ViewportMetrics');
 
 var isStartish = EventPluginUtils.isStartish;
 var isEndish = EventPluginUtils.isEndish;
@@ -74,9 +73,7 @@ function getAxisCoordOfEvent(
   if (singleTouch) {
     return singleTouch[axis.page];
   }
-  return axis.page in nativeEvent
-    ? nativeEvent[axis.page]
-    : nativeEvent[axis.client] + ViewportMetrics[axis.envScroll];
+  return nativeEvent[axis.page];
 }
 
 function getDistance(coords: CoordinatesType, nativeEvent: _Touch): number {
diff --git a/src/renderers/dom/shared/syntheticEvents/SyntheticMouseEvent.js b/src/renderers/dom/shared/syntheticEvents/SyntheticMouseEvent.js
index 6ff156c564ee7..d7d2cbaa191ba 100644
--- a/src/renderers/dom/shared/syntheticEvents/SyntheticMouseEvent.js
+++ b/src/renderers/dom/shared/syntheticEvents/SyntheticMouseEvent.js
@@ -12,7 +12,6 @@
 'use strict';
 
 var SyntheticUIEvent = require('SyntheticUIEvent');
-var ViewportMetrics = require('ViewportMetrics');
 
 var getEventModifierState = require('getEventModifierState');
 
@@ -25,6 +24,8 @@ var MouseEventInterface = {
   screenY: null,
   clientX: null,
   clientY: null,
+  pageX: null,
+  pageY: null,
   ctrlKey: null,
   shiftKey: null,
   altKey: null,
@@ -51,17 +52,6 @@ var MouseEventInterface = {
         ? event.toElement
         : event.fromElement);
   },
-  // "Proprietary" Interface.
-  pageX: function(event) {
-    return 'pageX' in event
-      ? event.pageX
-      : event.clientX + ViewportMetrics.currentScrollLeft;
-  },
-  pageY: function(event) {
-    return 'pageY' in event
-      ? event.pageY
-      : event.clientY + ViewportMetrics.currentScrollTop;
-  },
 };
 
 /**
diff --git a/src/renderers/dom/shared/utils/ViewportMetrics.js b/src/renderers/dom/shared/utils/ViewportMetrics.js
deleted file mode 100644
index c23d0275c3fe2..0000000000000
--- a/src/renderers/dom/shared/utils/ViewportMetrics.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule ViewportMetrics
- */
-
-'use strict';
-
-var ViewportMetrics = {
-  currentScrollLeft: 0,
-
-  currentScrollTop: 0,
-
-  refreshScrollValues: function(scrollPosition) {
-    ViewportMetrics.currentScrollLeft = scrollPosition.x;
-    ViewportMetrics.currentScrollTop = scrollPosition.y;
-  },
-};
-
-module.exports = ViewportMetrics;
diff --git a/src/renderers/dom/stack/client/ReactMount.js b/src/renderers/dom/stack/client/ReactMount.js
index 20940c6fce4dc..93c21c84a2d91 100644
--- a/src/renderers/dom/stack/client/ReactMount.js
+++ b/src/renderers/dom/stack/client/ReactMount.js
@@ -14,7 +14,6 @@
 var DOMLazyTree = require('DOMLazyTree');
 var DOMProperty = require('DOMProperty');
 var React = require('react');
-var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');
 var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
 var ReactDOMComponentTree = require('ReactDOMComponentTree');
 var ReactDOMContainerInfo = require('ReactDOMContainerInfo');
@@ -382,7 +381,6 @@ var ReactMount = {
       '_registerComponent(...): Target container is not a DOM element.',
     );
 
-    ReactBrowserEventEmitter.ensureScrollValueMonitoring();
     var componentInstance = instantiateReactComponent(nextElement, false);
 
     if (callback) {

From 27c844905fcbb64ca0ba7c0a6b0fa0e121f9c429 Mon Sep 17 00:00:00 2001
From: Nathan Hunzaker <nate.hunzaker@gmail.com>
Date: Fri, 31 Mar 2017 06:36:08 -0400
Subject: [PATCH 036/153] Remove scroll capture support warning (#9303)

I removed the scroll capture feature check for IE8, however I missed
the associated warning.
---
 scripts/fiber/tests-passing-except-dev.txt    |  1 -
 scripts/fiber/tests-passing.txt               |  1 -
 .../dom/fiber/ReactDOMFiberComponent.js       |  9 -------
 .../__tests__/ReactDOMComponent-test.js       | 24 -------------------
 .../dom/stack/client/ReactDOMComponent.js     |  9 -------
 5 files changed, 44 deletions(-)

diff --git a/scripts/fiber/tests-passing-except-dev.txt b/scripts/fiber/tests-passing-except-dev.txt
index 5b7ce16d9231d..3ff930bd86045 100644
--- a/scripts/fiber/tests-passing-except-dev.txt
+++ b/scripts/fiber/tests-passing-except-dev.txt
@@ -1,5 +1,4 @@
 src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
-* should not warn when server-side rendering `onScroll`
 * should warn about incorrect casing on properties (ssr)
 * should warn about incorrect casing on event handlers (ssr)
 * should warn about class (ssr)
diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index 951646da67c76..be1d9751e158c 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -951,7 +951,6 @@ src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
 * should report component containing invalid styles
 * should properly escape text content and attributes values
 * unmounts children before unsetting DOM node info
-* should warn about the `onScroll` issue when unsupported (IE8)
 * should throw when an invalid tag name is used server-side
 * should throw when an attack vector is used server-side
 * should throw when an invalid tag name is used
diff --git a/src/renderers/dom/fiber/ReactDOMFiberComponent.js b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
index 89df93b868b3f..bea2bf0ca5a0c 100644
--- a/src/renderers/dom/fiber/ReactDOMFiberComponent.js
+++ b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
@@ -28,7 +28,6 @@ var {getCurrentFiberOwnerName} = require('ReactDebugCurrentFiber');
 
 var emptyFunction = require('fbjs/lib/emptyFunction');
 var invariant = require('fbjs/lib/invariant');
-var isEventSupported = require('isEventSupported');
 var setInnerHTML = require('setInnerHTML');
 var setTextContent = require('setTextContent');
 var inputValueTracking = require('inputValueTracking');
@@ -145,14 +144,6 @@ if (__DEV__) {
 }
 
 function ensureListeningTo(rootContainerElement, registrationName) {
-  if (__DEV__) {
-    // IE8 has no API for event capturing and the `onScroll` event doesn't
-    // bubble.
-    warning(
-      registrationName !== 'onScroll' || isEventSupported('scroll', true),
-      "This browser doesn't support the `onScroll` event",
-    );
-  }
   var isDocumentFragment = rootContainerElement.nodeType === DOC_FRAGMENT_TYPE;
   var doc = isDocumentFragment
     ? rootContainerElement
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
index 9a5adddf9adab..7a8c73ddc79e7 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
@@ -1233,30 +1233,6 @@ describe('ReactDOMComponent', () => {
     });
   });
 
-  describe('onScroll warning', () => {
-    it('should warn about the `onScroll` issue when unsupported (IE8)', () => {
-      // Mock this here so we can mimic IE8 support. We require isEventSupported
-      // before React so it's pre-mocked before React would require it.
-      jest.resetModules().mock('isEventSupported');
-      var isEventSupported = require('isEventSupported');
-      isEventSupported.mockReturnValueOnce(false);
-      ReactTestUtils = require('ReactTestUtils');
-
-      spyOn(console, 'error');
-      ReactTestUtils.renderIntoDocument(<div onScroll={function() {}} />);
-      expectDev(console.error.calls.count()).toBe(1);
-      expectDev(console.error.calls.argsFor(0)[0]).toBe(
-        "Warning: This browser doesn't support the `onScroll` event",
-      );
-    });
-
-    it('should not warn when server-side rendering `onScroll`', () => {
-      spyOn(console, 'error');
-      ReactDOMServer.renderToString(<div onScroll={() => {}} />);
-      expectDev(console.error).not.toHaveBeenCalled();
-    });
-  });
-
   describe('tag sanitization', () => {
     it('should throw when an invalid tag name is used server-side', () => {
       var hackzor = React.createElement('script tag');
diff --git a/src/renderers/dom/stack/client/ReactDOMComponent.js b/src/renderers/dom/stack/client/ReactDOMComponent.js
index 8e73894697a43..ac717f96c7366 100644
--- a/src/renderers/dom/stack/client/ReactDOMComponent.js
+++ b/src/renderers/dom/stack/client/ReactDOMComponent.js
@@ -34,7 +34,6 @@ var ReactServerRenderingTransaction = require('ReactServerRenderingTransaction')
 var emptyFunction = require('fbjs/lib/emptyFunction');
 var escapeTextContentForBrowser = require('escapeTextContentForBrowser');
 var invariant = require('fbjs/lib/invariant');
-var isEventSupported = require('isEventSupported');
 var inputValueTracking = require('inputValueTracking');
 var validateDOMNesting = require('validateDOMNesting');
 var warning = require('fbjs/lib/warning');
@@ -138,14 +137,6 @@ function ensureListeningTo(inst, registrationName, transaction) {
   if (transaction instanceof ReactServerRenderingTransaction) {
     return;
   }
-  if (__DEV__) {
-    // IE8 has no API for event capturing and the `onScroll` event doesn't
-    // bubble.
-    warning(
-      registrationName !== 'onScroll' || isEventSupported('scroll', true),
-      "This browser doesn't support the `onScroll` event",
-    );
-  }
   var containerInfo = inst._hostContainerInfo;
   var isDocumentFragment = containerInfo._node &&
     containerInfo._node.nodeType === DOC_FRAGMENT_TYPE;

From e9c995974de812db67777e5ca64697152bc30a3d Mon Sep 17 00:00:00 2001
From: Ben Alpert <ben@benalpert.com>
Date: Fri, 31 Mar 2017 16:13:01 +0100
Subject: [PATCH 037/153] Port out bug fixes to ReactARTFiber (#9309)

D4616127 D4629747 D4631778
---
 src/renderers/art/ReactARTFiber.js | 34 ++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/renderers/art/ReactARTFiber.js b/src/renderers/art/ReactARTFiber.js
index 86b04e5e1cf30..2aa02b151a80f 100644
--- a/src/renderers/art/ReactARTFiber.js
+++ b/src/renderers/art/ReactARTFiber.js
@@ -292,7 +292,7 @@ class RadialGradient {
   }
 
   applyFill(node) {
-    node.fillRadial.apply(node, this.args);
+    node.fillRadial.apply(node, this._args);
   }
 }
 
@@ -302,7 +302,7 @@ class Pattern {
   }
 
   applyFill(node) {
-    node.fillImage.apply(node, this.args);
+    node.fillImage.apply(node, this._args);
   }
 }
 
@@ -361,6 +361,30 @@ class Surface extends Component {
   }
 }
 
+class Text extends React.Component {
+  constructor(props) {
+    super(props);
+    // We allow reading these props. Ideally we could expose the Text node as
+    // ref directly.
+    for (const key of ['height', 'width', 'x', 'y']) {
+      Object.defineProperty(this, key, {
+        get: function() {
+          return this._text ? this._text[key] : undefined;
+        },
+      });
+    }
+  }
+  render() {
+    // This means you can't have children that render into strings...
+    const T = TYPES.TEXT;
+    return (
+      <T {...this.props} ref={t => this._text = t}>
+        {childrenAsString(this.props.children)}
+      </T>
+    );
+  }
+}
+
 /** ART Renderer */
 
 const ARTRenderer = ReactFiberReconciler({
@@ -506,10 +530,6 @@ module.exports = {
   RadialGradient,
   Shape: TYPES.SHAPE,
   Surface,
-  Text: function Text(props) {
-    // TODO: This means you can't have children that render into strings.
-    const T = TYPES.TEXT;
-    return <T {...props}>{childrenAsString(props.children)}</T>;
-  },
+  Text: Text,
   Transform,
 };

From 6fd539ec66adad6ec159ebf616871fa8076cdcc4 Mon Sep 17 00:00:00 2001
From: Ben Alpert <balpert@fb.com>
Date: Fri, 31 Mar 2017 16:20:28 +0100
Subject: [PATCH 038/153] Fix build

oops i broke it
---
 src/renderers/art/ReactARTFiber.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderers/art/ReactARTFiber.js b/src/renderers/art/ReactARTFiber.js
index 2aa02b151a80f..215d15153fb39 100644
--- a/src/renderers/art/ReactARTFiber.js
+++ b/src/renderers/art/ReactARTFiber.js
@@ -366,13 +366,13 @@ class Text extends React.Component {
     super(props);
     // We allow reading these props. Ideally we could expose the Text node as
     // ref directly.
-    for (const key of ['height', 'width', 'x', 'y']) {
+    ['height', 'width', 'x', 'y'].forEach(key => {
       Object.defineProperty(this, key, {
         get: function() {
           return this._text ? this._text[key] : undefined;
         },
       });
-    }
+    });
   }
   render() {
     // This means you can't have children that render into strings...

From a734aecc983bc484845ce2a34c2fe4bbd0f16b18 Mon Sep 17 00:00:00 2001
From: Sasha Aickin <xander76@yahoo.com>
Date: Fri, 31 Mar 2017 14:49:03 -0700
Subject: [PATCH 039/153] Response to code review comment
 https://github.com/facebook/react/pull/9264#discussion_r108974871 . Thanks,
 @spicyj!

---
 .../dom/shared/__tests__/ReactDOMServerIntegration-test.js    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js b/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
index 403254c66ff91..af29b8d5ac882 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
@@ -1043,12 +1043,14 @@ describe('ReactDOMServerIntegration', () => {
           // onChange or readOnly is a mistake.
           const e = await render(<input value="foo" />, 1);
           expect(e.value).toBe('foo');
+          expect(e.getAttribute('value')).toBe('foo');
         },
       );
 
       itRenders('an input with a defaultValue', async render => {
         const e = await render(<input defaultValue="foo" />);
         expect(e.value).toBe('foo');
+        expect(e.getAttribute('value')).toBe('foo');
         expect(e.getAttribute('defaultValue')).toBe(null);
       });
 
@@ -1058,6 +1060,7 @@ describe('ReactDOMServerIntegration', () => {
           1,
         );
         expect(e.value).toBe('foo');
+        expect(e.getAttribute('value')).toBe('foo');
         expect(e.getAttribute('defaultValue')).toBe(null);
       });
 
@@ -1069,6 +1072,7 @@ describe('ReactDOMServerIntegration', () => {
             1,
           );
           expect(e.value).toBe('foo');
+          expect(e.getAttribute('value')).toBe('foo');
           expect(e.getAttribute('defaultValue')).toBe(null);
         },
       );

From d9915db43bcb9683fc5658d15c98f2b2065bd502 Mon Sep 17 00:00:00 2001
From: Andrey Marchenko <tom910ru@gmail.com>
Date: Sat, 1 Apr 2017 01:31:52 +0300
Subject: [PATCH 040/153] Deleting a specific style name float for ie8 (#9311)

* Deleting a specific style name float for ie8

* Remove unnecessary condition
---
 src/renderers/dom/shared/CSSPropertyOperations.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/renderers/dom/shared/CSSPropertyOperations.js b/src/renderers/dom/shared/CSSPropertyOperations.js
index d23c5b6be41e4..a7a70ed895372 100644
--- a/src/renderers/dom/shared/CSSPropertyOperations.js
+++ b/src/renderers/dom/shared/CSSPropertyOperations.js
@@ -30,7 +30,6 @@ var processStyleName = memoizeStringOnly(function(styleName) {
 });
 
 var hasShorthandPropertyBug = false;
-var styleFloatAccessor = 'cssFloat';
 if (ExecutionEnvironment.canUseDOM) {
   var tempStyle = document.createElement('div').style;
   try {
@@ -39,10 +38,6 @@ if (ExecutionEnvironment.canUseDOM) {
   } catch (e) {
     hasShorthandPropertyBug = true;
   }
-  // IE8 only supports accessing cssFloat (standard) as styleFloat
-  if (document.documentElement.style.cssFloat === undefined) {
-    styleFloatAccessor = 'styleFloat';
-  }
 }
 
 if (__DEV__) {
@@ -215,8 +210,8 @@ var CSSPropertyOperations = {
         styles[styleName],
         component,
       );
-      if (styleName === 'float' || styleName === 'cssFloat') {
-        styleName = styleFloatAccessor;
+      if (styleName === 'float') {
+        styleName = 'cssFloat';
       }
       if (styleValue) {
         style[styleName] = styleValue;

From 4a37718e4ed56f1893abb19f59ec91a861000803 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 3 Apr 2017 20:32:02 +0100
Subject: [PATCH 041/153] Remove examples/ folder (#9323)

---
 .eslintignore                                 |   1 -
 .flowconfig                                   |   1 -
 .gitignore                                    |   2 -
 docs/contributing/how-to-contribute.md        |   2 +-
 docs/docs/web-components.md                   |   2 -
 examples/README.md                            |   5 -
 examples/basic-click-counter/index.html       |  54 -----
 examples/basic-commonjs/.babelrc              |   3 -
 examples/basic-commonjs/README.md             |   9 -
 examples/basic-commonjs/index.html            |  37 ----
 examples/basic-commonjs/index.js              |  24 ---
 examples/basic-commonjs/package.json          |  19 --
 examples/basic-jsx-external/example.js        |  19 --
 examples/basic-jsx-external/index.html        |  37 ----
 examples/basic-jsx-harmony/index.html         |  49 -----
 examples/basic-jsx-precompile/example.js      |  19 --
 examples/basic-jsx-precompile/index.html      |  40 ----
 examples/basic-jsx/index.html                 |  49 -----
 examples/basic/index.html                     |  52 -----
 examples/fiber/debugger/.env                  |   1 -
 examples/jquery-bootstrap/css/example.css     |   3 -
 examples/jquery-bootstrap/index.html          |  20 --
 examples/jquery-bootstrap/js/app.js           | 139 -------------
 examples/jquery-mobile/README.md              |   6 -
 examples/jquery-mobile/index.html             |  19 --
 examples/jquery-mobile/js/app.js              | 191 ------------------
 examples/quadratic/example.js                 |  59 ------
 examples/quadratic/index.html                 |  31 ---
 examples/shared/css/base.css                  |  62 ------
 examples/transitions/index.html               |  81 --------
 examples/transitions/transition.css           |  44 ----
 examples/webcomponents/index.html             |  65 ------
 fixtures/fiber-debugger/.env                  |   1 +
 .../fiber-debugger}/.gitignore                |   0
 .../fiber-debugger}/README.md                 |   0
 .../fiber-debugger}/package.json              |   0
 .../fiber-debugger}/public/favicon.ico        | Bin
 .../fiber-debugger}/public/index.html         |   0
 .../fiber-debugger}/src/App.js                |   0
 .../fiber-debugger}/src/Editor.js             |   0
 .../fiber-debugger}/src/Fibers.js             |   0
 .../fiber-debugger}/src/describeFibers.js     |   0
 .../fiber-debugger}/src/index.css             |   0
 .../fiber-debugger}/src/index.js              |   0
 .../fiber-debugger}/yarn.lock                 |   0
 .../fiber-triangle}/index.html                |   0
 fixtures/packaging/babel-standalone.html      |  14 ++
 47 files changed, 16 insertions(+), 1144 deletions(-)
 delete mode 100644 examples/README.md
 delete mode 100644 examples/basic-click-counter/index.html
 delete mode 100644 examples/basic-commonjs/.babelrc
 delete mode 100644 examples/basic-commonjs/README.md
 delete mode 100644 examples/basic-commonjs/index.html
 delete mode 100644 examples/basic-commonjs/index.js
 delete mode 100644 examples/basic-commonjs/package.json
 delete mode 100644 examples/basic-jsx-external/example.js
 delete mode 100644 examples/basic-jsx-external/index.html
 delete mode 100644 examples/basic-jsx-harmony/index.html
 delete mode 100644 examples/basic-jsx-precompile/example.js
 delete mode 100644 examples/basic-jsx-precompile/index.html
 delete mode 100644 examples/basic-jsx/index.html
 delete mode 100644 examples/basic/index.html
 delete mode 100644 examples/fiber/debugger/.env
 delete mode 100644 examples/jquery-bootstrap/css/example.css
 delete mode 100644 examples/jquery-bootstrap/index.html
 delete mode 100644 examples/jquery-bootstrap/js/app.js
 delete mode 100644 examples/jquery-mobile/README.md
 delete mode 100644 examples/jquery-mobile/index.html
 delete mode 100644 examples/jquery-mobile/js/app.js
 delete mode 100644 examples/quadratic/example.js
 delete mode 100644 examples/quadratic/index.html
 delete mode 100644 examples/shared/css/base.css
 delete mode 100644 examples/transitions/index.html
 delete mode 100644 examples/transitions/transition.css
 delete mode 100644 examples/webcomponents/index.html
 create mode 100644 fixtures/fiber-debugger/.env
 rename {examples/fiber/debugger => fixtures/fiber-debugger}/.gitignore (100%)
 rename {examples/fiber/debugger => fixtures/fiber-debugger}/README.md (100%)
 rename {examples/fiber/debugger => fixtures/fiber-debugger}/package.json (100%)
 rename {examples/fiber/debugger => fixtures/fiber-debugger}/public/favicon.ico (100%)
 rename {examples/fiber/debugger => fixtures/fiber-debugger}/public/index.html (100%)
 rename {examples/fiber/debugger => fixtures/fiber-debugger}/src/App.js (100%)
 rename {examples/fiber/debugger => fixtures/fiber-debugger}/src/Editor.js (100%)
 rename {examples/fiber/debugger => fixtures/fiber-debugger}/src/Fibers.js (100%)
 rename {examples/fiber/debugger => fixtures/fiber-debugger}/src/describeFibers.js (100%)
 rename {examples/fiber/debugger => fixtures/fiber-debugger}/src/index.css (100%)
 rename {examples/fiber/debugger => fixtures/fiber-debugger}/src/index.js (100%)
 rename {examples/fiber/debugger => fixtures/fiber-debugger}/yarn.lock (100%)
 rename {examples/fiber => fixtures/fiber-triangle}/index.html (100%)
 create mode 100644 fixtures/packaging/babel-standalone.html

diff --git a/.eslintignore b/.eslintignore
index 225671653384a..c9866f87df26b 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -9,7 +9,6 @@ docs/_site/
 docs/vendor/bundle/
 # This should be more like examples/**/thirdparty/** but
 # we should fix https://github.com/facebook/esprima/pull/85 first
-examples/
 fixtures/
 # Ignore built files.
 build/
diff --git a/.flowconfig b/.flowconfig
index 4c85601032784..15f21d00b2470 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -1,6 +1,5 @@
 [ignore]
 
-<PROJECT_ROOT>/examples/.*
 <PROJECT_ROOT>/fixtures/.*
 <PROJECT_ROOT>/build/.*
 <PROJECT_ROOT>/.*/node_modules/y18n/.*
diff --git a/.gitignore b/.gitignore
index 18dfb23662d25..035106e39925b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,8 +17,6 @@ docs/.sass-cache
 docs/js/*
 docs/downloads/*.zip
 docs/vendor/bundle
-examples/shared/*.js
-examples/**/bundle.js
 fixtures/dom/public/react-dom.js
 fixtures/dom/public/react.js
 test/the-files-to-test.generated.js
diff --git a/docs/contributing/how-to-contribute.md b/docs/contributing/how-to-contribute.md
index 6613a3c74bf4c..ff2180e0dbb07 100644
--- a/docs/contributing/how-to-contribute.md
+++ b/docs/contributing/how-to-contribute.md
@@ -115,7 +115,7 @@ We recommend running `npm test` (or its variations above) to make sure you don't
 
 First, run `npm run build`. This will produce pre-built bundles in `build` folder, as well as prepare npm packages inside `build/packages`.
 
-The easiest way to try your changes is to open and modify `examples/basic/index.html`. This file already uses `react.js` from the `build` folder so it will pick up your changes. Please make sure to rollback any unintentional changes in `examples` before sending a pull request.
+The easiest way to try your changes is to run `npm run build` and then open `fixtures/packaging/globals.html`. This file already uses `react.js` from the `build` folder so it will pick up your changes.
 
 If you want to try your changes in your existing React project, you may copy `build/react.js`, `build/react-dom.js`, or any other build products into your app and use them instead of the stable version. If your project uses React from npm, you may delete `react` and `react-dom` in its dependencies and use `npm link` to point them to your local `build` folder:
 
diff --git a/docs/docs/web-components.md b/docs/docs/web-components.md
index 4063db0e1ca15..1012ea795b696 100644
--- a/docs/docs/web-components.md
+++ b/docs/docs/web-components.md
@@ -56,5 +56,3 @@ const proto = Object.create(HTMLElement.prototype, {
 });
 document.registerElement('x-search', {prototype: proto});
 ```
-
-You can also check out this [complete Web Components example on GitHub](https://github.com/facebook/react/tree/master/examples/webcomponents).
diff --git a/examples/README.md b/examples/README.md
deleted file mode 100644
index 53d7a6445b8e5..0000000000000
--- a/examples/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# React Examples
-
-Here are some small React demos. Some use [JSX](https://facebook.github.io/react/docs/jsx-in-depth.html) and some include third-party library integration.
-
-For more fully-featured examples, check out [React TodoMVC](http://todomvc.com/examples/react/) and [React + Backbone TodoMVC](http://todomvc.com/examples/react-backbone/).
diff --git a/examples/basic-click-counter/index.html b/examples/basic-click-counter/index.html
deleted file mode 100644
index 3c8e9c8e8f1e0..0000000000000
--- a/examples/basic-click-counter/index.html
+++ /dev/null
@@ -1,54 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Basic Click Counter Example with JSX</title>
-    <link rel="stylesheet" href="../shared/css/base.css" />
-  </head>
-  <body>
-    <h1>Basic Click Counter Example with JSX</h1>
-    <div id="container">
-      <p>
-        To install React, follow the instructions on
-        <a href="https://github.com/facebook/react/">GitHub</a>.
-      </p>
-      <p>
-        If you can see this, React is <strong>not</strong> working right.
-        If you checked out the source from GitHub make sure to run <code>grunt</code>.
-      </p>
-    </div>
-    <h4>Example Details</h4>
-    <p>This is written with JSX and transformed in the browser.</p>
-    <p>This example uses events and state to track clicks and update the rendered output.</p>
-    <p>
-      Learn more about React at
-      <a href="https://facebook.github.io/react" target="_blank">facebook.github.io/react</a>.
-    </p>
-    <script src="../../build/react.js"></script>
-    <script src="../../build/react-dom.js"></script>
-    <script src="https://unpkg.com/babel-standalone@6.15.0/babel.min.js"></script>
-    <script type="text/babel">
-      var Counter = React.createClass({
-        getInitialState: function () {
-          return { count: 0 };
-        },
-        handleClick: function () {
-          this.setState({
-            count: this.state.count + 1,
-          });
-        },
-        render: function () {
-          return (
-            <button onClick={this.handleClick}>
-              Click me! Number of clicks: {this.state.count}
-            </button>
-          );
-        }
-      });
-      ReactDOM.render(
-        <Counter />,
-        document.getElementById('container')
-      );
-    </script>
-  </body>
-</html>
diff --git a/examples/basic-commonjs/.babelrc b/examples/basic-commonjs/.babelrc
deleted file mode 100644
index 05786794195f7..0000000000000
--- a/examples/basic-commonjs/.babelrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "presets": ["react", "es2015"]
-}
diff --git a/examples/basic-commonjs/README.md b/examples/basic-commonjs/README.md
deleted file mode 100644
index 87025c46e2162..0000000000000
--- a/examples/basic-commonjs/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Basic example of using React with Browserify
-
-Run `npm install` in the directory to install React from npm. Then run:
-
-```sh
-npm start
-```
-
-to produce `bundle.js` with example code and React.
diff --git a/examples/basic-commonjs/index.html b/examples/basic-commonjs/index.html
deleted file mode 100644
index 0b6c023c3f718..0000000000000
--- a/examples/basic-commonjs/index.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Basic CommonJS Example with Browserify</title>
-    <link rel="stylesheet" href="../shared/css/base.css" />
-  </head>
-  <body>
-    <h1>Basic CommonJS Example with Browserify</h1>
-    <div id="container">
-      <p>
-        To install React, follow the instructions on
-        <a href="https://github.com/facebook/react/">GitHub</a>.
-      </p>
-      <p>
-        If you can see this, React is <strong>not</strong> working right.
-        If you checked out the source from GitHub make sure to run <code>grunt</code>.
-      </p>
-    </div>
-    <h4>Example Details</h4>
-    <p>This is written with JSX in a CommonJS module and precompiled to vanilla JS by navigating to the example
-      directory
-      <pre>cd /path/to/react/examples/example-name</pre>
-      and running
-      <pre>npm start</pre>
-      <br>
-      (don't forget to install first) 
-      <pre>npm install</pre>
-      <br>
-    </p>
-    <p>
-      Learn more about React at
-      <a href="https://facebook.github.io/react" target="_blank">facebook.github.io/react</a>.
-    </p>
-    <script src="bundle.js"></script>
-  </body>
-</html>
diff --git a/examples/basic-commonjs/index.js b/examples/basic-commonjs/index.js
deleted file mode 100644
index ef90bbb89c3ea..0000000000000
--- a/examples/basic-commonjs/index.js
+++ /dev/null
@@ -1,24 +0,0 @@
-'use strict';
-
-var React = require('react');
-var ReactDOM = require('react-dom');
-
-var ExampleApplication = React.createClass({
-  render: function() {
-    var elapsed = Math.round(this.props.elapsed  / 100);
-    var seconds = elapsed / 10 + (elapsed % 10 ? '' : '.0' );
-    var message =
-      'React has been successfully running for ' + seconds + ' seconds.';
-
-    return <p>{message}</p>;
-  }
-});
-
-var start = new Date().getTime();
-
-setInterval(function() {
-  ReactDOM.render(
-    <ExampleApplication elapsed={new Date().getTime() - start} />,
-    document.getElementById('container')
-  );
-}, 50);
diff --git a/examples/basic-commonjs/package.json b/examples/basic-commonjs/package.json
deleted file mode 100644
index e42eb80de4a30..0000000000000
--- a/examples/basic-commonjs/package.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "name": "react-basic-commonjs-example",
-  "description": "Basic example of using React with CommonJS",
-  "private": true,
-  "main": "index.js",
-  "dependencies": {
-    "babel-preset-es2015": "^6.6.0",
-    "babel-preset-react": "^6.5.0",
-    "babelify": "^7.3.0",
-    "browserify": "^13.0.0",
-    "react": "^15.0.2",
-    "react-dom": "^15.0.2",
-    "watchify": "^3.7.0"
-  },
-  "scripts": {
-    "build": "browserify ./index.js -t babelify -o bundle.js",
-    "start": "watchify ./index.js -v -t babelify -o bundle.js"
-  }
-}
diff --git a/examples/basic-jsx-external/example.js b/examples/basic-jsx-external/example.js
deleted file mode 100644
index 7d9911eb6cc45..0000000000000
--- a/examples/basic-jsx-external/example.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var ExampleApplication = React.createClass({
-  render: function() {
-    var elapsed = Math.round(this.props.elapsed  / 100);
-    var seconds = elapsed / 10 + (elapsed % 10 ? '' : '.0' );
-    var message =
-      'React has been successfully running for ' + seconds + ' seconds.';
-
-    return <p>{message}</p>;
-  }
-});
-
-var start = new Date().getTime();
-
-setInterval(function() {
-  ReactDOM.render(
-    <ExampleApplication elapsed={new Date().getTime() - start} />,
-    document.getElementById('container')
-  );
-}, 50);
diff --git a/examples/basic-jsx-external/index.html b/examples/basic-jsx-external/index.html
deleted file mode 100644
index 7dd70346cb01a..0000000000000
--- a/examples/basic-jsx-external/index.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Basic Example with External JSX</title>
-    <link rel="stylesheet" href="../shared/css/base.css" />
-  </head>
-
-  <body>
-    <h1>Basic Example with External JSX</h1>
-    <div id="container">
-      <p>
-        If you can see this, React is <strong>not</strong> working right. This is probably because you&apos;re viewing
-        this on your file system instead of a web server.<br>
-        Try navigating to the React root
-        <pre>
-          cd /path/to/react
-        </pre>
-        and running
-        <pre>
-          python -m SimpleHTTPServer
-        </pre>
-        and going to <a href="http://localhost:8000/examples/basic-jsx-external/">http://localhost:8000/examples/basic-jsx-external/</a>.
-      </p>
-    </div>
-    <h4>Example Details</h4>
-    <p>This is written with JSX in a separate file and transformed in the browser.</p>
-    <p>
-      Learn more about React at
-      <a href="https://facebook.github.io/react" target="_blank">facebook.github.io/react</a>.
-    </p>
-    <script src="../../build/react.js"></script>
-    <script src="../../build/react-dom.js"></script>
-    <script src="https://unpkg.com/babel-standalone@6.15.0/babel.min.js"></script>
-    <script type="text/babel" src="example.js"></script>
-  </body>
-</html>
diff --git a/examples/basic-jsx-harmony/index.html b/examples/basic-jsx-harmony/index.html
deleted file mode 100644
index 608fefa21d6e3..0000000000000
--- a/examples/basic-jsx-harmony/index.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Basic Example with JSX and ES6 features</title>
-    <link rel="stylesheet" href="../shared/css/base.css" />
-  </head>
-  <body>
-    <h1>Basic Example with JSX and ES6 features</h1>
-    <div id="container">
-      <p>
-        To install React, follow the instructions on
-        <a href="https://github.com/facebook/react/">GitHub</a>.
-      </p>
-      <p>
-        If you can see this, React is <strong>not</strong> working right.
-        If you checked out the source from GitHub make sure to run <code>grunt</code>.
-      </p>
-    </div>
-    <h4>Example Details</h4>
-    <p>This is written with JSX with Harmony (ES6) syntax and transformed in the browser.</p>
-    <p>
-      Learn more about React at
-      <a href="https://facebook.github.io/react" target="_blank">facebook.github.io/react</a>.
-    </p>
-    <script src="../../build/react.js"></script>
-    <script src="../../build/react-dom.js"></script>
-    <script src="https://unpkg.com/babel-standalone@6.15.0/babel.min.js"></script>
-    <script type="text/babel">
-      class ExampleApplication extends React.Component {
-        render() {
-          var elapsed = Math.round(this.props.elapsed  / 100);
-          var seconds = elapsed / 10 + (elapsed % 10 ? '' : '.0' );
-          var message =
-            `React has been successfully running for ${seconds} seconds.`;
-
-          return <p>{message}</p>;
-        }
-      }
-      var start = new Date().getTime();
-      setInterval(() => {
-        ReactDOM.render(
-          <ExampleApplication elapsed={new Date().getTime() - start} />,
-          document.getElementById('container')
-        );
-      }, 50);
-    </script>
-  </body>
-</html>
diff --git a/examples/basic-jsx-precompile/example.js b/examples/basic-jsx-precompile/example.js
deleted file mode 100644
index 7d9911eb6cc45..0000000000000
--- a/examples/basic-jsx-precompile/example.js
+++ /dev/null
@@ -1,19 +0,0 @@
-var ExampleApplication = React.createClass({
-  render: function() {
-    var elapsed = Math.round(this.props.elapsed  / 100);
-    var seconds = elapsed / 10 + (elapsed % 10 ? '' : '.0' );
-    var message =
-      'React has been successfully running for ' + seconds + ' seconds.';
-
-    return <p>{message}</p>;
-  }
-});
-
-var start = new Date().getTime();
-
-setInterval(function() {
-  ReactDOM.render(
-    <ExampleApplication elapsed={new Date().getTime() - start} />,
-    document.getElementById('container')
-  );
-}, 50);
diff --git a/examples/basic-jsx-precompile/index.html b/examples/basic-jsx-precompile/index.html
deleted file mode 100644
index 88720b6a015b9..0000000000000
--- a/examples/basic-jsx-precompile/index.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Basic Example with Precompiled JSX</title>
-    <link rel="stylesheet" href="../shared/css/base.css" />
-  </head>
-  <body>
-    <h1>Basic Example with Precompiled JSX</h1>
-    <div id="container">
-      <p>
-        If you can see this, React is <strong>not</strong> running. Try running:
-      </p>
-      <pre>npm install -g babel-cli
-cd examples/basic-jsx-precompile/
-npm install babel-preset-react
-babel example.js --presets react --out-dir=build</pre>
-    </div>
-    <h4>Example Details</h4>
-    <p>This is written with JSX in a separate file and precompiled to vanilla JS by running:</p>
-
-    <p><i>With Babel lower than 6.0</i></p>
-    <pre>npm install -g babel
-cd examples/basic-jsx-precompile/
-babel example.js --out-dir=build</pre>
-
-	<p><i>With Babel 6.0 or higher</i></p>
-    <pre>npm install -g babel-cli
-cd examples/basic-jsx-precompile/
-npm install babel-preset-react
-babel example.js --presets react --out-dir=build</pre>
-    <p>
-      Learn more about React at
-      <a href="https://facebook.github.io/react" target="_blank">facebook.github.io/react</a>.
-    </p>
-    <script src="../../build/react.js"></script>
-    <script src="../../build/react-dom.js"></script>
-    <script src="build/example.js"></script>
-  </body>
-</html>
diff --git a/examples/basic-jsx/index.html b/examples/basic-jsx/index.html
deleted file mode 100644
index 19fb195e3ffc6..0000000000000
--- a/examples/basic-jsx/index.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Basic Example with JSX</title>
-    <link rel="stylesheet" href="../shared/css/base.css" />
-  </head>
-  <body>
-    <h1>Basic Example with JSX</h1>
-    <div id="container">
-      <p>
-        To install React, follow the instructions on
-        <a href="https://github.com/facebook/react/">GitHub</a>.
-      </p>
-      <p>
-        If you can see this, React is <strong>not</strong> working right.
-        If you checked out the source from GitHub make sure to run <code>grunt</code>.
-      </p>
-    </div>
-    <h4>Example Details</h4>
-    <p>This is written with JSX and transformed in the browser.</p>
-    <p>
-      Learn more about React at
-      <a href="https://facebook.github.io/react" target="_blank">facebook.github.io/react</a>.
-    </p>
-    <script src="../../build/react.js"></script>
-    <script src="../../build/react-dom.js"></script>
-    <script src="https://unpkg.com/babel-standalone@6.15.0/babel.min.js"></script>
-    <script type="text/babel">
-      var ExampleApplication = React.createClass({
-        render: function() {
-          var elapsed = Math.round(this.props.elapsed  / 100);
-          var seconds = elapsed / 10 + (elapsed % 10 ? '' : '.0' );
-          var message =
-            'React has been successfully running for ' + seconds + ' seconds.';
-
-          return <p>{message}</p>;
-        }
-      });
-      var start = new Date().getTime();
-      setInterval(function() {
-        ReactDOM.render(
-          <ExampleApplication elapsed={new Date().getTime() - start} />,
-          document.getElementById('container')
-        );
-      }, 50);
-    </script>
-  </body>
-</html>
diff --git a/examples/basic/index.html b/examples/basic/index.html
deleted file mode 100644
index 9fc1fb3c30cdb..0000000000000
--- a/examples/basic/index.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Basic Example</title>
-    <link rel="stylesheet" href="../shared/css/base.css" />
-  </head>
-  <body>
-    <h1>Basic Example</h1>
-    <div id="container">
-      <p>
-        To install React, follow the instructions on
-        <a href="https://github.com/facebook/react/">GitHub</a>.
-      </p>
-      <p>
-        If you can see this, React is <strong>not</strong> working right.
-        If you checked out the source from GitHub make sure to run <code>grunt</code>.
-      </p>
-    </div>
-    <h4>Example Details</h4>
-    <p>This is written in vanilla JavaScript (without JSX) and transformed in the browser.</p>
-    <p>
-      Learn more about React at
-      <a href="https://facebook.github.io/react" target="_blank">facebook.github.io/react</a>.
-    </p>
-    <script src="../../build/react.js"></script>
-    <script src="../../build/react-dom.js"></script>
-    <script>
-      var ExampleApplication = React.createClass({
-        render: function() {
-          var elapsed = Math.round(this.props.elapsed  / 100);
-          var seconds = elapsed / 10 + (elapsed % 10 ? '' : '.0' );
-          var message =
-            'React has been successfully running for ' + seconds + ' seconds.';
-
-          return React.DOM.p(null, message);
-        }
-      });
-
-      // Call React.createFactory instead of directly call ExampleApplication({...}) in React.render
-      var ExampleApplicationFactory = React.createFactory(ExampleApplication);
-
-      var start = new Date().getTime();
-      setInterval(function() {
-        ReactDOM.render(
-          ExampleApplicationFactory({elapsed: new Date().getTime() - start}),
-          document.getElementById('container')
-        );
-      }, 50);
-    </script>
-  </body>
-</html>
diff --git a/examples/fiber/debugger/.env b/examples/fiber/debugger/.env
deleted file mode 100644
index 9d12ed5867afd..0000000000000
--- a/examples/fiber/debugger/.env
+++ /dev/null
@@ -1 +0,0 @@
-NODE_PATH=../../../build/packages
\ No newline at end of file
diff --git a/examples/jquery-bootstrap/css/example.css b/examples/jquery-bootstrap/css/example.css
deleted file mode 100644
index d40f2fbd057ed..0000000000000
--- a/examples/jquery-bootstrap/css/example.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.example {
-  margin: 20px;
-}
\ No newline at end of file
diff --git a/examples/jquery-bootstrap/index.html b/examples/jquery-bootstrap/index.html
deleted file mode 100644
index 58adfa69f1f23..0000000000000
--- a/examples/jquery-bootstrap/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <title>jQuery Integration</title>
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap-theme.min.css" integrity="sha384-fLW2N01lMqjakBkx3l/M9EahuwpSfeNvV63J5ezn3uZzapT0u7EYsXMjQV+0En5r" crossorigin="anonymous">
-    <link rel="stylesheet" href="css/example.css" type="text/css" />
-  </head>
-  <body>
-    <div id="jqueryexample"></div>
-    <script src="../../build/react.js"></script>
-    <script src="../../build/react-dom.js"></script>
-    <script src="https://unpkg.com/babel-standalone@6.15.0/babel.min.js"></script>
-    <script src="http://code.jquery.com/jquery-2.2.2.min.js"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>
-    <script type="text/babel" src="js/app.js"></script>
-  </body>
-</html>
diff --git a/examples/jquery-bootstrap/js/app.js b/examples/jquery-bootstrap/js/app.js
deleted file mode 100644
index c1342d82a76af..0000000000000
--- a/examples/jquery-bootstrap/js/app.js
+++ /dev/null
@@ -1,139 +0,0 @@
-'use strict';
-
-// Simple pure-React component so we don't have to remember
-// Bootstrap's classes
-var BootstrapButton = React.createClass({
-  render: function() {
-    return (
-      <a {...this.props}
-        href="javascript:;"
-        role="button"
-        className={(this.props.className || '') + ' btn'} />
-    );
-  }
-});
-
-var BootstrapModal = React.createClass({
-  // The following two methods are the only places we need to
-  // integrate Bootstrap or jQuery with the components lifecycle methods.
-  componentDidMount: function() {
-    // When the component is added, turn it into a modal
-    $(this.refs.root).modal({backdrop: 'static', keyboard: false, show: false});
-
-    // Bootstrap's modal class exposes a few events for hooking into modal
-    // functionality. Lets hook into one of them:
-    $(this.refs.root).on('hidden.bs.modal', this.handleHidden);
-  },
-  componentWillUnmount: function() {
-    $(this.refs.root).off('hidden.bs.modal', this.handleHidden);
-  },
-  close: function() {
-    $(this.refs.root).modal('hide');
-  },
-  open: function() {
-    $(this.refs.root).modal('show');
-  },
-  render: function() {
-    var confirmButton = null;
-    var cancelButton = null;
-
-    if (this.props.confirm) {
-      confirmButton = (
-        <BootstrapButton
-          onClick={this.handleConfirm}
-          className="btn-primary">
-          {this.props.confirm}
-        </BootstrapButton>
-      );
-    }
-    if (this.props.cancel) {
-      cancelButton = (
-        <BootstrapButton onClick={this.handleCancel} className="btn-default">
-          {this.props.cancel}
-        </BootstrapButton>
-      );
-    }
-
-    return (
-      <div className="modal fade" ref="root">
-        <div className="modal-dialog">
-          <div className="modal-content">
-            <div className="modal-header">
-              <button
-                type="button"
-                className="close"
-                onClick={this.handleCancel}>
-                &times;
-              </button>
-              <h3>{this.props.title}</h3>
-            </div>
-            <div className="modal-body">
-              {this.props.children}
-            </div>
-            <div className="modal-footer">
-              {cancelButton}
-              {confirmButton}
-            </div>
-          </div>
-        </div>
-      </div>
-    );
-  },
-  handleCancel: function() {
-    if (this.props.onCancel) {
-      this.props.onCancel();
-    }
-  },
-  handleConfirm: function() {
-    if (this.props.onConfirm) {
-      this.props.onConfirm();
-    }
-  },
-  handleHidden: function() {
-    if (this.props.onHidden) {
-      this.props.onHidden();
-    }
-  }
-});
-
-var Example = React.createClass({
-  handleCancel: function() {
-    if (confirm('Are you sure you want to cancel?')) {
-      this.refs.modal.close();
-    }
-  },
-  render: function() {
-    var modal = null;
-    modal = (
-      <BootstrapModal
-        ref="modal"
-        confirm="OK"
-        cancel="Cancel"
-        onCancel={this.handleCancel}
-        onConfirm={this.closeModal}
-        onHidden={this.handleModalDidClose}
-        title="Hello, Bootstrap!">
-          This is a React component powered by jQuery and Bootstrap!
-      </BootstrapModal>
-    );
-    return (
-      <div className="example">
-        {modal}
-        <BootstrapButton onClick={this.openModal} className="btn-default">
-          Open modal
-        </BootstrapButton>
-      </div>
-    );
-  },
-  openModal: function() {
-    this.refs.modal.open();
-  },
-  closeModal: function() {
-    this.refs.modal.close();
-  },
-  handleModalDidClose: function() {
-    alert("The modal has been dismissed!");
-  }
-});
-
-ReactDOM.render(<Example />, document.getElementById('jqueryexample'));
diff --git a/examples/jquery-mobile/README.md b/examples/jquery-mobile/README.md
deleted file mode 100644
index dd9661a363a7a..0000000000000
--- a/examples/jquery-mobile/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-jQuery Mobile React Example
-===========================
-
-This example demonstrates how jQuery Mobile applications can be built with React.
-
-The source code is based on jQuery Mobile's [pages-multi-page example](https://github.com/jquery/jquery-mobile/tree/master/demos/pages-multi-page).
diff --git a/examples/jquery-mobile/index.html b/examples/jquery-mobile/index.html
deleted file mode 100644
index b244949b4991f..0000000000000
--- a/examples/jquery-mobile/index.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>jQuery Mobile React Example</title>
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery-mobile/1.4.5/jquery.mobile.min.css" />
-  <link rel="stylesheet" href="https://demos.jquerymobile.com/1.4.5/_assets/css/jqm-demos.css" />
-</head>
-<body class="ui-mobile-viewport ui-overlay-a">
-  <div id="content"></div>
-  <script src="http://code.jquery.com/jquery-2.2.2.min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-mobile/1.4.5/jquery.mobile.min.js"></script>
-  <script src="../../build/react.js"></script>
-  <script src="../../build/react-dom.js"></script>
-  <script src="js/app.js"></script>
-</body>
-</html>
diff --git a/examples/jquery-mobile/js/app.js b/examples/jquery-mobile/js/app.js
deleted file mode 100644
index 1eb728bbd55f4..0000000000000
--- a/examples/jquery-mobile/js/app.js
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * jQuery Mobile React Example
- *
- * Main application script.
- * For variety, this example is written in 100% JSHint-compliant JavaScript, not in JSX.
- *
- * Component structure:
- *
- * - App
- *   |-- JQueryMobilePage (one)
- *   |   |-- JQueryMobileHeader
- *   |   |-- JQueryMobileContent
- *   |   |   |-- PageOneContent
- *   |   |       |-- JQueryMobileButton
- *   |   |-- JQueryMobileFooter
- *   |-- JQueryMobilePage (two)
- *   |   |-- JQueryMobileHeader
- *   |   |-- JQueryMobileContent
- *   |   |   |-- PageTwoContent
- *   |   |       |-- JQueryMobileButton
- *   |   |-- JQueryMobileFooter
- *   |-- JQueryMobilePage (popup)
- *       |-- JQueryMobileHeader
- *       |-- JQueryMobileContent
- *       |   |-- PagePopUpContent
- *       |       |-- JQueryMobileButton
- *       |-- JQueryMobileFooter
- */
-
- /* global document, React */
-
-'use strict';
-
-/** Main application component. */
-var App = React.createClass({
-  displayName: 'App',
-
-  render: function() {
-    return React.DOM.div({className:'app'},
-      JQueryMobilePage({id:'one'}, PageOneContent(null)),
-      JQueryMobilePage({id:'two'}, PageTwoContent(null)),
-      JQueryMobilePage({id:'popup', headerTheme:'b'}, PagePopUpContent(null))
-    );
-  }
-});
-App = React.createFactory(App);
-
-/** jQuery Mobile button component. */
-var JQueryMobileButton = React.createClass({
-  displayName: 'JQueryMobileButton',
-
-  getDefaultProps: function() {
-    return {className:'ui-btn ui-shadow ui-corner-all'};
-  },
-
-  render: function() {
-    return React.DOM.p(null,
-      React.DOM.a(this.props, this.props.children)
-    );
-  }
-});
-JQueryMobileButton = React.createFactory(JQueryMobileButton);
-
-/** jQuery Mobile page content component. */
-var JQueryMobileContent = React.createClass({
-  displayName: 'JQueryMobileContent',
-
-  render: function() {
-    return React.DOM.div({role:'main', className:'ui-content'},
-      this.props.children
-    );
-  }
-});
-JQueryMobileContent = React.createFactory(JQueryMobileContent);
-
-/** jQuery Mobile footer component. */
-var JQueryMobileFooter = React.createClass({
-  displayName: 'JQueryMobileFooter',
-
-  render: function() {
-    return React.DOM.div({'data-role':'footer'},
-      React.DOM.h4(null, 'Page footer')
-    );
-  }
-});
-JQueryMobileFooter = React.createFactory(JQueryMobileFooter);
-
-/** jQuery Mobile header component. */
-var JQueryMobileHeader = React.createClass({
-  displayName: 'JQueryMobileHeader',
-
-  render: function() {
-    return React.DOM.div({'data-role':'header', 'data-theme':this.props.headerTheme},
-      React.DOM.h1(null, this.props.title)
-    );
-  }
-});
-JQueryMobileHeader = React.createFactory(JQueryMobileHeader);
-
-/** jQuery Mobile page component. */
-var JQueryMobilePage = React.createClass({
-  displayName: 'JQueryMobilePage',
-
-  getDefaultProps: function() {
-    return {'data-role':'page', 'data-theme':'a', headerTheme:'a'};
-  },
-
-  render: function() {
-    var props = {};
-    for (var key in this.props) {
-      props[key] = this.props[key];
-    }
-    return React.DOM.div(props,
-      JQueryMobileHeader({title:'Page ' + this.props.id, headerTheme:this.props.headerTheme}),
-      JQueryMobileContent(null, this.props.children),
-      JQueryMobileFooter(null)
-    );
-  }
-});
-JQueryMobilePage = React.createFactory(JQueryMobilePage);
-
-/** Application page one component. */
-var PageOneContent = React.createClass({
-  displayName: 'PageOneContent',
-
-  render: function() {
-    return React.DOM.div(null,
-      React.DOM.h2(null, 'One'),
-      React.DOM.p(null,
-        'I have an ',
-        React.DOM.code(null, 'id'),
-        ' of "one" on my page container. I\'m first in the source order so I\'m shown when the page loads.'
-      ),
-      React.DOM.p(null, 'This is a multi-page boilerplate template that you can copy to build your first jQuery Mobile page. This template contains multiple "page" containers inside, unlike a single page template that has just one page within it.'),
-      React.DOM.p(null, 'Just view the source and copy the code to get started. All the CSS and JS is linked to the jQuery CDN versions so this is super easy to set up. Remember to include a meta viewport tag in the head to set the zoom level.'),
-      React.DOM.p(null,
-        'You link to internal pages by referring to the ',
-        React.DOM.code(null, 'id'),
-        ' of the page you want to show. For example, to ',
-        React.DOM.a({href:'#two'}, 'link'),
-        ' to the page with an ',
-        React.DOM.code(null, 'id'),
-        ' of "two", my link would have a ',
-        React.DOM.code(null, 'href="#two"'),
-        ' in the code.'
-      ),
-      React.DOM.h3(null, 'Show internal pages:'),
-      JQueryMobileButton({href:'#two'}, 'Show page "two"'),
-      JQueryMobileButton({href:'#popup', 'data-rel':'dialog', 'data-transition':'pop'}, 'Show page "popup" (as a dialog)')
-    );
-  }
-});
-PageOneContent = React.createFactory(PageOneContent);
-
-/** Application page two component. */
-var PageTwoContent = React.createClass({
-  displayName: 'PageTwoContent',
-
-  render: function() {
-    return React.DOM.div(null,
-      React.DOM.h2(null, 'Two'),
-      React.DOM.p(null, 'I have an id of "two" on my page container. I\'m the second page container in this multi-page template.'),
-      React.DOM.p(null, 'Notice that the theme is different for this page because we\'ve added a few ',
-        React.DOM.code(null, 'data-theme'),
-        ' swatch assigments here to show off how flexible it is. You can add any content or widget to these pages, but we\'re keeping these simple.'),
-      JQueryMobileButton({href:'#one', 'data-direction':'reverse', className:'ui-btn ui-shadow ui-corner-all ui-btn-b'}, 'Back to page "one"')
-    );
-  }
-});
-PageTwoContent = React.createFactory(PageTwoContent);
-
-/** Application popup page component. */
-var PagePopUpContent = React.createClass({
-  displayName: 'PagePopUpContent',
-
-  render: function() {
-    return React.DOM.div(null,
-      React.DOM.h2(null, 'Popup'),
-      React.DOM.p(null, 'I have an id of "popup" on my page container and only look like a dialog because the link to me had a ',
-        React.DOM.code(null, 'data-rel="dialog"'),
-        ' attribute which gives me this inset look and a ',
-        React.DOM.code(null, 'data-transition="pop"'),
-        ' attribute to change the transition to pop. Without this, I\'d be styled as a normal page.'),
-      JQueryMobileButton({href:'#one', 'data-rel':'back', className:'ui-btn ui-shadow ui-corner-all ui-btn-inline ui-icon-back ui-btn-icon-left'}, 'Back to page "one"')
-    );
-  }
-});
-PagePopUpContent = React.createFactory(PagePopUpContent);
-
-// Render application.
-ReactDOM.render(App(null), document.getElementById('content'));
diff --git a/examples/quadratic/example.js b/examples/quadratic/example.js
deleted file mode 100644
index c86ba29aabc97..0000000000000
--- a/examples/quadratic/example.js
+++ /dev/null
@@ -1,59 +0,0 @@
-var QuadraticCalculator = React.createClass({
-  getInitialState: function() {
-    return {
-      a: 1,
-      b: 3,
-      c: -4
-    };
-  },
-
-  /**
-   * This function will be re-bound in render multiple times. Each .bind() will
-   * create a new function that calls this with the appropriate key as well as
-   * the event. The key is the key in the state object that the value should be
-   * mapped from.
-   */
-  handleInputChange: function(key, event) {
-    var partialState = {};
-    partialState[key] = parseFloat(event.target.value);
-    this.setState(partialState);
-  },
-
-  render: function() {
-    var a = this.state.a;
-    var b = this.state.b;
-    var c = this.state.c;
-    var root = Math.sqrt(Math.pow(b, 2) - 4 * a * c);
-    var denominator = 2 * a;
-    var x1 = (-b + root) / denominator;
-    var x2 = (-b - root) / denominator;
-    return (
-      <div>
-        <strong>
-          <em>ax</em><sup>2</sup> + <em>bx</em> + <em>c</em> = 0
-        </strong>
-        <h4>Solve for <em>x</em>:</h4>
-        <p>
-          <label>
-            a: <input type="number" value={a} onChange={this.handleInputChange.bind(null, 'a')} />
-          </label>
-          <br />
-          <label>
-            b: <input type="number" value={b} onChange={this.handleInputChange.bind(null, 'b')} />
-          </label>
-          <br />
-          <label>
-            c: <input type="number" value={c} onChange={this.handleInputChange.bind(null, 'c')} />
-          </label>
-          <br />
-          x: <strong>{x1}, {x2}</strong>
-        </p>
-      </div>
-    );
-  }
-});
-
-ReactDOM.render(
-  <QuadraticCalculator />,
-  document.getElementById('container')
-);
diff --git a/examples/quadratic/index.html b/examples/quadratic/index.html
deleted file mode 100644
index 2feffcb57e463..0000000000000
--- a/examples/quadratic/index.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Quadratic Formula Calculator</title>
-    <link rel="stylesheet" href="../shared/css/base.css" />
-  </head>
-  <body>
-    <h1>Quadratic Formula Calculator</h1>
-    <div id="container">
-      <p>
-        If you can see this, React is <strong>not</strong> working right. This is probably because you&apos;re viewing
-        this on your file system instead of a web server. Try running
-        <pre>
-          python -m SimpleHTTPServer
-        </pre>
-        and going to <a href="http://localhost:8000/">http://localhost:8000/</a>.
-      </p>
-    </div>
-    <h4>Example Details</h4>
-    <p>This is written with JSX in a separate file and transformed in the browser.</p>
-    <p>
-      Learn more about React at
-      <a href="https://facebook.github.io/react" target="_blank">facebook.github.io/react</a>.
-    </p>
-    <script src="../../build/react.js"></script>
-    <script src="../../build/react-dom.js"></script>
-    <script src="https://unpkg.com/babel-standalone@6.15.0/babel.min.js"></script>
-    <script type="text/babel" src="example.js"></script>
-  </body>
-</html>
diff --git a/examples/shared/css/base.css b/examples/shared/css/base.css
deleted file mode 100644
index bf382be3891cf..0000000000000
--- a/examples/shared/css/base.css
+++ /dev/null
@@ -1,62 +0,0 @@
-body {
-  background: #fff;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 15px;
-  line-height: 1.7;
-  margin: 0;
-  padding: 30px;
-}
-
-a {
-  color: #4183c4;
-  text-decoration: none;
-}
-
-a:hover {
-  text-decoration: underline;
-}
-
-code {
-  background-color: #f8f8f8;
-  border: 1px solid #ddd;
-  border-radius: 3px;
-  font-family: "Bitstream Vera Sans Mono", Consolas, Courier, monospace;
-  font-size: 12px;
-  margin: 0 2px;
-  padding: 0px 5px;
-}
-
-h1, h2, h3, h4 {
-  font-weight: bold;
-  margin: 0 0 15px;
-  padding: 0;
-}
-
-h1 {
-  border-bottom: 1px solid #ddd;
-  font-size: 2.5em;
-  font-weight: bold;
-  margin: 0 0 15px;
-  padding: 0;
-}
-
-h2 {
-  border-bottom: 1px solid #eee;
-  font-size: 2em;
-}
-
-h3 {
-  font-size: 1.5em;
-}
-
-h4 {
-  font-size: 1.2em;
-}
-
-p, ul {
-  margin: 15px 0;
-}
-
-ul {
-  padding-left: 30px;
-}
diff --git a/examples/transitions/index.html b/examples/transitions/index.html
deleted file mode 100644
index 99f8d18f244ac..0000000000000
--- a/examples/transitions/index.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Example with Transitions</title>
-    <link rel="stylesheet" href="../shared/css/base.css" />
-    <link rel="stylesheet" href="transition.css" />
-  </head>
-  <body>
-    <h1>Example with Transitions</h1>
-    <div id="container">
-      <p>
-        To install React, follow the instructions on
-        <a href="https://github.com/facebook/react/">GitHub</a>.
-      </p>
-      <p>
-        If you can see this, React is <strong>not</strong> working right.
-        If you checked out the source from GitHub make sure to run <code>grunt</code>.
-      </p>
-    </div>
-    <h4>Example Details</h4>
-    <p>This is written with JSX and transformed in the browser.</p>
-    <p>
-      Learn more about React at
-      <a href="https://facebook.github.io/react" target="_blank">facebook.github.io/react</a>.
-    </p>
-    <script src="../../build/react-with-addons.js"></script>
-    <script src="../../build/react-dom.js"></script>
-    <script src="https://unpkg.com/babel-standalone@6.15.0/babel.min.js"></script>
-    <script type="text/babel">
-      var CSSTransitionGroup = React.addons.CSSTransitionGroup;
-      var INTERVAL = 2000;
-
-      var AnimateDemo = React.createClass({
-        getInitialState: function() {
-          return {current: 0};
-        },
-
-        componentDidMount: function() {
-          this.interval = setInterval(this.tick, INTERVAL);
-        },
-
-        componentWillUnmount: function() {
-          clearInterval(this.interval);
-        },
-
-        tick: function() {
-          this.setState({current: this.state.current + 1});
-        },
-
-        render: function() {
-          var children = [];
-          var pos = 0;
-          var colors = ['red', 'gray', 'blue'];
-          for (var i = this.state.current; i < this.state.current + colors.length; i++) {
-            var style = {
-              left: pos * 128,
-              background: colors[i % colors.length]
-            };
-            pos++;
-            children.push(<div key={i} className="animateItem" style={style}>{i}</div>);
-          }
-          return (
-            <CSSTransitionGroup
-              className="animateExample"
-              transitionEnterTimeout={250}
-              transitionLeaveTimeout={250}
-              transitionName="example">
-              {children}
-            </CSSTransitionGroup>
-          );
-        }
-      });
-
-      ReactDOM.render(
-        <AnimateDemo />,
-        document.getElementById('container')
-      );
-    </script>
-  </body>
-</html>
diff --git a/examples/transitions/transition.css b/examples/transitions/transition.css
deleted file mode 100644
index ee851d1136084..0000000000000
--- a/examples/transitions/transition.css
+++ /dev/null
@@ -1,44 +0,0 @@
-.example-enter,
-.example-leave {
-  -webkit-transition: all .25s;
-  transition: all .25s;
-}
-
-.example-enter,
-.example-leave.example-leave-active {
-  opacity: 0.01;
-}
-
-.example-leave.example-leave-active {
-  margin-left: -128px;
-}
-
-.example-enter {
-  margin-left: 128px;
-}
-
-.example-enter.example-enter-active,
-.example-leave {
-  margin-left: 0;
-  opacity: 1;
-}
-
-.animateExample {
-  display: block;
-  height: 128px;
-  position: relative;
-  width: 384px;
-}
-
-.animateItem {
-  color: white;
-  font-size: 36px;
-  font-weight: bold;
-  height: 128px;
-  line-height: 128px;
-  position: absolute;
-  text-align: center;
-  -webkit-transition: all .25s; /* TODO: make this a move animation */
-  transition: all .25s; /* TODO: make this a move animation */
-  width: 128px;
-}
diff --git a/examples/webcomponents/index.html b/examples/webcomponents/index.html
deleted file mode 100644
index 80b63a7f98a78..0000000000000
--- a/examples/webcomponents/index.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Basic Example with Web Components</title>
-    <link rel="stylesheet" href="../shared/css/base.css" />
-  </head>
-  <body>
-    <h1>Basic Example with Web Components</h1>
-    <div id="container">
-      <p>
-        To install React, follow the instructions on
-        <a href="http://www.github.com/facebook/react/">GitHub</a>.
-      </p>
-      <p>
-        If you can see this, React is <strong>not</strong> working right.
-        If you checked out the source from GitHub make sure to run <code>grunt</code>.
-      </p>
-    </div>
-    <br /><br />
-    <h4>Example Details</h4>
-    <p>
-        This example demonstrates Web Component / React Component interoperability
-        by rendering a React Component, which renders a Web Component, which renders
-        another React Component in the Web Component's shadow DOM.
-    <p>
-    <p>
-      Learn more about React at
-      <a href="http://facebook.github.io/react" target="_blank">facebook.github.io/react</a>.
-    </p>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/0.7.21/webcomponents.js"></script>
-    <script src="../../build/react.js"></script>
-    <script src="../../build/react-dom.js"></script>
-    <script src="https://unpkg.com/babel-standalone@6.15.0/babel.min.js"></script>
-
-    <script type="text/babel">
-
-      // Define Web Component
-      var proto = Object.create(HTMLElement.prototype, {
-        attachedCallback: {
-          value: function() {
-            var mountPoint = document.createElement('span');
-            this.createShadowRoot().appendChild(mountPoint);
-
-            var name = this.getAttribute('name');
-            var url = 'https://www.google.com/search?q=' + encodeURIComponent(name);
-            ReactDOM.render(<a href={url}>{name}</a>, mountPoint);
-          }
-        }
-      });
-      document.registerElement('x-search', {prototype: proto});
-
-      // Define React Component
-      class HelloMessage extends React.Component {
-        render() {
-          return <div>Hello <x-search name={this.props.name} />!</div>;
-        }
-      }
-
-      // Mount React Component (which uses Web Component which uses React)
-      var container = document.getElementById('container');
-      ReactDOM.render(<HelloMessage name="Jim Sproch" />, container);
-    </script>
-  </body>
-</html>
diff --git a/fixtures/fiber-debugger/.env b/fixtures/fiber-debugger/.env
new file mode 100644
index 0000000000000..9be793231926d
--- /dev/null
+++ b/fixtures/fiber-debugger/.env
@@ -0,0 +1 @@
+NODE_PATH=../../build/packages
\ No newline at end of file
diff --git a/examples/fiber/debugger/.gitignore b/fixtures/fiber-debugger/.gitignore
similarity index 100%
rename from examples/fiber/debugger/.gitignore
rename to fixtures/fiber-debugger/.gitignore
diff --git a/examples/fiber/debugger/README.md b/fixtures/fiber-debugger/README.md
similarity index 100%
rename from examples/fiber/debugger/README.md
rename to fixtures/fiber-debugger/README.md
diff --git a/examples/fiber/debugger/package.json b/fixtures/fiber-debugger/package.json
similarity index 100%
rename from examples/fiber/debugger/package.json
rename to fixtures/fiber-debugger/package.json
diff --git a/examples/fiber/debugger/public/favicon.ico b/fixtures/fiber-debugger/public/favicon.ico
similarity index 100%
rename from examples/fiber/debugger/public/favicon.ico
rename to fixtures/fiber-debugger/public/favicon.ico
diff --git a/examples/fiber/debugger/public/index.html b/fixtures/fiber-debugger/public/index.html
similarity index 100%
rename from examples/fiber/debugger/public/index.html
rename to fixtures/fiber-debugger/public/index.html
diff --git a/examples/fiber/debugger/src/App.js b/fixtures/fiber-debugger/src/App.js
similarity index 100%
rename from examples/fiber/debugger/src/App.js
rename to fixtures/fiber-debugger/src/App.js
diff --git a/examples/fiber/debugger/src/Editor.js b/fixtures/fiber-debugger/src/Editor.js
similarity index 100%
rename from examples/fiber/debugger/src/Editor.js
rename to fixtures/fiber-debugger/src/Editor.js
diff --git a/examples/fiber/debugger/src/Fibers.js b/fixtures/fiber-debugger/src/Fibers.js
similarity index 100%
rename from examples/fiber/debugger/src/Fibers.js
rename to fixtures/fiber-debugger/src/Fibers.js
diff --git a/examples/fiber/debugger/src/describeFibers.js b/fixtures/fiber-debugger/src/describeFibers.js
similarity index 100%
rename from examples/fiber/debugger/src/describeFibers.js
rename to fixtures/fiber-debugger/src/describeFibers.js
diff --git a/examples/fiber/debugger/src/index.css b/fixtures/fiber-debugger/src/index.css
similarity index 100%
rename from examples/fiber/debugger/src/index.css
rename to fixtures/fiber-debugger/src/index.css
diff --git a/examples/fiber/debugger/src/index.js b/fixtures/fiber-debugger/src/index.js
similarity index 100%
rename from examples/fiber/debugger/src/index.js
rename to fixtures/fiber-debugger/src/index.js
diff --git a/examples/fiber/debugger/yarn.lock b/fixtures/fiber-debugger/yarn.lock
similarity index 100%
rename from examples/fiber/debugger/yarn.lock
rename to fixtures/fiber-debugger/yarn.lock
diff --git a/examples/fiber/index.html b/fixtures/fiber-triangle/index.html
similarity index 100%
rename from examples/fiber/index.html
rename to fixtures/fiber-triangle/index.html
diff --git a/fixtures/packaging/babel-standalone.html b/fixtures/packaging/babel-standalone.html
new file mode 100644
index 0000000000000..ea37f34df0974
--- /dev/null
+++ b/fixtures/packaging/babel-standalone.html
@@ -0,0 +1,14 @@
+<html>
+  <body>
+    <script src="../../build/react.js"></script>
+    <script src="../../build/react-dom.js"></script>
+    <script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
+    <div id="container"></div>
+    <script type="text/babel">
+      ReactDOM.render(
+        <h1>Hello World!</h1>,
+        document.getElementById('container')
+      );
+    </script>
+  </body>
+</html>
\ No newline at end of file

From 50b3cab3ec7565085da21106791dbaa6fe22d862 Mon Sep 17 00:00:00 2001
From: Aaron Cannon <cannona@fireantproductions.com>
Date: Mon, 3 Apr 2017 23:05:50 -0500
Subject: [PATCH 042/153] Make it clear that textarea also supports
 defaultValue. (#9318)

---
 docs/docs/uncontrolled-components.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/uncontrolled-components.md b/docs/docs/uncontrolled-components.md
index 2eaac55f6ffd8..d9fa20ac80a5a 100644
--- a/docs/docs/uncontrolled-components.md
+++ b/docs/docs/uncontrolled-components.md
@@ -63,4 +63,4 @@ render() {
 }
 ```
 
-Likewise, `<input type="checkbox">` and `<input type="radio">` support `defaultChecked`, and `<select>` supports `defaultValue`.
+Likewise, `<input type="checkbox">` and `<input type="radio">` support `defaultChecked`, and `<select>` and `<textarea>` supports `defaultValue`.

From e50f97b4cb17495f44153cd25f3c3a094c4e77b9 Mon Sep 17 00:00:00 2001
From: Ben Alpert <ben@benalpert.com>
Date: Tue, 4 Apr 2017 11:14:09 -0700
Subject: [PATCH 043/153] Update addons-two-way-binding-helpers.md

I don't think this reference is that helpful and could turn people away since it sounds very fancy and isn't relevant..
---
 docs/docs/addons-two-way-binding-helpers.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/addons-two-way-binding-helpers.md b/docs/docs/addons-two-way-binding-helpers.md
index 1d9591d3251ae..29e9662e93b6b 100644
--- a/docs/docs/addons-two-way-binding-helpers.md
+++ b/docs/docs/addons-two-way-binding-helpers.md
@@ -23,7 +23,7 @@ var LinkedStateMixin = React.addons.LinkedStateMixin; // ES5 with react-with-add
 
 `LinkedStateMixin` is an easy way to express two-way binding with React.
 
-In React, data flows one way: from owner to child. This is because data only flows one direction in [the Von Neumann model of computing](https://en.wikipedia.org/wiki/Von_Neumann_architecture). You can think of it as "one-way data binding."
+In React, data flows one way: from owner to child. We think that this makes your app's code easier to understand. You can think of it as "one-way data binding."
 
 However, there are lots of applications that require you to read some data and flow it back into your program. For example, when developing forms, you'll often want to update some React `state` when you receive user input. Or perhaps you want to perform layout in JavaScript and react to changes in some DOM element size.
 

From 0c7863075da94258bc0ef34f4f4e159fd0606f84 Mon Sep 17 00:00:00 2001
From: Justin <abigsmall@users.noreply.github.com>
Date: Tue, 4 Apr 2017 15:16:54 -0700
Subject: [PATCH 044/153] Fix grammar typo in Design Principles docs (#9324)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

features → feature
> There is nothing "bad" about using state or lifecycle hooks in components. Like any powerful feature**s**, they should be used in moderation, but we have no intention to remove them.

I can’t explain the exact grammatical principle this violates, but it sounds wrong to my native English ears that “feature” is plural here. Another way to check if the grammar sounds right is to change the order of the clauses: ”They should be used in moderation, like any powerful feature“ sounds right, whereas “They should be used in moderation, like any powerful features” does not.
---
 docs/contributing/design-principles.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contributing/design-principles.md b/docs/contributing/design-principles.md
index 3e848df38cb1f..20bc3dd7b0c22 100644
--- a/docs/contributing/design-principles.md
+++ b/docs/contributing/design-principles.md
@@ -20,7 +20,7 @@ The key feature of React is composition of components. Components written by dif
 
 For example, it should be possible to introduce some local state into a component without changing any of the components using it. Similarly, it should be possible to add some initialization and teardown code to any component when necessary.
 
-There is nothing "bad" about using state or lifecycle hooks in components. Like any powerful features, they should be used in moderation, but we have no intention to remove them. On the contrary, we think they are integral parts of what makes React useful. We might enable [more functional patterns](https://github.com/reactjs/react-future/tree/master/07%20-%20Returning%20State) in the future, but both local state and lifecycle hooks will be a part of that model.
+There is nothing "bad" about using state or lifecycle hooks in components. Like any powerful feature, they should be used in moderation, but we have no intention to remove them. On the contrary, we think they are integral parts of what makes React useful. We might enable [more functional patterns](https://github.com/reactjs/react-future/tree/master/07%20-%20Returning%20State) in the future, but both local state and lifecycle hooks will be a part of that model.
 
 Components are often described as "just functions" but in our view they need to be more than that to be useful. In React, components describe any composable behavior, and this includes rendering, lifecycle, and state. Some external libraries like [Relay](http://facebook.github.io/relay/) augment components with other responsibilities such as describing data dependencies. It is possible that those ideas might make it back into React too in some form.
 

From 3829859e22c9b112c00188d00e5650a272099464 Mon Sep 17 00:00:00 2001
From: Rahul Gupta <rahulgupta4@practo.com>
Date: Wed, 5 Apr 2017 17:04:14 +0530
Subject: [PATCH 045/153] Moved the JSdoc for invokeGuardedCallback to correct
 position (#9337)

---
 src/renderers/shared/utils/ReactErrorUtils.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/renderers/shared/utils/ReactErrorUtils.js b/src/renderers/shared/utils/ReactErrorUtils.js
index 2a08fb1124f18..a16e885ef7c7f 100644
--- a/src/renderers/shared/utils/ReactErrorUtils.js
+++ b/src/renderers/shared/utils/ReactErrorUtils.js
@@ -76,15 +76,6 @@ let rethrowCaughtError = function() {
   }
 };
 
-/**
- * Call a function while guarding against errors that happens within it.
- * Returns an error if it throws, otherwise null.
- *
- * @param {String} name of the guard to use for logging or debugging
- * @param {Function} func The function to invoke
- * @param {*} context The context to use when calling the function
- * @param {...*} args Arguments for function
- */
 const ReactErrorUtils = {
   injection: {
     injectErrorUtils(injectedErrorUtils: Object) {
@@ -96,6 +87,15 @@ const ReactErrorUtils = {
     },
   },
 
+  /**
+   * Call a function while guarding against errors that happens within it.
+   * Returns an error if it throws, otherwise null.
+   *
+   * @param {String} name of the guard to use for logging or debugging
+   * @param {Function} func The function to invoke
+   * @param {*} context The context to use when calling the function
+   * @param {...*} args Arguments for function
+   */
   invokeGuardedCallback: function<A, B, C, D, E, F, Context>(
     name: string | null,
     func: (a: A, b: B, c: C, d: D, e: E, f: F) => void,

From d99b3fc6d6bd35306d0d23b635afd42dc3c20f05 Mon Sep 17 00:00:00 2001
From: Nathan Hunzaker <nate.hunzaker@gmail.com>
Date: Wed, 5 Apr 2017 07:34:48 -0400
Subject: [PATCH 046/153] Remove MouseEvent.button polyfill (#9334)

MouseEvent.button is supported in every browser React targets:
https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/button
---
 .../shared/syntheticEvents/SyntheticMouseEvent.js | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/src/renderers/dom/shared/syntheticEvents/SyntheticMouseEvent.js b/src/renderers/dom/shared/syntheticEvents/SyntheticMouseEvent.js
index d7d2cbaa191ba..33c4046a89dd1 100644
--- a/src/renderers/dom/shared/syntheticEvents/SyntheticMouseEvent.js
+++ b/src/renderers/dom/shared/syntheticEvents/SyntheticMouseEvent.js
@@ -31,20 +31,7 @@ var MouseEventInterface = {
   altKey: null,
   metaKey: null,
   getModifierState: getEventModifierState,
-  button: function(event) {
-    // Webkit, Firefox, IE9+
-    // which:  1 2 3
-    // button: 0 1 2 (standard)
-    var button = event.button;
-    if ('which' in event) {
-      return button;
-    }
-    // IE<9
-    // which:  undefined
-    // button: 0 0 0
-    // button: 1 4 2 (onmouseup)
-    return button === 2 ? 2 : button === 4 ? 1 : 0;
-  },
+  button: null,
   buttons: null,
   relatedTarget: function(event) {
     return event.relatedTarget ||

From 4b2eac3de7e1dbf5c2dd742fd9989974a83972cb Mon Sep 17 00:00:00 2001
From: Dominic Gannaway <trueadm@users.noreply.github.com>
Date: Wed, 5 Apr 2017 16:47:29 +0100
Subject: [PATCH 047/153] Convert current build system to Rollup and adopt flat
 bundles (#9327)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* WIP

* fbjs support

* WIP

* dev/prod mode WIP

* More WIP

* builds a cjs bundle

* adding forwarding modules

* more progress on forwarding modules and FB config

* improved how certain modules get inlined for fb and cjs

* more forwarding modules

* added comments to the module aliasing code

* made ReactPerf and ReactTestUtils bundle again

* Use -core suffix for all bundles

This makes it easier to override things in www.

* Add a lazy shim for ReactPerf

This prevents a circular dependency between ReactGKJSModule and ReactDOM

* Fix forwarding module for ReactCurrentOwner

* Revert "Add a lazy shim for ReactPerf"

This reverts commit 723b402c07116a70ce8ff1e43a1f4d92052e8f43.

* Rename -core suffix to -fb for clarity

* Change forwarding modules to import from -fb

This is another, more direct fix for ReactPerf circular dependency

* should fix fb and cjs bundles for ReactCurrentOwner

* added provides module for ReactCurrentOwner

* should improve console output

* fixed typo with argument passing on functon call

* Revert "should improve console output"

This breaks the FB bundles.

This reverts commit 65f11ee64f678c387cb3cfef9a8b28b89a6272b9.

* Work around internal FB transform require() issue

* moved  ReactInstanceMap out of React and into ReactDOM and ReactDOMFiber

* Expose more internal modules to www

* Add missing modules to Stack ReactDOM to fix UFI

* Fix onlyChild module

* improved the build tool

* Add a rollup npm script

* Rename ReactDOM-fb to ReactDOMStack-fb

* Fix circular dependencies now that ReactDOM-fb is a GK switch

* Revert "Work around internal FB transform require() issue"

This reverts commit 0a50b6a90bffc59f8f5416ef36000b5e3a44d253.

* Bump rollup-plugin-commonjs to include a fix for rollup/rollup-plugin-commonjs#176

* Add more forwarding modules that are used on www

* Add even more forwarding modules that are used on www

* Add DOMProperty to hidden exports

* Externalize feature flags

This lets www specify them dynamically.

* Remove forwarding modules with implementations

Instead I'm adding them to react-fb in my diff.

* Add all injection necessary for error logging

* Add missing forwarding module (oops)

* Add ReactART builds

* Add ReactDOMServer bundle

* Fix UMD build of ReactDOMFiber

* Work in progress: start adding ReactNative bundle

* tidied up the options for bundles, so they can define what types they output and exclude

* Add a working RN build

* further improved and tidied up build process

* improved how bundles are built by exposing externals and making the process less "magical", also tidied up code and added more comments

* better handling of bundling ReactCurrentOwner and accessing it from renderer modules

* added NODE_DEV and NODE_PROD

* added NPM package creation and copying into build chain

* Improved UMD bundles, added better fixture testing and doc plus prod builds

* updated internal modules (WIP)

* removed all react/lib/* dependencies from appearing in bundles created on build

* added react-test-renderer bundles

* renamed bundles and paths

* fixed fixture path changes

* added extract-errors support

* added extractErrors warning

* moved shims to shims directory in rollup scripts

* changed pathing to use build rather than build/rollup

* updated release doc to reflect some rollup changes

* Updated ReactNative findNodeHandle() to handle number case (#9238)

* Add dynamic injection to ReactErrorUtils (#9246)

* Fix ReactErrorUtils injection (#9247)

* Fix Haste name

* Move files around

* More descriptive filenames

* Add missing ReactErrorUtils shim

* Tweak reactComponentExpect to make it standalone-ish in www

* Unflowify shims

* facebook-www shims now get copied over correctly to build

* removed unnecessary resolve

* building facebook-www/build is now all sync to prevent IO issues plus handles extra facebook-www src assets

* removed react-native-renderer package and made build make a react-native build dir instead

* 😭😭😭

* Add more SSR unit tests for elements and children. (#9221)

* Adding more SSR unit tests for elements and children.

* Some of my SSR tests were testing for react-text and react-empty elements that no longer exist in Fiber. Fixed the tests so that they expect correct markup in Fiber.

* Tweaked some test names after @gaearon review comment https://github.com/facebook/react/pull/9221#discussion_r107045673 . Also realized that one of the tests was essentially a direct copy of another, so deleted it.

* Responding to code review https://github.com/facebook/react/pull/9221#pullrequestreview-28996315 . Thanks @spicyj!

* ReactElementValidator uses temporary ReactNative View propTypes getter (#9256)

* Updating packages for 16.0.0-alpha.6 release

* Revert "😭😭😭"

This reverts commit 7dba33b2cfc67246881f6d57633a80e628ea05ec.

* Work around Jest issue with CurrentOwner shared state in www

* updated error codes

* splits FB into FB_DEV and FB_PROD

* Remove deps on specific builds from shims

* should no longer mangle FB_PROD output

* Added init() dev block to ReactTestUtils

* added shims for DEV only code so it does not get included in prod bundles

* added a __DEV__ wrapping code to FB_DEV

* added __DEV__ flag behind a footer/header

* Use right haste names

* keeps comments in prod

* added external babel helpers plugin

* fixed fixtures and updated cjs/umd paths

* Fixes Jest so it run tests correctly

* fixed an issue with stubbed modules not properly being replaced due to greedy replacement

* added a WIP solution for ReactCurrentOwner on FB DEV

* adds a FB_TEST bundle

* allows both ReactCurrentOwner and react/lib/ReactCurrentOwner

* adds -test to provides module name

* Remove TEST env

* Ensure requires stay at the top

* added basic mangle support (disbaled by default)

* per bundle property mangling added

* moved around plugin order to try and fix deadcode requires as per https://github.com/rollup/rollup/issues/855

* Fix flow issues

* removed gulp and grunt and moved tasks to standalone node script

* configured circleci to use new paths

* Fix lint

* removed gulp-extract-errors

* added test_build.sh back in

* added missing newline to flow.js

* fixed test coverage command

* changed permissions on test_build.sh

* fixed test_html_generations.sh

* temp removed html render test

* removed the warning output from test_build, the build should do this instead

* fixed test_build

* fixed broken npm script

* Remove unused ViewportMetrics shim

* better error output

* updated circleci to node 7 for async/await

* Fixes

* removed coverage test from circleci run

* circleci run tets

* removed build from circlci

* made a dedicated jest script in a new process

* moved order around of circlci tasks

* changing path to jest in more circleci tests

* re-enabled code coverage

* Add file header to prod bundles

* Remove react-dom/server.js (WIP: decide on the plan)

* Only UMD bundles need version header

* Merge with master

* disabled const evaluation by uglify for <script></script> string literal

* deal with ART modules for UMD bundles

* improved how bundle output gets printed

* fixed filesize difference reporting

* added filesize dep

* Update yarn lockfile for some reason

* now compares against the last run branch built on

* added react-dom-server

* removed un-needed comment

* results only get saved on full builds

* moved the rollup sized plugin into a plugins directory

* added a missing commonjs()

* fixed missing ignore

* Hack around to fix RN bundle

* Partially fix RN bundles

* added react-art bundle and a fixture for it

* Point UMD bundle to Fiber and add EventPluginHub to exported internals

* Make it build on Node 4

* fixed eslint error with resolve being defined in outer scope

* Tweak how build results are calculated and stored

* Tweak fixtures build to work on Node 4

* Include LICENSE/PATENTS and fix up package.json files

* Add Node bundle for react-test-renderer

* Revert "Hack around to fix RN bundle"

We'll do this later.

This reverts commit 59445a625962d7be4c7c3e98defc8a31f8761ec1.

* Revert more RN changes

We'll do them separately later

* Revert more unintentional changes

* Revert changes to error codes

* Add accidentally deleted RN externals

* added RN_DEV/RN_PROD bundles

* fixed typo where RN_DEV and RN_PROD were the wrong way around

* Delete/ignore fixture build outputs

* Format scripts/ with Prettier

* tidied up the Rollup build process and split functions into various different files to improve readability

* Copy folder before files

* updated yarn.lock

* updated results and yarn dependencies to the latest versions
---
 .babelrc                                      |    5 +-
 .flowconfig                                   |    1 +
 Gruntfile.js                                  |  202 --
 circle.yml                                    |    1 -
 .../no-primitive-constructors-test.js         |    3 +-
 fixtures/art/.gitignore                       |    1 +
 fixtures/art/README.md                        |   10 +
 fixtures/art/VectorWidget.js                  |  132 ++
 fixtures/art/app.js                           |    7 +
 fixtures/art/index.html                       |   22 +
 fixtures/art/package.json                     |   12 +
 fixtures/art/webpack.config.js                |   34 +
 fixtures/art/yarn.lock                        | 2079 +++++++++++++++++
 fixtures/dom/.gitignore                       |    4 +-
 fixtures/dom/package.json                     |    4 +-
 fixtures/dom/public/react-loader.js           |    4 +-
 fixtures/dom/yarn.lock                        | 1263 +++++-----
 fixtures/fiber-debugger/package.json          |    2 +-
 fixtures/fiber-debugger/src/App.js            |    4 +-
 fixtures/fiber-debugger/src/Fibers.js         |   11 +-
 fixtures/fiber-debugger/yarn.lock             |  704 +-----
 fixtures/fiber-triangle/index.html            |   13 +-
 fixtures/packaging/README.md                  |   14 +-
 fixtures/packaging/babel-standalone/dev.html  |   14 +
 .../packaging/browserify/{ => dev}/.gitignore |    0
 .../packaging/browserify/{ => dev}/index.html |    0
 .../packaging/browserify/{ => dev}/input.js   |    0
 .../browserify/{ => dev}/package.json         |    2 +-
 fixtures/packaging/browserify/prod/.gitignore |    1 +
 .../prod}/index.html                          |    0
 .../{brunch => browserify/prod}/input.js      |    0
 .../packaging/browserify/prod/package.json    |   13 +
 .../packaging/brunch/{ => dev}/.gitignore     |    0
 .../brunch/{ => dev}/app/initialize.js        |    0
 fixtures/packaging/brunch/{ => dev}/config.js |    0
 .../packaging/brunch/{ => dev}/index.html     |    0
 .../{webpack-alias => brunch/dev}/input.js    |    0
 fixtures/packaging/brunch/dev/package.json    |   10 +
 fixtures/packaging/brunch/package.json        |   10 -
 fixtures/packaging/brunch/prod/.gitignore     |    2 +
 .../prod/app/initialize.js}                   |    0
 fixtures/packaging/brunch/prod/config.js      |   10 +
 fixtures/packaging/brunch/prod/index.html     |    7 +
 fixtures/packaging/brunch/prod/input.js       |    7 +
 fixtures/packaging/brunch/prod/package.json   |   10 +
 fixtures/packaging/build-all.js               |   50 +-
 .../{globals.html => globals/dev.html}        |    4 +-
 fixtures/packaging/globals/prod.html          |   13 +
 fixtures/packaging/index.html                 |   92 +
 .../{requirejs.html => requirejs/dev.html}    |    4 +-
 fixtures/packaging/requirejs/prod.html        |   21 +
 fixtures/packaging/rjs/config.js              |   10 -
 fixtures/packaging/rjs/{ => dev}/.gitignore   |    0
 fixtures/packaging/rjs/dev/config.js          |   10 +
 fixtures/packaging/rjs/{ => dev}/index.html   |    0
 fixtures/packaging/rjs/{ => dev}/input.js     |    0
 fixtures/packaging/rjs/{ => dev}/package.json |    0
 .../{systemjs-builder => rjs/prod}/.gitignore |    0
 fixtures/packaging/rjs/prod/config.js         |   10 +
 fixtures/packaging/rjs/prod/index.html        |    7 +
 fixtures/packaging/rjs/prod/input.js          |    6 +
 fixtures/packaging/rjs/prod/package.json      |   10 +
 fixtures/packaging/systemjs-builder/config.js |    6 -
 .../dev}/.gitignore                           |    0
 .../systemjs-builder/{ => dev}/build.js       |    0
 .../packaging/systemjs-builder/dev/config.js  |    6 +
 .../dev}/index.html                           |    0
 .../systemjs-builder/{ => dev}/input.js       |    0
 .../systemjs-builder/{ => dev}/package.json   |    0
 .../prod}/.gitignore                          |    0
 .../packaging/systemjs-builder/prod/build.js  |   12 +
 .../packaging/systemjs-builder/prod/config.js |    6 +
 .../prod}/index.html                          |    0
 .../packaging/systemjs-builder/prod/input.js  |    7 +
 .../systemjs-builder/prod/package.json        |   10 +
 .../{systemjs.html => systemjs/dev.html}      |    4 +-
 fixtures/packaging/systemjs/prod.html         |   27 +
 fixtures/packaging/webpack-alias/config.js    |   15 -
 .../packaging/webpack-alias/dev/.gitignore    |    1 +
 .../packaging/webpack-alias/dev/config.js     |   15 +
 .../packaging/webpack-alias/dev/index.html    |    6 +
 fixtures/packaging/webpack-alias/dev/input.js |    7 +
 .../webpack-alias/{ => dev}/package.json      |    0
 .../packaging/webpack-alias/prod/.gitignore   |    1 +
 .../packaging/webpack-alias/prod/config.js    |   15 +
 .../packaging/webpack-alias/prod/index.html   |    6 +
 .../packaging/webpack-alias/prod/input.js     |    7 +
 .../prod}/package.json                        |    0
 fixtures/packaging/webpack/dev/.gitignore     |    1 +
 .../packaging/webpack/{ => dev}/config.js     |    2 +-
 fixtures/packaging/webpack/dev/index.html     |    6 +
 fixtures/packaging/webpack/dev/input.js       |    7 +
 fixtures/packaging/webpack/dev/package.json   |   10 +
 fixtures/packaging/webpack/prod/.gitignore    |    1 +
 fixtures/packaging/webpack/prod/config.js     |   19 +
 fixtures/packaging/webpack/prod/index.html    |    6 +
 fixtures/packaging/webpack/prod/input.js      |    7 +
 fixtures/packaging/webpack/prod/package.json  |   10 +
 grunt/config/browserify.js                    |  275 ---
 grunt/config/compare_size.js                  |   17 -
 grunt/config/npm.js                           |    3 -
 grunt/data/header-template-short.txt          |    3 -
 grunt/tasks/browserify.js                     |   69 -
 grunt/tasks/jest.js                           |   51 -
 grunt/tasks/npm-react-dom.js                  |   67 -
 grunt/tasks/npm-react-native.js               |   52 -
 grunt/tasks/npm-react-noop.js                 |   52 -
 grunt/tasks/npm-react-test.js                 |   52 -
 grunt/tasks/npm-react.js                      |   73 -
 grunt/tasks/npm.js                            |  100 -
 grunt/tasks/release.js                        |  115 -
 gulp/tasks/eslint.js                          |   48 -
 gulp/tasks/flow.js                            |   49 -
 gulp/tasks/version-check.js                   |   52 -
 gulpfile.js                                   |  291 ---
 package.json                                  |   39 +-
 packages/react-art/README.md                  |   13 +
 packages/react-art/index.js                   |    7 +
 packages/react-art/package.json               |   41 +
 packages/react-dom/index.js                   |    6 +-
 packages/react-dom/package.json               |    6 +-
 packages/react-dom/server.js                  |    6 +-
 packages/react-native-renderer/README.md      |    5 -
 packages/react-native-renderer/index.js       |    3 -
 packages/react-native-renderer/package.json   |   30 -
 packages/react-noop-renderer/index.js         |    2 +-
 packages/react-noop-renderer/package.json     |    2 +-
 packages/react-test-renderer/index.js         |    2 +-
 packages/react-test-renderer/package.json     |    2 +-
 packages/react/index.js                       |    7 +
 packages/react/package.json                   |   11 +-
 packages/react/react.js                       |    3 -
 .../babel/transform-object-assign-require.js  |    7 +-
 scripts/circleci/build.sh                     |    6 +
 scripts/circleci/test_coverage.sh             |    2 +-
 scripts/circleci/test_entry_point.sh          |    8 +-
 scripts/circleci/test_extract_errors.sh       |   10 -
 scripts/circleci/test_html_generation.sh      |    2 +-
 scripts/error-codes/Types.js                  |    1 +
 .../dev-expression-with-codes-test.js         |   52 +-
 .../__tests__/evalToString-test.js            |   18 +-
 .../__tests__/invertObject-test.js            |   54 +-
 scripts/error-codes/codes.json                |    2 +-
 .../error-codes/dev-expression-with-codes.js  |   85 +-
 scripts/error-codes/evalToString.js           |    2 +-
 ...lp-extract-errors.js => extract-errors.js} |   66 +-
 scripts/error-codes/invertObject.js           |    2 +-
 scripts/error-codes/print-warnings.js         |    8 +-
 scripts/facts-tracker/index.js                |  109 +-
 scripts/jest/environment.js                   |    6 +-
 scripts/jest/preprocessor.js                  |   53 +-
 scripts/jest/setupSpecEquivalenceReporter.js  |    6 +-
 scripts/jest/test-framework-setup.js          |    7 +-
 scripts/jest/ts-preprocessor.js               |   27 +-
 scripts/prettier/index.js                     |   23 +-
 scripts/release-manager/Readme.md             |   12 +-
 scripts/release-manager/cli.js                |   27 +-
 scripts/release-manager/commands/docs-prs.js  |  120 +-
 scripts/release-manager/commands/init.js      |   20 +-
 .../commands/npm-check-access.js              |    9 +-
 .../commands/npm-grant-access.js              |   24 +-
 .../release-manager/commands/npm-publish.js   |   18 +-
 scripts/release-manager/commands/q.js         |    9 +-
 .../release-manager/commands/stable-prs.js    |  417 ++--
 .../release-manager/commands/start-release.js |    4 +-
 scripts/release-manager/commands/utils/git.js |   10 +-
 scripts/release-manager/commands/utils/npm.js |   10 +-
 scripts/release-manager/commands/version.js   |   47 +-
 scripts/rollup/build.js                       |  423 ++++
 scripts/rollup/bundles.js                     |  382 +++
 scripts/rollup/header.js                      |   29 +
 scripts/rollup/mangle.js                      |   12 +
 scripts/rollup/modules.js                     |  366 +++
 scripts/rollup/packaging.js                   |  163 ++
 scripts/rollup/plugins/sizes-plugin.js        |   12 +
 scripts/rollup/results.json                   |  141 ++
 .../rollup/shims/facebook-www/DOMProperty.js  |   18 +
 .../shims/facebook-www/EventPluginHub.js      |   18 +
 .../shims/facebook-www/EventPluginUtils.js    |   18 +
 .../shims/facebook-www/EventPropagators.js    |   18 +
 .../rollup/shims/facebook-www/PooledClass.js  |   18 +
 .../facebook-www/ReactBrowserEventEmitter.js  |   18 +
 .../shims/facebook-www/ReactChildren.js       |   20 +
 .../facebook-www/ReactDOMComponentTree.js     |   18 +
 .../facebook-www/ReactDOMInputSelection.js    |   18 +
 .../shims/facebook-www/ReactDOMSelection.js   |   18 +
 .../rollup/shims/facebook-www/ReactElement.js |   23 +
 .../shims/facebook-www/ReactErrorUtils.js     |   18 +
 .../facebook-www/ReactFiberErrorLogger.js     |   26 +
 .../shims/facebook-www/ReactInputSelection.js |   18 +
 .../shims/facebook-www/ReactInstanceMap.js    |   18 +
 .../rollup/shims/facebook-www/ReactPerf.js    |   38 +
 .../shims/facebook-www/ReactTestUtils.js      |   18 +
 .../shims/facebook-www/SyntheticEvent.js      |   18 +
 .../facebook-www/SyntheticKeyboardEvent.js    |   18 +
 .../shims/facebook-www/SyntheticMouseEvent.js |   18 +
 .../shims/facebook-www/SyntheticUIEvent.js    |   18 +
 scripts/rollup/shims/facebook-www/adler32.js  |   18 +
 .../rollup/shims/facebook-www/findDOMNode.js  |   18 +
 .../shims/facebook-www/flattenChildren.js     |   18 +
 .../shims/facebook-www/getComponentName.js    |   18 +
 .../shims/facebook-www/getEventCharCode.js    |   18 +
 .../rollup/shims/facebook-www/getEventKey.js  |   18 +
 .../shims/facebook-www/getEventTarget.js      |   18 +
 .../getVendorPrefixedEventName.js             |   18 +
 .../shims/facebook-www/isEventSupported.js    |   18 +
 .../rollup/shims/facebook-www/onlyChild.js    |    8 +-
 .../renderSubtreeIntoContainer.js             |   16 +
 .../rollup/shims/facebook-www/setInnerHTML.js |   18 +
 .../shims/facebook-www/setTextContent.js      |   18 +
 .../shims/react-native/NativeMethodsMixin.js  |   19 +
 .../rollup/shims/react-native/PooledClass.js  |   18 +
 .../shims/react-native/ReactDebugTool.js      |   18 +
 .../shims/react-native/ReactErrorUtils.js     |   18 +
 .../react-native/ReactNativeComponentTree.js  |   19 +
 .../react-native/ReactNativePropRegistry.js   |   19 +
 .../rollup/shims/react-native/ReactPerf.js    |   18 +
 .../shims/react-native/TouchHistoryMath.js    |   18 +
 .../createReactNativeComponentClass.js        |   19 +
 .../shims/react-native/findNodeHandle.js      |   29 +
 .../rollup/shims/rollup/DevOnlyStubShim.js    |    1 +
 .../rollup/ReactCheckPropTypesRollupShim.js   |    3 +
 .../ReactComponentTreeHookRollupShim.js       |    3 +
 .../rollup/ReactCurrentOwnerRollupShim.js     |    3 +
 scripts/rollup/stats.js                       |   76 +
 scripts/tasks/eslint.js                       |   27 +
 scripts/tasks/flow.js                         |   26 +
 scripts/tasks/jest.js                         |   31 +
 scripts/tasks/version-check.js                |   36 +
 src/fb/ReactDOMFBEntry.js                     |   54 +
 src/fb/ReactDOMFiberFBEntry.js                |   57 +
 src/fb/ReactFBEntry.js                        |   36 +
 src/renderers/art/ReactARTStack.js            |   34 +-
 .../dom/shared/eventPlugins/TapEventPlugin.js |   12 +-
 src/renderers/noop/ReactNoop.js               |    7 +
 .../shared/fiber/ReactFiberErrorLogger.js     |    2 +-
 src/shared/utils/getComponentName.js          |    2 +-
 src/test/reactComponentExpect.js              |    9 +-
 src/umd/ReactDOMUMDEntry.js                   |   18 +-
 yarn.lock                                     | 1964 +++++++---------
 240 files changed, 7981 insertions(+), 4690 deletions(-)
 delete mode 100644 Gruntfile.js
 create mode 100644 fixtures/art/.gitignore
 create mode 100644 fixtures/art/README.md
 create mode 100644 fixtures/art/VectorWidget.js
 create mode 100644 fixtures/art/app.js
 create mode 100644 fixtures/art/index.html
 create mode 100644 fixtures/art/package.json
 create mode 100644 fixtures/art/webpack.config.js
 create mode 100644 fixtures/art/yarn.lock
 create mode 100644 fixtures/packaging/babel-standalone/dev.html
 rename fixtures/packaging/browserify/{ => dev}/.gitignore (100%)
 rename fixtures/packaging/browserify/{ => dev}/index.html (100%)
 rename fixtures/packaging/browserify/{ => dev}/input.js (100%)
 rename fixtures/packaging/browserify/{ => dev}/package.json (53%)
 create mode 100644 fixtures/packaging/browserify/prod/.gitignore
 rename fixtures/packaging/{systemjs-builder => browserify/prod}/index.html (100%)
 rename fixtures/packaging/{brunch => browserify/prod}/input.js (100%)
 create mode 100644 fixtures/packaging/browserify/prod/package.json
 rename fixtures/packaging/brunch/{ => dev}/.gitignore (100%)
 rename fixtures/packaging/brunch/{ => dev}/app/initialize.js (100%)
 rename fixtures/packaging/brunch/{ => dev}/config.js (100%)
 rename fixtures/packaging/brunch/{ => dev}/index.html (100%)
 rename fixtures/packaging/{webpack-alias => brunch/dev}/input.js (100%)
 create mode 100644 fixtures/packaging/brunch/dev/package.json
 delete mode 100644 fixtures/packaging/brunch/package.json
 create mode 100644 fixtures/packaging/brunch/prod/.gitignore
 rename fixtures/packaging/{webpack/input.js => brunch/prod/app/initialize.js} (100%)
 create mode 100644 fixtures/packaging/brunch/prod/config.js
 create mode 100644 fixtures/packaging/brunch/prod/index.html
 create mode 100644 fixtures/packaging/brunch/prod/input.js
 create mode 100644 fixtures/packaging/brunch/prod/package.json
 rename fixtures/packaging/{globals.html => globals/dev.html} (61%)
 create mode 100644 fixtures/packaging/globals/prod.html
 create mode 100644 fixtures/packaging/index.html
 rename fixtures/packaging/{requirejs.html => requirejs/dev.html} (78%)
 create mode 100644 fixtures/packaging/requirejs/prod.html
 delete mode 100644 fixtures/packaging/rjs/config.js
 rename fixtures/packaging/rjs/{ => dev}/.gitignore (100%)
 create mode 100644 fixtures/packaging/rjs/dev/config.js
 rename fixtures/packaging/rjs/{ => dev}/index.html (100%)
 rename fixtures/packaging/rjs/{ => dev}/input.js (100%)
 rename fixtures/packaging/rjs/{ => dev}/package.json (100%)
 rename fixtures/packaging/{systemjs-builder => rjs/prod}/.gitignore (100%)
 create mode 100644 fixtures/packaging/rjs/prod/config.js
 create mode 100644 fixtures/packaging/rjs/prod/index.html
 create mode 100644 fixtures/packaging/rjs/prod/input.js
 create mode 100644 fixtures/packaging/rjs/prod/package.json
 delete mode 100644 fixtures/packaging/systemjs-builder/config.js
 rename fixtures/packaging/{webpack-alias => systemjs-builder/dev}/.gitignore (100%)
 rename fixtures/packaging/systemjs-builder/{ => dev}/build.js (100%)
 create mode 100644 fixtures/packaging/systemjs-builder/dev/config.js
 rename fixtures/packaging/{webpack-alias => systemjs-builder/dev}/index.html (100%)
 rename fixtures/packaging/systemjs-builder/{ => dev}/input.js (100%)
 rename fixtures/packaging/systemjs-builder/{ => dev}/package.json (100%)
 rename fixtures/packaging/{webpack => systemjs-builder/prod}/.gitignore (100%)
 create mode 100644 fixtures/packaging/systemjs-builder/prod/build.js
 create mode 100644 fixtures/packaging/systemjs-builder/prod/config.js
 rename fixtures/packaging/{webpack => systemjs-builder/prod}/index.html (100%)
 create mode 100644 fixtures/packaging/systemjs-builder/prod/input.js
 create mode 100644 fixtures/packaging/systemjs-builder/prod/package.json
 rename fixtures/packaging/{systemjs.html => systemjs/dev.html} (81%)
 create mode 100644 fixtures/packaging/systemjs/prod.html
 delete mode 100644 fixtures/packaging/webpack-alias/config.js
 create mode 100644 fixtures/packaging/webpack-alias/dev/.gitignore
 create mode 100644 fixtures/packaging/webpack-alias/dev/config.js
 create mode 100644 fixtures/packaging/webpack-alias/dev/index.html
 create mode 100644 fixtures/packaging/webpack-alias/dev/input.js
 rename fixtures/packaging/webpack-alias/{ => dev}/package.json (100%)
 create mode 100644 fixtures/packaging/webpack-alias/prod/.gitignore
 create mode 100644 fixtures/packaging/webpack-alias/prod/config.js
 create mode 100644 fixtures/packaging/webpack-alias/prod/index.html
 create mode 100644 fixtures/packaging/webpack-alias/prod/input.js
 rename fixtures/packaging/{webpack => webpack-alias/prod}/package.json (100%)
 create mode 100644 fixtures/packaging/webpack/dev/.gitignore
 rename fixtures/packaging/webpack/{ => dev}/config.js (70%)
 create mode 100644 fixtures/packaging/webpack/dev/index.html
 create mode 100644 fixtures/packaging/webpack/dev/input.js
 create mode 100644 fixtures/packaging/webpack/dev/package.json
 create mode 100644 fixtures/packaging/webpack/prod/.gitignore
 create mode 100644 fixtures/packaging/webpack/prod/config.js
 create mode 100644 fixtures/packaging/webpack/prod/index.html
 create mode 100644 fixtures/packaging/webpack/prod/input.js
 create mode 100644 fixtures/packaging/webpack/prod/package.json
 delete mode 100644 grunt/config/browserify.js
 delete mode 100644 grunt/config/compare_size.js
 delete mode 100644 grunt/config/npm.js
 delete mode 100644 grunt/data/header-template-short.txt
 delete mode 100644 grunt/tasks/browserify.js
 delete mode 100644 grunt/tasks/jest.js
 delete mode 100644 grunt/tasks/npm-react-dom.js
 delete mode 100644 grunt/tasks/npm-react-native.js
 delete mode 100644 grunt/tasks/npm-react-noop.js
 delete mode 100644 grunt/tasks/npm-react-test.js
 delete mode 100644 grunt/tasks/npm-react.js
 delete mode 100644 grunt/tasks/npm.js
 delete mode 100644 grunt/tasks/release.js
 delete mode 100644 gulp/tasks/eslint.js
 delete mode 100644 gulp/tasks/flow.js
 delete mode 100644 gulp/tasks/version-check.js
 delete mode 100644 gulpfile.js
 create mode 100644 packages/react-art/README.md
 create mode 100644 packages/react-art/index.js
 create mode 100644 packages/react-art/package.json
 delete mode 100644 packages/react-native-renderer/README.md
 delete mode 100644 packages/react-native-renderer/index.js
 delete mode 100644 packages/react-native-renderer/package.json
 create mode 100644 packages/react/index.js
 delete mode 100644 packages/react/react.js
 create mode 100755 scripts/circleci/build.sh
 delete mode 100755 scripts/circleci/test_extract_errors.sh
 rename scripts/error-codes/{gulp-extract-errors.js => extract-errors.js} (65%)
 create mode 100644 scripts/rollup/build.js
 create mode 100644 scripts/rollup/bundles.js
 create mode 100644 scripts/rollup/header.js
 create mode 100644 scripts/rollup/mangle.js
 create mode 100644 scripts/rollup/modules.js
 create mode 100644 scripts/rollup/packaging.js
 create mode 100644 scripts/rollup/plugins/sizes-plugin.js
 create mode 100644 scripts/rollup/results.json
 create mode 100644 scripts/rollup/shims/facebook-www/DOMProperty.js
 create mode 100644 scripts/rollup/shims/facebook-www/EventPluginHub.js
 create mode 100644 scripts/rollup/shims/facebook-www/EventPluginUtils.js
 create mode 100644 scripts/rollup/shims/facebook-www/EventPropagators.js
 create mode 100644 scripts/rollup/shims/facebook-www/PooledClass.js
 create mode 100644 scripts/rollup/shims/facebook-www/ReactBrowserEventEmitter.js
 create mode 100644 scripts/rollup/shims/facebook-www/ReactChildren.js
 create mode 100644 scripts/rollup/shims/facebook-www/ReactDOMComponentTree.js
 create mode 100644 scripts/rollup/shims/facebook-www/ReactDOMInputSelection.js
 create mode 100644 scripts/rollup/shims/facebook-www/ReactDOMSelection.js
 create mode 100644 scripts/rollup/shims/facebook-www/ReactElement.js
 create mode 100644 scripts/rollup/shims/facebook-www/ReactErrorUtils.js
 create mode 100644 scripts/rollup/shims/facebook-www/ReactFiberErrorLogger.js
 create mode 100644 scripts/rollup/shims/facebook-www/ReactInputSelection.js
 create mode 100644 scripts/rollup/shims/facebook-www/ReactInstanceMap.js
 create mode 100644 scripts/rollup/shims/facebook-www/ReactPerf.js
 create mode 100644 scripts/rollup/shims/facebook-www/ReactTestUtils.js
 create mode 100644 scripts/rollup/shims/facebook-www/SyntheticEvent.js
 create mode 100644 scripts/rollup/shims/facebook-www/SyntheticKeyboardEvent.js
 create mode 100644 scripts/rollup/shims/facebook-www/SyntheticMouseEvent.js
 create mode 100644 scripts/rollup/shims/facebook-www/SyntheticUIEvent.js
 create mode 100644 scripts/rollup/shims/facebook-www/adler32.js
 create mode 100644 scripts/rollup/shims/facebook-www/findDOMNode.js
 create mode 100644 scripts/rollup/shims/facebook-www/flattenChildren.js
 create mode 100644 scripts/rollup/shims/facebook-www/getComponentName.js
 create mode 100644 scripts/rollup/shims/facebook-www/getEventCharCode.js
 create mode 100644 scripts/rollup/shims/facebook-www/getEventKey.js
 create mode 100644 scripts/rollup/shims/facebook-www/getEventTarget.js
 create mode 100644 scripts/rollup/shims/facebook-www/getVendorPrefixedEventName.js
 create mode 100644 scripts/rollup/shims/facebook-www/isEventSupported.js
 rename grunt/data/header-template-extended.txt => scripts/rollup/shims/facebook-www/onlyChild.js (73%)
 create mode 100644 scripts/rollup/shims/facebook-www/renderSubtreeIntoContainer.js
 create mode 100644 scripts/rollup/shims/facebook-www/setInnerHTML.js
 create mode 100644 scripts/rollup/shims/facebook-www/setTextContent.js
 create mode 100644 scripts/rollup/shims/react-native/NativeMethodsMixin.js
 create mode 100644 scripts/rollup/shims/react-native/PooledClass.js
 create mode 100644 scripts/rollup/shims/react-native/ReactDebugTool.js
 create mode 100644 scripts/rollup/shims/react-native/ReactErrorUtils.js
 create mode 100644 scripts/rollup/shims/react-native/ReactNativeComponentTree.js
 create mode 100644 scripts/rollup/shims/react-native/ReactNativePropRegistry.js
 create mode 100644 scripts/rollup/shims/react-native/ReactPerf.js
 create mode 100644 scripts/rollup/shims/react-native/TouchHistoryMath.js
 create mode 100644 scripts/rollup/shims/react-native/createReactNativeComponentClass.js
 create mode 100644 scripts/rollup/shims/react-native/findNodeHandle.js
 create mode 100644 scripts/rollup/shims/rollup/DevOnlyStubShim.js
 create mode 100644 scripts/rollup/shims/rollup/ReactCheckPropTypesRollupShim.js
 create mode 100644 scripts/rollup/shims/rollup/ReactComponentTreeHookRollupShim.js
 create mode 100644 scripts/rollup/shims/rollup/ReactCurrentOwnerRollupShim.js
 create mode 100644 scripts/rollup/stats.js
 create mode 100644 scripts/tasks/eslint.js
 create mode 100644 scripts/tasks/flow.js
 create mode 100644 scripts/tasks/jest.js
 create mode 100644 scripts/tasks/version-check.js
 create mode 100644 src/fb/ReactDOMFBEntry.js
 create mode 100644 src/fb/ReactDOMFiberFBEntry.js
 create mode 100644 src/fb/ReactFBEntry.js

diff --git a/.babelrc b/.babelrc
index cda595ba65281..68a8716985e67 100644
--- a/.babelrc
+++ b/.babelrc
@@ -19,10 +19,7 @@
     "transform-es2015-parameters",
     ["transform-es2015-destructuring", { "loose": true }],
     ["transform-es2015-block-scoping", { "throwIfClosureRequired": true }],
-    "transform-es2015-modules-commonjs",
     "transform-es3-member-expression-literals",
-    "transform-es3-property-literals",
-    "./scripts/babel/transform-object-assign-require",
-    "transform-react-jsx-source"
+    "transform-es3-property-literals"
   ]
 }
diff --git a/.flowconfig b/.flowconfig
index 15f21d00b2470..2eea16d57788c 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -2,6 +2,7 @@
 
 <PROJECT_ROOT>/fixtures/.*
 <PROJECT_ROOT>/build/.*
+<PROJECT_ROOT>/scripts/.*
 <PROJECT_ROOT>/.*/node_modules/y18n/.*
 <PROJECT_ROOT>/.*/__mocks__/.*
 <PROJECT_ROOT>/.*/__tests__/.*
diff --git a/Gruntfile.js b/Gruntfile.js
deleted file mode 100644
index 58c832e29c87d..0000000000000
--- a/Gruntfile.js
+++ /dev/null
@@ -1,202 +0,0 @@
-'use strict';
-
-var path = require('path');
-
-var GULP_EXE = 'gulp';
-if (process.platform === 'win32') {
-  GULP_EXE += '.cmd';
-}
-
-module.exports = function(grunt) {
-
-  grunt.initConfig({
-    pkg: grunt.file.readJSON('package.json'),
-    browserify: require('./grunt/config/browserify'),
-    npm: require('./grunt/config/npm'),
-    clean: [
-      './build',
-      './*.gem',
-      './docs/_site',
-      './examples/shared/*.js',
-      '.module-cache',
-    ],
-    'compare_size': require('./grunt/config/compare_size'),
-  });
-
-  function spawnGulp(args, opts, done) {
-
-    grunt.util.spawn({
-      // This could be more flexible (require.resolve & lookup bin in package)
-      // but if it breaks we'll fix it then.
-      cmd: path.join('node_modules', '.bin', GULP_EXE),
-      args: args,
-      opts: Object.assign({stdio: 'inherit'}, opts),
-    }, function(err, result, code) {
-      if (err) {
-        grunt.fail.fatal('Something went wrong running gulp: ', result);
-      }
-      done(code === 0);
-    });
-  }
-
-  Object.keys(grunt.file.readJSON('package.json').devDependencies)
-    .filter(function(npmTaskName) {
-      return npmTaskName.indexOf('grunt-') === 0;
-    })
-    .filter(function(npmTaskName) {
-      return npmTaskName !== 'grunt-cli';
-    })
-    .forEach(function(npmTaskName) {
-      grunt.loadNpmTasks(npmTaskName);
-    });
-
-  grunt.registerTask('eslint', function() {
-    // Use gulp here.
-    spawnGulp(['eslint'], null, this.async());
-  });
-
-  grunt.registerTask('lint', ['eslint']);
-
-  grunt.registerTask('flow', function() {
-    // Use gulp here.
-    spawnGulp(['flow'], null, this.async());
-  });
-
-  grunt.registerTask('delete-build-modules', function() {
-    // Use gulp here.
-    spawnGulp(['react:clean'], null, this.async());
-  });
-
-  // Our own browserify-based tasks to build a single JS file build.
-  grunt.registerMultiTask('browserify', require('./grunt/tasks/browserify'));
-
-  grunt.registerMultiTask('npm', require('./grunt/tasks/npm'));
-
-  var npmReactTasks = require('./grunt/tasks/npm-react');
-  grunt.registerTask('npm-react:release', npmReactTasks.buildRelease);
-  grunt.registerTask('npm-react:pack', npmReactTasks.packRelease);
-
-  var npmReactDOMTasks = require('./grunt/tasks/npm-react-dom');
-  grunt.registerTask('npm-react-dom:release', npmReactDOMTasks.buildRelease);
-  grunt.registerTask('npm-react-dom:pack', npmReactDOMTasks.packRelease);
-
-  var npmReactNativeTasks = require('./grunt/tasks/npm-react-native');
-  grunt.registerTask('npm-react-native:release', npmReactNativeTasks.buildRelease);
-  grunt.registerTask('npm-react-native:pack', npmReactNativeTasks.packRelease);
-
-  var npmReactTestRendererTasks = require('./grunt/tasks/npm-react-test');
-  grunt.registerTask('npm-react-test:release', npmReactTestRendererTasks.buildRelease);
-  grunt.registerTask('npm-react-test:pack', npmReactTestRendererTasks.packRelease);
-
-  var npmReactNoopRendererTasks = require('./grunt/tasks/npm-react-noop');
-  grunt.registerTask('npm-react-noop:release', npmReactNoopRendererTasks.buildRelease);
-  grunt.registerTask('npm-react-noop:pack', npmReactNoopRendererTasks.packRelease);
-
-  grunt.registerTask('version-check', function() {
-    // Use gulp here.
-    spawnGulp(['version-check'], null, this.async());
-  });
-
-  grunt.registerTask('build:basic', [
-    'build-modules',
-    'version-check',
-    'browserify:basic',
-  ]);
-  grunt.registerTask('build:min', [
-    'build-modules',
-    'version-check',
-    'browserify:min',
-  ]);
-  grunt.registerTask('build:dom', [
-    'build-modules',
-    'version-check',
-    'browserify:dom',
-  ]);
-  grunt.registerTask('build:dom-min', [
-    'build-modules',
-    'version-check',
-    'browserify:domMin',
-  ]);
-  grunt.registerTask('build:dom-server', [
-    'build-modules',
-    'version-check',
-    'browserify:domServer',
-  ]);
-  grunt.registerTask('build:dom-server-min', [
-    'build-modules',
-    'version-check',
-    'browserify:domServerMin',
-  ]);
-  grunt.registerTask('build:dom-fiber', [
-    'build-modules',
-    'version-check',
-    'browserify:domFiber',
-  ]);
-  grunt.registerTask('build:dom-fiber-min', [
-    'build-modules',
-    'version-check',
-    'browserify:domFiberMin',
-  ]);
-  grunt.registerTask('build:npm-react', [
-    'version-check',
-    'build-modules',
-    'npm-react:release',
-  ]);
-
-  var jestTasks = require('./grunt/tasks/jest');
-  grunt.registerTask('jest:normal', jestTasks.normal);
-  grunt.registerTask('jest:coverage', jestTasks.coverage);
-
-  grunt.registerTask('test', ['jest:normal']);
-  grunt.registerTask('npm:test', ['build', 'npm:pack']);
-
-  // Optimized build task that does all of our builds. The subtasks will be run
-  // in order so we can take advantage of that and only run build-modules once.
-  grunt.registerTask('build', [
-    'delete-build-modules',
-    'build-modules',
-    'version-check',
-    'browserify:basic',
-    'browserify:min',
-    'browserify:dom',
-    'browserify:domMin',
-    'browserify:domServer',
-    'browserify:domServerMin',
-    'browserify:domFiber',
-    'browserify:domFiberMin',
-    'npm-react:release',
-    'npm-react:pack',
-    'npm-react-dom:release',
-    'npm-react-dom:pack',
-    'npm-react-native:release',
-    'npm-react-native:pack',
-    'npm-react-test:release',
-    'npm-react-test:pack',
-    'npm-react-noop:release',
-    'npm-react-noop:pack',
-    'compare_size',
-  ]);
-
-  // Automate the release!
-  var releaseTasks = require('./grunt/tasks/release');
-  grunt.registerTask('release:setup', releaseTasks.setup);
-  grunt.registerTask('release:bower', releaseTasks.bower);
-  grunt.registerTask('release:docs', releaseTasks.docs);
-  grunt.registerTask('release:msg', releaseTasks.msg);
-
-  grunt.registerTask('release', [
-    'release:setup',
-    'clean',
-    'build',
-    'release:bower',
-    'release:docs',
-    'release:msg',
-  ]);
-
-  grunt.registerTask('build-modules', function() {
-    spawnGulp(['react:modules'], null, this.async());
-  });
-
-  // The default task - build - to keep setup easy.
-  grunt.registerTask('default', ['build']);
-};
diff --git a/circle.yml b/circle.yml
index ef3dca19875bc..aa793704867a3 100644
--- a/circle.yml
+++ b/circle.yml
@@ -33,7 +33,6 @@ dependencies:
     # - npm ls --depth=0
   cache_directories:
     - docs/vendor/bundle
-    - .grunt # Show size comparisons between builds
     - ~/react-gh-pages # docs checkout
     - ~/.yarn
     - ~/.yarn-cache
diff --git a/eslint-rules/__tests__/no-primitive-constructors-test.js b/eslint-rules/__tests__/no-primitive-constructors-test.js
index 8756117f8b924..5d1a19ef18ce4 100644
--- a/eslint-rules/__tests__/no-primitive-constructors-test.js
+++ b/eslint-rules/__tests__/no-primitive-constructors-test.js
@@ -34,7 +34,8 @@ ruleTester.run('eslint-rules/no-primitive-constructors', rule, {
       code: 'String(obj)',
       errors: [
         {
-          message: 'Do not use the String constructor. To cast a value to a string, concat it with the empty string (unless it\'s a symbol, which has different semantics): \'\' + value',
+          message: 'Do not use the String constructor. To cast a value to a string, ' +
+            'concat it with the empty string (unless it\'s a symbol, which has different semantics): \'\' + value',
         },
       ],
     },
diff --git a/fixtures/art/.gitignore b/fixtures/art/.gitignore
new file mode 100644
index 0000000000000..4187d67743a21
--- /dev/null
+++ b/fixtures/art/.gitignore
@@ -0,0 +1 @@
+bundle.js
\ No newline at end of file
diff --git a/fixtures/art/README.md b/fixtures/art/README.md
new file mode 100644
index 0000000000000..766882ff75686
--- /dev/null
+++ b/fixtures/art/README.md
@@ -0,0 +1,10 @@
+# VectorWidget example
+
+To try this example, run:
+
+```
+npm install
+npm run build
+```
+
+in this directory, then open index.html in your browser.
diff --git a/fixtures/art/VectorWidget.js b/fixtures/art/VectorWidget.js
new file mode 100644
index 0000000000000..dda64bee188db
--- /dev/null
+++ b/fixtures/art/VectorWidget.js
@@ -0,0 +1,132 @@
+/**
+ * Copyright 2013 Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+"use strict";
+
+var React = require('react');
+var ReactART = require('react-art');
+var Group = ReactART.Group;
+var Shape = ReactART.Shape;
+var Surface = ReactART.Surface;
+var Transform = ReactART.Transform;
+
+var MOUSE_UP_DRAG = 0.978;
+var MOUSE_DOWN_DRAG = 0.9;
+var MAX_VEL = 11;
+var CLICK_ACCEL = 3;
+var BASE_VEL = 0.15;
+
+/**
+ * An animated SVG component.
+ */
+var VectorWidget = React.createClass({
+  /**
+   * Initialize state members.
+   */
+  getInitialState: function() {
+    return {degrees: 0, velocity: 0, drag: MOUSE_UP_DRAG};
+  },
+
+  /**
+   * When the component is mounted into the document - this is similar to a
+   * constructor, but invoked when the instance is actually mounted into the
+   * document. Here's, we'll just set up an animation loop that invokes our
+   * method. Binding of `this.onTick` is not needed because all React methods
+   * are automatically bound before being mounted.
+   */
+  componentDidMount: function() {
+    this._interval = window.setInterval(this.onTick, 20);
+  },
+
+  componentWillUnmount: function() {
+    window.clearInterval(this._interval);
+  },
+
+  onTick: function() {
+    var nextDegrees = this.state.degrees + BASE_VEL + this.state.velocity;
+    var nextVelocity = this.state.velocity * this.state.drag;
+    this.setState({degrees: nextDegrees, velocity: nextVelocity});
+  },
+
+  /**
+   * When mousing down, we increase the friction down the velocity.
+   */
+  handleMouseDown: function() {
+    this.setState({drag: MOUSE_DOWN_DRAG});
+  },
+
+  /**
+   * Cause the rotation to "spring".
+   */
+  handleMouseUp: function() {
+    var nextVelocity = Math.min(this.state.velocity + CLICK_ACCEL, MAX_VEL);
+    this.setState({velocity: nextVelocity, drag: MOUSE_UP_DRAG});
+  },
+
+  /**
+   * This is the "main" method for any component. The React API allows you to
+   * describe the structure of your UI component at *any* point in time.
+   */
+  render: function() {
+    return (
+      <Surface
+        width={700}
+        height={700}
+        style={{cursor: 'pointer'}}>
+        {this.renderGraphic(this.state.degrees)}
+      </Surface>
+    );
+  },
+
+  /**
+   * Better SVG support for React coming soon.
+   */
+  renderGraphic: function(rotation) {
+
+    return (
+      <Group
+        onMouseDown={this.handleMouseDown}
+        onMouseUp={this.handleMouseUp}>
+        <Group x={210} y={135}>
+          <Shape fill="rgba(0,0,0,0.1)" d={BORDER_PATH} />
+          <Shape fill="#7BC7BA" d={BG_PATH} />
+          <Shape fill="#DCDCDC" d={BAR_PATH} />
+          <Shape fill="#D97B76" d={RED_DOT_PATH} />
+          <Shape fill="#DBBB79" d={YELLOW_DOT_PATH} />
+          <Shape fill="#A6BD8A" d={GREEN_DOT_PATH} />
+          <Group x={55} y={29}>
+            <Group rotation={rotation} originX={84} originY={89}>
+              <Shape fill="#FFFFFF" d={CENTER_DOT_PATH} />
+              <Group>
+                <Shape d={RING_ONE_PATH} stroke="#FFFFFF" strokeWidth={8} />
+                <Shape d={RING_TWO_PATH} transform={RING_TWO_ROTATE} stroke="#FFFFFF" strokeWidth={8} />
+                <Shape d={RING_THREE_PATH} transform={RING_THREE_ROTATE} stroke="#FFFFFF" strokeWidth={8} />
+              </Group>
+            </Group>
+          </Group>
+        </Group>
+      </Group>
+    );
+  }
+});
+
+var BORDER_PATH = "M3.00191459,4 C1.34400294,4 0,5.34785514 0,7.00550479 L0,220.994495 C0,222.65439 1.34239483,224 3.00191459,224 L276.998085,224 C278.655997,224 280,222.652145 280,220.994495 L280,7.00550479 C280,5.34561033 278.657605,4 276.998085,4 L3.00191459,4 Z M3.00191459,4";
+var BG_PATH = "M3.00191459,1 C1.34400294,1 0,2.34785514 0,4.00550479 L0,217.994495 C0,219.65439 1.34239483,221 3.00191459,221 L276.998085,221 C278.655997,221 280,219.652145 280,217.994495 L280,4.00550479 C280,2.34561033 278.657605,1 276.998085,1 L3.00191459,1 Z M3.00191459,1";
+var BAR_PATH = "M3.00191459,0 C1.34400294,0 0,1.34559019 0,3.00878799 L0,21 C0,21 0,21 0,21 L280,21 C280,21 280,21 280,21 L280,3.00878799 C280,1.34708027 278.657605,0 276.998085,0 L3.00191459,0 Z M3.00191459,0";
+var RED_DOT_PATH = "M12.5,17 C16.0898511,17 19,14.0898511 19,10.5 C19,6.91014895 16.0898511,4 12.5,4 C8.91014895,4 6,6.91014895 6,10.5 C6,14.0898511 8.91014895,17 12.5,17 Z M12.5,17";
+var YELLOW_DOT_PATH = "M31.5,17 C35.0898511,17 38,14.0898511 38,10.5 C38,6.91014895 35.0898511,4 31.5,4 C27.9101489,4 25,6.91014895 25,10.5 C25,14.0898511 27.9101489,17 31.5,17 Z M31.5,17";
+var GREEN_DOT_PATH = "M50.5,17 C54.0898511,17 57,14.0898511 57,10.5 C57,6.91014895 54.0898511,4 50.5,4 C46.9101489,4 44,6.91014895 44,10.5 C44,14.0898511 46.9101489,17 50.5,17 Z M50.5,17";
+var CENTER_DOT_PATH = "M84,105 C92.8365564,105 100,97.8365564 100,89 C100,80.1634436 92.8365564,73 84,73 C75.1634436,73 68,80.1634436 68,89 C68,97.8365564 75.1634436,105 84,105 Z M84,105";
+var RING_ONE_PATH = "M84,121 C130.391921,121 168,106.673113 168,89 C168,71.3268871 130.391921,57 84,57 C37.6080787,57 0,71.3268871 0,89 C0,106.673113 37.6080787,121 84,121 Z M84,121";
+var RING_TWO_PATH = "M84,121 C130.391921,121 168,106.673113 168,89 C168,71.3268871 130.391921,57 84,57 C37.6080787,57 0,71.3268871 0,89 C0,106.673113 37.6080787,121 84,121 Z M84,121";
+var RING_THREE_PATH = "M84,121 C130.391921,121 168,106.673113 168,89 C168,71.3268871 130.391921,57 84,57 C37.6080787,57 0,71.3268871 0,89 C0,106.673113 37.6080787,121 84,121 Z M84,121";
+var RING_TWO_ROTATE = new Transform().translate(84.000000, 89.000000).rotate(-240.000000).translate(-84.000000, -89.000000);
+var RING_THREE_ROTATE = new Transform().translate(84.000000, 89.000000).rotate(-300.000000).translate(-84.000000, -89.000000);
+
+module.exports = VectorWidget;
+
diff --git a/fixtures/art/app.js b/fixtures/art/app.js
new file mode 100644
index 0000000000000..5c981fabd0577
--- /dev/null
+++ b/fixtures/art/app.js
@@ -0,0 +1,7 @@
+"use strict";
+
+var React = require('react');
+var ReactDOM = require('react-dom');
+var VectorWidget = require('./VectorWidget');
+
+ReactDOM.render(<VectorWidget />, document.getElementById('container'));
diff --git a/fixtures/art/index.html b/fixtures/art/index.html
new file mode 100644
index 0000000000000..51e085a57064a
--- /dev/null
+++ b/fixtures/art/index.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>VectorWidget</title>
+</head>
+<body>
+
+  <div id="container">
+    <p>If you're seeing this message, it means you haven't generated the bundle file for this example. Try running:</p>
+
+    <pre><code>
+    npm install
+    npm run build
+    </code></pre>
+
+    <p>then reload the page.</p>
+  </div>
+
+  <script src="bundle.js"></script>
+
+</body>
+</html>
diff --git a/fixtures/art/package.json b/fixtures/art/package.json
new file mode 100644
index 0000000000000..f2870feddf706
--- /dev/null
+++ b/fixtures/art/package.json
@@ -0,0 +1,12 @@
+{
+  "devDependencies": {
+    "babel-core": "^6.24.0",
+    "babel-loader": "^6.4.1",
+    "babel-preset-es2015": "^6.6.0",
+    "babel-preset-react": "^6.5.0",
+    "webpack": "^1.14.0"
+  },
+  "scripts": {
+    "build": "ln -fs ../../build/packages/react node_modules/react && ln -fs ../../build/packages/react-dom node_modules/react-dom && ln -fs ../../build/packages/react-art node_modules/react-art && webpack app.js bundle.js"
+  }
+}
diff --git a/fixtures/art/webpack.config.js b/fixtures/art/webpack.config.js
new file mode 100644
index 0000000000000..3582a5bc1129b
--- /dev/null
+++ b/fixtures/art/webpack.config.js
@@ -0,0 +1,34 @@
+var webpack = require('webpack');
+var path = require('path');
+
+module.exports = {
+  context: __dirname,
+  entry: './app.js',
+  module: {
+    loaders: [
+      {
+        loader: require.resolve('babel-loader'),
+        test: /\.js$/,
+        exclude: /node_modules/,
+        query: {
+          presets: [
+            require.resolve('babel-preset-es2015'),
+            require.resolve('babel-preset-react'),
+          ],
+        },
+      }
+    ]
+  },
+  plugins: [
+    new webpack.DefinePlugin({
+      'process.env': {
+        NODE_ENV: JSON.stringify('development'),
+      },
+    })
+  ],
+  resolve: {
+    alias: {
+      react: require.resolve('react')
+    }
+  }
+};
diff --git a/fixtures/art/yarn.lock b/fixtures/art/yarn.lock
new file mode 100644
index 0000000000000..e4f676b6034b4
--- /dev/null
+++ b/fixtures/art/yarn.lock
@@ -0,0 +1,2079 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+abbrev@1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
+
+acorn@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+
+ajv@^4.9.1:
+  version "4.11.5"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.5.tgz#b6ee74657b993a01dce44b7944d56f485828d5bd"
+  dependencies:
+    co "^4.6.0"
+    json-stable-stringify "^1.0.1"
+
+align-text@^0.1.1, align-text@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
+  dependencies:
+    kind-of "^3.0.2"
+    longest "^1.0.1"
+    repeat-string "^1.5.2"
+
+amdefine@>=0.0.4:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+
+anymatch@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.0.tgz#a3e52fa39168c825ff57b0248126ce5a8ff95507"
+  dependencies:
+    arrify "^1.0.0"
+    micromatch "^2.1.5"
+
+aproba@^1.0.3:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.1.tgz#95d3600f07710aa0e9298c726ad5ecf2eacbabab"
+
+are-we-there-yet@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz#80e470e95a084794fe1899262c5667c6e88de1b3"
+  dependencies:
+    delegates "^1.0.0"
+    readable-stream "^2.0.0 || ^1.1.13"
+
+arr-diff@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
+  dependencies:
+    arr-flatten "^1.0.1"
+
+arr-flatten@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.1.tgz#e5ffe54d45e19f32f216e91eb99c8ce892bb604b"
+
+array-unique@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
+
+arrify@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+
+asap@~2.0.3:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.5.tgz#522765b50c3510490e52d7dcfe085ef9ba96958f"
+
+asn1@~0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
+
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
+assert-plus@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
+
+assert@^1.1.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
+  dependencies:
+    util "0.10.3"
+
+async-each@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
+
+async@^0.9.0:
+  version "0.9.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
+
+async@^1.3.0:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+
+async@~0.2.6:
+  version "0.2.10"
+  resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
+
+asynckit@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+
+aws-sign2@~0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
+
+aws4@^1.2.1:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+
+babel-code-frame@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
+  dependencies:
+    chalk "^1.1.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+babel-core@^6.24.0, babel-core@^6.7.7:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.0.tgz#8f36a0a77f5c155aed6f920b844d23ba56742a02"
+  dependencies:
+    babel-code-frame "^6.22.0"
+    babel-generator "^6.24.0"
+    babel-helpers "^6.23.0"
+    babel-messages "^6.23.0"
+    babel-register "^6.24.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+    babel-traverse "^6.23.1"
+    babel-types "^6.23.0"
+    babylon "^6.11.0"
+    convert-source-map "^1.1.0"
+    debug "^2.1.1"
+    json5 "^0.5.0"
+    lodash "^4.2.0"
+    minimatch "^3.0.2"
+    path-is-absolute "^1.0.0"
+    private "^0.1.6"
+    slash "^1.0.0"
+    source-map "^0.5.0"
+
+babel-generator@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.0.tgz#eba270a8cc4ce6e09a61be43465d7c62c1f87c56"
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-types "^6.23.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.2.0"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
+babel-helper-builder-react-jsx@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.23.0.tgz#d53fc8c996e0bc56d0de0fc4cc55a7138395ea4b"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.23.0"
+    esutils "^2.0.0"
+    lodash "^4.2.0"
+
+babel-helper-call-delegate@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.22.0.tgz#119921b56120f17e9dae3f74b4f5cc7bcc1b37ef"
+  dependencies:
+    babel-helper-hoist-variables "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-helper-define-map@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.23.0.tgz#1444f960c9691d69a2ced6a205315f8fd00804e7"
+  dependencies:
+    babel-helper-function-name "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-types "^6.23.0"
+    lodash "^4.2.0"
+
+babel-helper-function-name@^6.22.0, babel-helper-function-name@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.23.0.tgz#25742d67175c8903dbe4b6cb9d9e1fcb8dcf23a6"
+  dependencies:
+    babel-helper-get-function-arity "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+    babel-traverse "^6.23.0"
+    babel-types "^6.23.0"
+
+babel-helper-get-function-arity@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.22.0.tgz#0beb464ad69dc7347410ac6ade9f03a50634f5ce"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-helper-hoist-variables@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.22.0.tgz#3eacbf731d80705845dd2e9718f600cfb9b4ba72"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-helper-optimise-call-expression@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.23.0.tgz#f3ee7eed355b4282138b33d02b78369e470622f5"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.23.0"
+
+babel-helper-regex@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.22.0.tgz#79f532be1647b1f0ee3474b5f5c3da58001d247d"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+    lodash "^4.2.0"
+
+babel-helper-replace-supers@^6.22.0, babel-helper-replace-supers@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.23.0.tgz#eeaf8ad9b58ec4337ca94223bacdca1f8d9b4bfd"
+  dependencies:
+    babel-helper-optimise-call-expression "^6.23.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+    babel-traverse "^6.23.0"
+    babel-types "^6.23.0"
+
+babel-helpers@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.23.0.tgz#4f8f2e092d0b6a8808a4bde79c27f1e2ecf0d992"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+
+babel-loader@^6.2.4:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.4.1.tgz#0b34112d5b0748a8dcdbf51acf6f9bd42d50b8ca"
+  dependencies:
+    find-cache-dir "^0.1.1"
+    loader-utils "^0.2.16"
+    mkdirp "^0.5.1"
+    object-assign "^4.0.1"
+
+babel-messages@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-check-es2015-constants@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-syntax-flow@^6.18.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d"
+
+babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0:
+  version "6.18.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
+
+babel-plugin-transform-es2015-arrow-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-block-scoping@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.23.0.tgz#e48895cf0b375be148cd7c8879b422707a053b51"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+    babel-traverse "^6.23.0"
+    babel-types "^6.23.0"
+    lodash "^4.2.0"
+
+babel-plugin-transform-es2015-classes@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.23.0.tgz#49b53f326202a2fd1b3bbaa5e2edd8a4f78643c1"
+  dependencies:
+    babel-helper-define-map "^6.23.0"
+    babel-helper-function-name "^6.23.0"
+    babel-helper-optimise-call-expression "^6.23.0"
+    babel-helper-replace-supers "^6.23.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+    babel-traverse "^6.23.0"
+    babel-types "^6.23.0"
+
+babel-plugin-transform-es2015-computed-properties@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.22.0.tgz#7c383e9629bba4820c11b0425bdd6290f7f057e7"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.22.0"
+
+babel-plugin-transform-es2015-destructuring@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-duplicate-keys@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.22.0.tgz#672397031c21610d72dd2bbb0ba9fb6277e1c36b"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-plugin-transform-es2015-for-of@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-function-name@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.22.0.tgz#f5fcc8b09093f9a23c76ac3d9e392c3ec4b77104"
+  dependencies:
+    babel-helper-function-name "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-plugin-transform-es2015-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-modules-amd@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.0.tgz#a1911fb9b7ec7e05a43a63c5995007557bcf6a2e"
+  dependencies:
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.22.0"
+
+babel-plugin-transform-es2015-modules-commonjs@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.0.tgz#e921aefb72c2cc26cb03d107626156413222134f"
+  dependencies:
+    babel-plugin-transform-strict-mode "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+    babel-types "^6.23.0"
+
+babel-plugin-transform-es2015-modules-systemjs@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.23.0.tgz#ae3469227ffac39b0310d90fec73bfdc4f6317b0"
+  dependencies:
+    babel-helper-hoist-variables "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+
+babel-plugin-transform-es2015-modules-umd@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.0.tgz#fd5fa63521cae8d273927c3958afd7c067733450"
+  dependencies:
+    babel-plugin-transform-es2015-modules-amd "^6.24.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+
+babel-plugin-transform-es2015-object-super@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.22.0.tgz#daa60e114a042ea769dd53fe528fc82311eb98fc"
+  dependencies:
+    babel-helper-replace-supers "^6.22.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-parameters@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.23.0.tgz#3a2aabb70c8af945d5ce386f1a4250625a83ae3b"
+  dependencies:
+    babel-helper-call-delegate "^6.22.0"
+    babel-helper-get-function-arity "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+    babel-traverse "^6.23.0"
+    babel-types "^6.23.0"
+
+babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.22.0.tgz#8ba776e0affaa60bff21e921403b8a652a2ff723"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-plugin-transform-es2015-spread@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-sticky-regex@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.22.0.tgz#ab316829e866ee3f4b9eb96939757d19a5bc4593"
+  dependencies:
+    babel-helper-regex "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-plugin-transform-es2015-template-literals@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-typeof-symbol@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-es2015-unicode-regex@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.22.0.tgz#8d9cc27e7ee1decfe65454fb986452a04a613d20"
+  dependencies:
+    babel-helper-regex "^6.22.0"
+    babel-runtime "^6.22.0"
+    regexpu-core "^2.0.0"
+
+babel-plugin-transform-flow-strip-types@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf"
+  dependencies:
+    babel-plugin-syntax-flow "^6.18.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-react-display-name@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.23.0.tgz#4398910c358441dc4cef18787264d0412ed36b37"
+  dependencies:
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-react-jsx-self@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e"
+  dependencies:
+    babel-plugin-syntax-jsx "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-react-jsx-source@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6"
+  dependencies:
+    babel-plugin-syntax-jsx "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-react-jsx@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.23.0.tgz#23e892f7f2e759678eb5e4446a8f8e94e81b3470"
+  dependencies:
+    babel-helper-builder-react-jsx "^6.23.0"
+    babel-plugin-syntax-jsx "^6.8.0"
+    babel-runtime "^6.22.0"
+
+babel-plugin-transform-regenerator@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.22.0.tgz#65740593a319c44522157538d690b84094617ea6"
+  dependencies:
+    regenerator-transform "0.9.8"
+
+babel-plugin-transform-strict-mode@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.22.0.tgz#e008df01340fdc87e959da65991b7e05970c8c7c"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+
+babel-preset-es2015@^6.6.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.24.0.tgz#c162d68b1932696e036cd3110dc1ccd303d2673a"
+  dependencies:
+    babel-plugin-check-es2015-constants "^6.22.0"
+    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
+    babel-plugin-transform-es2015-block-scoping "^6.22.0"
+    babel-plugin-transform-es2015-classes "^6.22.0"
+    babel-plugin-transform-es2015-computed-properties "^6.22.0"
+    babel-plugin-transform-es2015-destructuring "^6.22.0"
+    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
+    babel-plugin-transform-es2015-for-of "^6.22.0"
+    babel-plugin-transform-es2015-function-name "^6.22.0"
+    babel-plugin-transform-es2015-literals "^6.22.0"
+    babel-plugin-transform-es2015-modules-amd "^6.24.0"
+    babel-plugin-transform-es2015-modules-commonjs "^6.24.0"
+    babel-plugin-transform-es2015-modules-systemjs "^6.22.0"
+    babel-plugin-transform-es2015-modules-umd "^6.24.0"
+    babel-plugin-transform-es2015-object-super "^6.22.0"
+    babel-plugin-transform-es2015-parameters "^6.22.0"
+    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
+    babel-plugin-transform-es2015-spread "^6.22.0"
+    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
+    babel-plugin-transform-es2015-template-literals "^6.22.0"
+    babel-plugin-transform-es2015-typeof-symbol "^6.22.0"
+    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
+    babel-plugin-transform-regenerator "^6.22.0"
+
+babel-preset-flow@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d"
+  dependencies:
+    babel-plugin-transform-flow-strip-types "^6.22.0"
+
+babel-preset-react@^6.5.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.23.0.tgz#eb7cee4de98a3f94502c28565332da9819455195"
+  dependencies:
+    babel-plugin-syntax-jsx "^6.3.13"
+    babel-plugin-transform-react-display-name "^6.23.0"
+    babel-plugin-transform-react-jsx "^6.23.0"
+    babel-plugin-transform-react-jsx-self "^6.22.0"
+    babel-plugin-transform-react-jsx-source "^6.22.0"
+    babel-preset-flow "^6.23.0"
+
+babel-register@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.0.tgz#5e89f8463ba9970356d02eb07dabe3308b080cfd"
+  dependencies:
+    babel-core "^6.24.0"
+    babel-runtime "^6.22.0"
+    core-js "^2.4.0"
+    home-or-tmp "^2.0.0"
+    lodash "^4.2.0"
+    mkdirp "^0.5.1"
+    source-map-support "^0.4.2"
+
+babel-runtime@^6.18.0, babel-runtime@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
+  dependencies:
+    core-js "^2.4.0"
+    regenerator-runtime "^0.10.0"
+
+babel-template@^6.22.0, babel-template@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.23.0.tgz#04d4f270adbb3aa704a8143ae26faa529238e638"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.23.0"
+    babel-types "^6.23.0"
+    babylon "^6.11.0"
+    lodash "^4.2.0"
+
+babel-traverse@^6.22.0, babel-traverse@^6.23.0, babel-traverse@^6.23.1:
+  version "6.23.1"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.23.1.tgz#d3cb59010ecd06a97d81310065f966b699e14f48"
+  dependencies:
+    babel-code-frame "^6.22.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-types "^6.23.0"
+    babylon "^6.15.0"
+    debug "^2.2.0"
+    globals "^9.0.0"
+    invariant "^2.2.0"
+    lodash "^4.2.0"
+
+babel-types@^6.19.0, babel-types@^6.22.0, babel-types@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.23.0.tgz#bb17179d7538bad38cd0c9e115d340f77e7e9acf"
+  dependencies:
+    babel-runtime "^6.22.0"
+    esutils "^2.0.2"
+    lodash "^4.2.0"
+    to-fast-properties "^1.0.1"
+
+babylon@^6.11.0, babylon@^6.15.0:
+  version "6.16.1"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.16.1.tgz#30c5a22f481978a9e7f8cdfdf496b11d94b404d3"
+
+balanced-match@^0.4.1:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
+
+base64-js@^1.0.2:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
+
+bcrypt-pbkdf@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d"
+  dependencies:
+    tweetnacl "^0.14.3"
+
+big.js@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.1.3.tgz#4cada2193652eb3ca9ec8e55c9015669c9806978"
+
+binary-extensions@^1.0.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.8.0.tgz#48ec8d16df4377eae5fa5884682480af4d95c774"
+
+block-stream@*:
+  version "0.0.9"
+  resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
+  dependencies:
+    inherits "~2.0.0"
+
+boom@2.x.x:
+  version "2.10.1"
+  resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
+  dependencies:
+    hoek "2.x.x"
+
+brace-expansion@^1.0.0:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9"
+  dependencies:
+    balanced-match "^0.4.1"
+    concat-map "0.0.1"
+
+braces@^1.8.2:
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
+  dependencies:
+    expand-range "^1.8.1"
+    preserve "^0.2.0"
+    repeat-element "^1.1.2"
+
+browserify-aes@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-0.4.0.tgz#067149b668df31c4b58533e02d01e806d8608e2c"
+  dependencies:
+    inherits "^2.0.1"
+
+browserify-zlib@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d"
+  dependencies:
+    pako "~0.2.0"
+
+buffer-shims@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
+
+buffer@^4.9.0:
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
+builtin-status-codes@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
+
+camelcase@^1.0.2:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
+
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+
+center-align@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
+  dependencies:
+    align-text "^0.1.3"
+    lazy-cache "^1.0.3"
+
+chalk@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+chokidar@^1.0.0:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.6.1.tgz#2f4447ab5e96e50fb3d789fd90d4c72e0e4c70c2"
+  dependencies:
+    anymatch "^1.3.0"
+    async-each "^1.0.0"
+    glob-parent "^2.0.0"
+    inherits "^2.0.1"
+    is-binary-path "^1.0.0"
+    is-glob "^2.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.0.0"
+  optionalDependencies:
+    fsevents "^1.0.0"
+
+cliui@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
+  dependencies:
+    center-align "^0.1.1"
+    right-align "^0.1.1"
+    wordwrap "0.0.2"
+
+clone@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
+
+co@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+
+code-point-at@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+
+combined-stream@^1.0.5, combined-stream@~1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009"
+  dependencies:
+    delayed-stream "~1.0.0"
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
+console-browserify@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.1.0.tgz#f0241c45730a9fc6323b206dbf38edc741d0bb10"
+  dependencies:
+    date-now "^0.1.4"
+
+console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
+
+constants-browserify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
+
+convert-source-map@^1.1.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
+
+core-js@^1.0.0:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
+
+core-js@^2.4.0:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
+
+core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+
+cryptiles@2.x.x:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
+  dependencies:
+    boom "2.x.x"
+
+crypto-browserify@3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.3.0.tgz#b9fc75bb4a0ed61dcf1cd5dae96eb30c9c3e506c"
+  dependencies:
+    browserify-aes "0.4.0"
+    pbkdf2-compat "2.0.1"
+    ripemd160 "0.2.0"
+    sha.js "2.2.6"
+
+dashdash@^1.12.0:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
+  dependencies:
+    assert-plus "^1.0.0"
+
+date-now@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
+
+debug@^2.1.1, debug@^2.2.0:
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
+  dependencies:
+    ms "0.7.2"
+
+decamelize@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+
+deep-extend@~0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.1.tgz#efe4113d08085f4e6f9687759810f807469e2253"
+
+delayed-stream@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+
+delegates@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
+
+detect-indent@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
+  dependencies:
+    repeating "^2.0.0"
+
+domain-browser@^1.1.1:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
+
+ecc-jsbn@~0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
+  dependencies:
+    jsbn "~0.1.0"
+
+emojis-list@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+
+encoding@^0.1.11:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  dependencies:
+    iconv-lite "~0.4.13"
+
+enhanced-resolve@~0.9.0:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz#4d6e689b3725f86090927ccc86cd9f1635b89e2e"
+  dependencies:
+    graceful-fs "^4.1.2"
+    memory-fs "^0.2.0"
+    tapable "^0.1.8"
+
+errno@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.4.tgz#b896e23a9e5e8ba33871fc996abd3635fc9a1c7d"
+  dependencies:
+    prr "~0.0.0"
+
+escape-string-regexp@^1.0.2:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+esutils@^2.0.0, esutils@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+
+events@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+
+expand-brackets@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
+  dependencies:
+    is-posix-bracket "^0.1.0"
+
+expand-range@^1.8.1:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
+  dependencies:
+    fill-range "^2.1.0"
+
+extend@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4"
+
+extglob@^0.3.1:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
+  dependencies:
+    is-extglob "^1.0.0"
+
+extsprintf@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
+
+fbjs@^0.8.1, fbjs@^0.8.4:
+  version "0.8.12"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.12.tgz#10b5d92f76d45575fd63a217d4ea02bea2f8ed04"
+  dependencies:
+    core-js "^1.0.0"
+    isomorphic-fetch "^2.1.1"
+    loose-envify "^1.0.0"
+    object-assign "^4.1.0"
+    promise "^7.1.1"
+    setimmediate "^1.0.5"
+    ua-parser-js "^0.7.9"
+
+filename-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775"
+
+fill-range@^2.1.0:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
+  dependencies:
+    is-number "^2.1.0"
+    isobject "^2.0.0"
+    randomatic "^1.1.3"
+    repeat-element "^1.1.2"
+    repeat-string "^1.5.2"
+
+find-cache-dir@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-0.1.1.tgz#c8defae57c8a52a8a784f9e31c57c742e993a0b9"
+  dependencies:
+    commondir "^1.0.1"
+    mkdirp "^0.5.1"
+    pkg-dir "^1.0.0"
+
+find-up@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  dependencies:
+    path-exists "^2.0.0"
+    pinkie-promise "^2.0.0"
+
+for-in@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+
+for-own@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
+  dependencies:
+    for-in "^1.0.1"
+
+forever-agent@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
+
+form-data@~2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.2.tgz#89c3534008b97eada4cbb157d58f6f5df025eae4"
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.5"
+    mime-types "^2.1.12"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
+fsevents@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.1.tgz#f19fd28f43eeaf761680e519a203c4d0b3d31aff"
+  dependencies:
+    nan "^2.3.0"
+    node-pre-gyp "^0.6.29"
+
+fstream-ignore@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
+  dependencies:
+    fstream "^1.0.0"
+    inherits "2"
+    minimatch "^3.0.0"
+
+fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
+  dependencies:
+    graceful-fs "^4.1.2"
+    inherits "~2.0.0"
+    mkdirp ">=0.5 0"
+    rimraf "2"
+
+gauge@~2.7.1:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.3.tgz#1c23855f962f17b3ad3d0dc7443f304542edfe09"
+  dependencies:
+    aproba "^1.0.3"
+    console-control-strings "^1.0.0"
+    has-unicode "^2.0.0"
+    object-assign "^4.1.0"
+    signal-exit "^3.0.0"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.1"
+    wide-align "^1.1.0"
+
+getpass@^0.1.1:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.6.tgz#283ffd9fc1256840875311c1b60e8c40187110e6"
+  dependencies:
+    assert-plus "^1.0.0"
+
+glob-base@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
+  dependencies:
+    glob-parent "^2.0.0"
+    is-glob "^2.0.0"
+
+glob-parent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
+  dependencies:
+    is-glob "^2.0.0"
+
+glob@^7.0.5:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.2"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+globals@^9.0.0:
+  version "9.17.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286"
+
+graceful-fs@^4.1.2:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+
+har-schema@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+
+har-validator@~4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
+  dependencies:
+    ajv "^4.9.1"
+    har-schema "^1.0.5"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
+
+has-unicode@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
+
+hawk@~3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
+  dependencies:
+    boom "2.x.x"
+    cryptiles "2.x.x"
+    hoek "2.x.x"
+    sntp "1.x.x"
+
+hoek@2.x.x:
+  version "2.16.3"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
+
+home-or-tmp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.1"
+
+http-signature@~1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
+  dependencies:
+    assert-plus "^0.2.0"
+    jsprim "^1.2.2"
+    sshpk "^1.7.0"
+
+https-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
+
+iconv-lite@~0.4.13:
+  version "0.4.15"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
+
+ieee754@^1.1.4:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
+
+indexof@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+
+inherits@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
+
+ini@~1.3.0:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
+
+interpret@^0.6.4:
+  version "0.6.6"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-0.6.6.tgz#fecd7a18e7ce5ca6abfb953e1f86213a49f1625b"
+
+invariant@^2.2.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
+  dependencies:
+    loose-envify "^1.0.0"
+
+is-binary-path@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-1.0.1.tgz#75f16642b480f187a711c814161fd3a4a7655898"
+  dependencies:
+    binary-extensions "^1.0.0"
+
+is-buffer@^1.0.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
+
+is-dotfile@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.2.tgz#2c132383f39199f8edc268ca01b9b007d205cc4d"
+
+is-equal-shallow@^0.1.3:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
+  dependencies:
+    is-primitive "^2.0.0"
+
+is-extendable@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+
+is-extglob@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
+
+is-finite@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.0.2.tgz#cc6677695602be550ef11e8b4aa6305342b6d0aa"
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-fullwidth-code-point@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  dependencies:
+    number-is-nan "^1.0.0"
+
+is-glob@^2.0.0, is-glob@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
+  dependencies:
+    is-extglob "^1.0.0"
+
+is-number@^2.0.2, is-number@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-posix-bracket@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
+
+is-primitive@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
+
+is-stream@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
+
+is-typedarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
+
+isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
+isobject@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  dependencies:
+    isarray "1.0.0"
+
+isomorphic-fetch@^2.1.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
+  dependencies:
+    node-fetch "^1.0.1"
+    whatwg-fetch ">=0.10.0"
+
+isstream@~0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
+
+jodid25519@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967"
+  dependencies:
+    jsbn "~0.1.0"
+
+js-tokens@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
+
+jsbn@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
+
+jsesc@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-1.3.0.tgz#46c3fec8c1892b12b0833db9bc7622176dbab34b"
+
+jsesc@~0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+
+json-schema@0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
+
+json-stable-stringify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af"
+  dependencies:
+    jsonify "~0.0.0"
+
+json-stringify-safe@~5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
+
+json5@^0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
+
+jsonify@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
+
+jsprim@^1.2.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
+  dependencies:
+    assert-plus "1.0.0"
+    extsprintf "1.0.2"
+    json-schema "0.2.3"
+    verror "1.3.6"
+
+kind-of@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.1.0.tgz#475d698a5e49ff5e53d14e3e732429dc8bf4cf47"
+  dependencies:
+    is-buffer "^1.0.2"
+
+lazy-cache@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
+
+loader-utils@^0.2.11, loader-utils@^0.2.16:
+  version "0.2.17"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
+  dependencies:
+    big.js "^3.1.3"
+    emojis-list "^2.0.0"
+    json5 "^0.5.0"
+    object-assign "^4.0.1"
+
+lodash@^4.2.0:
+  version "4.17.4"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
+
+longest@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+
+loose-envify@^1.0.0, loose-envify@^1.1.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
+  dependencies:
+    js-tokens "^3.0.0"
+
+memory-fs@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.2.0.tgz#f2bb25368bc121e391c2520de92969caee0a0290"
+
+memory-fs@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.3.0.tgz#7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20"
+  dependencies:
+    errno "^0.1.3"
+    readable-stream "^2.0.1"
+
+micromatch@^2.1.5:
+  version "2.3.11"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
+  dependencies:
+    arr-diff "^2.0.0"
+    array-unique "^0.2.1"
+    braces "^1.8.2"
+    expand-brackets "^0.1.4"
+    extglob "^0.3.1"
+    filename-regex "^2.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.1"
+    kind-of "^3.0.2"
+    normalize-path "^2.0.1"
+    object.omit "^2.0.0"
+    parse-glob "^3.0.4"
+    regex-cache "^0.4.2"
+
+mime-db@~1.27.0:
+  version "1.27.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
+
+mime-types@^2.1.12, mime-types@~2.1.7:
+  version "2.1.15"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
+  dependencies:
+    mime-db "~1.27.0"
+
+minimatch@^3.0.0, minimatch@^3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
+  dependencies:
+    brace-expansion "^1.0.0"
+
+minimist@0.0.8, minimist@~0.0.1:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
+
+minimist@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+
+"mkdirp@>=0.5 0", mkdirp@^0.5.1, mkdirp@~0.5.0:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
+  dependencies:
+    minimist "0.0.8"
+
+ms@0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
+
+nan@^2.3.0:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.1.tgz#d5b01691253326a97a2bbee9e61c55d8d60351e2"
+
+node-fetch@^1.0.1:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
+  dependencies:
+    encoding "^0.1.11"
+    is-stream "^1.0.1"
+
+node-libs-browser@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-0.7.0.tgz#3e272c0819e308935e26674408d7af0e1491b83b"
+  dependencies:
+    assert "^1.1.1"
+    browserify-zlib "^0.1.4"
+    buffer "^4.9.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "3.3.0"
+    domain-browser "^1.1.1"
+    events "^1.0.0"
+    https-browserify "0.0.1"
+    os-browserify "^0.2.0"
+    path-browserify "0.0.0"
+    process "^0.11.0"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.0.5"
+    stream-browserify "^2.0.1"
+    stream-http "^2.3.1"
+    string_decoder "^0.10.25"
+    timers-browserify "^2.0.2"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.10.3"
+    vm-browserify "0.0.4"
+
+node-pre-gyp@^0.6.29:
+  version "0.6.34"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz#94ad1c798a11d7fc67381b50d47f8cc18d9799f7"
+  dependencies:
+    mkdirp "^0.5.1"
+    nopt "^4.0.1"
+    npmlog "^4.0.2"
+    rc "^1.1.7"
+    request "^2.81.0"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^2.2.1"
+    tar-pack "^3.4.0"
+
+nopt@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
+  dependencies:
+    abbrev "1"
+    osenv "^0.1.4"
+
+normalize-path@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  dependencies:
+    remove-trailing-separator "^1.0.1"
+
+npmlog@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.0.2.tgz#d03950e0e78ce1527ba26d2a7592e9348ac3e75f"
+  dependencies:
+    are-we-there-yet "~1.1.2"
+    console-control-strings "~1.1.0"
+    gauge "~2.7.1"
+    set-blocking "~2.0.0"
+
+number-is-nan@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+
+oauth-sign@~0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
+
+object-assign@^4.0.1, object-assign@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
+object.omit@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
+  dependencies:
+    for-own "^0.1.4"
+    is-extendable "^0.1.1"
+
+once@^1.3.0, once@^1.3.3:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  dependencies:
+    wrappy "1"
+
+optimist@~0.6.0:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
+  dependencies:
+    minimist "~0.0.1"
+    wordwrap "~0.0.2"
+
+os-browserify@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.2.1.tgz#63fc4ccee5d2d7763d26bbf8601078e6c2e0044f"
+
+os-homedir@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+
+osenv@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
+pako@~0.2.0:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
+
+parse-glob@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
+  dependencies:
+    glob-base "^0.3.0"
+    is-dotfile "^1.0.0"
+    is-extglob "^1.0.0"
+    is-glob "^2.0.0"
+
+path-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
+
+path-exists@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  dependencies:
+    pinkie-promise "^2.0.0"
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+pbkdf2-compat@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz#b6e0c8fa99494d94e0511575802a59a5c142f288"
+
+performance-now@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+
+pinkie-promise@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  dependencies:
+    pinkie "^2.0.0"
+
+pinkie@^2.0.0:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+
+pkg-dir@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
+  dependencies:
+    find-up "^1.0.0"
+
+preserve@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
+
+private@^0.1.6:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
+
+process-nextick-args@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+
+process@^0.11.0:
+  version "0.11.9"
+  resolved "https://registry.yarnpkg.com/process/-/process-0.11.9.tgz#7bd5ad21aa6253e7da8682264f1e11d11c0318c1"
+
+promise@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.1.1.tgz#489654c692616b8aa55b0724fa809bb7db49c5bf"
+  dependencies:
+    asap "~2.0.3"
+
+prr@~0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
+
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+
+punycode@^1.2.4, punycode@^1.4.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
+
+qs@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
+
+querystring-es3@^0.2.0:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+
+querystring@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+
+randomatic@^1.1.3:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.6.tgz#110dcabff397e9dcff7c0789ccc0a49adf1ec5bb"
+  dependencies:
+    is-number "^2.0.2"
+    kind-of "^3.0.2"
+
+rc@^1.1.7:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"
+  dependencies:
+    deep-extend "~0.4.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
+react-dom@^15.0.2:
+  version "15.4.2"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.4.2.tgz#015363f05b0a1fd52ae9efdd3a0060d90695208f"
+  dependencies:
+    fbjs "^0.8.1"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.0"
+
+react@^15.0.2:
+  version "15.4.2"
+  resolved "https://registry.yarnpkg.com/react/-/react-15.4.2.tgz#41f7991b26185392ba9bae96c8889e7e018397ef"
+  dependencies:
+    fbjs "^0.8.4"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.0"
+
+"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.4, readable-stream@^2.2.6:
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.6.tgz#8b43aed76e71483938d12a8d46c6cf1a00b1f816"
+  dependencies:
+    buffer-shims "^1.0.0"
+    core-util-is "~1.0.0"
+    inherits "~2.0.1"
+    isarray "~1.0.0"
+    process-nextick-args "~1.0.6"
+    string_decoder "~0.10.x"
+    util-deprecate "~1.0.1"
+
+readdirp@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
+  dependencies:
+    graceful-fs "^4.1.2"
+    minimatch "^3.0.2"
+    readable-stream "^2.0.2"
+    set-immediate-shim "^1.0.1"
+
+regenerate@^1.2.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
+
+regenerator-runtime@^0.10.0:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz#8c4367a904b51ea62a908ac310bf99ff90a82a3e"
+
+regenerator-transform@0.9.8:
+  version "0.9.8"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.8.tgz#0f88bb2bc03932ddb7b6b7312e68078f01026d6c"
+  dependencies:
+    babel-runtime "^6.18.0"
+    babel-types "^6.19.0"
+    private "^0.1.6"
+
+regex-cache@^0.4.2:
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.3.tgz#9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145"
+  dependencies:
+    is-equal-shallow "^0.1.3"
+    is-primitive "^2.0.0"
+
+regexpu-core@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-2.0.0.tgz#49d038837b8dcf8bfa5b9a42139938e6ea2ae240"
+  dependencies:
+    regenerate "^1.2.1"
+    regjsgen "^0.2.0"
+    regjsparser "^0.1.4"
+
+regjsgen@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.2.0.tgz#6c016adeac554f75823fe37ac05b92d5a4edb1f7"
+
+regjsparser@^0.1.4:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.1.5.tgz#7ee8f84dc6fa792d3fd0ae228d24bd949ead205c"
+  dependencies:
+    jsesc "~0.5.0"
+
+remove-trailing-separator@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.0.1.tgz#615ebb96af559552d4bf4057c8436d486ab63cc4"
+
+repeat-element@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.2.tgz#ef089a178d1483baae4d93eb98b4f9e4e11d990a"
+
+repeat-string@^1.5.2:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+
+repeating@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
+  dependencies:
+    is-finite "^1.0.0"
+
+request@^2.81.0:
+  version "2.81.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~4.2.1"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.7"
+    oauth-sign "~0.8.1"
+    performance-now "^0.2.0"
+    qs "~6.4.0"
+    safe-buffer "^5.0.1"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.0.0"
+
+right-align@^0.1.1:
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
+  dependencies:
+    align-text "^0.1.1"
+
+rimraf@2, rimraf@^2.5.1, rimraf@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
+  dependencies:
+    glob "^7.0.5"
+
+ripemd160@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-0.2.0.tgz#2bf198bde167cacfa51c0a928e84b68bbe171fce"
+
+safe-buffer@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
+
+semver@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
+
+set-blocking@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+
+set-immediate-shim@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
+
+setimmediate@^1.0.4, setimmediate@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+
+sha.js@2.2.6:
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.2.6.tgz#17ddeddc5f722fb66501658895461977867315ba"
+
+signal-exit@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+
+sntp@1.x.x:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
+  dependencies:
+    hoek "2.x.x"
+
+source-list-map@~0.1.7:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
+
+source-map-support@^0.4.2:
+  version "0.4.14"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.14.tgz#9d4463772598b86271b4f523f6c1f4e02a7d6aef"
+  dependencies:
+    source-map "^0.5.6"
+
+source-map@^0.5.0, source-map@^0.5.6, source-map@~0.5.1:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+
+source-map@~0.4.1:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
+  dependencies:
+    amdefine ">=0.0.4"
+
+sshpk@^1.7.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.11.0.tgz#2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"
+  dependencies:
+    asn1 "~0.2.3"
+    assert-plus "^1.0.0"
+    dashdash "^1.12.0"
+    getpass "^0.1.1"
+  optionalDependencies:
+    bcrypt-pbkdf "^1.0.0"
+    ecc-jsbn "~0.1.1"
+    jodid25519 "^1.0.0"
+    jsbn "~0.1.0"
+    tweetnacl "~0.14.0"
+
+stream-browserify@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
+  dependencies:
+    inherits "~2.0.1"
+    readable-stream "^2.0.2"
+
+stream-http@^2.3.1:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.0.tgz#cec1f4e3b494bc4a81b451808970f8b20b4ed5f6"
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.1"
+    readable-stream "^2.2.6"
+    to-arraybuffer "^1.0.0"
+    xtend "^4.0.0"
+
+string-width@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    strip-ansi "^3.0.0"
+
+string_decoder@^0.10.25, string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+
+stringstream@~0.0.4:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"
+
+strip-ansi@^3.0.0, strip-ansi@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+
+supports-color@^3.1.0:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  dependencies:
+    has-flag "^1.0.0"
+
+tapable@^0.1.8, tapable@~0.1.8:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.1.10.tgz#29c35707c2b70e50d07482b5d202e8ed446dafd4"
+
+tar-pack@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
+  dependencies:
+    debug "^2.2.0"
+    fstream "^1.0.10"
+    fstream-ignore "^1.0.5"
+    once "^1.3.3"
+    readable-stream "^2.1.4"
+    rimraf "^2.5.1"
+    tar "^2.2.1"
+    uid-number "^0.0.6"
+
+tar@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
+  dependencies:
+    block-stream "*"
+    fstream "^1.0.2"
+    inherits "2"
+
+timers-browserify@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.2.tgz#ab4883cf597dcd50af211349a00fbca56ac86b86"
+  dependencies:
+    setimmediate "^1.0.4"
+
+to-arraybuffer@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz#7d229b1fcc637e466ca081180836a7aabff83f43"
+
+to-fast-properties@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320"
+
+tough-cookie@~2.3.0:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
+  dependencies:
+    punycode "^1.4.1"
+
+trim-right@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+
+tty-browserify@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
+
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  dependencies:
+    safe-buffer "^5.0.1"
+
+tweetnacl@^0.14.3, tweetnacl@~0.14.0:
+  version "0.14.5"
+  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
+
+ua-parser-js@^0.7.9:
+  version "0.7.12"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"
+
+uglify-js@~2.7.3:
+  version "2.7.5"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8"
+  dependencies:
+    async "~0.2.6"
+    source-map "~0.5.1"
+    uglify-to-browserify "~1.0.0"
+    yargs "~3.10.0"
+
+uglify-to-browserify@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
+
+uid-number@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
+
+url@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
+util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+
+util@0.10.3, util@^0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9"
+  dependencies:
+    inherits "2.0.1"
+
+uuid@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
+
+verror@1.3.6:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/verror/-/verror-1.3.6.tgz#cff5df12946d297d2baaefaa2689e25be01c005c"
+  dependencies:
+    extsprintf "1.0.2"
+
+vm-browserify@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
+  dependencies:
+    indexof "0.0.1"
+
+watchpack@^0.2.1:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-0.2.9.tgz#62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b"
+  dependencies:
+    async "^0.9.0"
+    chokidar "^1.0.0"
+    graceful-fs "^4.1.2"
+
+webpack-core@~0.6.9:
+  version "0.6.9"
+  resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2"
+  dependencies:
+    source-list-map "~0.1.7"
+    source-map "~0.4.1"
+
+webpack@^1.13.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-1.14.0.tgz#54f1ffb92051a328a5b2057d6ae33c289462c823"
+  dependencies:
+    acorn "^3.0.0"
+    async "^1.3.0"
+    clone "^1.0.2"
+    enhanced-resolve "~0.9.0"
+    interpret "^0.6.4"
+    loader-utils "^0.2.11"
+    memory-fs "~0.3.0"
+    mkdirp "~0.5.0"
+    node-libs-browser "^0.7.0"
+    optimist "~0.6.0"
+    supports-color "^3.1.0"
+    tapable "~0.1.8"
+    uglify-js "~2.7.3"
+    watchpack "^0.2.1"
+    webpack-core "~0.6.9"
+
+whatwg-fetch@>=0.10.0:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
+
+wide-align@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.0.tgz#40edde802a71fea1f070da3e62dcda2e7add96ad"
+  dependencies:
+    string-width "^1.0.1"
+
+window-size@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
+
+wordwrap@0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
+
+wordwrap@~0.0.2:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+
+xtend@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
+
+yargs@~3.10.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
+  dependencies:
+    camelcase "^1.0.2"
+    cliui "^2.1.0"
+    decamelize "^1.0.0"
+    window-size "0.1.0"
diff --git a/fixtures/dom/.gitignore b/fixtures/dom/.gitignore
index f3e81adec12c6..bcc245d36a251 100644
--- a/fixtures/dom/.gitignore
+++ b/fixtures/dom/.gitignore
@@ -8,8 +8,8 @@ coverage
 
 # production
 build
-public/react.js
-public/react-dom.js
+public/react.development.js
+public/react-dom.development.js
 
 # misc
 .DS_Store
diff --git a/fixtures/dom/package.json b/fixtures/dom/package.json
index 5de1a7d4b8d17..07a70c4dc1d74 100644
--- a/fixtures/dom/package.json
+++ b/fixtures/dom/package.json
@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "devDependencies": {
-    "react-scripts": "0.8.4"
+    "react-scripts": "0.9.5"
   },
   "dependencies": {
     "classnames": "^2.2.5",
@@ -14,7 +14,7 @@
   },
   "scripts": {
     "start": "react-scripts start",
-    "prestart": "cp ../../build/{react,react-dom}.js public/",
+    "prestart": "cp ../../build/dist/{react,react-dom}.development.js public/",
     "build": "react-scripts build",
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject"
diff --git a/fixtures/dom/public/react-loader.js b/fixtures/dom/public/react-loader.js
index f738275848788..af8fe8874e7b3 100644
--- a/fixtures/dom/public/react-loader.js
+++ b/fixtures/dom/public/react-loader.js
@@ -7,8 +7,8 @@
  * (Loads React 15.4.1)
  */
 
-var REACT_PATH = 'react.js';
-var DOM_PATH = 'react-dom.js';
+var REACT_PATH = 'react.development.js';
+var DOM_PATH = 'react-dom.development.js';
 
 function parseQuery(qstr) {
   var query = {};
diff --git a/fixtures/dom/yarn.lock b/fixtures/dom/yarn.lock
index 6136f0a9cffbe..e45c4a70540d7 100644
--- a/fixtures/dom/yarn.lock
+++ b/fixtures/dom/yarn.lock
@@ -2,11 +2,11 @@
 # yarn lockfile v1
 
 
-abab@^1.0.0:
+abab@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
 
-abbrev@1, abbrev@1.0.x:
+abbrev@1:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
 
@@ -17,11 +17,11 @@ accepts@~1.3.3:
     mime-types "~2.1.11"
     negotiator "0.6.1"
 
-acorn-globals@^1.0.4:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-1.0.9.tgz#55bb5e98691507b74579d0513413217c380c54cf"
+acorn-globals@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-3.1.0.tgz#fd8270f71fbb4996b004fa880ee5d46573a731bf"
   dependencies:
-    acorn "^2.1.0"
+    acorn "^4.0.4"
 
 acorn-jsx@^3.0.0, acorn-jsx@^3.0.1:
   version "3.0.1"
@@ -29,17 +29,17 @@ acorn-jsx@^3.0.0, acorn-jsx@^3.0.1:
   dependencies:
     acorn "^3.0.4"
 
-acorn@^2.1.0, acorn@^2.4.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
-
 acorn@^3.0.0, acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
-acorn@^4.0.1:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a"
+acorn@^4.0.4:
+  version "4.0.11"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0"
+
+acorn@^5.0.1:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
 
 ajv-keywords@^1.0.0:
   version "1.5.0"
@@ -95,9 +95,11 @@ anymatch@^1.3.0:
     arrify "^1.0.0"
     micromatch "^2.1.5"
 
-append-transform@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.3.0.tgz#d6933ce4a85f09445d9ccc4cc119051b7381a813"
+append-transform@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/append-transform/-/append-transform-0.4.0.tgz#d76ebf8ca94d276e247a36bad44a4b74ab611991"
+  dependencies:
+    default-require-extensions "^1.0.0"
 
 aproba@^1.0.3:
   version "1.0.4"
@@ -116,6 +118,12 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+aria-query@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-0.3.0.tgz#cb8a9984e2862711c83c80ade5b8f5ca0de2b467"
+  dependencies:
+    ast-types-flow "0.0.7"
+
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
@@ -126,10 +134,6 @@ arr-flatten@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.0.1.tgz#e5ffe54d45e19f32f216e91eb99c8ce892bb604b"
 
-array-differ@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
-
 array-equal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
@@ -178,18 +182,22 @@ assert@^1.1.1:
   dependencies:
     util "0.10.3"
 
+ast-types-flow@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
+
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
-async@1.x, async@^1.3.0, async@^1.4.0, async@^1.4.2, async@^1.5.0:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-
 async@^0.9.0:
   version "0.9.2"
   resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
 
+async@^1.3.0, async@^1.4.0, async@^1.5.0:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
+
 async@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/async/-/async-2.1.4.tgz#2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"
@@ -204,7 +212,18 @@ asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
-autoprefixer@6.5.1, autoprefixer@^6.3.1:
+autoprefixer@6.7.2:
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.2.tgz#172ab07b998ae9b957530928a59a40be54a45023"
+  dependencies:
+    browserslist "^1.7.1"
+    caniuse-db "^1.0.30000618"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^5.2.11"
+    postcss-value-parser "^3.2.3"
+
+autoprefixer@^6.3.1:
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.5.1.tgz#ae759a5221e709f3da17c2d656230e67c43cbb75"
   dependencies:
@@ -231,7 +250,39 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.20.0:
     esutils "^2.0.2"
     js-tokens "^2.0.0"
 
-babel-core@6.17.0, babel-core@^6.0.0:
+babel-code-frame@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
+  dependencies:
+    chalk "^1.1.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+babel-core@6.22.1:
+  version "6.22.1"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.22.1.tgz#9c5fd658ba1772d28d721f6d25d968fc7ae21648"
+  dependencies:
+    babel-code-frame "^6.22.0"
+    babel-generator "^6.22.0"
+    babel-helpers "^6.22.0"
+    babel-messages "^6.22.0"
+    babel-register "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.22.0"
+    babel-traverse "^6.22.1"
+    babel-types "^6.22.0"
+    babylon "^6.11.0"
+    convert-source-map "^1.1.0"
+    debug "^2.1.1"
+    json5 "^0.5.0"
+    lodash "^4.2.0"
+    minimatch "^3.0.2"
+    path-is-absolute "^1.0.0"
+    private "^0.1.6"
+    slash "^1.0.0"
+    source-map "^0.5.0"
+
+babel-core@^6.0.0:
   version "6.17.0"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.17.0.tgz#6c4576447df479e241e58c807e4bc7da4db7f425"
   dependencies:
@@ -281,6 +332,30 @@ babel-core@^6.18.0:
     slash "^1.0.0"
     source-map "^0.5.0"
 
+babel-core@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.0.tgz#8f36a0a77f5c155aed6f920b844d23ba56742a02"
+  dependencies:
+    babel-code-frame "^6.22.0"
+    babel-generator "^6.24.0"
+    babel-helpers "^6.23.0"
+    babel-messages "^6.23.0"
+    babel-register "^6.24.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+    babel-traverse "^6.23.1"
+    babel-types "^6.23.0"
+    babylon "^6.11.0"
+    convert-source-map "^1.1.0"
+    debug "^2.1.1"
+    json5 "^0.5.0"
+    lodash "^4.2.0"
+    minimatch "^3.0.2"
+    path-is-absolute "^1.0.0"
+    private "^0.1.6"
+    slash "^1.0.0"
+    source-map "^0.5.0"
+
 babel-eslint@7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.1.1.tgz#8a6a884f085aa7060af69cfc77341c2f99370fb2"
@@ -303,6 +378,19 @@ babel-generator@^6.17.0, babel-generator@^6.18.0, babel-generator@^6.21.0:
     lodash "^4.2.0"
     source-map "^0.5.0"
 
+babel-generator@^6.22.0, babel-generator@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.0.tgz#eba270a8cc4ce6e09a61be43465d7c62c1f87c56"
+  dependencies:
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-types "^6.23.0"
+    detect-indent "^4.0.0"
+    jsesc "^1.3.0"
+    lodash "^4.2.0"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
 babel-helper-builder-binary-assignment-operator-visitor@^6.8.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.18.0.tgz#8ae814989f7a53682152e3401a04fabd0bb333a6"
@@ -311,12 +399,12 @@ babel-helper-builder-binary-assignment-operator-visitor@^6.8.0:
     babel-runtime "^6.0.0"
     babel-types "^6.18.0"
 
-babel-helper-builder-react-jsx@^6.8.0:
-  version "6.21.1"
-  resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.21.1.tgz#c4a24208655be9dc1cccf14d366da176f20645e4"
+babel-helper-builder-react-jsx@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.23.0.tgz#d53fc8c996e0bc56d0de0fc4cc55a7138395ea4b"
   dependencies:
-    babel-runtime "^6.9.0"
-    babel-types "^6.21.0"
+    babel-runtime "^6.22.0"
+    babel-types "^6.23.0"
     esutils "^2.0.0"
     lodash "^4.2.0"
 
@@ -356,6 +444,16 @@ babel-helper-function-name@^6.18.0, babel-helper-function-name@^6.8.0:
     babel-traverse "^6.18.0"
     babel-types "^6.18.0"
 
+babel-helper-function-name@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.23.0.tgz#25742d67175c8903dbe4b6cb9d9e1fcb8dcf23a6"
+  dependencies:
+    babel-helper-get-function-arity "^6.22.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+    babel-traverse "^6.23.0"
+    babel-types "^6.23.0"
+
 babel-helper-get-function-arity@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.18.0.tgz#a5b19695fd3f9cdfc328398b47dafcd7094f9f24"
@@ -363,6 +461,13 @@ babel-helper-get-function-arity@^6.18.0:
     babel-runtime "^6.0.0"
     babel-types "^6.18.0"
 
+babel-helper-get-function-arity@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.22.0.tgz#0beb464ad69dc7347410ac6ade9f03a50634f5ce"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-types "^6.22.0"
+
 babel-helper-hoist-variables@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.18.0.tgz#a835b5ab8b46d6de9babefae4d98ea41e866b82a"
@@ -413,23 +518,36 @@ babel-helpers@^6.16.0:
     babel-runtime "^6.0.0"
     babel-template "^6.16.0"
 
-babel-jest@17.0.2, babel-jest@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-17.0.2.tgz#8d51e0d03759713c331f108eb0b2eaa4c6efff74"
+babel-helpers@^6.22.0, babel-helpers@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.23.0.tgz#4f8f2e092d0b6a8808a4bde79c27f1e2ecf0d992"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+
+babel-jest@18.0.0, babel-jest@^18.0.0:
+  version "18.0.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-18.0.0.tgz#17ebba8cb3285c906d859e8707e4e79795fb65e3"
   dependencies:
     babel-core "^6.0.0"
-    babel-plugin-istanbul "^2.0.0"
-    babel-preset-jest "^17.0.2"
+    babel-plugin-istanbul "^3.0.0"
+    babel-preset-jest "^18.0.0"
 
-babel-loader@6.2.7:
-  version "6.2.7"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.2.7.tgz#16fdbf64328030dc5a606827d389c8b92a2a8032"
+babel-loader@6.2.10:
+  version "6.2.10"
+  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.2.10.tgz#adefc2b242320cd5d15e65b31cea0e8b1b02d4b0"
   dependencies:
     find-cache-dir "^0.1.1"
     loader-utils "^0.2.11"
     mkdirp "^0.5.1"
     object-assign "^4.0.1"
 
+babel-messages@^6.22.0, babel-messages@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
+  dependencies:
+    babel-runtime "^6.22.0"
+
 babel-messages@^6.8.0:
   version "6.8.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.8.0.tgz#bf504736ca967e6d65ef0adb5a2a5f947c8e0eb9"
@@ -442,18 +560,18 @@ babel-plugin-check-es2015-constants@^6.3.13:
   dependencies:
     babel-runtime "^6.0.0"
 
-babel-plugin-istanbul@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-2.0.3.tgz#266b304b9109607d60748474394676982f660df4"
+babel-plugin-istanbul@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-3.1.2.tgz#11d5abde18425ec24b5d648c7e0b5d25cd354a22"
   dependencies:
     find-up "^1.1.2"
-    istanbul-lib-instrument "^1.1.4"
+    istanbul-lib-instrument "^1.4.2"
     object-assign "^4.1.0"
-    test-exclude "^2.1.1"
+    test-exclude "^3.3.0"
 
-babel-plugin-jest-hoist@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-17.0.2.tgz#213488ce825990acd4c30f887dca09fffeb45235"
+babel-plugin-jest-hoist@^18.0.0:
+  version "18.0.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-18.0.0.tgz#4150e70ecab560e6e7344adc849498072d34e12a"
 
 babel-plugin-syntax-async-functions@^6.8.0:
   version "6.13.0"
@@ -479,11 +597,11 @@ babel-plugin-syntax-object-rest-spread@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz#fd6536f2bce13836ffa3a5458c4903a597bb3bf5"
 
-babel-plugin-syntax-trailing-function-commas@^6.13.0, babel-plugin-syntax-trailing-function-commas@^6.8.0:
+babel-plugin-syntax-trailing-function-commas@^6.13.0:
   version "6.20.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.20.0.tgz#442835e19179f45b87e92d477d70b9f1f18b5c4f"
 
-babel-plugin-transform-async-to-generator@^6.16.0, babel-plugin-transform-async-to-generator@^6.8.0:
+babel-plugin-transform-async-to-generator@^6.8.0:
   version "6.16.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.16.0.tgz#19ec36cb1486b59f9f468adfa42ce13908ca2999"
   dependencies:
@@ -491,13 +609,14 @@ babel-plugin-transform-async-to-generator@^6.16.0, babel-plugin-transform-async-
     babel-plugin-syntax-async-functions "^6.8.0"
     babel-runtime "^6.0.0"
 
-babel-plugin-transform-class-properties@6.16.0:
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.16.0.tgz#969bca24d34e401d214f36b8af5c1346859bc904"
+babel-plugin-transform-class-properties@6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.22.0.tgz#aa78f8134495c7de06c097118ba061844e1dc1d8"
   dependencies:
-    babel-helper-function-name "^6.8.0"
+    babel-helper-function-name "^6.22.0"
     babel-plugin-syntax-class-properties "^6.8.0"
-    babel-runtime "^6.9.1"
+    babel-runtime "^6.22.0"
+    babel-template "^6.22.0"
 
 babel-plugin-transform-es2015-arrow-functions@^6.3.13:
   version "6.8.0"
@@ -511,7 +630,7 @@ babel-plugin-transform-es2015-block-scoped-functions@^6.3.13:
   dependencies:
     babel-runtime "^6.0.0"
 
-babel-plugin-transform-es2015-block-scoping@^6.18.0, babel-plugin-transform-es2015-block-scoping@^6.6.0:
+babel-plugin-transform-es2015-block-scoping@^6.6.0:
   version "6.21.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.21.0.tgz#e840687f922e70fb2c42bb13501838c174a115ed"
   dependencies:
@@ -521,7 +640,7 @@ babel-plugin-transform-es2015-block-scoping@^6.18.0, babel-plugin-transform-es20
     babel-types "^6.21.0"
     lodash "^4.2.0"
 
-babel-plugin-transform-es2015-classes@^6.18.0, babel-plugin-transform-es2015-classes@^6.6.0:
+babel-plugin-transform-es2015-classes@^6.6.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.18.0.tgz#ffe7a17321bf83e494dcda0ae3fc72df48ffd1d9"
   dependencies:
@@ -543,7 +662,7 @@ babel-plugin-transform-es2015-computed-properties@^6.3.13:
     babel-runtime "^6.0.0"
     babel-template "^6.8.0"
 
-babel-plugin-transform-es2015-destructuring@^6.18.0, babel-plugin-transform-es2015-destructuring@^6.6.0:
+babel-plugin-transform-es2015-destructuring@^6.6.0:
   version "6.19.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.19.0.tgz#ff1d911c4b3f4cab621bd66702a869acd1900533"
   dependencies:
@@ -556,13 +675,13 @@ babel-plugin-transform-es2015-duplicate-keys@^6.6.0:
     babel-runtime "^6.0.0"
     babel-types "^6.8.0"
 
-babel-plugin-transform-es2015-for-of@^6.18.0, babel-plugin-transform-es2015-for-of@^6.6.0:
+babel-plugin-transform-es2015-for-of@^6.6.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.18.0.tgz#4c517504db64bf8cfc119a6b8f177211f2028a70"
   dependencies:
     babel-runtime "^6.0.0"
 
-babel-plugin-transform-es2015-function-name@^6.3.13, babel-plugin-transform-es2015-function-name@^6.9.0:
+babel-plugin-transform-es2015-function-name@^6.3.13:
   version "6.9.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.9.0.tgz#8c135b17dbd064e5bba56ec511baaee2fca82719"
   dependencies:
@@ -593,7 +712,7 @@ babel-plugin-transform-es2015-modules-commonjs@^6.18.0, babel-plugin-transform-e
     babel-template "^6.16.0"
     babel-types "^6.18.0"
 
-babel-plugin-transform-es2015-modules-systemjs@^6.12.0, babel-plugin-transform-es2015-modules-systemjs@^6.18.0:
+babel-plugin-transform-es2015-modules-systemjs@^6.12.0:
   version "6.19.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.19.0.tgz#50438136eba74527efa00a5b0fefaf1dc4071da6"
   dependencies:
@@ -601,7 +720,7 @@ babel-plugin-transform-es2015-modules-systemjs@^6.12.0, babel-plugin-transform-e
     babel-runtime "^6.11.6"
     babel-template "^6.14.0"
 
-babel-plugin-transform-es2015-modules-umd@^6.12.0, babel-plugin-transform-es2015-modules-umd@^6.18.0:
+babel-plugin-transform-es2015-modules-umd@^6.12.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.18.0.tgz#23351770ece5c1f8e83ed67cb1d7992884491e50"
   dependencies:
@@ -616,7 +735,7 @@ babel-plugin-transform-es2015-object-super@^6.3.13:
     babel-helper-replace-supers "^6.8.0"
     babel-runtime "^6.0.0"
 
-babel-plugin-transform-es2015-parameters@6.18.0, babel-plugin-transform-es2015-parameters@^6.18.0, babel-plugin-transform-es2015-parameters@^6.6.0:
+babel-plugin-transform-es2015-parameters@^6.6.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.18.0.tgz#9b2cfe238c549f1635ba27fc1daa858be70608b1"
   dependencies:
@@ -627,7 +746,7 @@ babel-plugin-transform-es2015-parameters@6.18.0, babel-plugin-transform-es2015-p
     babel-traverse "^6.18.0"
     babel-types "^6.18.0"
 
-babel-plugin-transform-es2015-shorthand-properties@^6.18.0, babel-plugin-transform-es2015-shorthand-properties@^6.3.13:
+babel-plugin-transform-es2015-shorthand-properties@^6.3.13:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.18.0.tgz#e2ede3b7df47bf980151926534d1dd0cbea58f43"
   dependencies:
@@ -654,7 +773,7 @@ babel-plugin-transform-es2015-template-literals@^6.6.0:
   dependencies:
     babel-runtime "^6.0.0"
 
-babel-plugin-transform-es2015-typeof-symbol@^6.18.0, babel-plugin-transform-es2015-typeof-symbol@^6.6.0:
+babel-plugin-transform-es2015-typeof-symbol@^6.6.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.18.0.tgz#0b14c48629c90ff47a0650077f6aa699bee35798"
   dependencies:
@@ -668,7 +787,7 @@ babel-plugin-transform-es2015-unicode-regex@^6.3.13:
     babel-runtime "^6.0.0"
     regexpu-core "^2.0.0"
 
-babel-plugin-transform-exponentiation-operator@^6.3.13, babel-plugin-transform-exponentiation-operator@^6.8.0:
+babel-plugin-transform-exponentiation-operator@^6.8.0:
   version "6.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.8.0.tgz#db25742e9339eade676ca9acec46f955599a68a4"
   dependencies:
@@ -676,67 +795,65 @@ babel-plugin-transform-exponentiation-operator@^6.3.13, babel-plugin-transform-e
     babel-plugin-syntax-exponentiation-operator "^6.8.0"
     babel-runtime "^6.0.0"
 
-babel-plugin-transform-flow-strip-types@^6.3.13:
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.21.0.tgz#2eea3f8b5bb234339b47283feac155cfb237b948"
+babel-plugin-transform-flow-strip-types@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf"
   dependencies:
     babel-plugin-syntax-flow "^6.18.0"
-    babel-runtime "^6.0.0"
+    babel-runtime "^6.22.0"
 
-babel-plugin-transform-object-rest-spread@6.19.0:
-  version "6.19.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.19.0.tgz#f6ac428ee3cb4c6aa00943ed1422ce813603b34c"
+babel-plugin-transform-object-rest-spread@6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.22.0.tgz#1d419b55e68d2e4f64a5ff3373bd67d73c8e83bc"
   dependencies:
     babel-plugin-syntax-object-rest-spread "^6.8.0"
-    babel-runtime "^6.0.0"
+    babel-runtime "^6.22.0"
 
-babel-plugin-transform-react-constant-elements@6.9.1:
-  version "6.9.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-constant-elements/-/babel-plugin-transform-react-constant-elements-6.9.1.tgz#125b86d96cb322e2139b607fd749ad5fbb17f005"
+babel-plugin-transform-react-constant-elements@6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-constant-elements/-/babel-plugin-transform-react-constant-elements-6.22.0.tgz#4af456f80d283e8be00f00f12852354defa08ee1"
   dependencies:
-    babel-runtime "^6.9.1"
+    babel-runtime "^6.22.0"
 
-babel-plugin-transform-react-display-name@^6.3.13:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.8.0.tgz#f7a084977383d728bdbdc2835bba0159577f660e"
+babel-plugin-transform-react-display-name@^6.22.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.23.0.tgz#4398910c358441dc4cef18787264d0412ed36b37"
   dependencies:
-    babel-runtime "^6.0.0"
+    babel-runtime "^6.22.0"
 
-babel-plugin-transform-react-jsx-self@6.11.0, babel-plugin-transform-react-jsx-self@^6.11.0:
-  version "6.11.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.11.0.tgz#605c9450c1429f97a930f7e1dfe3f0d9d0dbd0f4"
+babel-plugin-transform-react-jsx-self@6.22.0, babel-plugin-transform-react-jsx-self@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e"
   dependencies:
     babel-plugin-syntax-jsx "^6.8.0"
-    babel-runtime "^6.9.0"
+    babel-runtime "^6.22.0"
 
-babel-plugin-transform-react-jsx-source@6.9.0, babel-plugin-transform-react-jsx-source@^6.3.13:
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.9.0.tgz#af684a05c2067a86e0957d4f343295ccf5dccf00"
+babel-plugin-transform-react-jsx-source@6.22.0, babel-plugin-transform-react-jsx-source@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6"
   dependencies:
     babel-plugin-syntax-jsx "^6.8.0"
-    babel-runtime "^6.9.0"
+    babel-runtime "^6.22.0"
 
-babel-plugin-transform-react-jsx@6.8.0, babel-plugin-transform-react-jsx@^6.3.13:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.8.0.tgz#94759942f70af18c617189aa7f3593f1644a71ab"
+babel-plugin-transform-react-jsx@6.22.0, babel-plugin-transform-react-jsx@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.22.0.tgz#48556b7dd4c3fe97d1c943bcd54fc3f2561c1817"
   dependencies:
-    babel-helper-builder-react-jsx "^6.8.0"
+    babel-helper-builder-react-jsx "^6.22.0"
     babel-plugin-syntax-jsx "^6.8.0"
-    babel-runtime "^6.0.0"
+    babel-runtime "^6.22.0"
 
-babel-plugin-transform-regenerator@6.16.1, babel-plugin-transform-regenerator@^6.16.0, babel-plugin-transform-regenerator@^6.6.0:
-  version "6.16.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.16.1.tgz#a75de6b048a14154aae14b0122756c5bed392f59"
+babel-plugin-transform-regenerator@6.22.0, babel-plugin-transform-regenerator@^6.6.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.22.0.tgz#65740593a319c44522157538d690b84094617ea6"
   dependencies:
-    babel-runtime "^6.9.0"
-    babel-types "^6.16.0"
-    private "~0.1.5"
+    regenerator-transform "0.9.8"
 
-babel-plugin-transform-runtime@6.15.0:
-  version "6.15.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.15.0.tgz#3d75b4d949ad81af157570273846fb59aeb0d57c"
+babel-plugin-transform-runtime@6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.22.0.tgz#10968d760bbf6517243081eec778e10fa828551c"
   dependencies:
-    babel-runtime "^6.9.0"
+    babel-runtime "^6.22.0"
 
 babel-plugin-transform-strict-mode@^6.18.0:
   version "6.18.0"
@@ -745,9 +862,9 @@ babel-plugin-transform-strict-mode@^6.18.0:
     babel-runtime "^6.0.0"
     babel-types "^6.18.0"
 
-babel-preset-env@0.0.8:
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-0.0.8.tgz#a7e37e4b345263d045cd29738a0aff1ce31f5b0e"
+babel-preset-env@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.2.1.tgz#659178f54df74a74765f796be4d290b5beeb3f5f"
   dependencies:
     babel-plugin-check-es2015-constants "^6.3.13"
     babel-plugin-syntax-trailing-function-commas "^6.13.0"
@@ -777,92 +894,42 @@ babel-preset-env@0.0.8:
     babel-plugin-transform-exponentiation-operator "^6.8.0"
     babel-plugin-transform-regenerator "^6.6.0"
     browserslist "^1.4.0"
+    electron-to-chromium "^1.1.0"
+    invariant "^2.2.2"
 
-babel-preset-es2015@^6.16.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.18.0.tgz#b8c70df84ec948c43dcf2bf770e988eb7da88312"
-  dependencies:
-    babel-plugin-check-es2015-constants "^6.3.13"
-    babel-plugin-transform-es2015-arrow-functions "^6.3.13"
-    babel-plugin-transform-es2015-block-scoped-functions "^6.3.13"
-    babel-plugin-transform-es2015-block-scoping "^6.18.0"
-    babel-plugin-transform-es2015-classes "^6.18.0"
-    babel-plugin-transform-es2015-computed-properties "^6.3.13"
-    babel-plugin-transform-es2015-destructuring "^6.18.0"
-    babel-plugin-transform-es2015-duplicate-keys "^6.6.0"
-    babel-plugin-transform-es2015-for-of "^6.18.0"
-    babel-plugin-transform-es2015-function-name "^6.9.0"
-    babel-plugin-transform-es2015-literals "^6.3.13"
-    babel-plugin-transform-es2015-modules-amd "^6.18.0"
-    babel-plugin-transform-es2015-modules-commonjs "^6.18.0"
-    babel-plugin-transform-es2015-modules-systemjs "^6.18.0"
-    babel-plugin-transform-es2015-modules-umd "^6.18.0"
-    babel-plugin-transform-es2015-object-super "^6.3.13"
-    babel-plugin-transform-es2015-parameters "^6.18.0"
-    babel-plugin-transform-es2015-shorthand-properties "^6.18.0"
-    babel-plugin-transform-es2015-spread "^6.3.13"
-    babel-plugin-transform-es2015-sticky-regex "^6.3.13"
-    babel-plugin-transform-es2015-template-literals "^6.6.0"
-    babel-plugin-transform-es2015-typeof-symbol "^6.18.0"
-    babel-plugin-transform-es2015-unicode-regex "^6.3.13"
-    babel-plugin-transform-regenerator "^6.16.0"
-
-babel-preset-es2016@^6.16.0:
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2016/-/babel-preset-es2016-6.16.0.tgz#c7daf5feedeee99c867813bdf0d573d94ca12812"
-  dependencies:
-    babel-plugin-transform-exponentiation-operator "^6.3.13"
-
-babel-preset-es2017@^6.16.0:
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2017/-/babel-preset-es2017-6.16.0.tgz#536c6287778a758948ddd092b466b6ef50b786fa"
-  dependencies:
-    babel-plugin-syntax-trailing-function-commas "^6.8.0"
-    babel-plugin-transform-async-to-generator "^6.16.0"
-
-babel-preset-jest@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-17.0.2.tgz#141e935debe164aaa0364c220d31ccb2176493b2"
-  dependencies:
-    babel-plugin-jest-hoist "^17.0.2"
-
-babel-preset-latest@6.16.0:
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-latest/-/babel-preset-latest-6.16.0.tgz#5b87e19e250bb1213f13af4ec9dc7a51d53f388d"
+babel-preset-jest@^18.0.0:
+  version "18.0.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-18.0.0.tgz#84faf8ca3ec65aba7d5e3f59bbaed935ab24049e"
   dependencies:
-    babel-preset-es2015 "^6.16.0"
-    babel-preset-es2016 "^6.16.0"
-    babel-preset-es2017 "^6.16.0"
+    babel-plugin-jest-hoist "^18.0.0"
 
-babel-preset-react-app@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-2.0.1.tgz#360efa5ef73213d0fe1b60fe35db482688ee2166"
-  dependencies:
-    babel-plugin-transform-class-properties "6.16.0"
-    babel-plugin-transform-es2015-parameters "6.18.0"
-    babel-plugin-transform-object-rest-spread "6.19.0"
-    babel-plugin-transform-react-constant-elements "6.9.1"
-    babel-plugin-transform-react-jsx "6.8.0"
-    babel-plugin-transform-react-jsx-self "6.11.0"
-    babel-plugin-transform-react-jsx-source "6.9.0"
-    babel-plugin-transform-regenerator "6.16.1"
-    babel-plugin-transform-runtime "6.15.0"
-    babel-preset-env "0.0.8"
-    babel-preset-latest "6.16.0"
-    babel-preset-react "6.16.0"
-    babel-runtime "6.11.6"
-
-babel-preset-react@6.16.0:
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.16.0.tgz#aa117d60de0928607e343c4828906e4661824316"
+babel-preset-react-app@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-2.2.0.tgz#3143bcf316049f78b5f9d0422fd7822ca4715ca4"
+  dependencies:
+    babel-plugin-transform-class-properties "6.22.0"
+    babel-plugin-transform-object-rest-spread "6.22.0"
+    babel-plugin-transform-react-constant-elements "6.22.0"
+    babel-plugin-transform-react-jsx "6.22.0"
+    babel-plugin-transform-react-jsx-self "6.22.0"
+    babel-plugin-transform-react-jsx-source "6.22.0"
+    babel-plugin-transform-regenerator "6.22.0"
+    babel-plugin-transform-runtime "6.22.0"
+    babel-preset-env "1.2.1"
+    babel-preset-react "6.22.0"
+    babel-runtime "6.22.0"
+
+babel-preset-react@6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.22.0.tgz#7bc97e2d73eec4b980fb6b4e4e0884e81ccdc165"
   dependencies:
     babel-plugin-syntax-flow "^6.3.13"
     babel-plugin-syntax-jsx "^6.3.13"
-    babel-plugin-transform-flow-strip-types "^6.3.13"
-    babel-plugin-transform-react-display-name "^6.3.13"
-    babel-plugin-transform-react-jsx "^6.3.13"
-    babel-plugin-transform-react-jsx-self "^6.11.0"
-    babel-plugin-transform-react-jsx-source "^6.3.13"
+    babel-plugin-transform-flow-strip-types "^6.22.0"
+    babel-plugin-transform-react-display-name "^6.22.0"
+    babel-plugin-transform-react-jsx "^6.22.0"
+    babel-plugin-transform-react-jsx-self "^6.22.0"
+    babel-plugin-transform-react-jsx-source "^6.22.0"
 
 babel-register@^6.16.0, babel-register@^6.18.0:
   version "6.18.0"
@@ -876,12 +943,24 @@ babel-register@^6.16.0, babel-register@^6.18.0:
     mkdirp "^0.5.1"
     source-map-support "^0.4.2"
 
-babel-runtime@6.11.6:
-  version "6.11.6"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.11.6.tgz#6db707fef2d49c49bfa3cb64efdb436b518b8222"
+babel-register@^6.22.0, babel-register@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.0.tgz#5e89f8463ba9970356d02eb07dabe3308b080cfd"
+  dependencies:
+    babel-core "^6.24.0"
+    babel-runtime "^6.22.0"
+    core-js "^2.4.0"
+    home-or-tmp "^2.0.0"
+    lodash "^4.2.0"
+    mkdirp "^0.5.1"
+    source-map-support "^0.4.2"
+
+babel-runtime@6.22.0, babel-runtime@^6.18.0, babel-runtime@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.22.0.tgz#1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611"
   dependencies:
     core-js "^2.4.0"
-    regenerator-runtime "^0.9.5"
+    regenerator-runtime "^0.10.0"
 
 babel-runtime@^6.0.0, babel-runtime@^6.11.6, babel-runtime@^6.20.0, babel-runtime@^6.9.0, babel-runtime@^6.9.1:
   version "6.20.0"
@@ -900,6 +979,16 @@ babel-template@^6.14.0, babel-template@^6.15.0, babel-template@^6.16.0, babel-te
     babylon "^6.11.0"
     lodash "^4.2.0"
 
+babel-template@^6.22.0, babel-template@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.23.0.tgz#04d4f270adbb3aa704a8143ae26faa529238e638"
+  dependencies:
+    babel-runtime "^6.22.0"
+    babel-traverse "^6.23.0"
+    babel-types "^6.23.0"
+    babylon "^6.11.0"
+    lodash "^4.2.0"
+
 babel-traverse@^6.15.0, babel-traverse@^6.16.0, babel-traverse@^6.18.0, babel-traverse@^6.20.0, babel-traverse@^6.21.0:
   version "6.21.0"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.21.0.tgz#69c6365804f1a4f69eb1213f85b00a818b8c21ad"
@@ -914,6 +1003,20 @@ babel-traverse@^6.15.0, babel-traverse@^6.16.0, babel-traverse@^6.18.0, babel-tr
     invariant "^2.2.0"
     lodash "^4.2.0"
 
+babel-traverse@^6.22.1, babel-traverse@^6.23.0, babel-traverse@^6.23.1:
+  version "6.23.1"
+  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.23.1.tgz#d3cb59010ecd06a97d81310065f966b699e14f48"
+  dependencies:
+    babel-code-frame "^6.22.0"
+    babel-messages "^6.23.0"
+    babel-runtime "^6.22.0"
+    babel-types "^6.23.0"
+    babylon "^6.15.0"
+    debug "^2.2.0"
+    globals "^9.0.0"
+    invariant "^2.2.0"
+    lodash "^4.2.0"
+
 babel-types@^6.15.0, babel-types@^6.16.0, babel-types@^6.18.0, babel-types@^6.20.0, babel-types@^6.21.0, babel-types@^6.8.0, babel-types@^6.9.0:
   version "6.21.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.21.0.tgz#314b92168891ef6d3806b7f7a917fdf87c11a4b2"
@@ -923,10 +1026,23 @@ babel-types@^6.15.0, babel-types@^6.16.0, babel-types@^6.18.0, babel-types@^6.20
     lodash "^4.2.0"
     to-fast-properties "^1.0.1"
 
+babel-types@^6.19.0, babel-types@^6.22.0, babel-types@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.23.0.tgz#bb17179d7538bad38cd0c9e115d340f77e7e9acf"
+  dependencies:
+    babel-runtime "^6.22.0"
+    esutils "^2.0.2"
+    lodash "^4.2.0"
+    to-fast-properties "^1.0.1"
+
 babylon@^6.11.0, babylon@^6.13.0:
   version "6.14.1"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.14.1.tgz#956275fab72753ad9b3435d7afe58f8bf0a29815"
 
+babylon@^6.15.0:
+  version "6.16.1"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.16.1.tgz#30c5a22f481978a9e7f8cdfdf496b11d94b404d3"
+
 balanced-match@^0.4.1, balanced-match@^0.4.2:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
@@ -1012,6 +1128,13 @@ browserslist@^1.4.0, browserslist@~1.4.0:
   dependencies:
     caniuse-db "^1.0.30000539"
 
+browserslist@^1.7.1:
+  version "1.7.7"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
+  dependencies:
+    caniuse-db "^1.0.30000639"
+    electron-to-chromium "^1.2.7"
+
 bser@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bser/-/bser-1.0.2.tgz#381116970b2a6deea5646dd15dd7278444b56169"
@@ -1075,6 +1198,10 @@ caniuse-db@^1.0.30000539, caniuse-db@^1.0.30000554:
   version "1.0.30000602"
   resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000602.tgz#06b2cbfb6c3aeef7ddb18cd588043549ad1a2d4e"
 
+caniuse-db@^1.0.30000618, caniuse-db@^1.0.30000639:
+  version "1.0.30000649"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000649.tgz#1ee1754a6df235450c8b7cd15e0ebf507221a86a"
+
 cardinal@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-1.0.0.tgz#50e21c1b0aa37729f9377def196b5a9cec932ee9"
@@ -1250,7 +1377,7 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.8.x, commander@~2.8.1:
+commander@2.8.x:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
   dependencies:
@@ -1390,9 +1517,9 @@ css-color-names@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
 
-css-loader@0.26.0:
-  version "0.26.0"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.26.0.tgz#160d378f5b8e0fd4ff6daf4f3580e2219b33025f"
+css-loader@0.26.1:
+  version "0.26.1"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.26.1.tgz#2ba7f20131b93597496b3e9bb500785a49cd29ea"
   dependencies:
     babel-code-frame "^6.11.0"
     css-selector-tokenizer "^0.7.0"
@@ -1484,11 +1611,15 @@ csso@~2.2.1:
     clap "^1.0.9"
     source-map "^0.5.3"
 
-cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0":
+cssom@0.3.x:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.1.tgz#c9e37ef2490e64f6d1baa10fda852257082c25d3"
 
-"cssstyle@>= 0.2.36 < 0.3.0":
+"cssom@>= 0.3.2 < 0.4.0":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
+
+"cssstyle@>= 0.2.37 < 0.3.0":
   version "0.2.37"
   resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
   dependencies:
@@ -1520,7 +1651,7 @@ debug@2.2.0, debug@~2.2.0:
   dependencies:
     ms "0.7.1"
 
-debug@^2.1.0, debug@^2.1.1, debug@^2.2.0:
+debug@^2.1.0, debug@^2.1.1, debug@^2.2.0, debug@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
   dependencies:
@@ -1538,6 +1669,12 @@ deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
 
+default-require-extensions@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-1.0.0.tgz#f37ea15d3e13ffd9b437d33e1a75b5fb97874cb8"
+  dependencies:
+    strip-bom "^2.0.0"
+
 defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
@@ -1576,30 +1713,23 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
-detect-port@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/detect-port/-/detect-port-1.0.1.tgz#3e1aa6a7ff6677bb60894b291172529d880c1e85"
+detect-port@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/detect-port/-/detect-port-1.1.0.tgz#fde7574591ea3de74445782643c3f921b2a4618c"
   dependencies:
-    commander "~2.8.1"
+    debug "^2.6.0"
 
 diff@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.2.0.tgz#c9ce393a4b7cbd0b058a725c93df299027868ff9"
 
-doctrine@1.3.x:
+doctrine@1.3.x, doctrine@^1.2.2:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.3.0.tgz#13e75682b55518424276f7c173783456ef913d26"
   dependencies:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
-doctrine@^1.2.2:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
-  dependencies:
-    esutils "^2.0.2"
-    isarray "^1.0.0"
-
 dom-converter@~0.1:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
@@ -1662,6 +1792,14 @@ ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
+electron-to-chromium@^1.1.0, electron-to-chromium@^1.2.7:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.2.tgz#b8ce5c93b308db0e92f6d0435c46ddec8f6363ab"
+
+emoji-regex@^6.1.0:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.4.1.tgz#77486fe9cd45421d260a6238b88d721e2fad2050"
+
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -1760,7 +1898,7 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
-escodegen@1.8.x, escodegen@^1.6.1:
+escodegen@^1.6.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018"
   dependencies:
@@ -1780,9 +1918,9 @@ escope@^3.6.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-config-react-app@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-0.5.0.tgz#68c6da07d1cfbce6a992bc244ba16186b942d89f"
+eslint-config-react-app@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-0.6.2.tgz#ee535cbaaf9e3576ea16b99afe720353d8730ec0"
 
 eslint-import-resolver-node@^0.2.0:
   version "0.2.3"
@@ -1828,11 +1966,14 @@ eslint-plugin-import@2.0.1:
     minimatch "^3.0.3"
     pkg-up "^1.0.0"
 
-eslint-plugin-jsx-a11y@2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-2.2.3.tgz#4e35cb71b8a7db702ac415c806eb8e8d9ea6c65d"
+eslint-plugin-jsx-a11y@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-4.0.0.tgz#779bb0fe7b08da564a422624911de10061e048ee"
   dependencies:
+    aria-query "^0.3.0"
+    ast-types-flow "0.0.7"
     damerau-levenshtein "^1.0.0"
+    emoji-regex "^6.1.0"
     jsx-ast-utils "^1.0.0"
     object-assign "^4.0.1"
 
@@ -1843,22 +1984,23 @@ eslint-plugin-react@6.4.1:
     doctrine "^1.2.2"
     jsx-ast-utils "^1.3.1"
 
-eslint@3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.8.1.tgz#7d02db44cd5aaf4fa7aa489e1f083baa454342ba"
+eslint@3.16.1:
+  version "3.16.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.16.1.tgz#9bc31fc7341692cf772e80607508f67d711c5609"
   dependencies:
+    babel-code-frame "^6.16.0"
     chalk "^1.1.3"
     concat-stream "^1.4.6"
     debug "^2.1.1"
     doctrine "^1.2.2"
     escope "^3.6.0"
-    espree "^3.3.1"
+    espree "^3.4.0"
     estraverse "^4.2.0"
     esutils "^2.0.2"
     file-entry-cache "^2.0.0"
     glob "^7.0.3"
-    globals "^9.2.0"
-    ignore "^3.1.5"
+    globals "^9.14.0"
+    ignore "^3.2.0"
     imurmurhash "^0.1.4"
     inquirer "^0.12.0"
     is-my-json-valid "^2.10.0"
@@ -1874,21 +2016,21 @@ eslint@3.8.1:
     pluralize "^1.2.1"
     progress "^1.1.8"
     require-uncached "^1.0.2"
-    shelljs "^0.6.0"
+    shelljs "^0.7.5"
     strip-bom "^3.0.0"
-    strip-json-comments "~1.0.1"
+    strip-json-comments "~2.0.1"
     table "^3.7.8"
     text-table "~0.2.0"
     user-home "^2.0.0"
 
-espree@^3.3.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.3.2.tgz#dbf3fadeb4ecb4d4778303e50103b3d36c88b89c"
+espree@^3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.1.tgz#28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2"
   dependencies:
-    acorn "^4.0.1"
+    acorn "^5.0.1"
     acorn-jsx "^3.0.0"
 
-esprima@2.7.x, esprima@^2.6.0, esprima@^2.7.1:
+esprima@^2.6.0, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
 
@@ -2071,9 +2213,9 @@ file-entry-cache@^2.0.0:
     flat-cache "^1.2.1"
     object-assign "^4.0.1"
 
-file-loader@0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.9.0.tgz#1d2daddd424ce6d1b07cfe3f79731bed3617ab42"
+file-loader@0.10.0:
+  version "0.10.0"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-0.10.0.tgz#bbe6db7474ac92c7f54fdc197cf547e98b6b8e12"
   dependencies:
     loader-utils "~0.2.5"
 
@@ -2184,7 +2326,14 @@ fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
-fsevents@1.0.14, fsevents@^1.0.0:
+fsevents@1.0.17:
+  version "1.0.17"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.0.17.tgz#8537f3f12272678765b4fd6528c0f1f66f8f4558"
+  dependencies:
+    nan "^2.3.0"
+    node-pre-gyp "^0.6.29"
+
+fsevents@^1.0.0:
   version "1.0.14"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.0.14.tgz#558e8cc38643d8ef40fe45158486d0d25758eee4"
   dependencies:
@@ -2259,17 +2408,7 @@ glob-parent@^2.0.0:
   dependencies:
     is-glob "^2.0.0"
 
-glob@^5.0.15:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.0.3, glob@^7.0.5:
+glob@^7.0.0, glob@^7.0.3, glob@^7.0.5:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
   dependencies:
@@ -2280,7 +2419,7 @@ glob@^7.0.3, glob@^7.0.5:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-globals@^9.0.0, globals@^9.2.0:
+globals@^9.0.0, globals@^9.14.0:
   version "9.14.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.14.0.tgz#8859936af0038741263053b39d0e76ca241e4034"
 
@@ -2313,7 +2452,7 @@ gzip-size@3.0.0:
   dependencies:
     duplexer "^0.1.1"
 
-handlebars@^4.0.1, handlebars@^4.0.3:
+handlebars@^4.0.3:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.6.tgz#2ce4484850537f9c97a8026d5399b935c4ed4ed7"
   dependencies:
@@ -2435,7 +2574,16 @@ http-errors@~1.5.0:
     setprototypeof "1.0.2"
     statuses ">= 1.3.1 < 2"
 
-http-proxy-middleware@0.17.2, http-proxy-middleware@~0.17.1:
+http-proxy-middleware@0.17.3:
+  version "0.17.3"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.3.tgz#940382147149b856084f5534752d5b5a8168cd1d"
+  dependencies:
+    http-proxy "^1.16.2"
+    is-glob "^3.1.0"
+    lodash "^4.17.2"
+    micromatch "^2.3.11"
+
+http-proxy-middleware@~0.17.1:
   version "0.17.2"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.2.tgz#572d517a6d2fb1063a469de294eed96066352007"
   dependencies:
@@ -2444,7 +2592,7 @@ http-proxy-middleware@0.17.2, http-proxy-middleware@~0.17.1:
     lodash "^4.16.2"
     micromatch "^2.3.11"
 
-http-proxy@^1.15.1:
+http-proxy@^1.15.1, http-proxy@^1.16.2:
   version "1.16.2"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742"
   dependencies:
@@ -2467,7 +2615,7 @@ iconv-lite@0.4.13:
   version "0.4.13"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
 
-iconv-lite@^0.4.13, iconv-lite@~0.4.13:
+iconv-lite@~0.4.13:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
 
@@ -2479,9 +2627,9 @@ ieee754@^1.1.4:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
 
-ignore@^3.1.5:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.0.tgz#8d88f03c3002a0ac52114db25d2c673b0bf1e435"
+ignore@^3.2.0:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.6.tgz#26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c"
 
 imurmurhash@^0.1.4:
   version "0.1.4"
@@ -2536,7 +2684,11 @@ interpret@^0.6.4:
   version "0.6.6"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-0.6.6.tgz#fecd7a18e7ce5ca6abfb953e1f86213a49f1625b"
 
-invariant@^2.2.0:
+interpret@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.2.tgz#f4f623f0bb7122f15f5717c8e254b8161b5c5b2d"
+
+invariant@^2.2.0, invariant@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
   dependencies:
@@ -2624,7 +2776,7 @@ is-glob@^2.0.0, is-glob@^2.0.1:
   dependencies:
     is-extglob "^1.0.0"
 
-is-glob@^3.0.0:
+is-glob@^3.0.0, is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
   dependencies:
@@ -2730,33 +2882,37 @@ isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
-istanbul-api@^1.0.0-aplha.10:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.0.tgz#fb3f62edd5bfc6ae09da09453ded6e10ae7e483b"
+istanbul-api@^1.1.0-alpha.1:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.7.tgz#f6f37f09f8002b130f891c646b70ee4a8e7345ae"
   dependencies:
     async "^2.1.4"
     fileset "^2.0.2"
-    istanbul-lib-coverage "^1.0.0"
-    istanbul-lib-hook "^1.0.0-alpha.4"
-    istanbul-lib-instrument "^1.3.0"
-    istanbul-lib-report "^1.0.0-alpha.3"
-    istanbul-lib-source-maps "^1.1.0"
-    istanbul-reports "^1.0.0"
+    istanbul-lib-coverage "^1.0.2"
+    istanbul-lib-hook "^1.0.5"
+    istanbul-lib-instrument "^1.7.0"
+    istanbul-lib-report "^1.0.0"
+    istanbul-lib-source-maps "^1.1.1"
+    istanbul-reports "^1.0.2"
     js-yaml "^3.7.0"
     mkdirp "^0.5.1"
     once "^1.4.0"
 
-istanbul-lib-coverage@^1.0.0, istanbul-lib-coverage@^1.0.0-alpha, istanbul-lib-coverage@^1.0.0-alpha.0:
+istanbul-lib-coverage@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.0.tgz#c3f9b6d226da12424064cce87fce0fb57fdfa7a2"
 
-istanbul-lib-hook@^1.0.0-alpha.4:
-  version "1.0.0-alpha.4"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.0-alpha.4.tgz#8c5bb9f6fbd8526e0ae6cf639af28266906b938f"
+istanbul-lib-coverage@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.2.tgz#87a0c015b6910651cb3b184814dfb339337e25e1"
+
+istanbul-lib-hook@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.5.tgz#6ca3d16d60c5f4082da39f7c5cd38ea8a772b88e"
   dependencies:
-    append-transform "^0.3.0"
+    append-transform "^0.4.0"
 
-istanbul-lib-instrument@^1.1.1, istanbul-lib-instrument@^1.1.4, istanbul-lib-instrument@^1.3.0:
+istanbul-lib-instrument@^1.1.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.3.1.tgz#112c25a4f2f9bc361d13d14bbff992331b974e52"
   dependencies:
@@ -2768,79 +2924,70 @@ istanbul-lib-instrument@^1.1.1, istanbul-lib-instrument@^1.1.4, istanbul-lib-ins
     istanbul-lib-coverage "^1.0.0"
     semver "^5.3.0"
 
-istanbul-lib-report@^1.0.0-alpha.3:
-  version "1.0.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.0.0-alpha.3.tgz#32d5f6ec7f33ca3a602209e278b2e6ff143498af"
+istanbul-lib-instrument@^1.4.2, istanbul-lib-instrument@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.0.tgz#b8e0dc25709bb44e17336ab47b7bb5c97c23f659"
+  dependencies:
+    babel-generator "^6.18.0"
+    babel-template "^6.16.0"
+    babel-traverse "^6.18.0"
+    babel-types "^6.18.0"
+    babylon "^6.13.0"
+    istanbul-lib-coverage "^1.0.2"
+    semver "^5.3.0"
+
+istanbul-lib-report@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.0.0.tgz#d83dac7f26566b521585569367fe84ccfc7aaecb"
   dependencies:
-    async "^1.4.2"
-    istanbul-lib-coverage "^1.0.0-alpha"
+    istanbul-lib-coverage "^1.0.2"
     mkdirp "^0.5.1"
     path-parse "^1.0.5"
-    rimraf "^2.4.3"
     supports-color "^3.1.2"
 
-istanbul-lib-source-maps@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.1.0.tgz#9d429218f35b823560ea300a96ff0c3bbdab785f"
+istanbul-lib-source-maps@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.1.1.tgz#f8c8c2e8f2160d1d91526d97e5bd63b2079af71c"
   dependencies:
-    istanbul-lib-coverage "^1.0.0-alpha.0"
+    istanbul-lib-coverage "^1.0.2"
     mkdirp "^0.5.1"
     rimraf "^2.4.4"
     source-map "^0.5.3"
 
-istanbul-reports@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.0.0.tgz#24b4eb2b1d29d50f103b369bd422f6e640aa0777"
+istanbul-reports@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.0.2.tgz#4e8366abe6fa746cc1cd6633f108de12cc6ac6fa"
   dependencies:
     handlebars "^4.0.3"
 
-istanbul@^0.4.5:
-  version "0.4.5"
-  resolved "https://registry.yarnpkg.com/istanbul/-/istanbul-0.4.5.tgz#65c7d73d4c4da84d4f3ac310b918fb0b8033733b"
-  dependencies:
-    abbrev "1.0.x"
-    async "1.x"
-    escodegen "1.8.x"
-    esprima "2.7.x"
-    glob "^5.0.15"
-    handlebars "^4.0.1"
-    js-yaml "3.x"
-    mkdirp "0.5.x"
-    nopt "3.x"
-    once "1.x"
-    resolve "1.1.x"
-    supports-color "^3.1.0"
-    which "^1.1.1"
-    wordwrap "^1.0.0"
-
 jest-changed-files@^17.0.2:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-17.0.2.tgz#f5657758736996f590a51b87e5c9369d904ba7b7"
 
-jest-cli@^17.0.2:
-  version "17.0.3"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-17.0.3.tgz#700b8c02a9ea0ec9eab0cd5a9fd42d8a858ce146"
+jest-cli@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-18.1.0.tgz#5ead36ecad420817c2c9baa2aa7574f63257b3d6"
   dependencies:
     ansi-escapes "^1.4.0"
     callsites "^2.0.0"
     chalk "^1.1.1"
     graceful-fs "^4.1.6"
     is-ci "^1.0.9"
-    istanbul-api "^1.0.0-aplha.10"
+    istanbul-api "^1.1.0-alpha.1"
     istanbul-lib-coverage "^1.0.0"
     istanbul-lib-instrument "^1.1.1"
     jest-changed-files "^17.0.2"
-    jest-config "^17.0.3"
-    jest-environment-jsdom "^17.0.2"
+    jest-config "^18.1.0"
+    jest-environment-jsdom "^18.1.0"
     jest-file-exists "^17.0.0"
-    jest-haste-map "^17.0.3"
-    jest-jasmine2 "^17.0.3"
-    jest-mock "^17.0.2"
-    jest-resolve "^17.0.3"
-    jest-resolve-dependencies "^17.0.3"
-    jest-runtime "^17.0.3"
-    jest-snapshot "^17.0.3"
-    jest-util "^17.0.2"
+    jest-haste-map "^18.1.0"
+    jest-jasmine2 "^18.1.0"
+    jest-mock "^18.0.0"
+    jest-resolve "^18.1.0"
+    jest-resolve-dependencies "^18.1.0"
+    jest-runtime "^18.1.0"
+    jest-snapshot "^18.1.0"
+    jest-util "^18.1.0"
     json-stable-stringify "^1.0.0"
     node-notifier "^4.6.1"
     sane "~1.4.1"
@@ -2850,149 +2997,150 @@ jest-cli@^17.0.2:
     worker-farm "^1.3.1"
     yargs "^6.3.0"
 
-jest-config@^17.0.3:
-  version "17.0.3"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-17.0.3.tgz#b6ed75d90d090b731fd894231904cadb7d5a5df2"
+jest-config@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-18.1.0.tgz#6111740a6d48aab86ff5a9e6ab0b98bd993b6ff4"
   dependencies:
     chalk "^1.1.1"
-    istanbul "^0.4.5"
-    jest-environment-jsdom "^17.0.2"
-    jest-environment-node "^17.0.2"
-    jest-jasmine2 "^17.0.3"
-    jest-mock "^17.0.2"
-    jest-resolve "^17.0.3"
-    jest-util "^17.0.2"
+    jest-environment-jsdom "^18.1.0"
+    jest-environment-node "^18.1.0"
+    jest-jasmine2 "^18.1.0"
+    jest-mock "^18.0.0"
+    jest-resolve "^18.1.0"
+    jest-util "^18.1.0"
     json-stable-stringify "^1.0.0"
 
-jest-diff@^17.0.3:
-  version "17.0.3"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-17.0.3.tgz#8fb31efab3b314d7b61b7b66b0bdea617ef1c02f"
+jest-diff@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-18.1.0.tgz#4ff79e74dd988c139195b365dc65d87f606f4803"
   dependencies:
     chalk "^1.1.3"
     diff "^3.0.0"
-    jest-matcher-utils "^17.0.3"
-    pretty-format "~4.2.1"
+    jest-matcher-utils "^18.1.0"
+    pretty-format "^18.1.0"
 
-jest-environment-jsdom@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-17.0.2.tgz#a3098dc29806d40802c52b62b848ab6aa00fdba0"
+jest-environment-jsdom@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-18.1.0.tgz#18b42f0c4ea2bae9f36cab3639b1e8f8c384e24e"
   dependencies:
-    jest-mock "^17.0.2"
-    jest-util "^17.0.2"
-    jsdom "^9.8.1"
+    jest-mock "^18.0.0"
+    jest-util "^18.1.0"
+    jsdom "^9.9.1"
 
-jest-environment-node@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-17.0.2.tgz#aff6133f4ca2faddcc5b0ce7d25cec83e16d8463"
+jest-environment-node@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-18.1.0.tgz#4d6797572c8dda99acf5fae696eb62945547c779"
   dependencies:
-    jest-mock "^17.0.2"
-    jest-util "^17.0.2"
+    jest-mock "^18.0.0"
+    jest-util "^18.1.0"
 
 jest-file-exists@^17.0.0:
   version "17.0.0"
   resolved "https://registry.yarnpkg.com/jest-file-exists/-/jest-file-exists-17.0.0.tgz#7f63eb73a1c43a13f461be261768b45af2cdd169"
 
-jest-haste-map@^17.0.3:
-  version "17.0.3"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-17.0.3.tgz#5232783e70577217b6b17d2a1c1766637a1d2fbd"
+jest-haste-map@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-18.1.0.tgz#06839c74b770a40c1a106968851df8d281c08375"
   dependencies:
     fb-watchman "^1.9.0"
     graceful-fs "^4.1.6"
-    multimatch "^2.1.0"
+    micromatch "^2.3.11"
     sane "~1.4.1"
     worker-farm "^1.3.1"
 
-jest-jasmine2@^17.0.3:
-  version "17.0.3"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-17.0.3.tgz#d4336b89f3ad288269a1c8e2bfc180dcf89c6ad1"
+jest-jasmine2@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-18.1.0.tgz#094e104c2c189708766c77263bb2aecb5860a80b"
   dependencies:
     graceful-fs "^4.1.6"
-    jest-matchers "^17.0.3"
-    jest-snapshot "^17.0.3"
-    jest-util "^17.0.2"
+    jest-matcher-utils "^18.1.0"
+    jest-matchers "^18.1.0"
+    jest-snapshot "^18.1.0"
+    jest-util "^18.1.0"
 
-jest-matcher-utils@^17.0.3:
-  version "17.0.3"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-17.0.3.tgz#f108e49b956e152c6626dcc0aba864f59ab7b0d3"
+jest-matcher-utils@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-18.1.0.tgz#1ac4651955ee2a60cef1e7fcc98cdfd773c0f932"
   dependencies:
     chalk "^1.1.3"
-    pretty-format "~4.2.1"
+    pretty-format "^18.1.0"
 
-jest-matchers@^17.0.3:
-  version "17.0.3"
-  resolved "https://registry.yarnpkg.com/jest-matchers/-/jest-matchers-17.0.3.tgz#88b95348c919343db86d08f12354a8650ae7eddf"
+jest-matchers@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-matchers/-/jest-matchers-18.1.0.tgz#0341484bf87a1fd0bac0a4d2c899e2b77a3f1ead"
   dependencies:
-    jest-diff "^17.0.3"
-    jest-matcher-utils "^17.0.3"
-    jest-util "^17.0.2"
+    jest-diff "^18.1.0"
+    jest-matcher-utils "^18.1.0"
+    jest-util "^18.1.0"
+    pretty-format "^18.1.0"
 
-jest-mock@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-17.0.2.tgz#3dfe9221afd9aa61b3d9992840813a358bb2f429"
+jest-mock@^18.0.0:
+  version "18.0.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-18.0.0.tgz#5c248846ea33fa558b526f5312ab4a6765e489b3"
 
-jest-resolve-dependencies@^17.0.3:
-  version "17.0.3"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-17.0.3.tgz#bbd37f4643704b97a980927212f3ab12b06e8894"
+jest-resolve-dependencies@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-18.1.0.tgz#8134fb5caf59c9ed842fe0152ab01c52711f1bbb"
   dependencies:
     jest-file-exists "^17.0.0"
-    jest-resolve "^17.0.3"
+    jest-resolve "^18.1.0"
 
-jest-resolve@^17.0.3:
-  version "17.0.3"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-17.0.3.tgz#7692a79de2831874375e9d664bc782c29e4da262"
+jest-resolve@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-18.1.0.tgz#6800accb536658c906cd5e29de412b1ab9ac249b"
   dependencies:
     browser-resolve "^1.11.2"
     jest-file-exists "^17.0.0"
-    jest-haste-map "^17.0.3"
-    resolve "^1.1.6"
+    jest-haste-map "^18.1.0"
+    resolve "^1.2.0"
 
-jest-runtime@^17.0.3:
-  version "17.0.3"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-17.0.3.tgz#eff4055fe8c3e17c95ed1aaaf5f719c420b86b1f"
+jest-runtime@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-18.1.0.tgz#3abfd687175b21fc3b85a2b8064399e997859922"
   dependencies:
     babel-core "^6.0.0"
-    babel-jest "^17.0.2"
-    babel-plugin-istanbul "^2.0.0"
+    babel-jest "^18.0.0"
+    babel-plugin-istanbul "^3.0.0"
     chalk "^1.1.3"
     graceful-fs "^4.1.6"
-    jest-config "^17.0.3"
+    jest-config "^18.1.0"
     jest-file-exists "^17.0.0"
-    jest-haste-map "^17.0.3"
-    jest-mock "^17.0.2"
-    jest-resolve "^17.0.3"
-    jest-snapshot "^17.0.3"
-    jest-util "^17.0.2"
+    jest-haste-map "^18.1.0"
+    jest-mock "^18.0.0"
+    jest-resolve "^18.1.0"
+    jest-snapshot "^18.1.0"
+    jest-util "^18.1.0"
     json-stable-stringify "^1.0.0"
-    multimatch "^2.1.0"
+    micromatch "^2.3.11"
     yargs "^6.3.0"
 
-jest-snapshot@^17.0.3:
-  version "17.0.3"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-17.0.3.tgz#c8199db4ccbd5515cfecc8e800ab076bdda7abc0"
+jest-snapshot@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-18.1.0.tgz#55b96d2ee639c9bce76f87f2a3fd40b71c7a5916"
   dependencies:
-    jest-diff "^17.0.3"
+    jest-diff "^18.1.0"
     jest-file-exists "^17.0.0"
-    jest-matcher-utils "^17.0.3"
-    jest-util "^17.0.2"
+    jest-matcher-utils "^18.1.0"
+    jest-util "^18.1.0"
     natural-compare "^1.4.0"
-    pretty-format "~4.2.1"
+    pretty-format "^18.1.0"
 
-jest-util@^17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-17.0.2.tgz#9fd9da8091e9904fb976da7e4d8912ca26968638"
+jest-util@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-18.1.0.tgz#3a99c32114ab17f84be094382527006e6d4bfc6a"
   dependencies:
     chalk "^1.1.1"
     diff "^3.0.0"
     graceful-fs "^4.1.6"
     jest-file-exists "^17.0.0"
-    jest-mock "^17.0.2"
+    jest-mock "^18.0.0"
     mkdirp "^0.5.1"
 
-jest@17.0.2:
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-17.0.2.tgz#a095e19f0b28f3f9925ec16b5bd67d5276d2756b"
+jest@18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-18.1.0.tgz#bcebf1e203dee5c2ad2091c805300a343d9e6c7d"
   dependencies:
-    jest-cli "^17.0.2"
+    jest-cli "^18.1.0"
 
 jodid25519@^1.0.0:
   version "1.0.2"
@@ -3008,16 +3156,20 @@ js-tokens@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-2.0.0.tgz#79903f5563ee778cc1162e6dcf1a0027c97f9cb5"
 
-js-yaml@3.x, js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
+js-tokens@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
+
+js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@~3.6.1:
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"
   dependencies:
     argparse "^1.0.7"
     esprima "^2.6.0"
 
-js-yaml@~3.6.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.6.1.tgz#6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"
+js-yaml@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
   dependencies:
     argparse "^1.0.7"
     esprima "^2.6.0"
@@ -3026,30 +3178,29 @@ jsbn@~0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.0.tgz#650987da0dd74f4ebf5a11377a2aa2d273e97dfd"
 
-jsdom@^9.8.1:
-  version "9.9.1"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.9.1.tgz#84f3972ad394ab963233af8725211bce4d01bfd5"
+jsdom@^9.9.1:
+  version "9.12.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz#e8c546fffcb06c00d4833ca84410fed7f8a097d4"
   dependencies:
-    abab "^1.0.0"
-    acorn "^2.4.0"
-    acorn-globals "^1.0.4"
+    abab "^1.0.3"
+    acorn "^4.0.4"
+    acorn-globals "^3.1.0"
     array-equal "^1.0.0"
     content-type-parser "^1.0.1"
-    cssom ">= 0.3.0 < 0.4.0"
-    cssstyle ">= 0.2.36 < 0.3.0"
+    cssom ">= 0.3.2 < 0.4.0"
+    cssstyle ">= 0.2.37 < 0.3.0"
     escodegen "^1.6.1"
     html-encoding-sniffer "^1.0.1"
-    iconv-lite "^0.4.13"
     nwmatcher ">= 1.3.9 < 2.0.0"
     parse5 "^1.5.1"
-    request "^2.55.0"
-    sax "^1.1.4"
-    symbol-tree ">= 3.1.0 < 4.0.0"
-    tough-cookie "^2.3.1"
-    webidl-conversions "^3.0.1"
+    request "^2.79.0"
+    sax "^1.2.1"
+    symbol-tree "^3.2.1"
+    tough-cookie "^2.3.2"
+    webidl-conversions "^4.0.0"
     whatwg-encoding "^1.0.1"
-    whatwg-url "^4.1.0"
-    xml-name-validator ">= 2.0.1 < 3.0.0"
+    whatwg-url "^4.3.0"
+    xml-name-validator "^2.0.1"
 
 jsesc@^1.3.0:
   version "1.3.0"
@@ -3251,7 +3402,7 @@ lodash.pickby@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff"
 
-"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.2, lodash@^4.16.4, lodash@^4.2.0, lodash@^4.3.0:
+"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.2, lodash@^4.16.4, lodash@^4.17.2, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -3376,18 +3527,12 @@ mime@1.3.4, mime@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
-"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3:
+minimatch@3.0.3, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
   dependencies:
     brace-expansion "^1.0.0"
 
-minimatch@3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.2.tgz#0f398a7300ea441e9c348c83d98ab8c9dbf9c40a"
-  dependencies:
-    brace-expansion "^1.0.0"
-
 minimist@0.0.8, minimist@~0.0.1:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
@@ -3396,7 +3541,7 @@ minimist@^1.1.1, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
+"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
@@ -3410,15 +3555,6 @@ ms@0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
 
-multimatch@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-2.1.0.tgz#9c7906a22fb4c02919e2f5f75161b4cdbd4b2a2b"
-  dependencies:
-    array-differ "^1.0.0"
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    minimatch "^3.0.0"
-
 mute-stream@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
@@ -3518,7 +3654,7 @@ node-pre-gyp@^0.6.29:
     tar "~2.2.1"
     tar-pack "~3.3.0"
 
-nopt@3.x, nopt@~3.0.6:
+nopt@~3.0.6:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
   dependencies:
@@ -3581,7 +3717,11 @@ oauth-sign@~0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
-object-assign@4.1.0, object-assign@^4.0.1, object-assign@^4.1.0:
+object-assign@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+
+object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
 
@@ -3602,7 +3742,7 @@ on-headers@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7"
 
-once@1.x, once@^1.3.0, once@^1.4.0:
+once@^1.3.0, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
@@ -3708,16 +3848,16 @@ path-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
 
-path-exists@2.1.0, path-exists@^2.0.0:
+path-exists@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-1.0.0.tgz#d5a8998eb71ef37a74c34eb0d9eba6e878eea081"
+
+path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
   dependencies:
     pinkie-promise "^2.0.0"
 
-path-exists@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-1.0.0.tgz#d5a8998eb71ef37a74c34eb0d9eba6e878eea081"
-
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -3837,37 +3977,37 @@ postcss-filter-plugins@^2.0.0:
     postcss "^5.0.4"
     uniqid "^4.0.0"
 
-postcss-load-config@^1.0.0-rc:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.0.0.tgz#1399f60dcd6bd9c3124b2eb22960f77f9dc08b3d"
+postcss-load-config@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-1.2.0.tgz#539e9afc9ddc8620121ebf9d8c3673e0ce50d28a"
   dependencies:
     cosmiconfig "^2.1.0"
     object-assign "^4.1.0"
-    postcss-load-options "^1.0.2"
-    postcss-load-plugins "^2.0.0"
+    postcss-load-options "^1.2.0"
+    postcss-load-plugins "^2.3.0"
 
-postcss-load-options@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-load-options/-/postcss-load-options-1.0.2.tgz#b99eb5759a588f4b2dd8b6471c6985f72060e7b0"
+postcss-load-options@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-load-options/-/postcss-load-options-1.2.0.tgz#b098b1559ddac2df04bc0bb375f99a5cfe2b6d8c"
   dependencies:
     cosmiconfig "^2.1.0"
     object-assign "^4.1.0"
 
-postcss-load-plugins@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-plugins/-/postcss-load-plugins-2.1.0.tgz#dbb6f46271df8d16e19b5d691ebda5175ce424a0"
+postcss-load-plugins@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz#745768116599aca2f009fad426b00175049d8d92"
   dependencies:
     cosmiconfig "^2.1.1"
     object-assign "^4.1.0"
 
-postcss-loader@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-1.0.0.tgz#e3b65d0c8596c1658f79d7db2d291310748d5d2a"
+postcss-loader@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-1.2.2.tgz#bbf4e19a8cde85597e0c9bfd96015fe775a157ac"
   dependencies:
     loader-utils "^0.2.16"
     object-assign "^4.1.0"
-    postcss "^5.2.4"
-    postcss-load-config "^1.0.0-rc"
+    postcss "^5.2.9"
+    postcss-load-config "^1.1.0"
 
 postcss-merge-idents@^2.1.5:
   version "2.1.7"
@@ -4043,6 +4183,15 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0
     source-map "^0.5.6"
     supports-color "^3.1.2"
 
+postcss@^5.2.11, postcss@^5.2.9:
+  version "5.2.16"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.16.tgz#732b3100000f9ff8379a48a53839ed097376ad57"
+  dependencies:
+    chalk "^1.1.3"
+    js-base64 "^2.1.9"
+    source-map "^0.5.6"
+    supports-color "^3.2.3"
+
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -4062,11 +4211,13 @@ pretty-error@^2.0.2:
     renderkid "~2.0.0"
     utila "~0.4"
 
-pretty-format@~4.2.1:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-4.2.3.tgz#8894c2ac81419cf801629d8f66320a25380d8b05"
+pretty-format@^18.1.0:
+  version "18.1.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-18.1.0.tgz#fb65a86f7a7f9194963eee91865c1bcf1039e284"
+  dependencies:
+    ansi-styles "^2.2.1"
 
-private@^0.1.6, private@~0.1.5:
+private@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.6.tgz#55c6a976d0f9bafb9924851350fe47b9b5fbb7c1"
 
@@ -4162,16 +4313,19 @@ rc@~1.1.6:
     minimist "^1.2.0"
     strip-json-comments "~1.0.4"
 
-react-dev-utils@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-0.4.2.tgz#ba6fae581fe945a2fc402e9b27c71fda4f62f6a1"
+react-dev-utils@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-0.5.2.tgz#50d0b962d3a94b6c2e8f2011ed6468e4124bc410"
   dependencies:
     ansi-html "0.0.5"
     chalk "1.1.3"
     escape-string-regexp "1.0.5"
+    filesize "3.3.0"
+    gzip-size "3.0.0"
     html-entities "1.2.0"
     opn "4.0.2"
-    sockjs-client "1.0.3"
+    recursive-readdir "2.1.1"
+    sockjs-client "1.0.1"
     strip-ansi "3.0.1"
 
 react-dom@^15.4.1:
@@ -4182,54 +4336,50 @@ react-dom@^15.4.1:
     loose-envify "^1.1.0"
     object-assign "^4.1.0"
 
-react-scripts@0.8.4:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-0.8.4.tgz#6c41a0ffb76985359fec3cf641ae7e788d905883"
+react-scripts@0.9.5:
+  version "0.9.5"
+  resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-0.9.5.tgz#e9f05c8427e27131662a9b9d7a9786d1ff16bb3f"
   dependencies:
-    autoprefixer "6.5.1"
-    babel-core "6.17.0"
+    autoprefixer "6.7.2"
+    babel-core "6.22.1"
     babel-eslint "7.1.1"
-    babel-jest "17.0.2"
-    babel-loader "6.2.7"
-    babel-preset-react-app "^2.0.1"
+    babel-jest "18.0.0"
+    babel-loader "6.2.10"
+    babel-preset-react-app "^2.2.0"
+    babel-runtime "^6.20.0"
     case-sensitive-paths-webpack-plugin "1.1.4"
     chalk "1.1.3"
     connect-history-api-fallback "1.3.0"
     cross-spawn "4.0.2"
-    css-loader "0.26.0"
-    detect-port "1.0.1"
+    css-loader "0.26.1"
+    detect-port "1.1.0"
     dotenv "2.0.0"
-    eslint "3.8.1"
-    eslint-config-react-app "^0.5.0"
+    eslint "3.16.1"
+    eslint-config-react-app "^0.6.2"
     eslint-loader "1.6.0"
     eslint-plugin-flowtype "2.21.0"
     eslint-plugin-import "2.0.1"
-    eslint-plugin-jsx-a11y "2.2.3"
+    eslint-plugin-jsx-a11y "4.0.0"
     eslint-plugin-react "6.4.1"
     extract-text-webpack-plugin "1.0.1"
-    file-loader "0.9.0"
-    filesize "3.3.0"
+    file-loader "0.10.0"
     fs-extra "0.30.0"
-    gzip-size "3.0.0"
     html-webpack-plugin "2.24.0"
-    http-proxy-middleware "0.17.2"
-    jest "17.0.2"
+    http-proxy-middleware "0.17.3"
+    jest "18.1.0"
     json-loader "0.5.4"
-    object-assign "4.1.0"
-    path-exists "2.1.0"
-    postcss-loader "1.0.0"
+    object-assign "4.1.1"
+    postcss-loader "1.2.2"
     promise "7.1.1"
-    react-dev-utils "^0.4.2"
-    recursive-readdir "2.1.0"
-    strip-ansi "3.0.1"
+    react-dev-utils "^0.5.2"
     style-loader "0.13.1"
     url-loader "0.5.7"
     webpack "1.14.0"
     webpack-dev-server "1.16.2"
     webpack-manifest-plugin "1.1.0"
-    whatwg-fetch "1.0.0"
+    whatwg-fetch "2.0.2"
   optionalDependencies:
-    fsevents "1.0.14"
+    fsevents "1.0.17"
 
 react@^15.4.1:
   version "15.4.1"
@@ -4304,11 +4454,17 @@ readline2@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     mute-stream "0.0.5"
 
-recursive-readdir@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.1.0.tgz#78b7bfd79582d3d7596b8ff1bd29fbd50229f6aa"
+rechoir@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  dependencies:
+    resolve "^1.1.6"
+
+recursive-readdir@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.1.1.tgz#a01cfc7f7f38a53ec096a096f63a50489c3e297c"
   dependencies:
-    minimatch "3.0.2"
+    minimatch "3.0.3"
 
 redeyed@~1.0.0:
   version "1.0.1"
@@ -4338,9 +4494,13 @@ regenerator-runtime@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz#257f41961ce44558b18f7814af48c17559f9faeb"
 
-regenerator-runtime@^0.9.5:
-  version "0.9.6"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz#d33eb95d0d2001a4be39659707c51b0cb71ce029"
+regenerator-transform@0.9.8:
+  version "0.9.8"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.9.8.tgz#0f88bb2bc03932ddb7b6b7312e68078f01026d6c"
+  dependencies:
+    babel-runtime "^6.18.0"
+    babel-types "^6.19.0"
+    private "^0.1.6"
 
 regex-cache@^0.4.2:
   version "0.4.3"
@@ -4403,7 +4563,7 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-request@^2.55.0, request@^2.79.0:
+request@^2.79.0:
   version "2.79.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
   dependencies:
@@ -4455,11 +4615,11 @@ resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
 
-resolve@1.1.7, resolve@1.1.x:
+resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.1.6:
+resolve@^1.1.6, resolve@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.2.0.tgz#9589c3f2f6149d1417a40becc1663db6ec6bc26c"
 
@@ -4476,7 +4636,7 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@~2.5.1, rimraf@~2.5.4:
+rimraf@2, rimraf@^2.2.8, rimraf@^2.4.4, rimraf@~2.5.1, rimraf@~2.5.4:
   version "2.5.4"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
   dependencies:
@@ -4507,7 +4667,7 @@ sane@~1.4.1:
     walker "~1.0.5"
     watch "~0.10.0"
 
-sax@^1.1.4, sax@~1.2.1:
+sax@^1.2.1, sax@~1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
 
@@ -4578,9 +4738,13 @@ shebang-regex@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
 
-shelljs@^0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.6.1.tgz#ec6211bed1920442088fe0f70b2837232ed2c8a8"
+shelljs@^0.7.5:
+  version "0.7.7"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
+  dependencies:
+    glob "^7.0.0"
+    interpret "^1.0.0"
+    rechoir "^0.6.2"
 
 shellwords@^0.1.0:
   version "0.1.0"
@@ -4604,7 +4768,18 @@ sntp@1.x.x:
   dependencies:
     hoek "2.x.x"
 
-sockjs-client@1.0.3, sockjs-client@^1.0.3:
+sockjs-client@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.0.1.tgz#8943ae05b46547bc2054816c409002cf5e2fe026"
+  dependencies:
+    debug "^2.1.0"
+    eventsource "^0.1.3"
+    faye-websocket "~0.7.3"
+    inherits "^2.0.1"
+    json3 "^3.3.2"
+    url-parse "^1.0.1"
+
+sockjs-client@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.0.3.tgz#b0d8280998460eb2564c5d79d7e3d7cfd8a353ad"
   dependencies:
@@ -4759,10 +4934,14 @@ strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
 
-strip-json-comments@~1.0.1, strip-json-comments@~1.0.4:
+strip-json-comments@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"
 
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+
 style-loader@0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.13.1.tgz#468280efbc0473023cd3a6cd56e33b5a1d7fc3a9"
@@ -4783,6 +4962,12 @@ supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.1.2:
   dependencies:
     has-flag "^1.0.0"
 
+supports-color@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
+  dependencies:
+    has-flag "^1.0.0"
+
 svgo@^0.7.0:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.1.tgz#287320fed972cb097e72c2bb1685f96fe08f8034"
@@ -4795,9 +4980,9 @@ svgo@^0.7.0:
     sax "~1.2.1"
     whet.extend "~0.9.9"
 
-"symbol-tree@>= 3.1.0 < 4.0.0":
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.1.tgz#8549dd1d01fa9f893c18cc9ab0b106b4d9b168cb"
+symbol-tree@^3.2.1:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
 table@^3.7.8:
   version "3.8.3"
@@ -4835,9 +5020,9 @@ tar@~2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
-test-exclude@^2.1.1:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-2.1.3.tgz#a8d8968e1da83266f9864f2852c55e220f06434a"
+test-exclude@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-3.3.0.tgz#7a17ca1239988c98367b0621456dbb7d4bc38977"
   dependencies:
     arrify "^1.0.1"
     micromatch "^2.3.11"
@@ -4879,7 +5064,7 @@ toposort@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.0.tgz#b66cf385a1a8a8e68e45b8259e7f55875e8b06ef"
 
-tough-cookie@^2.3.1, tough-cookie@~2.3.0:
+tough-cookie@^2.3.2, tough-cookie@~2.3.0:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a"
   dependencies:
@@ -4889,6 +5074,10 @@ tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
 
+trim-right@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
+
 tryit@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
@@ -5074,10 +5263,14 @@ watchpack@^0.2.1:
     chokidar "^1.0.0"
     graceful-fs "^4.1.2"
 
-webidl-conversions@^3.0.0, webidl-conversions@^3.0.1:
+webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
 
+webidl-conversions@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.1.tgz#8015a17ab83e7e1b311638486ace81da6ce206a0"
+
 webpack-core@~0.6.9:
   version "0.6.9"
   resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2"
@@ -5162,13 +5355,17 @@ whatwg-encoding@^1.0.1:
   dependencies:
     iconv-lite "0.4.13"
 
-whatwg-fetch@1.0.0, whatwg-fetch@>=0.10.0:
+whatwg-fetch@2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.2.tgz#fe294d1d89e36c5be8b3195057f2e4bc74fc980e"
+
+whatwg-fetch@>=0.10.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-1.0.0.tgz#01c2ac4df40e236aaa18480e3be74bd5c8eb798e"
 
-whatwg-url@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.1.1.tgz#567074923352de781e3500d64a86aa92a971b4a4"
+whatwg-url@^4.3.0:
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.7.0.tgz#202035ac1955b087cdd20fa8b58ded3ab1cd2af5"
   dependencies:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
@@ -5201,14 +5398,14 @@ wordwrap@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
-wordwrap@^1.0.0, wordwrap@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
-
 wordwrap@~0.0.2:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
 
+wordwrap@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+
 worker-farm@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.3.1.tgz#4333112bb49b17aa050b87895ca6b2cacf40e5ff"
@@ -5237,7 +5434,7 @@ xml-char-classes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d"
 
-"xml-name-validator@>= 2.0.1 < 3.0.0":
+xml-name-validator@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-2.0.1.tgz#4d8b8f1eccd3419aa362061becef515e1e559635"
 
diff --git a/fixtures/fiber-debugger/package.json b/fixtures/fiber-debugger/package.json
index 24c73be50033e..f917efe21f202 100644
--- a/fixtures/fiber-debugger/package.json
+++ b/fixtures/fiber-debugger/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "devDependencies": {
-    "react-scripts": "0.9.0"
+    "react-scripts": "0.9.5"
   },
   "dependencies": {
     "dagre": "^0.7.4",
diff --git a/fixtures/fiber-debugger/src/App.js b/fixtures/fiber-debugger/src/App.js
index 56c6a56798c36..8218e1b3aa170 100644
--- a/fixtures/fiber-debugger/src/App.js
+++ b/fixtures/fiber-debugger/src/App.js
@@ -1,11 +1,13 @@
 import React, { Component } from 'react';
 import Draggable from 'react-draggable';
 import ReactNoop from 'react-noop-renderer';
-import ReactFiberInstrumentation from 'react-noop-renderer/lib/ReactFiberInstrumentation';
 import Editor from './Editor';
 import Fibers from './Fibers';
 import describeFibers from './describeFibers';
 
+// The only place where we use it.
+const ReactFiberInstrumentation = ReactNoop.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactFiberInstrumentation;
+
 function getFiberState(root, workInProgress) {
   if (!root) {
     return null;
diff --git a/fixtures/fiber-debugger/src/Fibers.js b/fixtures/fiber-debugger/src/Fibers.js
index 3d4435ef9a2ea..1d89ba7c49b85 100644
--- a/fixtures/fiber-debugger/src/Fibers.js
+++ b/fixtures/fiber-debugger/src/Fibers.js
@@ -1,8 +1,8 @@
 import React from 'react';
 import { Motion, spring } from 'react-motion';
 import dagre from 'dagre';
-import prettyFormat from 'pretty-format';
-import reactElement from 'pretty-format/plugins/ReactElement';
+// import prettyFormat from 'pretty-format';
+// import reactElement from 'pretty-format/plugins/ReactElement';
 
 function getFiberColor(fibers, id) {
   if (fibers.currentIDs.indexOf(id) > -1) {
@@ -232,7 +232,7 @@ export default function Fibers({ fibers, show, ...rest }) {
   );
 
   const isDragging = rest.className.indexOf('dragging') > -1;
-  const [_, sdx, sdy] = rest.style.transform.match(/translate\((\-?\d+)px,(\-?\d+)px\)/) || [];
+  const [_, sdx, sdy] = rest.style.transform.match(/translate\((-?\d+)px,(-?\d+)px\)/) || [];
   const dx = Number(sdx);
   const dy = Number(sdy);
 
@@ -264,7 +264,10 @@ export default function Fibers({ fibers, show, ...rest }) {
                 height: '100%',
                 backgroundColor: getFiberColor(fibers, fiber.id)
               }}
-              title={prettyFormat(fiber, { plugins: [reactElement ]})}>
+              title={
+                /*prettyFormat(fiber, { plugins: [reactElement ]})*/
+                'todo: this was hanging last time I tried to pretty print'
+              }>
               <small>{fiber.tag} #{fiber.id}</small>
               <br />
               {fiber.type}
diff --git a/fixtures/fiber-debugger/yarn.lock b/fixtures/fiber-debugger/yarn.lock
index 23f8698d6d2c5..24d4f71294429 100644
--- a/fixtures/fiber-debugger/yarn.lock
+++ b/fixtures/fiber-debugger/yarn.lock
@@ -33,10 +33,14 @@ acorn@^3.0.0, acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
-acorn@^4.0.1, acorn@^4.0.4:
+acorn@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a"
 
+acorn@^5.0.1:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
+
 ajv-keywords@^1.0.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.0.tgz#c11e6859eafff83e0dafc416929472eca946aa2c"
@@ -114,6 +118,12 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+aria-query@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-0.3.0.tgz#cb8a9984e2862711c83c80ade5b8f5ca0de2b467"
+  dependencies:
+    ast-types-flow "0.0.7"
+
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
@@ -172,6 +182,10 @@ assert@^1.1.1:
   dependencies:
     util "0.10.3"
 
+ast-types-flow@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
+
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
@@ -217,15 +231,7 @@ aws4@^1.2.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.5.0.tgz#0a29ffb79c31c9e712eeb087e8e7a64b4a56d755"
 
-babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.20.0:
-  version "6.20.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.20.0.tgz#b968f839090f9a8bc6d41938fb96cb84f7387b26"
-  dependencies:
-    chalk "^1.1.0"
-    esutils "^2.0.2"
-    js-tokens "^2.0.0"
-
-babel-code-frame@^6.22.0:
+babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.22.0.tgz#027620bee567a88c32561574e7fd0801d33118e4"
   dependencies:
@@ -233,7 +239,7 @@ babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-babel-core@6.22.1:
+babel-core@6.22.1, babel-core@^6.0.0:
   version "6.22.1"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.22.1.tgz#9c5fd658ba1772d28d721f6d25d968fc7ae21648"
   dependencies:
@@ -257,56 +263,6 @@ babel-core@6.22.1:
     slash "^1.0.0"
     source-map "^0.5.0"
 
-babel-core@^6.0.0:
-  version "6.17.0"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.17.0.tgz#6c4576447df479e241e58c807e4bc7da4db7f425"
-  dependencies:
-    babel-code-frame "^6.16.0"
-    babel-generator "^6.17.0"
-    babel-helpers "^6.16.0"
-    babel-messages "^6.8.0"
-    babel-register "^6.16.0"
-    babel-runtime "^6.9.1"
-    babel-template "^6.16.0"
-    babel-traverse "^6.16.0"
-    babel-types "^6.16.0"
-    babylon "^6.11.0"
-    convert-source-map "^1.1.0"
-    debug "^2.1.1"
-    json5 "^0.4.0"
-    lodash "^4.2.0"
-    minimatch "^3.0.2"
-    path-exists "^1.0.0"
-    path-is-absolute "^1.0.0"
-    private "^0.1.6"
-    shebang-regex "^1.0.0"
-    slash "^1.0.0"
-    source-map "^0.5.0"
-
-babel-core@^6.18.0:
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.21.0.tgz#75525480c21c803f826ef3867d22c19f080a3724"
-  dependencies:
-    babel-code-frame "^6.20.0"
-    babel-generator "^6.21.0"
-    babel-helpers "^6.16.0"
-    babel-messages "^6.8.0"
-    babel-register "^6.18.0"
-    babel-runtime "^6.20.0"
-    babel-template "^6.16.0"
-    babel-traverse "^6.21.0"
-    babel-types "^6.21.0"
-    babylon "^6.11.0"
-    convert-source-map "^1.1.0"
-    debug "^2.1.1"
-    json5 "^0.5.0"
-    lodash "^4.2.0"
-    minimatch "^3.0.2"
-    path-is-absolute "^1.0.0"
-    private "^0.1.6"
-    slash "^1.0.0"
-    source-map "^0.5.0"
-
 babel-core@^6.23.0:
   version "6.23.1"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.23.1.tgz#c143cb621bb2f621710c220c5d579d15b8a442df"
@@ -341,19 +297,7 @@ babel-eslint@7.1.1:
     babylon "^6.13.0"
     lodash.pickby "^4.6.0"
 
-babel-generator@^6.17.0, babel-generator@^6.18.0, babel-generator@^6.21.0:
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.21.0.tgz#605f1269c489a1c75deeca7ea16d43d4656c8494"
-  dependencies:
-    babel-messages "^6.8.0"
-    babel-runtime "^6.20.0"
-    babel-types "^6.21.0"
-    detect-indent "^4.0.0"
-    jsesc "^1.3.0"
-    lodash "^4.2.0"
-    source-map "^0.5.0"
-
-babel-generator@^6.22.0, babel-generator@^6.23.0:
+babel-generator@^6.18.0, babel-generator@^6.22.0, babel-generator@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.23.0.tgz#6b8edab956ef3116f79d8c84c5a3c05f32a74bc5"
   dependencies:
@@ -366,14 +310,6 @@ babel-generator@^6.22.0, babel-generator@^6.23.0:
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
-babel-helper-builder-binary-assignment-operator-visitor@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.22.0.tgz#29df56be144d81bdeac08262bfa41d2c5e91cdcd"
-  dependencies:
-    babel-helper-explode-assignable-expression "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-
 babel-helper-builder-binary-assignment-operator-visitor@^6.8.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.18.0.tgz#8ae814989f7a53682152e3401a04fabd0bb333a6"
@@ -409,15 +345,6 @@ babel-helper-define-map@^6.18.0, babel-helper-define-map@^6.8.0:
     babel-types "^6.18.0"
     lodash "^4.2.0"
 
-babel-helper-define-map@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.23.0.tgz#1444f960c9691d69a2ced6a205315f8fd00804e7"
-  dependencies:
-    babel-helper-function-name "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.23.0"
-    lodash "^4.2.0"
-
 babel-helper-explode-assignable-expression@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.18.0.tgz#14b8e8c2d03ad735d4b20f1840b24cd1f65239fe"
@@ -426,25 +353,7 @@ babel-helper-explode-assignable-expression@^6.18.0:
     babel-traverse "^6.18.0"
     babel-types "^6.18.0"
 
-babel-helper-explode-assignable-expression@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.22.0.tgz#c97bf76eed3e0bae4048121f2b9dae1a4e7d0478"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.22.0"
-    babel-types "^6.22.0"
-
-babel-helper-function-name@^6.18.0, babel-helper-function-name@^6.8.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.18.0.tgz#68ec71aeba1f3e28b2a6f0730190b754a9bf30e6"
-  dependencies:
-    babel-helper-get-function-arity "^6.18.0"
-    babel-runtime "^6.0.0"
-    babel-template "^6.8.0"
-    babel-traverse "^6.18.0"
-    babel-types "^6.18.0"
-
-babel-helper-function-name@^6.22.0, babel-helper-function-name@^6.23.0:
+babel-helper-function-name@^6.18.0, babel-helper-function-name@^6.22.0, babel-helper-function-name@^6.8.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.23.0.tgz#25742d67175c8903dbe4b6cb9d9e1fcb8dcf23a6"
   dependencies:
@@ -454,13 +363,6 @@ babel-helper-function-name@^6.22.0, babel-helper-function-name@^6.23.0:
     babel-traverse "^6.23.0"
     babel-types "^6.23.0"
 
-babel-helper-get-function-arity@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.18.0.tgz#a5b19695fd3f9cdfc328398b47dafcd7094f9f24"
-  dependencies:
-    babel-runtime "^6.0.0"
-    babel-types "^6.18.0"
-
 babel-helper-get-function-arity@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.22.0.tgz#0beb464ad69dc7347410ac6ade9f03a50634f5ce"
@@ -489,21 +391,6 @@ babel-helper-optimise-call-expression@^6.18.0:
     babel-runtime "^6.0.0"
     babel-types "^6.18.0"
 
-babel-helper-optimise-call-expression@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.23.0.tgz#f3ee7eed355b4282138b33d02b78369e470622f5"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.23.0"
-
-babel-helper-regex@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.22.0.tgz#79f532be1647b1f0ee3474b5f5c3da58001d247d"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-    lodash "^4.2.0"
-
 babel-helper-regex@^6.8.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-helper-regex/-/babel-helper-regex-6.18.0.tgz#ae0ebfd77de86cb2f1af258e2cc20b5fe893ecc6"
@@ -522,16 +409,6 @@ babel-helper-remap-async-to-generator@^6.16.0:
     babel-traverse "^6.20.0"
     babel-types "^6.20.0"
 
-babel-helper-remap-async-to-generator@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.22.0.tgz#2186ae73278ed03b8b15ced089609da981053383"
-  dependencies:
-    babel-helper-function-name "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-    babel-traverse "^6.22.0"
-    babel-types "^6.22.0"
-
 babel-helper-replace-supers@^6.18.0, babel-helper-replace-supers@^6.8.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.18.0.tgz#28ec69877be4144dbd64f4cc3a337e89f29a924e"
@@ -543,24 +420,6 @@ babel-helper-replace-supers@^6.18.0, babel-helper-replace-supers@^6.8.0:
     babel-traverse "^6.18.0"
     babel-types "^6.18.0"
 
-babel-helper-replace-supers@^6.22.0, babel-helper-replace-supers@^6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.23.0.tgz#eeaf8ad9b58ec4337ca94223bacdca1f8d9b4bfd"
-  dependencies:
-    babel-helper-optimise-call-expression "^6.23.0"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-    babel-traverse "^6.23.0"
-    babel-types "^6.23.0"
-
-babel-helpers@^6.16.0:
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.16.0.tgz#1095ec10d99279460553e67eb3eee9973d3867e3"
-  dependencies:
-    babel-runtime "^6.0.0"
-    babel-template "^6.16.0"
-
 babel-helpers@^6.22.0, babel-helpers@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.23.0.tgz#4f8f2e092d0b6a8808a4bde79c27f1e2ecf0d992"
@@ -585,24 +444,12 @@ babel-loader@6.2.10:
     mkdirp "^0.5.1"
     object-assign "^4.0.1"
 
-babel-messages@^6.22.0, babel-messages@^6.23.0:
+babel-messages@^6.22.0, babel-messages@^6.23.0, babel-messages@^6.8.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-messages@^6.8.0:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.8.0.tgz#bf504736ca967e6d65ef0adb5a2a5f947c8e0eb9"
-  dependencies:
-    babel-runtime "^6.0.0"
-
-babel-plugin-check-es2015-constants@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz#35157b101426fd2ffd3da3f75c7d1e91835bbf8a"
-  dependencies:
-    babel-runtime "^6.22.0"
-
 babel-plugin-check-es2015-constants@^6.3.13:
   version "6.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.8.0.tgz#dbf024c32ed37bfda8dee1e76da02386a8d26fe7"
@@ -650,18 +497,6 @@ babel-plugin-syntax-trailing-function-commas@^6.13.0:
   version "6.20.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.20.0.tgz#442835e19179f45b87e92d477d70b9f1f18b5c4f"
 
-babel-plugin-syntax-trailing-function-commas@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz#ba0360937f8d06e40180a43fe0d5616fff532cf3"
-
-babel-plugin-transform-async-to-generator@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.22.0.tgz#194b6938ec195ad36efc4c33a971acf00d8cd35e"
-  dependencies:
-    babel-helper-remap-async-to-generator "^6.22.0"
-    babel-plugin-syntax-async-functions "^6.8.0"
-    babel-runtime "^6.22.0"
-
 babel-plugin-transform-async-to-generator@^6.8.0:
   version "6.16.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.16.0.tgz#19ec36cb1486b59f9f468adfa42ce13908ca2999"
@@ -679,40 +514,18 @@ babel-plugin-transform-class-properties@6.22.0:
     babel-runtime "^6.22.0"
     babel-template "^6.22.0"
 
-babel-plugin-transform-es2015-arrow-functions@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
-  dependencies:
-    babel-runtime "^6.22.0"
-
 babel-plugin-transform-es2015-arrow-functions@^6.3.13:
   version "6.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.8.0.tgz#5b63afc3181bdc9a8c4d481b5a4f3f7d7fef3d9d"
   dependencies:
     babel-runtime "^6.0.0"
 
-babel-plugin-transform-es2015-block-scoped-functions@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz#bbc51b49f964d70cb8d8e0b94e820246ce3a6141"
-  dependencies:
-    babel-runtime "^6.22.0"
-
 babel-plugin-transform-es2015-block-scoped-functions@^6.3.13:
   version "6.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.8.0.tgz#ed95d629c4b5a71ae29682b998f70d9833eb366d"
   dependencies:
     babel-runtime "^6.0.0"
 
-babel-plugin-transform-es2015-block-scoping@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.23.0.tgz#e48895cf0b375be148cd7c8879b422707a053b51"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-    babel-traverse "^6.23.0"
-    babel-types "^6.23.0"
-    lodash "^4.2.0"
-
 babel-plugin-transform-es2015-block-scoping@^6.6.0:
   version "6.21.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.21.0.tgz#e840687f922e70fb2c42bb13501838c174a115ed"
@@ -723,20 +536,6 @@ babel-plugin-transform-es2015-block-scoping@^6.6.0:
     babel-types "^6.21.0"
     lodash "^4.2.0"
 
-babel-plugin-transform-es2015-classes@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.23.0.tgz#49b53f326202a2fd1b3bbaa5e2edd8a4f78643c1"
-  dependencies:
-    babel-helper-define-map "^6.23.0"
-    babel-helper-function-name "^6.23.0"
-    babel-helper-optimise-call-expression "^6.23.0"
-    babel-helper-replace-supers "^6.23.0"
-    babel-messages "^6.23.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-    babel-traverse "^6.23.0"
-    babel-types "^6.23.0"
-
 babel-plugin-transform-es2015-classes@^6.6.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.18.0.tgz#ffe7a17321bf83e494dcda0ae3fc72df48ffd1d9"
@@ -751,13 +550,6 @@ babel-plugin-transform-es2015-classes@^6.6.0:
     babel-traverse "^6.18.0"
     babel-types "^6.18.0"
 
-babel-plugin-transform-es2015-computed-properties@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.22.0.tgz#7c383e9629bba4820c11b0425bdd6290f7f057e7"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-
 babel-plugin-transform-es2015-computed-properties@^6.3.13:
   version "6.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.8.0.tgz#f51010fd61b3bd7b6b60a5fdfd307bb7a5279870"
@@ -766,25 +558,12 @@ babel-plugin-transform-es2015-computed-properties@^6.3.13:
     babel-runtime "^6.0.0"
     babel-template "^6.8.0"
 
-babel-plugin-transform-es2015-destructuring@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
-  dependencies:
-    babel-runtime "^6.22.0"
-
 babel-plugin-transform-es2015-destructuring@^6.6.0:
   version "6.19.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.19.0.tgz#ff1d911c4b3f4cab621bd66702a869acd1900533"
   dependencies:
     babel-runtime "^6.9.0"
 
-babel-plugin-transform-es2015-duplicate-keys@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.22.0.tgz#672397031c21610d72dd2bbb0ba9fb6277e1c36b"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-
 babel-plugin-transform-es2015-duplicate-keys@^6.6.0:
   version "6.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.8.0.tgz#fd8f7f7171fc108cc1c70c3164b9f15a81c25f7d"
@@ -792,26 +571,12 @@ babel-plugin-transform-es2015-duplicate-keys@^6.6.0:
     babel-runtime "^6.0.0"
     babel-types "^6.8.0"
 
-babel-plugin-transform-es2015-for-of@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
-  dependencies:
-    babel-runtime "^6.22.0"
-
 babel-plugin-transform-es2015-for-of@^6.6.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.18.0.tgz#4c517504db64bf8cfc119a6b8f177211f2028a70"
   dependencies:
     babel-runtime "^6.0.0"
 
-babel-plugin-transform-es2015-function-name@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.22.0.tgz#f5fcc8b09093f9a23c76ac3d9e392c3ec4b77104"
-  dependencies:
-    babel-helper-function-name "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-
 babel-plugin-transform-es2015-function-name@^6.3.13:
   version "6.9.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.9.0.tgz#8c135b17dbd064e5bba56ec511baaee2fca82719"
@@ -820,12 +585,6 @@ babel-plugin-transform-es2015-function-name@^6.3.13:
     babel-runtime "^6.9.0"
     babel-types "^6.9.0"
 
-babel-plugin-transform-es2015-literals@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz#4f54a02d6cd66cf915280019a31d31925377ca2e"
-  dependencies:
-    babel-runtime "^6.22.0"
-
 babel-plugin-transform-es2015-literals@^6.3.13:
   version "6.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.8.0.tgz#50aa2e5c7958fc2ab25d74ec117e0cc98f046468"
@@ -840,14 +599,6 @@ babel-plugin-transform-es2015-modules-amd@^6.18.0, babel-plugin-transform-es2015
     babel-runtime "^6.0.0"
     babel-template "^6.8.0"
 
-babel-plugin-transform-es2015-modules-amd@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.22.0.tgz#bf69cd34889a41c33d90dfb740e0091ccff52f21"
-  dependencies:
-    babel-plugin-transform-es2015-modules-commonjs "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-
 babel-plugin-transform-es2015-modules-commonjs@^6.18.0, babel-plugin-transform-es2015-modules-commonjs@^6.6.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.18.0.tgz#c15ae5bb11b32a0abdcc98a5837baa4ee8d67bcc"
@@ -857,15 +608,6 @@ babel-plugin-transform-es2015-modules-commonjs@^6.18.0, babel-plugin-transform-e
     babel-template "^6.16.0"
     babel-types "^6.18.0"
 
-babel-plugin-transform-es2015-modules-commonjs@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.23.0.tgz#cba7aa6379fb7ec99250e6d46de2973aaffa7b92"
-  dependencies:
-    babel-plugin-transform-strict-mode "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-    babel-types "^6.23.0"
-
 babel-plugin-transform-es2015-modules-systemjs@^6.12.0:
   version "6.19.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.19.0.tgz#50438136eba74527efa00a5b0fefaf1dc4071da6"
@@ -874,14 +616,6 @@ babel-plugin-transform-es2015-modules-systemjs@^6.12.0:
     babel-runtime "^6.11.6"
     babel-template "^6.14.0"
 
-babel-plugin-transform-es2015-modules-systemjs@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.23.0.tgz#ae3469227ffac39b0310d90fec73bfdc4f6317b0"
-  dependencies:
-    babel-helper-hoist-variables "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-
 babel-plugin-transform-es2015-modules-umd@^6.12.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.18.0.tgz#23351770ece5c1f8e83ed67cb1d7992884491e50"
@@ -890,21 +624,6 @@ babel-plugin-transform-es2015-modules-umd@^6.12.0:
     babel-runtime "^6.0.0"
     babel-template "^6.8.0"
 
-babel-plugin-transform-es2015-modules-umd@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.23.0.tgz#8d284ae2e19ed8fe21d2b1b26d6e7e0fcd94f0f1"
-  dependencies:
-    babel-plugin-transform-es2015-modules-amd "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.23.0"
-
-babel-plugin-transform-es2015-object-super@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.22.0.tgz#daa60e114a042ea769dd53fe528fc82311eb98fc"
-  dependencies:
-    babel-helper-replace-supers "^6.22.0"
-    babel-runtime "^6.22.0"
-
 babel-plugin-transform-es2015-object-super@^6.3.13:
   version "6.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.8.0.tgz#1b858740a5a4400887c23dcff6f4d56eea4a24c5"
@@ -912,7 +631,7 @@ babel-plugin-transform-es2015-object-super@^6.3.13:
     babel-helper-replace-supers "^6.8.0"
     babel-runtime "^6.0.0"
 
-babel-plugin-transform-es2015-parameters@6.22.0, babel-plugin-transform-es2015-parameters@^6.22.0, babel-plugin-transform-es2015-parameters@^6.6.0:
+babel-plugin-transform-es2015-parameters@^6.6.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.22.0.tgz#57076069232019094f27da8c68bb7162fe208dbb"
   dependencies:
@@ -923,13 +642,6 @@ babel-plugin-transform-es2015-parameters@6.22.0, babel-plugin-transform-es2015-p
     babel-traverse "^6.22.0"
     babel-types "^6.22.0"
 
-babel-plugin-transform-es2015-shorthand-properties@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.22.0.tgz#8ba776e0affaa60bff21e921403b8a652a2ff723"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-
 babel-plugin-transform-es2015-shorthand-properties@^6.3.13:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.18.0.tgz#e2ede3b7df47bf980151926534d1dd0cbea58f43"
@@ -937,26 +649,12 @@ babel-plugin-transform-es2015-shorthand-properties@^6.3.13:
     babel-runtime "^6.0.0"
     babel-types "^6.18.0"
 
-babel-plugin-transform-es2015-spread@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz#d6d68a99f89aedc4536c81a542e8dd9f1746f8d1"
-  dependencies:
-    babel-runtime "^6.22.0"
-
 babel-plugin-transform-es2015-spread@^6.3.13:
   version "6.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.8.0.tgz#0217f737e3b821fa5a669f187c6ed59205f05e9c"
   dependencies:
     babel-runtime "^6.0.0"
 
-babel-plugin-transform-es2015-sticky-regex@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.22.0.tgz#ab316829e866ee3f4b9eb96939757d19a5bc4593"
-  dependencies:
-    babel-helper-regex "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-
 babel-plugin-transform-es2015-sticky-regex@^6.3.13:
   version "6.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.8.0.tgz#e73d300a440a35d5c64f5c2a344dc236e3df47be"
@@ -965,38 +663,18 @@ babel-plugin-transform-es2015-sticky-regex@^6.3.13:
     babel-runtime "^6.0.0"
     babel-types "^6.8.0"
 
-babel-plugin-transform-es2015-template-literals@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz#a84b3450f7e9f8f1f6839d6d687da84bb1236d8d"
-  dependencies:
-    babel-runtime "^6.22.0"
-
 babel-plugin-transform-es2015-template-literals@^6.6.0:
   version "6.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.8.0.tgz#86eb876d0a2c635da4ec048b4f7de9dfc897e66b"
   dependencies:
     babel-runtime "^6.0.0"
 
-babel-plugin-transform-es2015-typeof-symbol@^6.22.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz#dec09f1cddff94b52ac73d505c84df59dcceb372"
-  dependencies:
-    babel-runtime "^6.22.0"
-
 babel-plugin-transform-es2015-typeof-symbol@^6.6.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.18.0.tgz#0b14c48629c90ff47a0650077f6aa699bee35798"
   dependencies:
     babel-runtime "^6.0.0"
 
-babel-plugin-transform-es2015-unicode-regex@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.22.0.tgz#8d9cc27e7ee1decfe65454fb986452a04a613d20"
-  dependencies:
-    babel-helper-regex "^6.22.0"
-    babel-runtime "^6.22.0"
-    regexpu-core "^2.0.0"
-
 babel-plugin-transform-es2015-unicode-regex@^6.3.13:
   version "6.11.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.11.0.tgz#6298ceabaad88d50a3f4f392d8de997260f6ef2c"
@@ -1005,14 +683,6 @@ babel-plugin-transform-es2015-unicode-regex@^6.3.13:
     babel-runtime "^6.0.0"
     regexpu-core "^2.0.0"
 
-babel-plugin-transform-exponentiation-operator@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.22.0.tgz#d57c8335281918e54ef053118ce6eb108468084d"
-  dependencies:
-    babel-helper-builder-binary-assignment-operator-visitor "^6.22.0"
-    babel-plugin-syntax-exponentiation-operator "^6.8.0"
-    babel-runtime "^6.22.0"
-
 babel-plugin-transform-exponentiation-operator@^6.8.0:
   version "6.8.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.8.0.tgz#db25742e9339eade676ca9acec46f955599a68a4"
@@ -1069,7 +739,7 @@ babel-plugin-transform-react-jsx@6.22.0, babel-plugin-transform-react-jsx@^6.22.
     babel-plugin-syntax-jsx "^6.8.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-regenerator@6.22.0, babel-plugin-transform-regenerator@^6.22.0, babel-plugin-transform-regenerator@^6.6.0:
+babel-plugin-transform-regenerator@6.22.0, babel-plugin-transform-regenerator@^6.6.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.22.0.tgz#65740593a319c44522157538d690b84094617ea6"
   dependencies:
@@ -1088,16 +758,9 @@ babel-plugin-transform-strict-mode@^6.18.0:
     babel-runtime "^6.0.0"
     babel-types "^6.18.0"
 
-babel-plugin-transform-strict-mode@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.22.0.tgz#e008df01340fdc87e959da65991b7e05970c8c7c"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-
-babel-preset-env@1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.1.8.tgz#c46734c6233c3f87d177513773db3cf3c1758aaa"
+babel-preset-env@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.2.1.tgz#659178f54df74a74765f796be4d290b5beeb3f5f"
   dependencies:
     babel-plugin-check-es2015-constants "^6.3.13"
     babel-plugin-syntax-trailing-function-commas "^6.13.0"
@@ -1127,48 +790,8 @@ babel-preset-env@1.1.8:
     babel-plugin-transform-exponentiation-operator "^6.8.0"
     babel-plugin-transform-regenerator "^6.6.0"
     browserslist "^1.4.0"
-
-babel-preset-es2015@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.22.0.tgz#af5a98ecb35eb8af764ad8a5a05eb36dc4386835"
-  dependencies:
-    babel-plugin-check-es2015-constants "^6.22.0"
-    babel-plugin-transform-es2015-arrow-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoped-functions "^6.22.0"
-    babel-plugin-transform-es2015-block-scoping "^6.22.0"
-    babel-plugin-transform-es2015-classes "^6.22.0"
-    babel-plugin-transform-es2015-computed-properties "^6.22.0"
-    babel-plugin-transform-es2015-destructuring "^6.22.0"
-    babel-plugin-transform-es2015-duplicate-keys "^6.22.0"
-    babel-plugin-transform-es2015-for-of "^6.22.0"
-    babel-plugin-transform-es2015-function-name "^6.22.0"
-    babel-plugin-transform-es2015-literals "^6.22.0"
-    babel-plugin-transform-es2015-modules-amd "^6.22.0"
-    babel-plugin-transform-es2015-modules-commonjs "^6.22.0"
-    babel-plugin-transform-es2015-modules-systemjs "^6.22.0"
-    babel-plugin-transform-es2015-modules-umd "^6.22.0"
-    babel-plugin-transform-es2015-object-super "^6.22.0"
-    babel-plugin-transform-es2015-parameters "^6.22.0"
-    babel-plugin-transform-es2015-shorthand-properties "^6.22.0"
-    babel-plugin-transform-es2015-spread "^6.22.0"
-    babel-plugin-transform-es2015-sticky-regex "^6.22.0"
-    babel-plugin-transform-es2015-template-literals "^6.22.0"
-    babel-plugin-transform-es2015-typeof-symbol "^6.22.0"
-    babel-plugin-transform-es2015-unicode-regex "^6.22.0"
-    babel-plugin-transform-regenerator "^6.22.0"
-
-babel-preset-es2016@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2016/-/babel-preset-es2016-6.22.0.tgz#b061aaa3983d40c9fbacfa3743b5df37f336156c"
-  dependencies:
-    babel-plugin-transform-exponentiation-operator "^6.22.0"
-
-babel-preset-es2017@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-es2017/-/babel-preset-es2017-6.22.0.tgz#de2f9da5a30c50d293fb54a0ba15d6ddc573f0f2"
-  dependencies:
-    babel-plugin-syntax-trailing-function-commas "^6.22.0"
-    babel-plugin-transform-async-to-generator "^6.22.0"
+    electron-to-chromium "^1.1.0"
+    invariant "^2.2.2"
 
 babel-preset-jest@^18.0.0:
   version "18.0.0"
@@ -1176,20 +799,11 @@ babel-preset-jest@^18.0.0:
   dependencies:
     babel-plugin-jest-hoist "^18.0.0"
 
-babel-preset-latest@6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-latest/-/babel-preset-latest-6.22.0.tgz#47b800531350a3dc69126e8c375a40655cd1eeff"
-  dependencies:
-    babel-preset-es2015 "^6.22.0"
-    babel-preset-es2016 "^6.22.0"
-    babel-preset-es2017 "^6.22.0"
-
-babel-preset-react-app@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-2.1.0.tgz#409a84ce321fb0859a5fe301c91ec01aaa201907"
+babel-preset-react-app@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-2.2.0.tgz#3143bcf316049f78b5f9d0422fd7822ca4715ca4"
   dependencies:
     babel-plugin-transform-class-properties "6.22.0"
-    babel-plugin-transform-es2015-parameters "6.22.0"
     babel-plugin-transform-object-rest-spread "6.22.0"
     babel-plugin-transform-react-constant-elements "6.22.0"
     babel-plugin-transform-react-jsx "6.22.0"
@@ -1197,8 +811,7 @@ babel-preset-react-app@^2.1.0:
     babel-plugin-transform-react-jsx-source "6.22.0"
     babel-plugin-transform-regenerator "6.22.0"
     babel-plugin-transform-runtime "6.22.0"
-    babel-preset-env "1.1.8"
-    babel-preset-latest "6.22.0"
+    babel-preset-env "1.2.1"
     babel-preset-react "6.22.0"
     babel-runtime "6.22.0"
 
@@ -1214,18 +827,6 @@ babel-preset-react@6.22.0:
     babel-plugin-transform-react-jsx-self "^6.22.0"
     babel-plugin-transform-react-jsx-source "^6.22.0"
 
-babel-register@^6.16.0, babel-register@^6.18.0:
-  version "6.18.0"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.18.0.tgz#892e2e03865078dd90ad2c715111ec4449b32a68"
-  dependencies:
-    babel-core "^6.18.0"
-    babel-runtime "^6.11.6"
-    core-js "^2.4.0"
-    home-or-tmp "^2.0.0"
-    lodash "^4.2.0"
-    mkdirp "^0.5.1"
-    source-map-support "^0.4.2"
-
 babel-register@^6.22.0, babel-register@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.23.0.tgz#c9aa3d4cca94b51da34826c4a0f9e08145d74ff3"
@@ -1238,21 +839,21 @@ babel-register@^6.22.0, babel-register@^6.23.0:
     mkdirp "^0.5.1"
     source-map-support "^0.4.2"
 
-babel-runtime@6.22.0, babel-runtime@^6.18.0, babel-runtime@^6.22.0:
+babel-runtime@6.22.0, babel-runtime@^6.0.0, babel-runtime@^6.11.6, babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.9.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.22.0.tgz#1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611"
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-runtime@^6.0.0, babel-runtime@^6.11.6, babel-runtime@^6.20.0, babel-runtime@^6.9.0, babel-runtime@^6.9.1:
+babel-runtime@^6.20.0:
   version "6.20.0"
   resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.20.0.tgz#87300bdcf4cd770f09bf0048c64204e17806d16f"
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-template@^6.14.0, babel-template@^6.15.0, babel-template@^6.22.0, babel-template@^6.23.0, babel-template@^6.8.0:
+babel-template@^6.14.0, babel-template@^6.15.0, babel-template@^6.16.0, babel-template@^6.22.0, babel-template@^6.23.0, babel-template@^6.8.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.23.0.tgz#04d4f270adbb3aa704a8143ae26faa529238e638"
   dependencies:
@@ -1262,31 +863,7 @@ babel-template@^6.14.0, babel-template@^6.15.0, babel-template@^6.22.0, babel-te
     babylon "^6.11.0"
     lodash "^4.2.0"
 
-babel-template@^6.16.0:
-  version "6.16.0"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.16.0.tgz#e149dd1a9f03a35f817ddbc4d0481988e7ebc8ca"
-  dependencies:
-    babel-runtime "^6.9.0"
-    babel-traverse "^6.16.0"
-    babel-types "^6.16.0"
-    babylon "^6.11.0"
-    lodash "^4.2.0"
-
-babel-traverse@^6.15.0, babel-traverse@^6.16.0, babel-traverse@^6.18.0, babel-traverse@^6.20.0, babel-traverse@^6.21.0:
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.21.0.tgz#69c6365804f1a4f69eb1213f85b00a818b8c21ad"
-  dependencies:
-    babel-code-frame "^6.20.0"
-    babel-messages "^6.8.0"
-    babel-runtime "^6.20.0"
-    babel-types "^6.21.0"
-    babylon "^6.11.0"
-    debug "^2.2.0"
-    globals "^9.0.0"
-    invariant "^2.2.0"
-    lodash "^4.2.0"
-
-babel-traverse@^6.22.0, babel-traverse@^6.22.1, babel-traverse@^6.23.0, babel-traverse@^6.23.1:
+babel-traverse@^6.15.0, babel-traverse@^6.18.0, babel-traverse@^6.20.0, babel-traverse@^6.21.0, babel-traverse@^6.22.0, babel-traverse@^6.22.1, babel-traverse@^6.23.0, babel-traverse@^6.23.1:
   version "6.23.1"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.23.1.tgz#d3cb59010ecd06a97d81310065f966b699e14f48"
   dependencies:
@@ -1300,16 +877,7 @@ babel-traverse@^6.22.0, babel-traverse@^6.22.1, babel-traverse@^6.23.0, babel-tr
     invariant "^2.2.0"
     lodash "^4.2.0"
 
-babel-types@^6.15.0, babel-types@^6.16.0, babel-types@^6.18.0, babel-types@^6.20.0, babel-types@^6.21.0, babel-types@^6.8.0, babel-types@^6.9.0:
-  version "6.21.0"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.21.0.tgz#314b92168891ef6d3806b7f7a917fdf87c11a4b2"
-  dependencies:
-    babel-runtime "^6.20.0"
-    esutils "^2.0.2"
-    lodash "^4.2.0"
-    to-fast-properties "^1.0.1"
-
-babel-types@^6.19.0, babel-types@^6.22.0, babel-types@^6.23.0:
+babel-types@^6.15.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.20.0, babel-types@^6.21.0, babel-types@^6.22.0, babel-types@^6.23.0, babel-types@^6.8.0, babel-types@^6.9.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.23.0.tgz#bb17179d7538bad38cd0c9e115d340f77e7e9acf"
   dependencies:
@@ -1401,13 +969,7 @@ browserify-zlib@^0.1.4:
   dependencies:
     pako "~0.2.0"
 
-browserslist@^1.0.1, browserslist@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.5.2.tgz#1c82fde0ee8693e6d15c49b7bff209dc06298c56"
-  dependencies:
-    caniuse-db "^1.0.30000604"
-
-browserslist@^1.4.0, browserslist@^1.7.1:
+browserslist@^1.0.1, browserslist@^1.4.0, browserslist@^1.5.2, browserslist@^1.7.1:
   version "1.7.5"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.5.tgz#eca4713897b51e444283241facf3985de49a9e2b"
   dependencies:
@@ -1483,11 +1045,7 @@ caniuse-api@^1.5.2:
     lodash.uniq "^4.3.0"
     shelljs "^0.7.0"
 
-caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000604:
-  version "1.0.30000607"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000607.tgz#f9d5b542f30d064c305544ff8938b217c67b88e9"
-
-caniuse-db@^1.0.30000618, caniuse-db@^1.0.30000624:
+caniuse-db@^1.0.30000346, caniuse-db@^1.0.30000618, caniuse-db@^1.0.30000624:
   version "1.0.30000624"
   resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000624.tgz#554b87547895e36f5fe128f4b7448a2ea5bf2213"
 
@@ -1666,7 +1224,7 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.8.x, commander@~2.8.1:
+commander@2.8.x:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
   dependencies:
@@ -1939,7 +1497,7 @@ debug@2.2.0, debug@~2.2.0:
   dependencies:
     ms "0.7.1"
 
-debug@^2.1.0, debug@^2.1.1, debug@^2.2.0:
+debug@^2.1.0, debug@^2.1.1, debug@^2.2.0, debug@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
   dependencies:
@@ -2001,11 +1559,11 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
-detect-port@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/detect-port/-/detect-port-1.0.1.tgz#3e1aa6a7ff6677bb60894b291172529d880c1e85"
+detect-port@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/detect-port/-/detect-port-1.1.0.tgz#fde7574591ea3de74445782643c3f921b2a4618c"
   dependencies:
-    commander "~2.8.1"
+    debug "^2.6.0"
 
 diff@^3.0.0:
   version "3.2.0"
@@ -2080,10 +1638,14 @@ ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
-electron-to-chromium@^1.2.3:
+electron-to-chromium@^1.1.0, electron-to-chromium@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.2.3.tgz#4b4d04d237c301f72e2d15c2137b2b79f9f5ab76"
 
+emoji-regex@^6.1.0:
+  version "6.4.1"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.4.1.tgz#77486fe9cd45421d260a6238b88d721e2fad2050"
+
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -2196,9 +1758,9 @@ escope@^3.6.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
-eslint-config-react-app@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-0.5.1.tgz#de05b6fc191e627c38240299ad038aecb8478e88"
+eslint-config-react-app@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-0.6.2.tgz#ee535cbaaf9e3576ea16b99afe720353d8730ec0"
 
 eslint-import-resolver-node@^0.2.0:
   version "0.2.3"
@@ -2244,11 +1806,14 @@ eslint-plugin-import@2.0.1:
     minimatch "^3.0.3"
     pkg-up "^1.0.0"
 
-eslint-plugin-jsx-a11y@2.2.3:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-2.2.3.tgz#4e35cb71b8a7db702ac415c806eb8e8d9ea6c65d"
+eslint-plugin-jsx-a11y@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-4.0.0.tgz#779bb0fe7b08da564a422624911de10061e048ee"
   dependencies:
+    aria-query "^0.3.0"
+    ast-types-flow "0.0.7"
     damerau-levenshtein "^1.0.0"
+    emoji-regex "^6.1.0"
     jsx-ast-utils "^1.0.0"
     object-assign "^4.0.1"
 
@@ -2259,22 +1824,23 @@ eslint-plugin-react@6.4.1:
     doctrine "^1.2.2"
     jsx-ast-utils "^1.3.1"
 
-eslint@3.8.1:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.8.1.tgz#7d02db44cd5aaf4fa7aa489e1f083baa454342ba"
+eslint@3.16.1:
+  version "3.16.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.16.1.tgz#9bc31fc7341692cf772e80607508f67d711c5609"
   dependencies:
+    babel-code-frame "^6.16.0"
     chalk "^1.1.3"
     concat-stream "^1.4.6"
     debug "^2.1.1"
     doctrine "^1.2.2"
     escope "^3.6.0"
-    espree "^3.3.1"
+    espree "^3.4.0"
     estraverse "^4.2.0"
     esutils "^2.0.2"
     file-entry-cache "^2.0.0"
     glob "^7.0.3"
-    globals "^9.2.0"
-    ignore "^3.1.5"
+    globals "^9.14.0"
+    ignore "^3.2.0"
     imurmurhash "^0.1.4"
     inquirer "^0.12.0"
     is-my-json-valid "^2.10.0"
@@ -2290,18 +1856,18 @@ eslint@3.8.1:
     pluralize "^1.2.1"
     progress "^1.1.8"
     require-uncached "^1.0.2"
-    shelljs "^0.6.0"
+    shelljs "^0.7.5"
     strip-bom "^3.0.0"
-    strip-json-comments "~1.0.1"
+    strip-json-comments "~2.0.1"
     table "^3.7.8"
     text-table "~0.2.0"
     user-home "^2.0.0"
 
-espree@^3.3.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.3.2.tgz#dbf3fadeb4ecb4d4778303e50103b3d36c88b89c"
+espree@^3.4.0:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.1.tgz#28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2"
   dependencies:
-    acorn "^4.0.1"
+    acorn "^5.0.1"
     acorn-jsx "^3.0.0"
 
 esprima@^2.6.0, esprima@^2.7.1:
@@ -2588,20 +2154,13 @@ fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
-fsevents@1.0.17:
+fsevents@1.0.17, fsevents@^1.0.0:
   version "1.0.17"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.0.17.tgz#8537f3f12272678765b4fd6528c0f1f66f8f4558"
   dependencies:
     nan "^2.3.0"
     node-pre-gyp "^0.6.29"
 
-fsevents@^1.0.0:
-  version "1.0.14"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.0.14.tgz#558e8cc38643d8ef40fe45158486d0d25758eee4"
-  dependencies:
-    nan "^2.3.0"
-    node-pre-gyp "^0.6.29"
-
 fstream-ignore@~1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
@@ -2681,7 +2240,7 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-globals@^9.0.0, globals@^9.2.0:
+globals@^9.0.0, globals@^9.14.0:
   version "9.14.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-9.14.0.tgz#8859936af0038741263053b39d0e76ca241e4034"
 
@@ -2842,7 +2401,7 @@ http-errors@~1.5.0:
     setprototypeof "1.0.2"
     statuses ">= 1.3.1 < 2"
 
-http-proxy-middleware@0.17.3:
+http-proxy-middleware@0.17.3, http-proxy-middleware@~0.17.1:
   version "0.17.3"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.3.tgz#940382147149b856084f5534752d5b5a8168cd1d"
   dependencies:
@@ -2851,16 +2410,7 @@ http-proxy-middleware@0.17.3:
     lodash "^4.17.2"
     micromatch "^2.3.11"
 
-http-proxy-middleware@~0.17.1:
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.2.tgz#572d517a6d2fb1063a469de294eed96066352007"
-  dependencies:
-    http-proxy "^1.15.1"
-    is-glob "^3.0.0"
-    lodash "^4.16.2"
-    micromatch "^2.3.11"
-
-http-proxy@^1.15.1, http-proxy@^1.16.2:
+http-proxy@^1.16.2:
   version "1.16.2"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742"
   dependencies:
@@ -2891,9 +2441,9 @@ ieee754@^1.1.4:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
 
-ignore@^3.1.5:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.0.tgz#8d88f03c3002a0ac52114db25d2c673b0bf1e435"
+ignore@^3.2.0:
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.6.tgz#26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c"
 
 imurmurhash@^0.1.4:
   version "0.1.4"
@@ -2952,7 +2502,7 @@ interpret@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c"
 
-invariant@^2.2.0:
+invariant@^2.2.0, invariant@^2.2.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
   dependencies:
@@ -3040,7 +2590,7 @@ is-glob@^2.0.0, is-glob@^2.0.1:
   dependencies:
     is-extglob "^1.0.0"
 
-is-glob@^3.0.0, is-glob@^3.1.0:
+is-glob@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
   dependencies:
@@ -3471,10 +3021,6 @@ json3@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"
 
-json5@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.4.0.tgz#054352e4c4c80c86c0923877d449de176a732c8d"
-
 json5@^0.5.0:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
@@ -3649,7 +3195,7 @@ lodash.uniq@^4.3.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
-"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.2, lodash@^4.16.4, lodash@^4.17.2, lodash@^4.2.0, lodash@^4.3.0:
+"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.4, lodash@^4.17.2, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
@@ -3778,13 +3324,7 @@ mime@1.3.4, mime@^1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
-minimatch@3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.2.tgz#0f398a7300ea441e9c348c83d98ab8c9dbf9c40a"
-  dependencies:
-    brace-expansion "^1.0.0"
-
-minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3:
+minimatch@3.0.3, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
   dependencies:
@@ -3967,14 +3507,10 @@ oauth-sign@~0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
-object-assign@4.1.1:
+object-assign@4.1.1, object-assign@^4.0.1, object-assign@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
-object-assign@^4.0.1, object-assign@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"
-
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
@@ -4098,10 +3634,6 @@ path-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
 
-path-exists@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-1.0.0.tgz#d5a8998eb71ef37a74c34eb0d9eba6e878eea081"
-
 path-exists@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
@@ -4431,16 +3963,7 @@ postcss-zindex@^2.0.1:
     postcss "^5.0.4"
     uniqs "^2.0.0"
 
-postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8:
-  version "5.2.10"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.10.tgz#b58b64e04f66f838b7bc7cb41f7dac168568a945"
-  dependencies:
-    chalk "^1.1.3"
-    js-base64 "^2.1.9"
-    source-map "^0.5.6"
-    supports-color "^3.1.2"
-
-postcss@^5.2.11, postcss@^5.2.9:
+postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.11, postcss@^5.2.9:
   version "5.2.15"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.15.tgz#a9e8685e50e06cc5b3fdea5297273246c26f5b30"
   dependencies:
@@ -4580,15 +4103,18 @@ rc@~1.1.6:
     minimist "^1.2.0"
     strip-json-comments "~1.0.4"
 
-react-dev-utils@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-0.5.0.tgz#aedbf69cb1fbedb6f42350e4a988021f5cb4c493"
+react-dev-utils@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-0.5.2.tgz#50d0b962d3a94b6c2e8f2011ed6468e4124bc410"
   dependencies:
     ansi-html "0.0.5"
     chalk "1.1.3"
     escape-string-regexp "1.0.5"
+    filesize "3.3.0"
+    gzip-size "3.0.0"
     html-entities "1.2.0"
     opn "4.0.2"
+    recursive-readdir "2.1.1"
     sockjs-client "1.0.1"
     strip-ansi "3.0.1"
 
@@ -4605,36 +4131,34 @@ react-motion@^0.4.5:
     performance-now "^0.2.0"
     raf "^3.1.0"
 
-react-scripts@0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-0.9.0.tgz#c03f3f46268fd3708137e3f6cbd649008fa965c8"
+react-scripts@0.9.5:
+  version "0.9.5"
+  resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-0.9.5.tgz#e9f05c8427e27131662a9b9d7a9786d1ff16bb3f"
   dependencies:
     autoprefixer "6.7.2"
     babel-core "6.22.1"
     babel-eslint "7.1.1"
     babel-jest "18.0.0"
     babel-loader "6.2.10"
-    babel-preset-react-app "^2.1.0"
+    babel-preset-react-app "^2.2.0"
     babel-runtime "^6.20.0"
     case-sensitive-paths-webpack-plugin "1.1.4"
     chalk "1.1.3"
     connect-history-api-fallback "1.3.0"
     cross-spawn "4.0.2"
     css-loader "0.26.1"
-    detect-port "1.0.1"
+    detect-port "1.1.0"
     dotenv "2.0.0"
-    eslint "3.8.1"
-    eslint-config-react-app "^0.5.1"
+    eslint "3.16.1"
+    eslint-config-react-app "^0.6.2"
     eslint-loader "1.6.0"
     eslint-plugin-flowtype "2.21.0"
     eslint-plugin-import "2.0.1"
-    eslint-plugin-jsx-a11y "2.2.3"
+    eslint-plugin-jsx-a11y "4.0.0"
     eslint-plugin-react "6.4.1"
     extract-text-webpack-plugin "1.0.1"
     file-loader "0.10.0"
-    filesize "3.3.0"
     fs-extra "0.30.0"
-    gzip-size "3.0.0"
     html-webpack-plugin "2.24.0"
     http-proxy-middleware "0.17.3"
     jest "18.1.0"
@@ -4642,9 +4166,7 @@ react-scripts@0.9.0:
     object-assign "4.1.1"
     postcss-loader "1.2.2"
     promise "7.1.1"
-    react-dev-utils "^0.5.0"
-    recursive-readdir "2.1.0"
-    strip-ansi "3.0.1"
+    react-dev-utils "^0.5.2"
     style-loader "0.13.1"
     url-loader "0.5.7"
     webpack "1.14.0"
@@ -4725,11 +4247,11 @@ rechoir@^0.6.2:
   dependencies:
     resolve "^1.1.6"
 
-recursive-readdir@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.1.0.tgz#78b7bfd79582d3d7596b8ff1bd29fbd50229f6aa"
+recursive-readdir@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/recursive-readdir/-/recursive-readdir-2.1.1.tgz#a01cfc7f7f38a53ec096a096f63a50489c3e297c"
   dependencies:
-    minimatch "3.0.2"
+    minimatch "3.0.3"
 
 redeyed@~1.0.0:
   version "1.0.1"
@@ -4999,15 +4521,7 @@ sha.js@2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.2.6.tgz#17ddeddc5f722fb66501658895461977867315ba"
 
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-
-shelljs@^0.6.0:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.6.1.tgz#ec6211bed1920442088fe0f70b2837232ed2c8a8"
-
-shelljs@^0.7.0:
+shelljs@^0.7.0, shelljs@^0.7.5:
   version "0.7.6"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.6.tgz#379cccfb56b91c8601e4793356eb5382924de9ad"
   dependencies:
@@ -5203,10 +4717,14 @@ strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
 
-strip-json-comments@~1.0.1, strip-json-comments@~1.0.4:
+strip-json-comments@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"
 
+strip-json-comments@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
+
 style-loader@0.13.1:
   version "0.13.1"
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.13.1.tgz#468280efbc0473023cd3a6cd56e33b5a1d7fc3a9"
@@ -5221,13 +4739,13 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-supports-color@^3.1.0, supports-color@^3.1.1, supports-color@^3.1.2:
+supports-color@^3.1.0, supports-color@^3.1.1:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.1.2.tgz#72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^3.2.3:
+supports-color@^3.1.2, supports-color@^3.2.3:
   version "3.2.3"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
   dependencies:
diff --git a/fixtures/fiber-triangle/index.html b/fixtures/fiber-triangle/index.html
index 0d8ac000291c7..d2541eee1e93e 100644
--- a/fixtures/fiber-triangle/index.html
+++ b/fixtures/fiber-triangle/index.html
@@ -3,7 +3,6 @@
   <head>
     <meta charset="utf-8">
     <title>Fiber Example</title>
-    <link rel="stylesheet" href="../shared/css/base.css" />
   </head>
   <body>
     <h1>Fiber Example</h1>
@@ -14,12 +13,12 @@ <h1>Fiber Example</h1>
       </p>
       <p>
         If you can see this, React is <strong>not</strong> working right.
-        If you checked out the source from GitHub make sure to run <code>grunt</code>.
+        If you checked out the source from GitHub make sure to run <code>npm run build</code>.
       </p>
     </div>
-    <script src="../../build/react.js"></script>
-    <script src="../../build/react-dom-fiber.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/babel-core/5.8.24/browser.min.js"></script>
+    <script src="../../build/dist/react.development.js"></script>
+    <script src="../../build/dist/react-dom.development.js"></script>
+    <script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
     <script type="text/babel">
       var dotStyle = {
         position: 'absolute',
@@ -139,7 +138,7 @@ <h1>Fiber Example</h1>
         tick() {
           if (this.state.useTimeSlicing) {
             // Update is time-sliced.
-            ReactDOMFiber.unstable_deferredUpdates(() => {
+            ReactDOM.unstable_deferredUpdates(() => {
               this.setState(state => ({ seconds: (state.seconds % 10) + 1 }));
             });
           } else {
@@ -210,7 +209,7 @@ <h3>Time-slicing</h3>
 
       var start = new Date().getTime();
       function update() {
-        ReactDOMFiber.render(
+        ReactDOM.render(
           <ExampleApplication elapsed={new Date().getTime() - start} />,
           document.getElementById('container')
         );
diff --git a/fixtures/packaging/README.md b/fixtures/packaging/README.md
index af59bcaa1607e..134afd4d056e7 100644
--- a/fixtures/packaging/README.md
+++ b/fixtures/packaging/README.md
@@ -30,21 +30,13 @@ pushstate-server .
 
 (Too complicated? Send a PR to simplify this :-).
 
-Then open the corresponding URLs, for example:
+Then open the following URL in your browser:
 
 ```
-open http://localhost:9000/fixtures/globals.html
-open http://localhost:9000/fixtures/requirejs.html
-open http://localhost:9000/fixtures/systemjs.html
-open http://localhost:9000/fixtures/browserify/index.html
-open http://localhost:9000/fixtures/brunch/index.html
-open http://localhost:9000/fixtures/rjs/index.html
-open http://localhost:9000/fixtures/systemjs-builder/index.html
-open http://localhost:9000/fixtures/webpack/index.html
-open http://localhost:9000/fixtures/webpack-alias/index.html
+open http://localhost:9000/fixtures/packaging/index.html
 ```
 
 You should see two things:
 
-* "Hello World" is rendered.
+* "Hello World" is rendered in each iframe.
 * No errors in the console.
diff --git a/fixtures/packaging/babel-standalone/dev.html b/fixtures/packaging/babel-standalone/dev.html
new file mode 100644
index 0000000000000..9c3a931badcc4
--- /dev/null
+++ b/fixtures/packaging/babel-standalone/dev.html
@@ -0,0 +1,14 @@
+<html>
+  <body>
+    <script src="../../../build/dist/react.development.js"></script>
+    <script src="../../../build/dist/react-dom.development.js"></script>
+    <script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
+    <div id="container"></div>
+    <script type="text/babel">
+      ReactDOM.render(
+        <h1>Hello World!</h1>,
+        document.getElementById('container')
+      );
+    </script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/fixtures/packaging/browserify/.gitignore b/fixtures/packaging/browserify/dev/.gitignore
similarity index 100%
rename from fixtures/packaging/browserify/.gitignore
rename to fixtures/packaging/browserify/dev/.gitignore
diff --git a/fixtures/packaging/browserify/index.html b/fixtures/packaging/browserify/dev/index.html
similarity index 100%
rename from fixtures/packaging/browserify/index.html
rename to fixtures/packaging/browserify/dev/index.html
diff --git a/fixtures/packaging/browserify/input.js b/fixtures/packaging/browserify/dev/input.js
similarity index 100%
rename from fixtures/packaging/browserify/input.js
rename to fixtures/packaging/browserify/dev/input.js
diff --git a/fixtures/packaging/browserify/package.json b/fixtures/packaging/browserify/dev/package.json
similarity index 53%
rename from fixtures/packaging/browserify/package.json
rename to fixtures/packaging/browserify/dev/package.json
index 860f27289e11b..ce4caf22c67a4 100644
--- a/fixtures/packaging/browserify/package.json
+++ b/fixtures/packaging/browserify/dev/package.json
@@ -5,6 +5,6 @@
     "browserify": "^13.3.0"
   },
   "scripts": {
-    "build": "rm -f output.js && NODE_PATH=../../../build/packages browserify ./input.js -o output.js"
+    "build": "rm -f output.js && NODE_PATH=../../../../build/packages browserify ./input.js -o output.js"
   }
 }
diff --git a/fixtures/packaging/browserify/prod/.gitignore b/fixtures/packaging/browserify/prod/.gitignore
new file mode 100644
index 0000000000000..66b00e6a05af0
--- /dev/null
+++ b/fixtures/packaging/browserify/prod/.gitignore
@@ -0,0 +1 @@
+output.js
diff --git a/fixtures/packaging/systemjs-builder/index.html b/fixtures/packaging/browserify/prod/index.html
similarity index 100%
rename from fixtures/packaging/systemjs-builder/index.html
rename to fixtures/packaging/browserify/prod/index.html
diff --git a/fixtures/packaging/brunch/input.js b/fixtures/packaging/browserify/prod/input.js
similarity index 100%
rename from fixtures/packaging/brunch/input.js
rename to fixtures/packaging/browserify/prod/input.js
diff --git a/fixtures/packaging/browserify/prod/package.json b/fixtures/packaging/browserify/prod/package.json
new file mode 100644
index 0000000000000..95d4e197f8416
--- /dev/null
+++ b/fixtures/packaging/browserify/prod/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "webpack-test",
+  "private": true,
+  "dependencies": {
+    "browserify": "^13.3.0"
+  },
+  "scripts": {
+    "build": "rm -f output.js && NODE_PATH=../../../../build/packages browserify ./input.js -g [envify --NODE_ENV 'production'] -o output.js"
+  },
+  "devDependencies": {
+    "envify": "^4.0.0"
+  }
+}
diff --git a/fixtures/packaging/brunch/.gitignore b/fixtures/packaging/brunch/dev/.gitignore
similarity index 100%
rename from fixtures/packaging/brunch/.gitignore
rename to fixtures/packaging/brunch/dev/.gitignore
diff --git a/fixtures/packaging/brunch/app/initialize.js b/fixtures/packaging/brunch/dev/app/initialize.js
similarity index 100%
rename from fixtures/packaging/brunch/app/initialize.js
rename to fixtures/packaging/brunch/dev/app/initialize.js
diff --git a/fixtures/packaging/brunch/config.js b/fixtures/packaging/brunch/dev/config.js
similarity index 100%
rename from fixtures/packaging/brunch/config.js
rename to fixtures/packaging/brunch/dev/config.js
diff --git a/fixtures/packaging/brunch/index.html b/fixtures/packaging/brunch/dev/index.html
similarity index 100%
rename from fixtures/packaging/brunch/index.html
rename to fixtures/packaging/brunch/dev/index.html
diff --git a/fixtures/packaging/webpack-alias/input.js b/fixtures/packaging/brunch/dev/input.js
similarity index 100%
rename from fixtures/packaging/webpack-alias/input.js
rename to fixtures/packaging/brunch/dev/input.js
diff --git a/fixtures/packaging/brunch/dev/package.json b/fixtures/packaging/brunch/dev/package.json
new file mode 100644
index 0000000000000..19b8693717e2d
--- /dev/null
+++ b/fixtures/packaging/brunch/dev/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "brunch-test",
+  "devDependencies": {
+      "brunch": "^2.9.1",
+      "javascript-brunch": "^2.0.0"
+  },
+  "scripts": {
+    "build": "rm -rf public && ln -fs ../../../../../build/packages/react node_modules/react && ln -fs ../../../../../build/packages/react-dom node_modules/react-dom && brunch build"
+  }
+}
\ No newline at end of file
diff --git a/fixtures/packaging/brunch/package.json b/fixtures/packaging/brunch/package.json
deleted file mode 100644
index 4713d27c21c33..0000000000000
--- a/fixtures/packaging/brunch/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "name": "brunch-test",
-  "devDependencies": {
-      "brunch": "^2.9.1",
-      "javascript-brunch": "^2.0.0"
-  },
-  "scripts": {
-    "build": "rm -rf public && ln -fs ../../../../build/packages/react node_modules/react && ln -fs ../../../../build/packages/react-dom node_modules/react-dom && brunch build"
-  }
-}
\ No newline at end of file
diff --git a/fixtures/packaging/brunch/prod/.gitignore b/fixtures/packaging/brunch/prod/.gitignore
new file mode 100644
index 0000000000000..b8d1dfad58f8f
--- /dev/null
+++ b/fixtures/packaging/brunch/prod/.gitignore
@@ -0,0 +1,2 @@
+output.js
+output.js.map
\ No newline at end of file
diff --git a/fixtures/packaging/webpack/input.js b/fixtures/packaging/brunch/prod/app/initialize.js
similarity index 100%
rename from fixtures/packaging/webpack/input.js
rename to fixtures/packaging/brunch/prod/app/initialize.js
diff --git a/fixtures/packaging/brunch/prod/config.js b/fixtures/packaging/brunch/prod/config.js
new file mode 100644
index 0000000000000..ba12fc72c23d6
--- /dev/null
+++ b/fixtures/packaging/brunch/prod/config.js
@@ -0,0 +1,10 @@
+exports.config = {
+  paths: {
+    public: '.',
+  },
+  files: {
+    javascripts: {
+      joinTo: 'output.js',
+    },
+  },
+};
diff --git a/fixtures/packaging/brunch/prod/index.html b/fixtures/packaging/brunch/prod/index.html
new file mode 100644
index 0000000000000..5902a1a6905dc
--- /dev/null
+++ b/fixtures/packaging/brunch/prod/index.html
@@ -0,0 +1,7 @@
+<html>
+  <body>
+    <div id="container"></div>
+    <script src="output.js"></script>
+    <script>require('initialize');</script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/fixtures/packaging/brunch/prod/input.js b/fixtures/packaging/brunch/prod/input.js
new file mode 100644
index 0000000000000..93a0e76d43dfb
--- /dev/null
+++ b/fixtures/packaging/brunch/prod/input.js
@@ -0,0 +1,7 @@
+var React = require('react');
+var ReactDOM = require('react-dom');
+
+ReactDOM.render(
+  React.createElement('h1', null, 'Hello World!'),
+  document.getElementById('container')
+);
diff --git a/fixtures/packaging/brunch/prod/package.json b/fixtures/packaging/brunch/prod/package.json
new file mode 100644
index 0000000000000..00e428d80c320
--- /dev/null
+++ b/fixtures/packaging/brunch/prod/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "brunch-test",
+  "devDependencies": {
+      "brunch": "^2.9.1",
+      "javascript-brunch": "^2.0.0"
+  },
+  "scripts": {
+    "build": "rm -rf public && ln -fs ../../../../../build/packages/react node_modules/react && ln -fs ../../../../../build/packages/react-dom node_modules/react-dom && brunch build -p"
+  }
+}
\ No newline at end of file
diff --git a/fixtures/packaging/build-all.js b/fixtures/packaging/build-all.js
index b5620c0fa32e0..f1883d8350463 100644
--- a/fixtures/packaging/build-all.js
+++ b/fixtures/packaging/build-all.js
@@ -1,30 +1,48 @@
-var fs = require('fs');
-var path = require('path');
-var { spawnSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+const child_process = require('child_process');
 
-var fixtureDirs = fs.readdirSync(__dirname).filter((file) => {
+const fixtureDirs = fs.readdirSync(__dirname).filter((file) => {
   return fs.statSync(path.join(__dirname, file)).isDirectory();
 });
 
-var cmdArgs = [
+const cmdArgs = [
   {cmd: 'npm', args: ['install']},
   {cmd: 'npm', args: ['run', 'build']},
 ];
 
-for (const dir of fixtureDirs) {
-  for (const cmdArg of cmdArgs) {
-    const opts = {
-      cwd: path.join(__dirname, dir),
-      stdio: 'inherit',
-    };
-    let result = spawnSync(cmdArg.cmd, cmdArg.args, opts);
-    if (result.status !== 0) {
-      throw new Error('Failed to build fixtures.');
-    }
+function buildFixture(cmdArg, path) {
+  const opts = {
+    cwd: path,
+    stdio: 'inherit',
+  };
+  const result = child_process.spawnSync(cmdArg.cmd, cmdArg.args, opts);
+  if (result.status !== 0) {
+    throw new Error(`Failed to build fixtures!`);
   }
 }
 
+fixtureDirs.forEach(dir => {
+  cmdArgs.forEach(cmdArg => {
+    // we only care about directories that have DEV and PROD directories in
+    // otherwise they don't need to be built
+    const devPath = path.join(__dirname, dir, 'dev');
+
+    if (fs.existsSync(devPath)) {
+      buildFixture(cmdArg, devPath);
+    }
+    const prodPath = path.join(__dirname, dir, 'prod');
+
+    if (fs.existsSync(prodPath)) {
+      buildFixture(cmdArg, prodPath);
+    }
+  });
+});
+
 console.log('-------------------------');
 console.log('All fixtures were built!');
-console.log('Now make sure to open each HTML file in this directory and each index.html in subdirectories.');
+console.log('Now ensure all frames display a welcome message:');
+console.log('  npm install -g serve');
+console.log('  serve ../..');
+console.log('  open http://localhost:5000/fixtures/packaging/');
 console.log('-------------------------');
diff --git a/fixtures/packaging/globals.html b/fixtures/packaging/globals/dev.html
similarity index 61%
rename from fixtures/packaging/globals.html
rename to fixtures/packaging/globals/dev.html
index 3c80fbfe8d47d..27dadd7e7f55e 100644
--- a/fixtures/packaging/globals.html
+++ b/fixtures/packaging/globals/dev.html
@@ -1,7 +1,7 @@
 <html>
   <body>
-    <script src="../../build/react.js"></script>
-    <script src="../../build/react-dom.js"></script>
+    <script src="../../../build/dist/react.development.js"></script>
+    <script src="../../../build/dist/react-dom.development.js"></script>
     <div id="container"></div>
     <script>
       ReactDOM.render(
diff --git a/fixtures/packaging/globals/prod.html b/fixtures/packaging/globals/prod.html
new file mode 100644
index 0000000000000..8ce10fa281bd3
--- /dev/null
+++ b/fixtures/packaging/globals/prod.html
@@ -0,0 +1,13 @@
+<html>
+  <body>
+    <script src="../../../build/dist/react.production.min.js"></script>
+    <script src="../../../build/dist/react-dom.production.min.js"></script>
+    <div id="container"></div>
+    <script>
+      ReactDOM.render(
+        React.createElement('h1', null, 'Hello World!'),
+        document.getElementById('container')
+      );
+    </script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/fixtures/packaging/index.html b/fixtures/packaging/index.html
new file mode 100644
index 0000000000000..45e5219d98c84
--- /dev/null
+++ b/fixtures/packaging/index.html
@@ -0,0 +1,92 @@
+<html>
+  <head>
+    <style>
+      .frame {
+        display: block;
+        float: left;
+        width: 350px;
+        overflow: hidden;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>bundle packaging</h1>
+    <p>If you see Hello World in each frame with no console errors, all is well!</p>
+    <div class="frame">
+      <h2>babel-standalone (dev only)</h2>
+      <iframe src="/fixtures/packaging/babel-standalone/dev.html"></iframe>
+    </div>
+    <div class="frame">
+      <h2>globals (dev)</h2>
+      <iframe src="/fixtures/packaging/globals/dev.html"></iframe>
+    </div>
+    <div class="frame">
+      <h2>globals (prod)</h2>
+      <iframe src="/fixtures/packaging/globals/prod.html"></iframe>
+    </div>
+    <div class="frame">
+      <h2>requirejs (dev)</h2>
+      <iframe src="/fixtures/packaging/requirejs/dev.html"></iframe>
+    </div>
+    <div class="frame">
+      <h2>requirejs (prod)</h2>
+      <iframe src="/fixtures/packaging/requirejs/prod.html"></iframe>
+    </div>
+    <div class="frame">
+      <h2>systemjs (dev)</h2>
+      <iframe src="/fixtures/packaging/systemjs/dev.html"></iframe>
+    </div>
+    <div class="frame">
+      <h2>systemjs (prod)</h2>
+      <iframe src="/fixtures/packaging/systemjs/dev.html"></iframe>
+    </div>
+    <div class="frame">
+      <h2>browserify (dev)</h2>
+      <iframe src="/fixtures/packaging/browserify/dev/index.html"></iframe>
+    </div>
+    <div class="frame">
+      <h2>browserify (prod)</h2>
+      <iframe src="/fixtures/packaging/browserify/prod/index.html"></iframe>
+    </div>
+    <div class="frame">
+      <h2>brunch (dev)</h2>
+      <iframe src="/fixtures/packaging/brunch/dev/index.html"></iframe>
+    </div>
+    <div class="frame">
+      <h2>brunch (prod)</h2>
+      <iframe src="/fixtures/packaging/brunch/prod/index.html"></iframe>
+    </div>
+    <div class="frame">
+      <h2>rjs (dev)</h2>
+      <iframe src="/fixtures/packaging/rjs/dev/index.html"></iframe>
+    </div>
+    <div class="frame">
+      <h2>rjs (prod)</h2>
+      <iframe src="/fixtures/packaging/rjs/prod/index.html"></iframe>
+    </div>    
+    <div class="frame">
+      <h2>systemjs-builder (dev)</h2>
+      <iframe src="/fixtures/packaging/systemjs-builder/dev/index.html"></iframe>
+    </div>
+    <div class="frame">
+      <h2>systemjs-builder (prod)</h2>
+      <iframe src="/fixtures/packaging/systemjs-builder/prod/index.html"></iframe>
+    </div>
+    <div class="frame">
+      <h2>webpack (dev)</h2>
+      <iframe src="/fixtures/packaging/webpack/dev/index.html"></iframe>
+    </div>
+    <div class="frame">
+      <h2>webpack (prod)</h2>
+      <iframe src="/fixtures/packaging/webpack/prod/index.html"></iframe>
+    </div>
+    <div class="frame">
+      <h2>webpack-alias (dev)</h2>
+      <iframe src="/fixtures/packaging/webpack-alias/dev/index.html"></iframe>
+    </div>
+    <div class="frame">
+      <h2>webpack-alias (prod)</h2>
+      <iframe src="/fixtures/packaging/webpack-alias/prod/index.html"></iframe>
+    </div>
+  </body>
+</html>
\ No newline at end of file
diff --git a/fixtures/packaging/requirejs.html b/fixtures/packaging/requirejs/dev.html
similarity index 78%
rename from fixtures/packaging/requirejs.html
rename to fixtures/packaging/requirejs/dev.html
index 325a2f031a6ef..498afd7824e21 100644
--- a/fixtures/packaging/requirejs.html
+++ b/fixtures/packaging/requirejs/dev.html
@@ -5,8 +5,8 @@
     <script>
       requirejs.config({
         paths: {
-          react: '../../build/react',
-          'react-dom': '../../build/react-dom'
+          react: '../../../build/dist/react.development',
+          'react-dom': '../../../build/dist/react-dom.development'
         }
       });
 
diff --git a/fixtures/packaging/requirejs/prod.html b/fixtures/packaging/requirejs/prod.html
new file mode 100644
index 0000000000000..9b64260fc266c
--- /dev/null
+++ b/fixtures/packaging/requirejs/prod.html
@@ -0,0 +1,21 @@
+<html>
+  <body>
+    <script src="https://unpkg.com/requirejs@2.3.2/require.js"></script>
+    <div id="container"></div>
+    <script>
+      requirejs.config({
+        paths: {
+          react: '../../../build/dist/react.production.min',
+          'react-dom': '../../../build/dist/react-dom.production.min'
+        }
+      });
+
+      require(['react', 'react-dom'], function(React, ReactDOM) {
+        ReactDOM.render(
+          React.createElement('h1', null, 'Hello World!'),
+          document.getElementById('container')
+        );
+      });
+    </script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/fixtures/packaging/rjs/config.js b/fixtures/packaging/rjs/config.js
deleted file mode 100644
index 10846b2e18d64..0000000000000
--- a/fixtures/packaging/rjs/config.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
-  baseUrl: '.',
-  name: 'input',
-  out: 'output.js',
-  optimize: 'none',
-  paths: {
-    react: '../../../build/react',
-    'react-dom': '../../../build/react-dom',
-  },
-};
diff --git a/fixtures/packaging/rjs/.gitignore b/fixtures/packaging/rjs/dev/.gitignore
similarity index 100%
rename from fixtures/packaging/rjs/.gitignore
rename to fixtures/packaging/rjs/dev/.gitignore
diff --git a/fixtures/packaging/rjs/dev/config.js b/fixtures/packaging/rjs/dev/config.js
new file mode 100644
index 0000000000000..b955f32efe97c
--- /dev/null
+++ b/fixtures/packaging/rjs/dev/config.js
@@ -0,0 +1,10 @@
+module.exports = {
+  baseUrl: '.',
+  name: 'input',
+  out: 'output.js',
+  optimize: 'none',
+  paths: {
+    react: '../../../../build/dist/react.development',
+    'react-dom': '../../../../build/dist/react-dom.development',
+  },
+};
diff --git a/fixtures/packaging/rjs/index.html b/fixtures/packaging/rjs/dev/index.html
similarity index 100%
rename from fixtures/packaging/rjs/index.html
rename to fixtures/packaging/rjs/dev/index.html
diff --git a/fixtures/packaging/rjs/input.js b/fixtures/packaging/rjs/dev/input.js
similarity index 100%
rename from fixtures/packaging/rjs/input.js
rename to fixtures/packaging/rjs/dev/input.js
diff --git a/fixtures/packaging/rjs/package.json b/fixtures/packaging/rjs/dev/package.json
similarity index 100%
rename from fixtures/packaging/rjs/package.json
rename to fixtures/packaging/rjs/dev/package.json
diff --git a/fixtures/packaging/systemjs-builder/.gitignore b/fixtures/packaging/rjs/prod/.gitignore
similarity index 100%
rename from fixtures/packaging/systemjs-builder/.gitignore
rename to fixtures/packaging/rjs/prod/.gitignore
diff --git a/fixtures/packaging/rjs/prod/config.js b/fixtures/packaging/rjs/prod/config.js
new file mode 100644
index 0000000000000..86d76331a2220
--- /dev/null
+++ b/fixtures/packaging/rjs/prod/config.js
@@ -0,0 +1,10 @@
+module.exports = {
+  baseUrl: '.',
+  name: 'input',
+  out: 'output.js',
+  optimize: 'none',
+  paths: {
+    react: '../../../../build/dist/react.production.min',
+    'react-dom': '../../../../build/dist/react-dom.production.min',
+  },
+};
diff --git a/fixtures/packaging/rjs/prod/index.html b/fixtures/packaging/rjs/prod/index.html
new file mode 100644
index 0000000000000..0171bdf9b2fca
--- /dev/null
+++ b/fixtures/packaging/rjs/prod/index.html
@@ -0,0 +1,7 @@
+<html>
+  <body>
+    <div id="container"></div>
+    <script src="https://unpkg.com/requirejs@2.3.2/require.js"></script>
+    <script src="output.js"></script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/fixtures/packaging/rjs/prod/input.js b/fixtures/packaging/rjs/prod/input.js
new file mode 100644
index 0000000000000..510e71da20221
--- /dev/null
+++ b/fixtures/packaging/rjs/prod/input.js
@@ -0,0 +1,6 @@
+require(['react', 'react-dom'], function(React, ReactDOM) {
+  ReactDOM.render(
+    React.createElement('h1', null, 'Hello World!'),
+    document.getElementById('container')
+  );
+});
diff --git a/fixtures/packaging/rjs/prod/package.json b/fixtures/packaging/rjs/prod/package.json
new file mode 100644
index 0000000000000..bc94a37011eea
--- /dev/null
+++ b/fixtures/packaging/rjs/prod/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "rjs-test",
+  "private": true,
+  "dependencies": {
+    "requirejs": "^2.3.2"
+  },
+  "scripts": {
+    "build": "rm -f output.js && r.js -o config.js"
+  }
+}
diff --git a/fixtures/packaging/systemjs-builder/config.js b/fixtures/packaging/systemjs-builder/config.js
deleted file mode 100644
index 4a4a2c0c3e437..0000000000000
--- a/fixtures/packaging/systemjs-builder/config.js
+++ /dev/null
@@ -1,6 +0,0 @@
-System.config({
-  paths: {
-    react: '../../../build/react.js',
-    'react-dom': '../../../build/react-dom.js',
-  },
-});
diff --git a/fixtures/packaging/webpack-alias/.gitignore b/fixtures/packaging/systemjs-builder/dev/.gitignore
similarity index 100%
rename from fixtures/packaging/webpack-alias/.gitignore
rename to fixtures/packaging/systemjs-builder/dev/.gitignore
diff --git a/fixtures/packaging/systemjs-builder/build.js b/fixtures/packaging/systemjs-builder/dev/build.js
similarity index 100%
rename from fixtures/packaging/systemjs-builder/build.js
rename to fixtures/packaging/systemjs-builder/dev/build.js
diff --git a/fixtures/packaging/systemjs-builder/dev/config.js b/fixtures/packaging/systemjs-builder/dev/config.js
new file mode 100644
index 0000000000000..2cd1b3d66f9ce
--- /dev/null
+++ b/fixtures/packaging/systemjs-builder/dev/config.js
@@ -0,0 +1,6 @@
+System.config({
+  paths: {
+    react: '../../../../build/dist/react.development.js',
+    'react-dom': '../../../../build/dist/react-dom.development.js',
+  },
+});
diff --git a/fixtures/packaging/webpack-alias/index.html b/fixtures/packaging/systemjs-builder/dev/index.html
similarity index 100%
rename from fixtures/packaging/webpack-alias/index.html
rename to fixtures/packaging/systemjs-builder/dev/index.html
diff --git a/fixtures/packaging/systemjs-builder/input.js b/fixtures/packaging/systemjs-builder/dev/input.js
similarity index 100%
rename from fixtures/packaging/systemjs-builder/input.js
rename to fixtures/packaging/systemjs-builder/dev/input.js
diff --git a/fixtures/packaging/systemjs-builder/package.json b/fixtures/packaging/systemjs-builder/dev/package.json
similarity index 100%
rename from fixtures/packaging/systemjs-builder/package.json
rename to fixtures/packaging/systemjs-builder/dev/package.json
diff --git a/fixtures/packaging/webpack/.gitignore b/fixtures/packaging/systemjs-builder/prod/.gitignore
similarity index 100%
rename from fixtures/packaging/webpack/.gitignore
rename to fixtures/packaging/systemjs-builder/prod/.gitignore
diff --git a/fixtures/packaging/systemjs-builder/prod/build.js b/fixtures/packaging/systemjs-builder/prod/build.js
new file mode 100644
index 0000000000000..d476c09a64624
--- /dev/null
+++ b/fixtures/packaging/systemjs-builder/prod/build.js
@@ -0,0 +1,12 @@
+var Builder = require('systemjs-builder');
+
+var builder = new Builder('/', './config.js');
+builder
+  .buildStatic('./input.js', './output.js')
+  .then(function() {
+    console.log('Build complete');
+  })
+  .catch(function(err) {
+    console.log('Build error');
+    console.log(err);
+  });
diff --git a/fixtures/packaging/systemjs-builder/prod/config.js b/fixtures/packaging/systemjs-builder/prod/config.js
new file mode 100644
index 0000000000000..bb981fe2b7e59
--- /dev/null
+++ b/fixtures/packaging/systemjs-builder/prod/config.js
@@ -0,0 +1,6 @@
+System.config({
+  paths: {
+    react: '../../../../build/dist/react.production.min.js',
+    'react-dom': '../../../../build/dist/react-dom.production.min.js',
+  },
+});
diff --git a/fixtures/packaging/webpack/index.html b/fixtures/packaging/systemjs-builder/prod/index.html
similarity index 100%
rename from fixtures/packaging/webpack/index.html
rename to fixtures/packaging/systemjs-builder/prod/index.html
diff --git a/fixtures/packaging/systemjs-builder/prod/input.js b/fixtures/packaging/systemjs-builder/prod/input.js
new file mode 100644
index 0000000000000..e919c6f098b16
--- /dev/null
+++ b/fixtures/packaging/systemjs-builder/prod/input.js
@@ -0,0 +1,7 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+
+ReactDOM.render(
+  React.createElement('h1', null, 'Hello World!'),
+  document.getElementById('container')
+);
diff --git a/fixtures/packaging/systemjs-builder/prod/package.json b/fixtures/packaging/systemjs-builder/prod/package.json
new file mode 100644
index 0000000000000..b4c6acdccad5e
--- /dev/null
+++ b/fixtures/packaging/systemjs-builder/prod/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "systemjs-builder-test",
+  "private": true,
+  "dependencies": {
+    "systemjs-builder": "^0.15.34"
+  },
+  "scripts": {
+    "build": "rm -f output.js && node build.js"
+  }
+}
diff --git a/fixtures/packaging/systemjs.html b/fixtures/packaging/systemjs/dev.html
similarity index 81%
rename from fixtures/packaging/systemjs.html
rename to fixtures/packaging/systemjs/dev.html
index 2f4125c702d5f..389a201cadc72 100644
--- a/fixtures/packaging/systemjs.html
+++ b/fixtures/packaging/systemjs/dev.html
@@ -5,8 +5,8 @@
     <script>
       System.config({
         paths: {
-          react: '../../build/react.js',
-          'react-dom': '../../build/react-dom.js'
+          react: '../../../build/dist/react.development.js',
+          'react-dom': '../../../build/dist/react-dom.development.js'
         }
       });
 
diff --git a/fixtures/packaging/systemjs/prod.html b/fixtures/packaging/systemjs/prod.html
new file mode 100644
index 0000000000000..848fb767b1c4e
--- /dev/null
+++ b/fixtures/packaging/systemjs/prod.html
@@ -0,0 +1,27 @@
+<html>
+  <body>
+    <script src="https://unpkg.com/systemjs@0.19.41/dist/system.js"></script>
+    <div id="container"></div>
+    <script>
+      System.config({
+        paths: {
+          react: '../../../build/dist/react.production.min.js',
+          'react-dom': '../../../build/dist/react-dom.production.min.js'
+        }
+      });
+
+      Promise.all([
+        System.import("react"),
+        System.import("react-dom")
+      ]).then(function (deps) {
+        var React = deps[0];
+        var ReactDOM = deps[1];
+
+        ReactDOM.render(
+          React.createElement('h1', null, 'Hello World!'),
+          document.getElementById('container')
+        );
+      });
+    </script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/fixtures/packaging/webpack-alias/config.js b/fixtures/packaging/webpack-alias/config.js
deleted file mode 100644
index de8d86ba1c602..0000000000000
--- a/fixtures/packaging/webpack-alias/config.js
+++ /dev/null
@@ -1,15 +0,0 @@
-var path = require('path');
-
-module.exports = {
-  entry: './input',
-  output: {
-    filename: 'output.js',
-  },
-  resolve: {
-    root: path.resolve('../../../build/packages'),
-    alias: {
-      'react': 'react/dist/react',
-      'react-dom': 'react-dom/dist/react-dom',
-    },
-  },
-};
diff --git a/fixtures/packaging/webpack-alias/dev/.gitignore b/fixtures/packaging/webpack-alias/dev/.gitignore
new file mode 100644
index 0000000000000..fa213fe698b13
--- /dev/null
+++ b/fixtures/packaging/webpack-alias/dev/.gitignore
@@ -0,0 +1 @@
+output.js
\ No newline at end of file
diff --git a/fixtures/packaging/webpack-alias/dev/config.js b/fixtures/packaging/webpack-alias/dev/config.js
new file mode 100644
index 0000000000000..8de2bba648c42
--- /dev/null
+++ b/fixtures/packaging/webpack-alias/dev/config.js
@@ -0,0 +1,15 @@
+var path = require('path');
+
+module.exports = {
+  entry: './input',
+  output: {
+    filename: 'output.js',
+  },
+  resolve: {
+    root: path.resolve('../../../../build/packages'),
+    alias: {
+      'react': 'react/umd/react.development',
+      'react-dom': 'react-dom/umd/react-dom.development',
+    },
+  },
+};
diff --git a/fixtures/packaging/webpack-alias/dev/index.html b/fixtures/packaging/webpack-alias/dev/index.html
new file mode 100644
index 0000000000000..e010d6b31db68
--- /dev/null
+++ b/fixtures/packaging/webpack-alias/dev/index.html
@@ -0,0 +1,6 @@
+<html>
+  <body>
+    <div id="container"></div>
+    <script src="output.js"></script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/fixtures/packaging/webpack-alias/dev/input.js b/fixtures/packaging/webpack-alias/dev/input.js
new file mode 100644
index 0000000000000..93a0e76d43dfb
--- /dev/null
+++ b/fixtures/packaging/webpack-alias/dev/input.js
@@ -0,0 +1,7 @@
+var React = require('react');
+var ReactDOM = require('react-dom');
+
+ReactDOM.render(
+  React.createElement('h1', null, 'Hello World!'),
+  document.getElementById('container')
+);
diff --git a/fixtures/packaging/webpack-alias/package.json b/fixtures/packaging/webpack-alias/dev/package.json
similarity index 100%
rename from fixtures/packaging/webpack-alias/package.json
rename to fixtures/packaging/webpack-alias/dev/package.json
diff --git a/fixtures/packaging/webpack-alias/prod/.gitignore b/fixtures/packaging/webpack-alias/prod/.gitignore
new file mode 100644
index 0000000000000..fa213fe698b13
--- /dev/null
+++ b/fixtures/packaging/webpack-alias/prod/.gitignore
@@ -0,0 +1 @@
+output.js
\ No newline at end of file
diff --git a/fixtures/packaging/webpack-alias/prod/config.js b/fixtures/packaging/webpack-alias/prod/config.js
new file mode 100644
index 0000000000000..c10c4da9585cf
--- /dev/null
+++ b/fixtures/packaging/webpack-alias/prod/config.js
@@ -0,0 +1,15 @@
+var path = require('path');
+
+module.exports = {
+  entry: './input',
+  output: {
+    filename: 'output.js',
+  },
+  resolve: {
+    root: path.resolve('../../../../build/packages'),
+    alias: {
+      'react': 'react/umd/react.production.min',
+      'react-dom': 'react-dom/umd/react-dom.production.min',
+    },
+  },
+};
diff --git a/fixtures/packaging/webpack-alias/prod/index.html b/fixtures/packaging/webpack-alias/prod/index.html
new file mode 100644
index 0000000000000..e010d6b31db68
--- /dev/null
+++ b/fixtures/packaging/webpack-alias/prod/index.html
@@ -0,0 +1,6 @@
+<html>
+  <body>
+    <div id="container"></div>
+    <script src="output.js"></script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/fixtures/packaging/webpack-alias/prod/input.js b/fixtures/packaging/webpack-alias/prod/input.js
new file mode 100644
index 0000000000000..93a0e76d43dfb
--- /dev/null
+++ b/fixtures/packaging/webpack-alias/prod/input.js
@@ -0,0 +1,7 @@
+var React = require('react');
+var ReactDOM = require('react-dom');
+
+ReactDOM.render(
+  React.createElement('h1', null, 'Hello World!'),
+  document.getElementById('container')
+);
diff --git a/fixtures/packaging/webpack/package.json b/fixtures/packaging/webpack-alias/prod/package.json
similarity index 100%
rename from fixtures/packaging/webpack/package.json
rename to fixtures/packaging/webpack-alias/prod/package.json
diff --git a/fixtures/packaging/webpack/dev/.gitignore b/fixtures/packaging/webpack/dev/.gitignore
new file mode 100644
index 0000000000000..fa213fe698b13
--- /dev/null
+++ b/fixtures/packaging/webpack/dev/.gitignore
@@ -0,0 +1 @@
+output.js
\ No newline at end of file
diff --git a/fixtures/packaging/webpack/config.js b/fixtures/packaging/webpack/dev/config.js
similarity index 70%
rename from fixtures/packaging/webpack/config.js
rename to fixtures/packaging/webpack/dev/config.js
index e895e84850652..24eed41fe101e 100644
--- a/fixtures/packaging/webpack/config.js
+++ b/fixtures/packaging/webpack/dev/config.js
@@ -6,6 +6,6 @@ module.exports = {
     filename: 'output.js',
   },
   resolve: {
-    root: path.resolve('../../../build/packages/'),
+    root: path.resolve('../../../../build/packages/'),
   },
 };
diff --git a/fixtures/packaging/webpack/dev/index.html b/fixtures/packaging/webpack/dev/index.html
new file mode 100644
index 0000000000000..e010d6b31db68
--- /dev/null
+++ b/fixtures/packaging/webpack/dev/index.html
@@ -0,0 +1,6 @@
+<html>
+  <body>
+    <div id="container"></div>
+    <script src="output.js"></script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/fixtures/packaging/webpack/dev/input.js b/fixtures/packaging/webpack/dev/input.js
new file mode 100644
index 0000000000000..93a0e76d43dfb
--- /dev/null
+++ b/fixtures/packaging/webpack/dev/input.js
@@ -0,0 +1,7 @@
+var React = require('react');
+var ReactDOM = require('react-dom');
+
+ReactDOM.render(
+  React.createElement('h1', null, 'Hello World!'),
+  document.getElementById('container')
+);
diff --git a/fixtures/packaging/webpack/dev/package.json b/fixtures/packaging/webpack/dev/package.json
new file mode 100644
index 0000000000000..8ea2da478bbef
--- /dev/null
+++ b/fixtures/packaging/webpack/dev/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "webpack-test",
+  "private": true,
+  "dependencies": {
+    "webpack": "^1.14.0"
+  },
+  "scripts": {
+    "build": "rm -f output.js && webpack --config config.js"
+  }
+}
diff --git a/fixtures/packaging/webpack/prod/.gitignore b/fixtures/packaging/webpack/prod/.gitignore
new file mode 100644
index 0000000000000..fa213fe698b13
--- /dev/null
+++ b/fixtures/packaging/webpack/prod/.gitignore
@@ -0,0 +1 @@
+output.js
\ No newline at end of file
diff --git a/fixtures/packaging/webpack/prod/config.js b/fixtures/packaging/webpack/prod/config.js
new file mode 100644
index 0000000000000..5516e81a8085a
--- /dev/null
+++ b/fixtures/packaging/webpack/prod/config.js
@@ -0,0 +1,19 @@
+var path = require('path');
+var webpack = require('webpack');
+
+module.exports = {
+  entry: './input',
+  output: {
+    filename: 'output.js',
+  },
+  resolve: {
+    root: path.resolve('../../../../build/packages/'),
+  },
+  plugins: [  
+    new webpack.DefinePlugin({  
+        'process.env':{  
+            'NODE_ENV': JSON.stringify('production')
+        }
+    })
+  ]
+};
diff --git a/fixtures/packaging/webpack/prod/index.html b/fixtures/packaging/webpack/prod/index.html
new file mode 100644
index 0000000000000..e010d6b31db68
--- /dev/null
+++ b/fixtures/packaging/webpack/prod/index.html
@@ -0,0 +1,6 @@
+<html>
+  <body>
+    <div id="container"></div>
+    <script src="output.js"></script>
+  </body>
+</html>
\ No newline at end of file
diff --git a/fixtures/packaging/webpack/prod/input.js b/fixtures/packaging/webpack/prod/input.js
new file mode 100644
index 0000000000000..93a0e76d43dfb
--- /dev/null
+++ b/fixtures/packaging/webpack/prod/input.js
@@ -0,0 +1,7 @@
+var React = require('react');
+var ReactDOM = require('react-dom');
+
+ReactDOM.render(
+  React.createElement('h1', null, 'Hello World!'),
+  document.getElementById('container')
+);
diff --git a/fixtures/packaging/webpack/prod/package.json b/fixtures/packaging/webpack/prod/package.json
new file mode 100644
index 0000000000000..8ea2da478bbef
--- /dev/null
+++ b/fixtures/packaging/webpack/prod/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "webpack-test",
+  "private": true,
+  "dependencies": {
+    "webpack": "^1.14.0"
+  },
+  "scripts": {
+    "build": "rm -f output.js && webpack --config config.js"
+  }
+}
diff --git a/grunt/config/browserify.js b/grunt/config/browserify.js
deleted file mode 100644
index 4cbdef2b25aa9..0000000000000
--- a/grunt/config/browserify.js
+++ /dev/null
@@ -1,275 +0,0 @@
-/*eslint-disable no-multi-str */
-
-'use strict';
-
-var envify = require('loose-envify/custom');
-var grunt = require('grunt');
-var UglifyJS = require('uglify-js');
-var uglifyify = require('uglifyify');
-var derequire = require('derequire');
-var aliasify = require('aliasify');
-var collapser = require('bundle-collapser/plugin');
-
-var envifyDev = envify({NODE_ENV: process.env.NODE_ENV || 'development'});
-var envifyProd = envify({NODE_ENV: process.env.NODE_ENV || 'production'});
-
-var shimSharedModules = aliasify.configure({
-  'aliases': {
-    'react/lib/React': 'react/lib/ReactUMDShim',
-    'react/lib/ReactCurrentOwner': 'react/lib/ReactCurrentOwnerUMDShim',
-    'react/lib/ReactComponentTreeHook': 'react/lib/ReactComponentTreeHookUMDShim',
-  },
-});
-
-var SIMPLE_TEMPLATE =
-  grunt.file.read('./grunt/data/header-template-short.txt');
-
-var LICENSE_TEMPLATE =
-  grunt.file.read('./grunt/data/header-template-extended.txt');
-
-function minify(src) {
-  return UglifyJS.minify(src, {
-    fromString: true,
-    output: {
-      comments(node, comment) {
-        // Preserve license headers in dependencies like object-assign.
-        if (comment.type === 'comment2') {
-          return /@license/i.test(comment.value);
-        }
-        return false;
-      },
-    },
-  }).code;
-}
-
-// TODO: move this out to another build step maybe.
-function bannerify(src) {
-  var version = grunt.config.data.pkg.version;
-  var packageName = this.data.packageName || this.data.standalone;
-  return (
-    grunt.template.process(
-      LICENSE_TEMPLATE,
-      {data: {package: packageName, version: version}}
-    ) +
-    src
-  );
-}
-
-function simpleBannerify(src) {
-  var version = grunt.config.data.pkg.version;
-  var packageName = this.data.packageName || this.data.standalone;
-  return (
-    grunt.template.process(
-      SIMPLE_TEMPLATE,
-      {data: {package: packageName, version: version}}
-    ) +
-    src
-  );
-}
-
-// What is happening here???
-// I'm glad you asked. It became really hard to make our bundle splitting work.
-// Everything is fine in node and when bundling with those packages, but when
-// using our pre-packaged files, the splitting didn't work. Specifically due to
-// the UMD wrappers defining their own require and creating their own encapsulated
-// "registry" scope, we couldn't require across the boundaries. Webpack tries to
-// be smart and looks for top-level requires (even when aliasing to a bundle),
-// but since we didn't have those, we couldn't require 'react' from 'react-dom'.
-// But we are already shimming in some modules that look for a global React
-// variable. So we replace the UMD wrapper that browserify creates with out own,
-// in 2 steps.
-// 1. We swap out the browserify UMD with a plain function call. This ensures
-// that the internal wrapper doesn't interact with the external state. By the
-// time we're in the internal wrapper it doesn't matter what the external wrapper
-// detected. Browserify insulates its CommonJS system inside closures so can just
-// call that function and return it.
-// 2. We put our own UMD wrapper around that fixed internal function, ensuring
-// React is in scope. This outer wrapper is essentially the same UMD wrapper
-// browserify would create, just handling the scope issue.
-// Is this insane? Yes.
-// Does it work? Yes.
-// Should it go away ASAP? Yes.
-function wrapperify(src) {
-  /* eslint-disable max-len*/
-  var toReplace =
-    `function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.${this.data.standalone} = f()}}`;
-  /* eslint-enable max-len */
-  if (src.indexOf(toReplace) === -1) {
-    throw new Error('wrapperify failed to find code to replace');
-  }
-  src = src.replace(
-    toReplace,
-    `function(f){return f()}`
-  );
-  return `
-;(function(f) {
-  // CommonJS
-  if (typeof exports === "object" && typeof module !== "undefined") {
-    module.exports = f(require('react'));
-
-  // RequireJS
-  } else if (typeof define === "function" && define.amd) {
-    define(['react'], f);
-
-  // <script>
-  } else {
-    var g;
-    if (typeof window !== "undefined") {
-      g = window;
-    } else if (typeof global !== "undefined") {
-      g = global;
-    } else if (typeof self !== "undefined") {
-      g = self;
-    } else {
-      // works providing we're not in "use strict";
-      // needed for Java 8 Nashorn
-      // see https://github.com/facebook/react/issues/3037
-      g = this;
-    }
-    g.${this.data.standalone} = f(g.React);
-  }
-})(function(React) {
-  return ${src}
-});
-`;
-}
-
-// Our basic config which we'll add to to make our other builds
-var basic = {
-  entries: [
-    './build/node_modules/react/lib/ReactUMDEntry.js',
-  ],
-  outfile: './build/react.js',
-  debug: false,
-  standalone: 'React',
-  // Apply as global transform so that we also envify fbjs and any other deps
-  globalTransforms: [envifyDev],
-  plugins: [collapser],
-  after: [derequire, simpleBannerify],
-};
-
-var min = {
-  entries: [
-    './build/node_modules/react/lib/ReactUMDEntry.js',
-  ],
-  outfile: './build/react.min.js',
-  debug: false,
-  standalone: 'React',
-  // Envify twice. The first ensures that when we uglifyify, we have the right
-  // conditions to exclude requires. The global transform runs on deps.
-  transforms: [envifyProd, uglifyify],
-  globalTransforms: [envifyProd],
-  plugins: [collapser],
-  // No need to derequire because the minifier will mangle
-  // the "require" calls.
-
-  after: [minify, bannerify],
-};
-
-// The DOM Builds
-var dom = {
-  entries: [
-    './build/node_modules/react-dom/lib/ReactDOMUMDEntry.js',
-  ],
-  outfile: './build/react-dom.js',
-  debug: false,
-  standalone: 'ReactDOM',
-  // Apply as global transform so that we also envify fbjs and any other deps
-  transforms: [shimSharedModules],
-  globalTransforms: [envifyDev],
-  plugins: [collapser],
-  after: [derequire, wrapperify, simpleBannerify],
-};
-
-var domMin = {
-  entries: [
-    './build/node_modules/react-dom/lib/ReactDOMUMDEntry.js',
-  ],
-  outfile: './build/react-dom.min.js',
-  debug: false,
-  standalone: 'ReactDOM',
-  // Envify twice. The first ensures that when we uglifyify, we have the right
-  // conditions to exclude requires. The global transform runs on deps.
-  transforms: [shimSharedModules, envifyProd, uglifyify],
-  globalTransforms: [envifyProd],
-  plugins: [collapser],
-  // No need to derequire because the minifier will mangle
-  // the "require" calls.
-
-  after: [wrapperify, minify, bannerify],
-};
-
-var domServer = {
-  entries: [
-    './build/node_modules/react-dom/lib/ReactDOMServerUMDEntry.js',
-  ],
-  outfile: './build/react-dom-server.js',
-  debug: false,
-  standalone: 'ReactDOMServer',
-  // Apply as global transform so that we also envify fbjs and any other deps
-  transforms: [shimSharedModules],
-  globalTransforms: [envifyDev],
-  plugins: [collapser],
-  after: [derequire, wrapperify, simpleBannerify],
-};
-
-var domServerMin = {
-  entries: [
-    './build/node_modules/react-dom/lib/ReactDOMServerUMDEntry.js',
-  ],
-  outfile: './build/react-dom-server.min.js',
-  debug: false,
-  standalone: 'ReactDOMServer',
-  // Envify twice. The first ensures that when we uglifyify, we have the right
-  // conditions to exclude requires. The global transform runs on deps.
-  transforms: [shimSharedModules, envifyProd, uglifyify],
-  globalTransforms: [envifyProd],
-  plugins: [collapser],
-  // No need to derequire because the minifier will mangle
-  // the "require" calls.
-
-  after: [wrapperify, minify, bannerify],
-};
-
-var domFiber = {
-  entries: [
-    './build/node_modules/react-dom/lib/ReactDOMFiber.js',
-  ],
-  outfile: './build/react-dom-fiber.js',
-  debug: false,
-  standalone: 'ReactDOMFiber',
-  // Apply as global transform so that we also envify fbjs and any other deps
-  transforms: [shimSharedModules],
-  globalTransforms: [envifyDev],
-  plugins: [collapser],
-  after: [derequire, wrapperify, simpleBannerify],
-};
-
-var domFiberMin = {
-  entries: [
-    './build/node_modules/react-dom/lib/ReactDOMFiber.js',
-  ],
-  outfile: './build/react-dom-fiber.min.js',
-  debug: false,
-  standalone: 'ReactDOMFiber',
-  // Envify twice. The first ensures that when we uglifyify, we have the right
-  // conditions to exclude requires. The global transform runs on deps.
-  transforms: [shimSharedModules, envifyProd, uglifyify],
-  globalTransforms: [envifyProd],
-  plugins: [collapser],
-  // No need to derequire because the minifier will mangle
-  // the "require" calls.
-
-  after: [wrapperify, minify, bannerify],
-};
-
-module.exports = {
-  basic: basic,
-  min: min,
-  dom: dom,
-  domMin: domMin,
-  domServer: domServer,
-  domServerMin: domServerMin,
-  domFiber: domFiber,
-  domFiberMin: domFiberMin,
-};
diff --git a/grunt/config/compare_size.js b/grunt/config/compare_size.js
deleted file mode 100644
index 35c58ed4e0c63..0000000000000
--- a/grunt/config/compare_size.js
+++ /dev/null
@@ -1,17 +0,0 @@
-'use strict';
-
-var gzip = require('gzip-js');
-
-module.exports = {
-  files: [
-    'build/*.js',
-  ],
-  options: {
-    compress: {
-      gz: function(contents) {
-        return gzip.zip(contents, {}).length;
-      },
-    },
-    cache: '.grunt/sizecache.json',
-  },
-};
diff --git a/grunt/config/npm.js b/grunt/config/npm.js
deleted file mode 100644
index 1fe5c2da0086b..0000000000000
--- a/grunt/config/npm.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-exports.pack = {};
diff --git a/grunt/data/header-template-short.txt b/grunt/data/header-template-short.txt
deleted file mode 100644
index ec08497d13a90..0000000000000
--- a/grunt/data/header-template-short.txt
+++ /dev/null
@@ -1,3 +0,0 @@
- /**
-  * <%= package %> v<%= version %>
-  */
diff --git a/grunt/tasks/browserify.js b/grunt/tasks/browserify.js
deleted file mode 100644
index 50a34d6f687fd..0000000000000
--- a/grunt/tasks/browserify.js
+++ /dev/null
@@ -1,69 +0,0 @@
-'use strict';
-
-var browserify = require('browserify');
-var grunt = require('grunt');
-
-module.exports = function() {
-  var config = this.data;
-
-  // This task is async...
-  var done = this.async();
-
-  // More/better assertions
-  // grunt.config.requires('outfile');
-  // grunt.config.requires('entries');
-  config.transforms = config.transforms || [];
-  config.globalTransforms = config.globalTransforms || [];
-  config.plugins = config.plugins || [];
-  config.after = config.after || [];
-
-  // create the bundle we'll work with
-  var entries = grunt.file.expand(config.entries);
-
-  // Extract other options
-  var options = {
-    entries: entries,
-    debug: config.debug, // sourcemaps
-    standalone: config.standalone, // global
-    insertGlobalVars: {
-      // We can remove this when we remove the few direct
-      // process.env.NODE_ENV checks against "test".
-      // The intention is to avoid embedding Browserify's `process` shim
-      // because we don't really need it.
-      // See https://github.com/facebook/react/pull/7245 for context.
-      process: function() {
-        return 'undefined';
-      },
-    },
-  };
-
-  var bundle = browserify(options);
-
-  config.transforms.forEach(function(transform) {
-    bundle.transform({}, transform);
-  });
-
-  config.globalTransforms.forEach(function(transform) {
-    bundle.transform({global: true}, transform);
-  });
-
-  config.plugins.forEach(bundle.plugin, bundle);
-
-  // Actually bundle it up
-  var _this = this;
-  bundle.bundle(function(err, buf) {
-    if (err) {
-      grunt.log.error(err);
-      return done();
-    }
-
-    var src = buf.toString();
-
-    config.after.forEach(function(fn) {
-      src = fn.call(_this, src);
-    });
-
-    grunt.file.write(config.outfile, src);
-    done();
-  });
-};
diff --git a/grunt/tasks/jest.js b/grunt/tasks/jest.js
deleted file mode 100644
index c95dfb992cd83..0000000000000
--- a/grunt/tasks/jest.js
+++ /dev/null
@@ -1,51 +0,0 @@
-'use strict';
-
-var grunt = require('grunt');
-var path = require('path');
-
-function run(done, coverage) {
-  grunt.log.writeln('running jest');
-
-  var args = [
-    path.join('node_modules', 'jest-cli', 'bin', 'jest'),
-    '--runInBand',
-  ];
-  if (coverage) {
-    args.push('--coverage');
-  }
-  grunt.util.spawn({
-    cmd: 'node',
-    args: args,
-    opts: {
-      stdio: 'inherit',
-      env: Object.assign({}, process.env, {
-        NODE_ENV: 'test',
-      }),
-    },
-  }, function(spawnErr, result, code) {
-    if (spawnErr) {
-      grunt.log.error('jest failed');
-      grunt.log.error(spawnErr);
-    } else {
-      grunt.log.ok('jest passed');
-    }
-    grunt.log.writeln(result.stdout);
-
-    done(code === 0);
-  });
-}
-
-function runJestNormally() {
-  var done = this.async();
-  run(done);
-}
-
-function runJestWithCoverage() {
-  var done = this.async();
-  run(done, /* coverage */ true);
-}
-
-module.exports = {
-  normal: runJestNormally,
-  coverage: runJestWithCoverage,
-};
diff --git a/grunt/tasks/npm-react-dom.js b/grunt/tasks/npm-react-dom.js
deleted file mode 100644
index 859e95ac3d34d..0000000000000
--- a/grunt/tasks/npm-react-dom.js
+++ /dev/null
@@ -1,67 +0,0 @@
-'use strict';
-
-var fs = require('fs');
-var grunt = require('grunt');
-
-var src = 'packages/react-dom/';
-var dest = 'build/packages/react-dom/';
-var modSrc = 'build/node_modules/react-dom/lib';
-var lib = dest + 'lib/';
-var dist = dest + 'dist/';
-var distFiles = [
-  'react-dom.js',
-  'react-dom.min.js',
-  'react-dom-server.js',
-  'react-dom-server.min.js',
-];
-
-function buildRelease() {
-  if (grunt.file.exists(dest)) {
-    grunt.file.delete(dest);
-  }
-
-  // Copy to build/packages/react-dom
-  var mappings = [].concat(
-    grunt.file.expandMapping('**/*', dest, {cwd: src}),
-    grunt.file.expandMapping('**/*', lib, {cwd: modSrc}),
-    grunt.file.expandMapping('{LICENSE,PATENTS}', dest)
-  );
-  mappings.forEach(function(mapping) {
-    var mappingSrc = mapping.src[0];
-    var mappingDest = mapping.dest;
-    if (grunt.file.isDir(mappingSrc)) {
-      grunt.file.mkdir(mappingDest);
-    } else {
-      grunt.file.copy(mappingSrc, mappingDest);
-    }
-  });
-
-  // Make built source available inside npm package
-  grunt.file.mkdir(dist);
-  distFiles.forEach(function(file) {
-    grunt.file.copy('build/' + file, dist + file);
-  });
-}
-
-function packRelease() {
-  var done = this.async();
-  var spawnCmd = {
-    cmd: 'npm',
-    args: ['pack', 'react-dom'],
-    opts: {
-      cwd: 'build/packages/',
-    },
-  };
-  grunt.util.spawn(spawnCmd, function() {
-    fs.rename(
-      'build/packages/react-dom-' + grunt.config.data.pkg.version + '.tgz',
-      'build/packages/react-dom.tgz',
-      done
-    );
-  });
-}
-
-module.exports = {
-  buildRelease: buildRelease,
-  packRelease: packRelease,
-};
diff --git a/grunt/tasks/npm-react-native.js b/grunt/tasks/npm-react-native.js
deleted file mode 100644
index 2116e545b9a55..0000000000000
--- a/grunt/tasks/npm-react-native.js
+++ /dev/null
@@ -1,52 +0,0 @@
-'use strict';
-
-var fs = require('fs');
-var grunt = require('grunt');
-
-var src = 'packages/react-native-renderer/';
-var dest = 'build/packages/react-native-renderer/';
-var modSrc = 'build/node_modules/react-native/lib';
-var lib = dest + 'lib/';
-
-function buildRelease() {
-  if (grunt.file.exists(dest)) {
-    grunt.file.delete(dest);
-  }
-
-  // Copy to build/packages/react-native-renderer
-  var mappings = [].concat(
-    grunt.file.expandMapping('**/*', dest, {cwd: src}),
-    grunt.file.expandMapping('**/*', lib, {cwd: modSrc}),
-    grunt.file.expandMapping('{LICENSE,PATENTS}', dest)
-  );
-  mappings.forEach(function(mapping) {
-    var mappingSrc = mapping.src[0];
-    var mappingDest = mapping.dest;
-    if (grunt.file.isDir(mappingSrc)) {
-      grunt.file.mkdir(mappingDest);
-    } else {
-      grunt.file.copy(mappingSrc, mappingDest);
-    }
-  });
-}
-
-function packRelease() {
-  var done = this.async();
-  var spawnCmd = {
-    cmd: 'npm',
-    args: ['pack', 'packages/react-native-renderer'],
-    opts: {
-      cwd: 'build/',
-    },
-  };
-  grunt.util.spawn(spawnCmd, function() {
-    var buildSrc = 'build/react-native-renderer-' + grunt.config.data.pkg.version + '.tgz';
-    var buildDest = 'build/packages/react-native-renderer.tgz';
-    fs.rename(buildSrc, buildDest, done);
-  });
-}
-
-module.exports = {
-  buildRelease: buildRelease,
-  packRelease: packRelease,
-};
diff --git a/grunt/tasks/npm-react-noop.js b/grunt/tasks/npm-react-noop.js
deleted file mode 100644
index 62fb60d34d57b..0000000000000
--- a/grunt/tasks/npm-react-noop.js
+++ /dev/null
@@ -1,52 +0,0 @@
-'use strict';
-
-var fs = require('fs');
-var grunt = require('grunt');
-
-var src = 'packages/react-noop-renderer/';
-var dest = 'build/packages/react-noop-renderer/';
-var modSrc = 'build/node_modules/react-noop-renderer/lib';
-var lib = dest + 'lib/';
-
-function buildRelease() {
-  if (grunt.file.exists(dest)) {
-    grunt.file.delete(dest);
-  }
-
-  // Copy to build/packages/react-noop-renderer
-  var mappings = [].concat(
-    grunt.file.expandMapping('**/*', dest, {cwd: src}),
-    grunt.file.expandMapping('**/*', lib, {cwd: modSrc}),
-    grunt.file.expandMapping('{LICENSE,PATENTS}', dest)
-  );
-  mappings.forEach(function(mapping) {
-    var mappingSrc = mapping.src[0];
-    var mappingDest = mapping.dest;
-    if (grunt.file.isDir(mappingSrc)) {
-      grunt.file.mkdir(mappingDest);
-    } else {
-      grunt.file.copy(mappingSrc, mappingDest);
-    }
-  });
-}
-
-function packRelease() {
-  var done = this.async();
-  var spawnCmd = {
-    cmd: 'npm',
-    args: ['pack', 'packages/react-noop-renderer'],
-    opts: {
-      cwd: 'build/',
-    },
-  };
-  grunt.util.spawn(spawnCmd, function() {
-    var buildSrc = 'build/react-noop-renderer-' + grunt.config.data.pkg.version + '.tgz';
-    var buildDest = 'build/packages/react-noop-renderer.tgz';
-    fs.rename(buildSrc, buildDest, done);
-  });
-}
-
-module.exports = {
-  buildRelease: buildRelease,
-  packRelease: packRelease,
-};
diff --git a/grunt/tasks/npm-react-test.js b/grunt/tasks/npm-react-test.js
deleted file mode 100644
index 448da02472e1c..0000000000000
--- a/grunt/tasks/npm-react-test.js
+++ /dev/null
@@ -1,52 +0,0 @@
-'use strict';
-
-var fs = require('fs');
-var grunt = require('grunt');
-
-var src = 'packages/react-test-renderer/';
-var dest = 'build/packages/react-test-renderer/';
-var modSrc = 'build/node_modules/react-test-renderer/lib';
-var lib = dest + 'lib/';
-
-function buildRelease() {
-  if (grunt.file.exists(dest)) {
-    grunt.file.delete(dest);
-  }
-
-  // Copy to build/packages/react-test-renderer
-  var mappings = [].concat(
-    grunt.file.expandMapping('**/*', dest, {cwd: src}),
-    grunt.file.expandMapping('**/*', lib, {cwd: modSrc}),
-    grunt.file.expandMapping('{LICENSE,PATENTS}', dest)
-  );
-  mappings.forEach(function(mapping) {
-    var mappingSrc = mapping.src[0];
-    var mappingDest = mapping.dest;
-    if (grunt.file.isDir(mappingSrc)) {
-      grunt.file.mkdir(mappingDest);
-    } else {
-      grunt.file.copy(mappingSrc, mappingDest);
-    }
-  });
-}
-
-function packRelease() {
-  var done = this.async();
-  var spawnCmd = {
-    cmd: 'npm',
-    args: ['pack', 'packages/react-test-renderer'],
-    opts: {
-      cwd: 'build/',
-    },
-  };
-  grunt.util.spawn(spawnCmd, function() {
-    var buildSrc = 'build/react-test-renderer-' + grunt.config.data.pkg.version + '.tgz';
-    var buildDest = 'build/packages/react-test-renderer.tgz';
-    fs.rename(buildSrc, buildDest, done);
-  });
-}
-
-module.exports = {
-  buildRelease: buildRelease,
-  packRelease: packRelease,
-};
diff --git a/grunt/tasks/npm-react.js b/grunt/tasks/npm-react.js
deleted file mode 100644
index 35c8a520ea558..0000000000000
--- a/grunt/tasks/npm-react.js
+++ /dev/null
@@ -1,73 +0,0 @@
-'use strict';
-
-var fs = require('fs');
-var grunt = require('grunt');
-
-var src = 'packages/react/';
-var dest = 'build/packages/react/';
-var modSrc = 'build/node_modules/react/lib';
-var lib = dest + 'lib/';
-var dist = dest + 'dist/';
-var distFiles = [
-  'react.js',
-  'react.min.js',
-];
-
-function buildRelease() {
-  // delete build/react-core for fresh start
-  if (grunt.file.exists(dest)) {
-    grunt.file.delete(dest);
-  }
-
-  // mkdir -p build/react-core/lib
-  grunt.file.mkdir(lib);
-
-  // Copy npm-react/**/* to build/npm-react
-  // and build/modules/**/* to build/react-core/lib
-  var mappings = [].concat(
-    grunt.file.expandMapping('**/*', dest, {cwd: src}),
-    grunt.file.expandMapping('**/*', lib, {cwd: modSrc}),
-    grunt.file.expandMapping('{LICENSE,PATENTS}', dest)
-  );
-  mappings.forEach(function(mapping) {
-    var mappingSrc = mapping.src[0];
-    var mappingDest = mapping.dest;
-    if (grunt.file.isDir(mappingSrc)) {
-      grunt.file.mkdir(mappingDest);
-    } else {
-      grunt.file.copy(mappingSrc, mappingDest);
-    }
-  });
-
-  // Make built source available inside npm package
-  grunt.file.mkdir(dist);
-  distFiles.forEach(function(file) {
-    grunt.file.copy('build/' + file, dist + file);
-  });
-
-  // modify build/react-core/package.json to set version ##
-  var pkg = grunt.file.readJSON(dest + 'package.json');
-  pkg.version = grunt.config.data.pkg.version;
-  grunt.file.write(dest + 'package.json', JSON.stringify(pkg, null, 2));
-}
-
-function packRelease() {
-  var done = this.async();
-  var spawnCmd = {
-    cmd: 'npm',
-    args: ['pack', 'packages/react'],
-    opts: {
-      cwd: 'build/',
-    },
-  };
-  grunt.util.spawn(spawnCmd, function() {
-    var buildSrc = 'build/react-' + grunt.config.data.pkg.version + '.tgz';
-    var buildDest = 'build/packages/react.tgz';
-    fs.rename(buildSrc, buildDest, done);
-  });
-}
-
-module.exports = {
-  buildRelease: buildRelease,
-  packRelease: packRelease,
-};
diff --git a/grunt/tasks/npm.js b/grunt/tasks/npm.js
deleted file mode 100644
index a2a676206dc4d..0000000000000
--- a/grunt/tasks/npm.js
+++ /dev/null
@@ -1,100 +0,0 @@
-'use strict';
-
-var assert = require('assert');
-var path = require('path');
-var grunt = require('grunt');
-var spawn = grunt.util.spawn;
-
-module.exports = function() {
-  var done = this.async();
-
-  function run(cmd, args, opts, callback) {
-    assert.strictEqual(typeof cmd, 'string');
-    assert.ok(args instanceof Array);
-
-    if (typeof opts === 'function' && !callback) {
-      callback = opts;
-      opts = {};
-    }
-
-    assert.strictEqual(typeof opts, 'object');
-    assert.strictEqual(typeof callback, 'function');
-
-    grunt.log.writeln('> ' + cmd + ' ' + args.join(' '));
-
-    // var proc =
-    spawn({
-      cmd: cmd,
-      args: args,
-      opts: opts,
-    }, function(error, result, code) {
-      if (error) {
-        grunt.log.error(error);
-        done(false);
-      } else {
-        callback(result, code);
-      }
-    });
-
-    // Uncomment these to see the output of the commands.
-    // proc.stdout.pipe(process.stdout);
-    // proc.stderr.pipe(process.stderr);
-  }
-
-  var pkg = grunt.config.data.pkg;
-  var tgz = pkg.name + '-' + pkg.version + '.tgz';
-
-  grunt.log.writeln('Packing ' + tgz + ' (this could take a while)...');
-
-  run('npm', ['pack', '--verbose', '.'], function() {
-    require('tmp').dir(function(err, dir) {
-      if (err) {
-        grunt.log.error(err);
-        done(false);
-        return;
-      }
-
-      run('cp', [tgz, dir], function() {
-        run('npm', [
-          'install',
-          '--production',
-          tgz,
-        ], {cwd: dir}, function() {
-          var nodePath = path.join(dir, 'node_modules');
-          var pkgDir = path.join(nodePath, pkg.name);
-          var doneCount = 2;
-
-          // Make sure that bin/jsx is runnable by echoing main.js.
-          run('bin/jsx', ['main.js'], {
-            cwd: pkgDir,
-          }, function(result) {
-            assert.ok(result.stdout.indexOf('transform') >= 0, result.stdout);
-
-            if (--doneCount === 0) {
-              done();
-            }
-          });
-
-          // Make sure the .transform package method works.
-          run('node', [
-            '--print',
-            'require(\'react-tools\').transform(' +
-              JSON.stringify(
-                '/** @jsx React.DOM */ <div>oyez</div>;'
-              ) + ')',
-          ], {
-            env: {NODE_PATH: nodePath},
-          }, function(result, code) {
-            assert.ok(result.stdout.indexOf(
-              'React.DOM.div(null, \'oyez\');'
-            ) >= 0, result.stdout);
-
-            if (--doneCount === 0) {
-              done();
-            }
-          });
-        });
-      });
-    });
-  });
-};
diff --git a/grunt/tasks/release.js b/grunt/tasks/release.js
deleted file mode 100644
index 87186227bb67c..0000000000000
--- a/grunt/tasks/release.js
+++ /dev/null
@@ -1,115 +0,0 @@
-'use strict';
-
-var grunt = require('grunt');
-
-var BOWER_PATH = '../react-bower/';
-var BOWER_GLOB = [BOWER_PATH + '*.{js}'];
-var BOWER_FILES = [
-  'react.js',
-  'react.min.js',
-  'react-dom.js',
-  'react-dom.min.js',
-  'react-dom-server.js',
-  'react-dom-server.min.js',
-];
-
-var VERSION;
-var VERSION_STRING;
-
-function _gitCommitAndTag(cwd, commitMsg, tag, cb) {
-  // `git add *` to make sure we catch untracked files
-  // `git add -u` to make sure we remove deleted files
-  // `git commit -m {commitMsg}`
-  // `git tag -a {tag}`
-  var opts = {cwd: cwd};
-  var gitAddAll = {
-    cmd: 'git',
-    args: ['add', '*'],
-    opts: opts,
-  };
-  var gitAddDel = {
-    cmd: 'git',
-    args: ['add', '-u'],
-    opts: opts,
-  };
-  var gitCommit = {
-    cmd: 'git',
-    args: ['commit', '-m', commitMsg],
-    opts: opts,
-  };
-  var gitTag = {
-    cmd: 'git',
-    args: ['tag', tag],
-    opts: opts,
-  };
-  grunt.util.spawn(gitAddAll, function() {
-    grunt.util.spawn(gitAddDel, function() {
-      grunt.util.spawn(gitCommit, function() {
-        if (tag) {
-          grunt.util.spawn(gitTag, cb);
-        } else {
-          cb();
-        }
-      });
-    });
-  });
-}
-
-function setup() {
-  if (!grunt.file.exists(BOWER_PATH)) {
-    grunt.log.error('Make sure you have the react-bower repository checked ' +
-                    'out at ../react-bower');
-    return false;
-  }
-
-  VERSION = grunt.config.data.pkg.version;
-  VERSION_STRING = 'v' + VERSION;
-}
-
-function bower() {
-  var done = this.async();
-
-  // clean out the bower folder in case we're removing files
-  var files = grunt.file.expand(BOWER_GLOB);
-  files.forEach(function(file) {
-    grunt.file.delete(file, {force: true});
-  });
-
-  // Now copy over build files
-  BOWER_FILES.forEach(function(file) {
-    grunt.file.copy('build/' + file, BOWER_PATH + file);
-  });
-
-  // Commit and tag the repo
-  _gitCommitAndTag(BOWER_PATH, VERSION_STRING, VERSION_STRING, done);
-}
-
-function docs() {
-  grunt.file.copy('build/react.js', 'docs/js/react.js');
-  grunt.file.copy('build/react-dom.js', 'docs/js/react-dom.js');
-}
-
-function msg() {
-  // Just output a friendly reminder message for the rest of the process
-  grunt.log.subhead('Release *almost* complete...');
-  var steps = [
-    'Still todo:',
-    '* push this repo with tags',
-    '* push bower repo with tags',
-    '* run `npm-publish` in rrm',
-    '* create release on github',
-    '* for a major release, update docs branch variable in Travis CI',
-    '* announce it on FB/Twitter/mailing list',
-  ];
-  steps.forEach(function(ln) {
-    grunt.log.writeln(ln);
-  });
-}
-
-
-module.exports = {
-  setup: setup,
-  bower: bower,
-  docs: docs,
-  msg: msg,
-};
diff --git a/gulp/tasks/eslint.js b/gulp/tasks/eslint.js
deleted file mode 100644
index 47d8f51fad2d7..0000000000000
--- a/gulp/tasks/eslint.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-'use strict';
-
-var path = require('path');
-var spawn = require('child_process').spawn;
-
-var extension = process.platform === 'win32' ? '.cmd' : '';
-
-module.exports = function(gulp, plugins) {
-  var gutil = plugins.util;
-
-  return function(done) {
-    spawn(
-      path.join('node_modules', '.bin', 'eslint' + extension),
-      [
-        '.',
-      ],
-      {
-        // Allow colors to pass through
-        stdio: 'inherit',
-      }
-    ).on('close', function(code) {
-      if (code !== 0) {
-        gutil.log(
-          gutil.colors.red(
-            'Lint failed'
-          )
-        );
-        process.exit(code);
-      }
-
-      gutil.log(
-        gutil.colors.green(
-          'Lint passed'
-        )
-      );
-      done();
-    });
-  };
-};
diff --git a/gulp/tasks/flow.js b/gulp/tasks/flow.js
deleted file mode 100644
index f076c79d84ee3..0000000000000
--- a/gulp/tasks/flow.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-'use strict';
-
-var path = require('path');
-var spawn = require('child_process').spawn;
-
-var extension = process.platform === 'win32' ? '.cmd' : '';
-
-module.exports = function(gulp, plugins) {
-  var gutil = plugins.util;
-
-  return function(done) {
-    spawn(
-      path.join('node_modules', '.bin', 'flow' + extension),
-      [
-        'check',
-        '.',
-      ],
-      {
-        // Allow colors to pass through
-        stdio: 'inherit',
-      }
-    ).on('close', function(code) {
-      if (code !== 0) {
-        gutil.log(
-          gutil.colors.red(
-            'Flow failed'
-          )
-        );
-        process.exit(code);
-      }
-
-      gutil.log(
-        gutil.colors.green(
-          'Flow passed'
-        )
-      );
-      done();
-    });
-  };
-};
diff --git a/gulp/tasks/version-check.js b/gulp/tasks/version-check.js
deleted file mode 100644
index 31118527d4fd7..0000000000000
--- a/gulp/tasks/version-check.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-'use strict';
-
-module.exports = function(gulp, plugins) {
-  var gutil = plugins.util;
-
-  return function(done) {
-    var reactVersion = require('../../package.json').version;
-
-    var versions = {
-      'packages/react/package.json':
-        require('../../packages/react/package.json').version,
-      'packages/react-dom/package.json':
-        require('../../packages/react-dom/package.json').version,
-      'packages/react-native-renderer/package.json':
-        require('../../packages/react-native-renderer/package.json').version,
-      'packages/react-test-renderer/package.json':
-        require('../../packages/react-test-renderer/package.json').version,
-      'src/ReactVersion.js': require('../../src/ReactVersion'),
-    };
-
-    var allVersionsMatch = true;
-    Object.keys(versions).forEach(function(name) {
-      var version = versions[name];
-      if (version !== reactVersion) {
-        allVersionsMatch = false;
-        gutil.log(
-          gutil.colors.red(
-            '%s version does not match package.json. Expected %s, saw %s.'
-          ),
-          name,
-          reactVersion,
-          version
-        );
-      }
-    });
-
-    if (!allVersionsMatch) {
-      process.exit(1);
-    }
-
-    done();
-  };
-};
diff --git a/gulpfile.js b/gulpfile.js
deleted file mode 100644
index f25bc585b5755..0000000000000
--- a/gulpfile.js
+++ /dev/null
@@ -1,291 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- */
-
-'use strict';
-
-var gulp = require('gulp');
-var babel = require('gulp-babel');
-var flatten = require('gulp-flatten');
-var del = require('del');
-var merge = require('merge-stream');
-
-var babelPluginModules = require('fbjs-scripts/babel-6/rewrite-modules');
-var stripProvidesModule = require('fbjs-scripts/gulp/strip-provides-module');
-var extractErrors = require('./scripts/error-codes/gulp-extract-errors');
-var devExpressionWithCodes = require('./scripts/error-codes/dev-expression-with-codes');
-
-// Load all of the Gulp plugins.
-var plugins = require('gulp-load-plugins')();
-
-function getTask(name) {
-  return require(`./gulp/tasks/${name}`)(gulp, plugins);
-}
-
-var paths = {
-  react: {
-    src: [
-      'src/umd/ReactUMDEntry.js',
-      'src/umd/shims/**/*.js',
-
-      'src/isomorphic/**/*.js',
-
-      'src/ReactVersion.js',
-      'src/shared/**/*.js',
-      '!src/**/__benchmarks__/**/*.js',
-      '!src/**/__tests__/**/*.js',
-      '!src/**/__mocks__/**/*.js',
-    ],
-    lib: 'build/node_modules/react/lib',
-  },
-  reactDOM: {
-    src: [
-      'src/umd/ReactDOMUMDEntry.js',
-      'src/umd/ReactDOMServerUMDEntry.js',
-
-      'src/renderers/dom/**/*.js',
-      'src/renderers/shared/**/*.js',
-      'src/test/**/*.js', // ReactTestUtils is currently very coupled to DOM.
-
-      'src/ReactVersion.js',
-      'src/shared/**/*.js',
-      '!src/**/__benchmarks__/**/*.js',
-      '!src/**/__tests__/**/*.js',
-      '!src/**/__mocks__/**/*.js',
-    ],
-    lib: 'build/node_modules/react-dom/lib',
-  },
-  reactNative: {
-    src: [
-      'src/renderers/native/**/*.js',
-      'src/renderers/shared/**/*.js',
-
-      'src/ReactVersion.js',
-      'src/shared/**/*.js',
-      '!src/**/__benchmarks__/**/*.js',
-      '!src/**/__tests__/**/*.js',
-      '!src/**/__mocks__/**/*.js',
-    ],
-    lib: 'build/node_modules/react-native/lib',
-  },
-  reactTestRenderer: {
-    src: [
-      'src/renderers/testing/**/*.js',
-      'src/renderers/shared/**/*.js',
-
-      'src/ReactVersion.js',
-      'src/shared/**/*.js',
-      '!src/**/__benchmarks__/**/*.js',
-      '!src/**/__tests__/**/*.js',
-      '!src/**/__mocks__/**/*.js',
-    ],
-    lib: 'build/node_modules/react-test-renderer/lib',
-  },
-  reactNoopRenderer: {
-    src: [
-      'src/renderers/noop/**/*.js',
-      'src/renderers/shared/**/*.js',
-
-      'src/ReactVersion.js',
-      'src/shared/**/*.js',
-      '!src/**/__benchmarks__/**/*.js',
-      '!src/**/__tests__/**/*.js',
-      '!src/**/__mocks__/**/*.js',
-    ],
-    lib: 'build/node_modules/react-noop-renderer/lib',
-  },
-};
-
-exports.paths = paths;
-
-var moduleMapBase = {'object-assign': 'object-assign'};
-
-var fbjsModules = require('fbjs/module-map');
-for (var key in fbjsModules) {
-  var path = fbjsModules[key];
-  moduleMapBase[path] = path;
-}
-
-var moduleMapReact = Object.assign(
-  {
-    // Addons needs to reach into DOM internals
-    'react-dom': 'react-dom',
-    'react-dom/lib/ReactInstanceMap': 'react-dom/lib/ReactInstanceMap',
-    'react-dom/lib/ReactTestUtils': 'react-dom/lib/ReactTestUtils',
-    'react-dom/lib/ReactPerf': 'react-dom/lib/ReactPerf',
-    'react-dom/lib/getVendorPrefixedEventName': 'react-dom/lib/getVendorPrefixedEventName',
-
-    // Alias
-    'react': './React',
-    // Shared state
-    'react/lib/ReactCurrentOwner': './ReactCurrentOwner',
-    'react/lib/checkPropTypes': './checkPropTypes',
-    'react/lib/ReactComponentTreeHook': './ReactComponentTreeHook',
-    'react/lib/ReactDebugCurrentFrame': './ReactDebugCurrentFrame',
-  },
-  moduleMapBase
-);
-
-var rendererSharedState = {
-  // Alias
-  'react': 'react/lib/React',
-  // Shared state
-  'react/lib/ReactCurrentOwner': 'react/lib/ReactCurrentOwner',
-  'react/lib/checkPropTypes': 'react/lib/checkPropTypes',
-  'react/lib/ReactComponentTreeHook': 'react/lib/ReactComponentTreeHook',
-  'react/lib/ReactDebugCurrentFrame': 'react/lib/ReactDebugCurrentFrame',
-};
-
-var moduleMapReactDOM = Object.assign(
-  {
-    'react-dom': './ReactDOMFiber',
-    'react-dom/lib/ReactInstanceMap': './ReactInstanceMap',
-    'react-dom/lib/ReactTestUtils': './ReactTestUtils',
-    'react-dom/lib/ReactPerf': './ReactPerf',
-    'react-dom/lib/getVendorPrefixedEventName': './getVendorPrefixedEventName',
-  },
-  rendererSharedState,
-  moduleMapBase
-);
-
-var moduleMapReactNative = Object.assign(
-  {
-    // React Native Hooks
-    deepDiffer: 'react-native/lib/deepDiffer',
-    deepFreezeAndThrowOnMutationInDev: 'react-native/lib/deepFreezeAndThrowOnMutationInDev',
-    flattenStyle: 'react-native/lib/flattenStyle',
-    InitializeCore: 'react-native/lib/InitializeCore',
-    RCTEventEmitter: 'react-native/lib/RCTEventEmitter',
-    TextInputState: 'react-native/lib/TextInputState',
-    UIManager: 'react-native/lib/UIManager',
-    UIManagerStatTracker: 'react-native/lib/UIManagerStatTracker',
-    View: 'react-native/lib/View',
-  },
-  rendererSharedState,
-  moduleMapBase
-);
-
-var moduleMapReactTestRenderer = Object.assign(
-  {},
-  rendererSharedState,
-  moduleMapBase
-);
-
-var moduleMapReactNoopRenderer = Object.assign(
-  {},
-  rendererSharedState,
-  moduleMapBase
-);
-
-
-var errorCodeOpts = {
-  errorMapFilePath: 'scripts/error-codes/codes.json',
-};
-
-var babelOptsReact = {
-  plugins: [
-    devExpressionWithCodes, // this pass has to run before `rewrite-modules`
-    [babelPluginModules, {map: moduleMapReact}],
-  ],
-};
-
-var babelOptsReactDOM = {
-  plugins: [
-    devExpressionWithCodes, // this pass has to run before `rewrite-modules`
-    [babelPluginModules, {map: moduleMapReactDOM}],
-  ],
-};
-
-var babelOptsReactNative = {
-  plugins: [
-    devExpressionWithCodes, // this pass has to run before `rewrite-modules`
-    [babelPluginModules, {map: moduleMapReactNative}],
-  ],
-};
-
-var babelOptsReactTestRenderer = {
-  plugins: [
-    devExpressionWithCodes, // this pass has to run before `rewrite-modules`
-    [babelPluginModules, {map: moduleMapReactTestRenderer}],
-  ],
-};
-
-var babelOptsReactNoopRenderer = {
-  plugins: [
-    devExpressionWithCodes, // this pass has to run before `rewrite-modules`
-    [babelPluginModules, {map: moduleMapReactNoopRenderer}],
-  ],
-};
-
-gulp.task('eslint', getTask('eslint'));
-
-gulp.task('lint', ['eslint']);
-
-gulp.task('flow', getTask('flow'));
-
-gulp.task('version-check', getTask('version-check'));
-
-gulp.task('react:clean', function() {
-  return del([
-    paths.react.lib,
-    paths.reactDOM.lib,
-    paths.reactNative.lib,
-    paths.reactTestRenderer.lib,
-    paths.reactNoopRenderer.lib,
-  ]);
-});
-
-gulp.task('react:modules', function() {
-  return merge(
-    gulp
-      .src(paths.react.src)
-      .pipe(babel(babelOptsReact))
-      .pipe(stripProvidesModule())
-      .pipe(flatten())
-      .pipe(gulp.dest(paths.react.lib)),
-
-    gulp
-      .src(paths.reactDOM.src)
-      .pipe(babel(babelOptsReactDOM))
-      .pipe(stripProvidesModule())
-      .pipe(flatten())
-      .pipe(gulp.dest(paths.reactDOM.lib)),
-
-    gulp
-      .src(paths.reactNative.src)
-      .pipe(babel(babelOptsReactNative))
-      .pipe(stripProvidesModule())
-      .pipe(flatten())
-      .pipe(gulp.dest(paths.reactNative.lib)),
-
-    gulp
-      .src(paths.reactTestRenderer.src)
-      .pipe(stripProvidesModule())
-      .pipe(babel(babelOptsReactTestRenderer))
-      .pipe(flatten())
-      .pipe(gulp.dest(paths.reactTestRenderer.lib)),
-
-    gulp
-      .src(paths.reactNoopRenderer.src)
-      .pipe(stripProvidesModule())
-      .pipe(babel(babelOptsReactNoopRenderer))
-      .pipe(flatten())
-      .pipe(gulp.dest(paths.reactNoopRenderer.lib))
-  );
-});
-
-gulp.task('react:extract-errors', function() {
-  return gulp.src([].concat(
-    paths.react.src,
-    paths.reactDOM.src,
-    paths.reactNative.src,
-    paths.reactTestRenderer.src
-  )).pipe(extractErrors(errorCodeOpts));
-});
-
-gulp.task('default', ['react:modules']);
diff --git a/package.json b/package.json
index f31ffb1a07787..d62a325c602fa 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "babel-eslint": "^7.1.0",
     "babel-jest": "^19.0.0",
     "babel-plugin-check-es2015-constants": "^6.5.0",
+    "babel-plugin-external-helpers": "^6.22.0",
     "babel-plugin-syntax-trailing-function-commas": "^6.5.0",
     "babel-plugin-transform-async-to-generator": "^6.22.0",
     "babel-plugin-transform-class-properties": "^6.11.5",
@@ -38,11 +39,13 @@
     "browserify": "^13.0.0",
     "bundle-collapser": "^1.1.1",
     "chalk": "^1.1.3",
+    "cli-table": "^0.3.1",
     "coffee-script": "^1.8.0",
     "core-js": "^2.2.1",
     "coveralls": "^2.11.6",
     "del": "^2.0.2",
     "derequire": "^2.0.3",
+    "escape-string-regexp": "^1.0.5",
     "eslint": "^3.10.2",
     "eslint-config-fbjs": "^1.1.1",
     "eslint-plugin-babel": "^3.3.0",
@@ -51,28 +54,33 @@
     "eslint-plugin-react-internal": "file:./eslint-rules",
     "fbjs": "^0.8.9",
     "fbjs-scripts": "^0.6.0",
+    "filesize": "^3.5.6",
     "flow-bin": "^0.41.0",
-    "glob": "^6.0.1",
+    "git-branch": "^0.3.0",
+    "glob": "^6.0.4",
     "glob-stream": "^6.1.0",
-    "grunt": "^0.4.5",
-    "grunt-cli": "^0.1.13",
-    "grunt-compare-size": "^0.4.0",
-    "grunt-contrib-clean": "^0.6.0",
-    "gulp": "^3.9.0",
-    "gulp-babel": "^6.0.0",
-    "gulp-flatten": "^0.2.0",
-    "gulp-load-plugins": "^1.2.4",
-    "gulp-util": "^3.0.7",
     "gzip-js": "~0.3.2",
+    "gzip-size": "^3.0.0",
     "jest": "^19.0.1",
     "jest-config": "^19.0.1",
     "jest-jasmine2": "^19.0.1",
     "jest-runtime": "^19.0.1",
     "loose-envify": "^1.1.0",
     "merge-stream": "^1.0.0",
+    "minimist": "^1.2.0",
+    "ncp": "^2.0.0",
     "object-assign": "^4.1.1",
     "platform": "^1.1.0",
     "prettier": "^0.22.0",
+    "rimraf": "^2.6.1",
+    "rollup": "^0.41.6",
+    "rollup-plugin-alias": "^1.2.1",
+    "rollup-plugin-babel": "^2.7.1",
+    "rollup-plugin-commonjs": "^8.0.2",
+    "rollup-plugin-inject": "^2.0.0",
+    "rollup-plugin-node-resolve": "^2.0.0",
+    "rollup-plugin-replace": "^1.1.1",
+    "rollup-plugin-uglify": "^1.0.1",
     "run-sequence": "^1.1.4",
     "through2": "^2.0.0",
     "tmp": "~0.0.28",
@@ -89,13 +97,14 @@
     "version": 7
   },
   "scripts": {
-    "build": "grunt build",
+    "build": "npm run version-check && node scripts/rollup/build.js",
     "linc": "git diff --name-only --diff-filter=ACMRTUB `git merge-base HEAD master` | grep '\\.js$' | xargs eslint --",
-    "lint": "grunt lint",
+    "lint": "node ./scripts/tasks/eslint.js",
     "postinstall": "node node_modules/fbjs-scripts/node/check-dev-engines.js package.json",
     "test": "jest",
-    "flow": "flow",
-    "prettier": "node ./scripts/prettier/index.js write"
+    "flow": "node ./scripts/tasks/flow.js",
+    "prettier": "node ./scripts/prettier/index.js write",
+    "version-check": "node ./scripts/tasks/version-check.js"
   },
   "jest": {
     "modulePathIgnorePatterns": [
@@ -121,7 +130,7 @@
     "roots": [
       "<rootDir>/eslint-rules",
       "<rootDir>/mocks",
-      "<rootDir>/scripts",
+      "<rootDir>/scripts/error-codes",
       "<rootDir>/src",
       "node_modules/fbjs"
     ],
diff --git a/packages/react-art/README.md b/packages/react-art/README.md
new file mode 100644
index 0000000000000..58d7307b94d59
--- /dev/null
+++ b/packages/react-art/README.md
@@ -0,0 +1,13 @@
+# React ART
+
+React ART is a JavaScript library for drawing vector graphics using [React](http://facebook.github.io/react/).
+
+It provides declarative and reactive bindings to the [ART library](https://github.com/sebmarkbage/art/).
+
+Using the same declarative API you can render the output to either Canvas, SVG or VML (IE8).
+
+The `examples` directory contains a simple example of using React ART; you can also test out the [art branch of the react-page project](https://github.com/facebook/react-page/tree/art).
+
+## Contribute
+
+To read more about the community and guidelines for submitting pull requests, please read the [Contributing document](CONTRIBUTING.md).
diff --git a/packages/react-art/index.js b/packages/react-art/index.js
new file mode 100644
index 0000000000000..549740524df38
--- /dev/null
+++ b/packages/react-art/index.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/react-art.production.min.js');
+} else {
+  module.exports = require('./cjs/react-art.development.js');
+}
diff --git a/packages/react-art/package.json b/packages/react-art/package.json
new file mode 100644
index 0000000000000..d105d3c6e6b34
--- /dev/null
+++ b/packages/react-art/package.json
@@ -0,0 +1,41 @@
+{
+  "name": "react-art",
+  "version": "16.0.0-alpha.6",
+  "description": "React ART is a JavaScript library for drawing vector graphics using React. It provides declarative and reactive bindings to the ART library. Using the same declarative API you can render the output to either Canvas, SVG or VML (IE8).",
+  "main": "index.js",
+  "repository": "facebook/react",
+  "keywords": [
+    "react",
+    "art",
+    "svg",
+    "vml",
+    "canvas",
+    "jsx"
+  ],
+  "license": "BSD-3-Clause",
+  "bugs": {
+    "url": "https://github.com/facebook/react/issues"
+  },
+  "homepage": "https://facebook.github.io/react/",
+  "dependencies": {
+    "fbjs": "^0.8.9",
+    "loose-envify": "^1.1.0",
+    "object-assign": "^4.1.0"
+  },
+  "peerDependencies": {
+    "react": "^16.0.0-alpha.6"
+  },
+  "files": [
+    "LICENSE",
+    "PATENTS",
+    "README.md",
+    "index.js",
+    "cjs/",
+    "umd/"
+  ],
+  "browserify": {
+    "transform": [
+      "loose-envify"
+    ]
+  }
+}
diff --git a/packages/react-dom/index.js b/packages/react-dom/index.js
index 44ae595f87178..3f92519f1732f 100644
--- a/packages/react-dom/index.js
+++ b/packages/react-dom/index.js
@@ -1,3 +1,7 @@
 'use strict';
 
-module.exports = require('./lib/ReactDOMFiber');
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/react-dom.production.min.js');
+} else {
+  module.exports = require('./cjs/react-dom.development.js');
+}
diff --git a/packages/react-dom/package.json b/packages/react-dom/package.json
index 8689445209741..efd91381e416b 100644
--- a/packages/react-dom/package.json
+++ b/packages/react-dom/package.json
@@ -24,10 +24,10 @@
     "LICENSE",
     "PATENTS",
     "README.md",
-    "dist/",
-    "lib/",
     "index.js",
-    "server.js"
+    "server.js",
+    "cjs/",
+    "umd/"
   ],
   "browserify": {
     "transform": [
diff --git a/packages/react-dom/server.js b/packages/react-dom/server.js
index 559676109da8a..1354ce851480e 100644
--- a/packages/react-dom/server.js
+++ b/packages/react-dom/server.js
@@ -1,3 +1,7 @@
 'use strict';
 
-module.exports = require('./lib/ReactDOMServer');
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/react-dom-server.production.min.js');
+} else {
+  module.exports = require('./cjs/react-dom-server.development.js');
+}
diff --git a/packages/react-native-renderer/README.md b/packages/react-native-renderer/README.md
deleted file mode 100644
index db3e7d3a5981d..0000000000000
--- a/packages/react-native-renderer/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# `react-native-renderer`
-
-This package is the renderer that is used by the react-native package.
-It is intended to be used inside the react-native environment. It is not
-intended to be used stand alone.
diff --git a/packages/react-native-renderer/index.js b/packages/react-native-renderer/index.js
deleted file mode 100644
index e9fbbc91a5f51..0000000000000
--- a/packages/react-native-renderer/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = require('./lib/ReactNative');
diff --git a/packages/react-native-renderer/package.json b/packages/react-native-renderer/package.json
deleted file mode 100644
index 88ada47e84556..0000000000000
--- a/packages/react-native-renderer/package.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "name": "react-native-renderer",
-  "version": "16.0.0-alpha.6",
-  "description": "React package for use inside react-native.",
-  "main": "index.js",
-  "repository": "facebook/react",
-  "keywords": [
-    "react",
-    "react-native"
-  ],
-  "license": "BSD-3-Clause",
-  "bugs": {
-    "url": "https://github.com/facebook/react/issues"
-  },
-  "homepage": "https://facebook.github.io/react-native/",
-  "dependencies": {
-    "fbjs": "^0.8.9",
-    "object-assign": "^4.1.0"
-  },
-  "peerDependencies": {
-    "react": "^16.0.0-alpha.6"
-  },
-  "files": [
-    "LICENSE",
-    "PATENTS",
-    "README.md",
-    "index.js",
-    "lib/"
-  ]
-}
diff --git a/packages/react-noop-renderer/index.js b/packages/react-noop-renderer/index.js
index f7371b224f726..c81766bd49010 100644
--- a/packages/react-noop-renderer/index.js
+++ b/packages/react-noop-renderer/index.js
@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = require('./lib/ReactNoop');
+module.exports = require('./cjs/react-noop-renderer.development.js');
diff --git a/packages/react-noop-renderer/package.json b/packages/react-noop-renderer/package.json
index 271b4070372b4..c7358af39faae 100644
--- a/packages/react-noop-renderer/package.json
+++ b/packages/react-noop-renderer/package.json
@@ -15,6 +15,6 @@
     "PATENTS",
     "README.md",
     "index.js",
-    "lib/"
+    "cjs/"
   ]
 }
diff --git a/packages/react-test-renderer/index.js b/packages/react-test-renderer/index.js
index 0ee92d26cb716..3a0cbe1a0417c 100644
--- a/packages/react-test-renderer/index.js
+++ b/packages/react-test-renderer/index.js
@@ -1,3 +1,3 @@
 'use strict';
 
-module.exports = require('./lib/ReactTestRendererFiber');
+module.exports = require('./cjs/react-test-renderer.development');
diff --git a/packages/react-test-renderer/package.json b/packages/react-test-renderer/package.json
index 9d01a6b79eabe..4c5389360ee2d 100644
--- a/packages/react-test-renderer/package.json
+++ b/packages/react-test-renderer/package.json
@@ -26,6 +26,6 @@
     "PATENTS",
     "README.md",
     "index.js",
-    "lib/"
+    "cjs/"
   ]
 }
diff --git a/packages/react/index.js b/packages/react/index.js
new file mode 100644
index 0000000000000..999ead77897d1
--- /dev/null
+++ b/packages/react/index.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  module.exports = require('./cjs/react.production.min.js');
+} else {
+  module.exports = require('./cjs/react.development.js');
+}
diff --git a/packages/react/package.json b/packages/react/package.json
index 82614dcab0a15..fe1076beacfb4 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -11,13 +11,12 @@
   "files": [
     "LICENSE",
     "PATENTS",
-    "addons.js",
-    "react.js",
-    "addons/",
-    "dist/",
-    "lib/"
+    "README.md",
+    "index.js",
+    "cjs/",
+    "umd/"
   ],
-  "main": "react.js",
+  "main": "index.js",
   "repository": "facebook/react",
   "engines": {
     "node": ">=0.10.0"
diff --git a/packages/react/react.js b/packages/react/react.js
deleted file mode 100644
index 53abd6f0362d8..0000000000000
--- a/packages/react/react.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = require('./lib/React');
diff --git a/scripts/babel/transform-object-assign-require.js b/scripts/babel/transform-object-assign-require.js
index 36d32241337a7..d11fba2466361 100644
--- a/scripts/babel/transform-object-assign-require.js
+++ b/scripts/babel/transform-object-assign-require.js
@@ -17,10 +17,9 @@ module.exports = function autoImporter(babel) {
       state.id = path.scope.generateUidIdentifier('assign');
       path.scope.getProgramParent().push({
         id: state.id,
-        init: t.callExpression(
-          t.identifier('require'),
-          [t.stringLiteral('object-assign')]
-        ),
+        init: t.callExpression(t.identifier('require'), [
+          t.stringLiteral('object-assign'),
+        ]),
       });
     }
     return state.id;
diff --git a/scripts/circleci/build.sh b/scripts/circleci/build.sh
new file mode 100755
index 0000000000000..95a5aacd2b538
--- /dev/null
+++ b/scripts/circleci/build.sh
@@ -0,0 +1,6 @@
+#!/bin/bash		
+		
+set -e		
+		
+npm run build -- --extractErrors
+git checkout -- scripts/error-codes/codes.json		
\ No newline at end of file
diff --git a/scripts/circleci/test_coverage.sh b/scripts/circleci/test_coverage.sh
index 05a717c2a4131..467471fff6452 100755
--- a/scripts/circleci/test_coverage.sh
+++ b/scripts/circleci/test_coverage.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-./node_modules/.bin/grunt jest:coverage
+node ./scripts/tasks/jest --coverage
 if [ -z $CI_PULL_REQUEST ]; then
   cat ./coverage/lcov.info | ./node_modules/.bin/coveralls
 fi
diff --git a/scripts/circleci/test_entry_point.sh b/scripts/circleci/test_entry_point.sh
index d9a2fbf959f55..2a4cbdf665117 100755
--- a/scripts/circleci/test_entry_point.sh
+++ b/scripts/circleci/test_entry_point.sh
@@ -26,11 +26,11 @@ fi
 
 # These seem out of order but extract-errors must be run after jest.
 if [ $((0 % CIRCLE_NODE_TOTAL)) -eq "$CIRCLE_NODE_INDEX" ]; then
-  COMMANDS_TO_RUN+=('./node_modules/.bin/gulp lint')
+  COMMANDS_TO_RUN+=('node ./scripts/tasks/eslint')
   COMMANDS_TO_RUN+=('node ./scripts/prettier/index')
-  COMMANDS_TO_RUN+=('./node_modules/.bin/gulp flow')
-  COMMANDS_TO_RUN+=('./node_modules/.bin/grunt build')
-  COMMANDS_TO_RUN+=('./scripts/circleci/test_extract_errors.sh')
+  COMMANDS_TO_RUN+=('node ./scripts/tasks/flow')
+  COMMANDS_TO_RUN+=('node ./scripts/tasks/jest')
+  COMMANDS_TO_RUN+=('./scripts/circleci/build.sh')
   COMMANDS_TO_RUN+=('./scripts/circleci/track_stats.sh')
 fi
 
diff --git a/scripts/circleci/test_extract_errors.sh b/scripts/circleci/test_extract_errors.sh
deleted file mode 100755
index cce29cc3473b8..0000000000000
--- a/scripts/circleci/test_extract_errors.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -e
-
-./node_modules/.bin/gulp react:extract-errors
-git checkout -- scripts/error-codes/codes.json
-
-WARNINGS=$(node scripts/error-codes/print-warnings.js)
-echo "$WARNINGS"
-test ! -z "$WARNINGS"
diff --git a/scripts/circleci/test_html_generation.sh b/scripts/circleci/test_html_generation.sh
index 0bedb26aea4ea..19c285b94d1de 100755
--- a/scripts/circleci/test_html_generation.sh
+++ b/scripts/circleci/test_html_generation.sh
@@ -5,5 +5,5 @@ set -e
 echo 'Testing in server-render (HTML generation) mode...'
 printf '\nmodule.exports.useCreateElement = false;\n' \
   >> src/renderers/dom/shared/ReactDOMFeatureFlags.js
-./node_modules/.bin/grunt jest:normal
+node ./scripts/tasks/jest
 git checkout -- src/renderers/dom/shared/ReactDOMFeatureFlags.js
diff --git a/scripts/error-codes/Types.js b/scripts/error-codes/Types.js
index 5f7fe7f0062c4..bbe6c3429afbe 100644
--- a/scripts/error-codes/Types.js
+++ b/scripts/error-codes/Types.js
@@ -11,3 +11,4 @@
 'use strict';
 
 /*:: export type ErrorMap = { [id: string]: string; }; */
+
diff --git a/scripts/error-codes/__tests__/dev-expression-with-codes-test.js b/scripts/error-codes/__tests__/dev-expression-with-codes-test.js
index 4a459a550829e..f91d5e39a5938 100644
--- a/scripts/error-codes/__tests__/dev-expression-with-codes-test.js
+++ b/scripts/error-codes/__tests__/dev-expression-with-codes-test.js
@@ -37,11 +37,11 @@ describe('dev-expression', () => {
 
   it('should replace __DEV__ in if', () => {
     compare(
-`
+      `
 if (__DEV__) {
   console.log('foo')
 }`,
-`
+      `
 if (process.env.NODE_ENV !== 'production') {
   console.log('foo');
 }`
@@ -57,9 +57,8 @@ if (process.env.NODE_ENV !== 'production') {
 
   it("should add `reactProdInvariant` when it finds `require('invariant')`", () => {
     compare(
-"var invariant = require('invariant');",
-
-`var _prodInvariant = require('reactProdInvariant');
+      "var invariant = require('invariant');",
+      `var _prodInvariant = require('reactProdInvariant');
 
 var invariant = require('invariant');`
     );
@@ -69,27 +68,24 @@ var invariant = require('invariant');`
     compare(
       "invariant(condition, 'Do not override existing functions.');",
       "var _prodInvariant = require('reactProdInvariant');\n\n" +
-      "!condition ? " +
-      "process.env.NODE_ENV !== 'production' ? " +
-      "invariant(false, 'Do not override existing functions.') : " +
-      `_prodInvariant('16') : void 0;`
+        '!condition ? ' +
+        "process.env.NODE_ENV !== 'production' ? " +
+        "invariant(false, 'Do not override existing functions.') : " +
+        `_prodInvariant('16') : void 0;`
     );
   });
 
-  it("should only add `reactProdInvariant` once", () => {
-    var expectedInvariantTransformResult = (
-      "!condition ? " +
+  it('should only add `reactProdInvariant` once', () => {
+    var expectedInvariantTransformResult = '!condition ? ' +
       "process.env.NODE_ENV !== 'production' ? " +
       "invariant(false, 'Do not override existing functions.') : " +
-      `_prodInvariant('16') : void 0;`
-    );
+      `_prodInvariant('16') : void 0;`;
 
     compare(
-`var invariant = require('invariant');
+      `var invariant = require('invariant');
 invariant(condition, 'Do not override existing functions.');
 invariant(condition, 'Do not override existing functions.');`,
-
-`var _prodInvariant = require('reactProdInvariant');
+      `var _prodInvariant = require('reactProdInvariant');
 
 var invariant = require('invariant');
 ${expectedInvariantTransformResult}
@@ -101,10 +97,10 @@ ${expectedInvariantTransformResult}`
     compare(
       "invariant(condition, 'Expected %s target to be an array; got %s', 'foo', 'bar');",
       "var _prodInvariant = require('reactProdInvariant');\n\n" +
-      "!condition ? " +
-      "process.env.NODE_ENV !== 'production' ? " +
-      "invariant(false, 'Expected %s target to be an array; got %s', 'foo', 'bar') : " +
-      `_prodInvariant('7', 'foo', 'bar') : void 0;`
+        '!condition ? ' +
+        "process.env.NODE_ENV !== 'production' ? " +
+        "invariant(false, 'Expected %s target to be an array; got %s', 'foo', 'bar') : " +
+        `_prodInvariant('7', 'foo', 'bar') : void 0;`
     );
   });
 
@@ -112,10 +108,10 @@ ${expectedInvariantTransformResult}`
     compare(
       "invariant(condition, 'Expected a component class, ' + 'got %s.' + '%s', 'Foo', 'Bar');",
       "var _prodInvariant = require('reactProdInvariant');\n\n" +
-      "!condition ? " +
-      "process.env.NODE_ENV !== 'production' ? " +
-      "invariant(false, 'Expected a component class, got %s.%s', 'Foo', 'Bar') : " +
-      `_prodInvariant('18', 'Foo', 'Bar') : void 0;`
+        '!condition ? ' +
+        "process.env.NODE_ENV !== 'production' ? " +
+        "invariant(false, 'Expected a component class, got %s.%s', 'Foo', 'Bar') : " +
+        `_prodInvariant('18', 'Foo', 'Bar') : void 0;`
     );
   });
 
@@ -126,9 +122,9 @@ ${expectedInvariantTransformResult}`
     expect(console.warn.calls.count()).toBe(1);
     expect(console.warn.calls.argsFor(0)[0]).toBe(
       'Error message "a %s b" ' +
-      'cannot be found. The current React version ' +
-      'and the error map are probably out of sync. ' +
-      'Please run `gulp react:extract-errors` before building React.'
+        'cannot be found. The current React version ' +
+        'and the error map are probably out of sync. ' +
+        'Please run `yarn build -- --extractErrors` to build React with the error map in sync.'
     );
   });
 
diff --git a/scripts/error-codes/__tests__/evalToString-test.js b/scripts/error-codes/__tests__/evalToString-test.js
index efc6b4bb6958f..161510354000e 100644
--- a/scripts/error-codes/__tests__/evalToString-test.js
+++ b/scripts/error-codes/__tests__/evalToString-test.js
@@ -11,11 +11,9 @@
 var evalToString = require('../evalToString');
 var babylon = require('babylon');
 
-var parse = (source) => babylon.parse(
-  `(${source});`
-).program.body[0].expression; // quick way to get an exp node
+var parse = source => babylon.parse(`(${source});`).program.body[0].expression; // quick way to get an exp node
 
-var parseAndEval = (source) => evalToString(parse(source));
+var parseAndEval = source => evalToString(parse(source));
 
 describe('evalToString', () => {
   it('should support StringLiteral', () => {
@@ -28,9 +26,15 @@ describe('evalToString', () => {
   });
 
   it('should throw when it finds other types', () => {
-    expect(() => parseAndEval(`'foo ' + true`)).toThrowError(/Unsupported type/);
+    expect(() => parseAndEval(`'foo ' + true`)).toThrowError(
+      /Unsupported type/
+    );
     expect(() => parseAndEval(`'foo ' + 3`)).toThrowError(/Unsupported type/);
-    expect(() => parseAndEval(`'foo ' + null`)).toThrowError(/Unsupported type/);
-    expect(() => parseAndEval(`'foo ' + undefined`)).toThrowError(/Unsupported type/);
+    expect(() => parseAndEval(`'foo ' + null`)).toThrowError(
+      /Unsupported type/
+    );
+    expect(() => parseAndEval(`'foo ' + undefined`)).toThrowError(
+      /Unsupported type/
+    );
   });
 });
diff --git a/scripts/error-codes/__tests__/invertObject-test.js b/scripts/error-codes/__tests__/invertObject-test.js
index dff7c25035a18..e173bc28d0085 100644
--- a/scripts/error-codes/__tests__/invertObject-test.js
+++ b/scripts/error-codes/__tests__/invertObject-test.js
@@ -10,7 +10,7 @@
 
 var invertObject = require('../invertObject');
 
-var objectValues = (target) => Object.keys(target).map((key) => target[key]);
+var objectValues = target => Object.keys(target).map(key => target[key]);
 
 describe('invertObject', () => {
   it('should return an empty object for an empty input', () => {
@@ -18,37 +18,49 @@ describe('invertObject', () => {
   });
 
   it('should invert key-values', () => {
-    expect(invertObject({
-      a: '3',
-      b: '4',
-    })).toEqual({
+    expect(
+      invertObject({
+        a: '3',
+        b: '4',
+      })
+    ).toEqual({
       3: 'a',
       4: 'b',
     });
   });
 
-  it('should take the last value when there\'re duplications in vals', () => {
-    expect(invertObject({
-      a: '3',
-      b: '4',
-      c: '3',
-    })).toEqual({
+  it("should take the last value when there're duplications in vals", () => {
+    expect(
+      invertObject({
+        a: '3',
+        b: '4',
+        c: '3',
+      })
+    ).toEqual({
       4: 'b',
       3: 'c',
     });
   });
 
   it('should preserve the original order', () => {
-    expect(Object.keys(invertObject({
-      a: '3',
-      b: '4',
-      c: '3',
-    }))).toEqual(['3', '4']);
+    expect(
+      Object.keys(
+        invertObject({
+          a: '3',
+          b: '4',
+          c: '3',
+        })
+      )
+    ).toEqual(['3', '4']);
 
-    expect(objectValues(invertObject({
-      a: '3',
-      b: '4',
-      c: '3',
-    }))).toEqual(['c', 'b']);
+    expect(
+      objectValues(
+        invertObject({
+          a: '3',
+          b: '4',
+          c: '3',
+        })
+      )
+    ).toEqual(['c', 'b']);
   });
 });
diff --git a/scripts/error-codes/codes.json b/scripts/error-codes/codes.json
index fb8006fdf2b84..a328e174400fe 100644
--- a/scripts/error-codes/codes.json
+++ b/scripts/error-codes/codes.json
@@ -144,4 +144,4 @@
   "142": "Expected onBeforeMountComponent() parent and onSetChildren() to be consistent (%s has parents %s and %s).",
   "143": "React.Children.only expected to receive a single React element child.",
   "144": "React.PropTypes type checking code is stripped in production."
-}
+}
\ No newline at end of file
diff --git a/scripts/error-codes/dev-expression-with-codes.js b/scripts/error-codes/dev-expression-with-codes.js
index 9862a20f51a7b..560264878dd3a 100644
--- a/scripts/error-codes/dev-expression-with-codes.js
+++ b/scripts/error-codes/dev-expression-with-codes.js
@@ -22,13 +22,14 @@ module.exports = function(babel) {
   // Generate a hygienic identifier
   function getProdInvariantIdentifier(path, localState) {
     if (!localState.prodInvariantIdentifier) {
-      localState.prodInvariantIdentifier = path.scope.generateUidIdentifier('prodInvariant');
+      localState.prodInvariantIdentifier = path.scope.generateUidIdentifier(
+        'prodInvariant'
+      );
       path.scope.getProgramParent().push({
         id: localState.prodInvariantIdentifier,
-        init: t.callExpression(
-          t.identifier('require'),
-          [t.stringLiteral('reactProdInvariant')]
-        ),
+        init: t.callExpression(t.identifier('require'), [
+          t.stringLiteral('reactProdInvariant'),
+        ]),
       });
     }
     return localState.prodInvariantIdentifier;
@@ -37,11 +38,7 @@ module.exports = function(babel) {
   var DEV_EXPRESSION = t.binaryExpression(
     '!==',
     t.memberExpression(
-      t.memberExpression(
-        t.identifier('process'),
-        t.identifier('env'),
-        false
-      ),
+      t.memberExpression(t.identifier('process'), t.identifier('env'), false),
       t.identifier('NODE_ENV'),
       false
     ),
@@ -122,42 +119,46 @@ module.exports = function(babel) {
               node[SEEN_SYMBOL] = true;
               if (process.env.NODE_ENV !== 'test') {
                 console.warn(
-                  'Error message "' + errorMsgLiteral +
-                  '" cannot be found. The current React version ' +
-                  'and the error map are probably out of sync. ' +
-                  'Please run `gulp react:extract-errors` before building React.'
+                  'Error message "' +
+                    errorMsgLiteral +
+                    '" cannot be found. The current React version ' +
+                    'and the error map are probably out of sync. ' +
+                    'Please run `yarn build -- --extractErrors` to ' +
+                    'build React with the error map in sync.'
                 );
               }
               return;
             }
 
-            var devInvariant = t.callExpression(node.callee, [
-              t.booleanLiteral(false),
-              t.stringLiteral(errorMsgLiteral),
-            ].concat(node.arguments.slice(2)));
+            var devInvariant = t.callExpression(
+              node.callee,
+              [
+                t.booleanLiteral(false),
+                t.stringLiteral(errorMsgLiteral),
+              ].concat(node.arguments.slice(2))
+            );
 
             devInvariant[SEEN_SYMBOL] = true;
 
             var localInvariantId = getProdInvariantIdentifier(path, this);
-            var prodInvariant = t.callExpression(localInvariantId, [
-              t.stringLiteral(prodErrorId),
-            ].concat(node.arguments.slice(2)));
+            var prodInvariant = t.callExpression(
+              localInvariantId,
+              [t.stringLiteral(prodErrorId)].concat(node.arguments.slice(2))
+            );
 
             prodInvariant[SEEN_SYMBOL] = true;
-            path.replaceWith(t.ifStatement(
-              t.unaryExpression('!', condition),
-              t.blockStatement([
-                t.ifStatement(
-                  DEV_EXPRESSION,
-                  t.blockStatement([
-                    t.expressionStatement(devInvariant),
-                  ]),
-                  t.blockStatement([
-                    t.expressionStatement(prodInvariant),
-                  ])
-                ),
-              ])
-            ));
+            path.replaceWith(
+              t.ifStatement(
+                t.unaryExpression('!', condition),
+                t.blockStatement([
+                  t.ifStatement(
+                    DEV_EXPRESSION,
+                    t.blockStatement([t.expressionStatement(devInvariant)]),
+                    t.blockStatement([t.expressionStatement(prodInvariant)])
+                  ),
+                ])
+              )
+            );
           } else if (path.get('callee').isIdentifier({name: 'warning'})) {
             // Turns this code:
             //
@@ -174,14 +175,12 @@ module.exports = function(babel) {
             // invariant because we don't care about an extra call in __DEV__
 
             node[SEEN_SYMBOL] = true;
-            path.replaceWith(t.ifStatement(
-              DEV_EXPRESSION,
-              t.blockStatement([
-                t.expressionStatement(
-                  node
-                ),
-              ])
-            ));
+            path.replaceWith(
+              t.ifStatement(
+                DEV_EXPRESSION,
+                t.blockStatement([t.expressionStatement(node)])
+              )
+            );
           }
         },
       },
diff --git a/scripts/error-codes/evalToString.js b/scripts/error-codes/evalToString.js
index a8a0b9c6b1df5..a011009713615 100644
--- a/scripts/error-codes/evalToString.js
+++ b/scripts/error-codes/evalToString.js
@@ -10,7 +10,7 @@
  */
 'use strict';
 
-function evalToString(ast/* : Object */)/* : string */ {
+function evalToString(ast /* : Object */) /* : string */ {
   switch (ast.type) {
     case 'StringLiteral':
       return ast.value;
diff --git a/scripts/error-codes/gulp-extract-errors.js b/scripts/error-codes/extract-errors.js
similarity index 65%
rename from scripts/error-codes/gulp-extract-errors.js
rename to scripts/error-codes/extract-errors.js
index cc873db9d4b05..89f7743e0767c 100644
--- a/scripts/error-codes/gulp-extract-errors.js
+++ b/scripts/error-codes/extract-errors.js
@@ -8,19 +8,14 @@
  */
 'use strict';
 
-var babylon = require('babylon');
-var fs = require('fs');
-var gutil = require('gulp-util');
-var path = require('path');
-var through = require('through2');
-var traverse = require('babel-traverse').default;
-
-var evalToString = require('./evalToString');
-var invertObject = require('./invertObject');
-
-var PLUGIN_NAME = 'extract-errors';
-
-var babylonOptions = {
+const babylon = require('babylon');
+const fs = require('fs');
+const path = require('path');
+const traverse = require('babel-traverse').default;
+const evalToString = require('./evalToString');
+const invertObject = require('./invertObject');
+
+const babylonOptions = {
   sourceType: 'module',
   // As a parser, babylon has its own options and we can't directly
   // import/require a babel preset. It should be kept **the same** as
@@ -37,8 +32,7 @@ var babylonOptions = {
 
 module.exports = function(opts) {
   if (!opts || !('errorMapFilePath' in opts)) {
-    throw new gutil.PluginError(
-      PLUGIN_NAME,
+    throw new Error(
       'Missing options. Ensure you pass an object with `errorMapFilePath`.'
     );
   }
@@ -46,9 +40,10 @@ module.exports = function(opts) {
   var errorMapFilePath = opts.errorMapFilePath;
   var existingErrorMap;
   try {
-    existingErrorMap = require(
-      path.join(__dirname, path.basename(errorMapFilePath))
-    );
+    existingErrorMap = require(path.join(
+      __dirname,
+      path.basename(errorMapFilePath)
+    ));
   } catch (e) {
     existingErrorMap = {};
   }
@@ -56,7 +51,8 @@ module.exports = function(opts) {
   var allErrorIDs = Object.keys(existingErrorMap);
   var currentID;
 
-  if (allErrorIDs.length === 0) { // Map is empty
+  if (allErrorIDs.length === 0) {
+    // Map is empty
     currentID = 0;
   } else {
     currentID = Math.max.apply(null, allErrorIDs) + 1;
@@ -65,18 +61,7 @@ module.exports = function(opts) {
   // Here we invert the map object in memory for faster error code lookup
   existingErrorMap = invertObject(existingErrorMap);
 
-  function transform(file, enc, cb) {
-    if (file.isNull()) {
-      cb(null, file);
-      return;
-    }
-
-    if (file.isStream()) {
-      cb(new gutil.PluginError(PLUGIN_NAME, 'Streaming not supported'));
-      return;
-    }
-
-    var source = file.contents.toString();
+  function transform(source) {
     var ast = babylon.parse(source, babylonOptions);
 
     traverse(ast, {
@@ -92,26 +77,25 @@ module.exports = function(opts) {
               return;
             }
 
-            existingErrorMap[errorMsgLiteral] = '' + (currentID++);
+            existingErrorMap[errorMsgLiteral] = '' + currentID++;
           }
         },
       },
     });
-
-    cb();
   }
 
   function flush(cb) {
-    fs.writeFile(
+    fs.writeFileSync(
       errorMapFilePath,
       JSON.stringify(invertObject(existingErrorMap), null, 2) + '\n',
-      'utf-8',
-      function() {
-        // avoid calling cb with fs.write callback data
-        cb();
-      }
+      'utf-8'
     );
   }
 
-  return through.obj(transform, flush);
+  return function extractErrors(filepath) {
+    const source = fs.readFileSync(filepath, 'utf-8');
+
+    transform(source);
+    flush();
+  };
 };
diff --git a/scripts/error-codes/invertObject.js b/scripts/error-codes/invertObject.js
index ddf72aac1c30f..821575c508c3d 100644
--- a/scripts/error-codes/invertObject.js
+++ b/scripts/error-codes/invertObject.js
@@ -18,7 +18,7 @@
  * into
  *   { 0: 'MUCH ERROR', 1: 'SUCH WRONG' }
  */
-function invertObject(targetObj/* : ErrorMap */)/* : ErrorMap */ {
+function invertObject(targetObj /* : ErrorMap */) /* : ErrorMap */ {
   var result = {};
   var mapKeys = Object.keys(targetObj);
 
diff --git a/scripts/error-codes/print-warnings.js b/scripts/error-codes/print-warnings.js
index c886e021958c3..73ac5e2c1aaac 100644
--- a/scripts/error-codes/print-warnings.js
+++ b/scripts/error-codes/print-warnings.js
@@ -18,7 +18,6 @@ const evalToString = require('./evalToString');
 
 const paths = require('../../gulpfile').paths;
 
-
 const babylonOptions = {
   sourceType: 'module',
   // As a parser, babylon has its own options and we can't directly
@@ -70,8 +69,9 @@ const sourcePaths = [].concat(
   paths.reactTestRenderer.src
 );
 
-gs(sourcePaths)
-  .pipe(through.obj(transform, cb => {
+gs(sourcePaths).pipe(
+  through.obj(transform, cb => {
     process.stdout.write(Array.from(warnings).sort().join('\n') + '\n');
     cb();
-  }));
+  })
+);
diff --git a/scripts/facts-tracker/index.js b/scripts/facts-tracker/index.js
index 0c7013e0235d4..fc47e43e1697e 100644
--- a/scripts/facts-tracker/index.js
+++ b/scripts/facts-tracker/index.js
@@ -25,15 +25,13 @@ function exec(command, args) {
   return execFileSync(command, args, options).toString();
 }
 
-
 var isCI = !!process.env.TRAVIS_REPO_SLUG;
 
 if (isCI) {
   var branch = process.env.TRAVIS_BRANCH || process.env.CIRCLE_BRANCH;
-  var isPullRequest = (
-    !!process.env.TRAVIS_PULL_REQUEST &&
-    process.env.TRAVIS_PULL_REQUEST !== 'false'
-  ) || !!process.env.CI_PULL_REQUEST;
+  var isPullRequest = (!!process.env.TRAVIS_PULL_REQUEST &&
+    process.env.TRAVIS_PULL_REQUEST !== 'false') ||
+    !!process.env.CI_PULL_REQUEST;
 
   if (branch !== 'master') {
     console.error('facts-tracker: Branch is not master, exiting...');
@@ -48,45 +46,41 @@ if (isCI) {
   if (!process.env.GITHUB_USER) {
     console.error(
       'In order to use facts-tracker, you need to configure a ' +
-      'few environment variables in order to be able to commit to the ' +
-      'repository. Follow those steps to get you setup:\n' +
-      '\n' +
-      'Go to https://github.com/settings/tokens/new\n' +
-      ' - Fill "Token description" with "facts-tracker for ' +
-        process.env.TRAVIS_REPO_SLUG + '"\n' +
-      ' - Check "public_repo"\n' +
-      ' - Press "Generate Token"\n' +
-      '\n' +
-      'In a different tab, go to https://travis-ci.org/' +
-        process.env.TRAVIS_REPO_SLUG + '/settings\n' +
-      ' - Make sure "Build only if .travis.yml is present" is ON\n' +
-      ' - Fill "Name" with "GITHUB_USER" and "Value" with the name of the ' +
+        'few environment variables in order to be able to commit to the ' +
+        'repository. Follow those steps to get you setup:\n' +
+        '\n' +
+        'Go to https://github.com/settings/tokens/new\n' +
+        ' - Fill "Token description" with "facts-tracker for ' +
+        process.env.TRAVIS_REPO_SLUG +
+        '"\n' +
+        ' - Check "public_repo"\n' +
+        ' - Press "Generate Token"\n' +
+        '\n' +
+        'In a different tab, go to https://travis-ci.org/' +
+        process.env.TRAVIS_REPO_SLUG +
+        '/settings\n' +
+        ' - Make sure "Build only if .travis.yml is present" is ON\n' +
+        ' - Fill "Name" with "GITHUB_USER" and "Value" with the name of the ' +
         'account you generated the token with. Press "Add"\n' +
-      '\n' +
-      'Once this is done, commit anything to the repository to restart ' +
+        '\n' +
+        'Once this is done, commit anything to the repository to restart ' +
         'Travis and it should work :)'
     );
     process.exit(1);
   }
 
-  exec(
-    'git',
-    [
-      'config',
-      '--global',
-      'user.name',
-      process.env.GITHUB_USER_NAME || 'facts-tracker',
-    ]
-  );
-  exec(
-    'git',
-    [
-      'config',
-      '--global',
-      'user.email',
-      process.env.GITHUB_USER_EMAIL || 'facts-tracker@no-reply.github.com',
-    ]
-  );
+  exec('git', [
+    'config',
+    '--global',
+    'user.name',
+    process.env.GITHUB_USER_NAME || 'facts-tracker',
+  ]);
+  exec('git', [
+    'config',
+    '--global',
+    'user.email',
+    process.env.GITHUB_USER_EMAIL || 'facts-tracker@no-reply.github.com',
+  ]);
 }
 
 if (process.argv.length <= 2) {
@@ -113,7 +107,8 @@ function getRepoSlug() {
 
 var repoSlug = getRepoSlug();
 var currentCommitHash = exec('git', ['rev-parse', 'HEAD']).trim();
-var currentTimestamp = new Date().toISOString()
+var currentTimestamp = new Date()
+  .toISOString()
   .replace('T', ' ')
   .replace(/\..+/, '');
 
@@ -122,22 +117,23 @@ function checkoutFactsFolder() {
   if (!fs.existsSync(factsFolder)) {
     var repoURL;
     if (isCI) {
-      repoURL = 'https://' + process.env.GITHUB_USER + '@github.com/' + repoSlug + '.git';
+      repoURL = 'https://' +
+        process.env.GITHUB_USER +
+        '@github.com/' +
+        repoSlug +
+        '.git';
     } else {
       repoURL = 'git@github.com:' + repoSlug + '.git';
     }
 
-    exec(
-      'git',
-      [
-        'clone',
-        '--branch',
-        'facts',
-        '--depth=5',
-        repoURL,
-        factsFolder,
-      ]
-    );
+    exec('git', [
+      'clone',
+      '--branch',
+      'facts',
+      '--depth=5',
+      repoURL,
+      factsFolder,
+    ]);
   }
 
   cwd = path.resolve(factsFolder);
@@ -155,8 +151,10 @@ for (var i = 2; i < process.argv.length; i += 2) {
   var value = process.argv[i + 1];
   if (value.indexOf('\n') !== -1) {
     console.error(
-      'facts-tracker: skipping', name,
-      'as the value contains new lines:', value
+      'facts-tracker: skipping',
+      name,
+      'as the value contains new lines:',
+      value
     );
     continue;
   }
@@ -167,9 +165,8 @@ for (var i = 2; i < process.argv.length; i += 2) {
   } catch (e) {
     // ignore error
   }
-  var lastValue = lastLine && lastLine
-    .replace(/^[^\t]+\t[^\t]+\t/, '') // commit hash \t timestamp \t
-    .slice(0, -1); // trailing \n
+  var lastValue = lastLine &&
+    lastLine.replace(/^[^\t]+\t[^\t]+\t/, '').slice(0, -1); // commit hash \t timestamp \t // trailing \n
 
   if (value !== lastValue) {
     fs.appendFileSync(
diff --git a/scripts/jest/environment.js b/scripts/jest/environment.js
index 98aa77b5591c1..71323d7deec47 100644
--- a/scripts/jest/environment.js
+++ b/scripts/jest/environment.js
@@ -8,6 +8,10 @@ global.requestAnimationFrame = function(callback) {
 
 global.requestIdleCallback = function(callback) {
   setTimeout(() => {
-    callback({ timeRemaining() { return Infinity; } });
+    callback({
+      timeRemaining() {
+        return Infinity;
+      },
+    });
   });
 };
diff --git a/scripts/jest/preprocessor.js b/scripts/jest/preprocessor.js
index 4a48cfe9e5554..7adc47e443471 100644
--- a/scripts/jest/preprocessor.js
+++ b/scripts/jest/preprocessor.js
@@ -18,11 +18,21 @@ var babelPluginModules = require('fbjs-scripts/babel-6/rewrite-modules');
 var createCacheKeyFunction = require('fbjs-scripts/jest/createCacheKeyFunction');
 
 // Use require.resolve to be resilient to file moves, npm updates, etc
-var pathToBabel = path.join(require.resolve('babel-core'), '..', 'package.json');
+var pathToBabel = path.join(
+  require.resolve('babel-core'),
+  '..',
+  'package.json'
+);
 var pathToModuleMap = require.resolve('fbjs/module-map');
-var pathToBabelPluginDevWithCode = require.resolve('../error-codes/dev-expression-with-codes');
-var pathToBabelPluginModules = require.resolve('fbjs-scripts/babel-6/rewrite-modules');
-var pathToBabelPluginAsyncToGenerator = require.resolve('babel-plugin-transform-async-to-generator');
+var pathToBabelPluginDevWithCode = require.resolve(
+  '../error-codes/dev-expression-with-codes'
+);
+var pathToBabelPluginModules = require.resolve(
+  'fbjs-scripts/babel-6/rewrite-modules'
+);
+var pathToBabelPluginAsyncToGenerator = require.resolve(
+  'babel-plugin-transform-async-to-generator'
+);
 var pathToBabelrc = path.join(__dirname, '..', '..', '.babelrc');
 var pathToErrorCodes = require.resolve('../error-codes/codes.json');
 
@@ -30,15 +40,19 @@ var pathToErrorCodes = require.resolve('../error-codes/codes.json');
 var babelOptions = {
   plugins: [
     pathToBabelPluginDevWithCode, // this pass has to run before `rewrite-modules`
-    [babelPluginModules, {
-      map: Object.assign(
-        {},
-        moduleMap,
-        {
+    [
+      babelPluginModules,
+      {
+        map: Object.assign({}, moduleMap, {
           'object-assign': 'object-assign',
-        }
-      ),
-    }],
+        }),
+      },
+    ],
+    // Keep stacks detailed in tests.
+    // Don't put this in .babelrc so that we don't embed filenames
+    // into ReactART builds that include JSX.
+    // TODO: I have not verified that this actually works.
+    require.resolve('babel-plugin-transform-react-jsx-source'),
   ],
   retainLines: true,
 };
@@ -46,14 +60,13 @@ var babelOptions = {
 module.exports = {
   process: function(src, filePath) {
     if (filePath.match(/\.coffee$/)) {
-      return coffee.compile(src, {'bare': true});
+      return coffee.compile(src, {bare: true});
     }
     if (filePath.match(/\.ts$/) && !filePath.match(/\.d\.ts$/)) {
       return tsPreprocessor.compile(src, filePath);
     }
     if (
-      !filePath.match(/\/node_modules\//) &&
-      !filePath.match(/\/third_party\//)
+      !filePath.match(/\/node_modules\//) && !filePath.match(/\/third_party\//)
     ) {
       // for test files, we also apply the async-await transform, but we want to
       // make sure we don't accidentally apply that transform to product code.
@@ -63,9 +76,13 @@ module.exports = {
         Object.assign(
           {filename: path.relative(process.cwd(), filePath)},
           babelOptions,
-          isTestFile ? {
-            plugins: [pathToBabelPluginAsyncToGenerator].concat(babelOptions.plugins),
-          } : {}
+          isTestFile
+            ? {
+                plugins: [pathToBabelPluginAsyncToGenerator].concat(
+                  babelOptions.plugins
+                ),
+              }
+            : {}
         )
       ).code;
     }
diff --git a/scripts/jest/setupSpecEquivalenceReporter.js b/scripts/jest/setupSpecEquivalenceReporter.js
index 90e430f4c7fe5..6f32fd38bf741 100644
--- a/scripts/jest/setupSpecEquivalenceReporter.js
+++ b/scripts/jest/setupSpecEquivalenceReporter.js
@@ -21,11 +21,11 @@ global.expect = function() {
 beforeEach(() => numExpectations = 0);
 
 jasmine.currentEnv_.addReporter({
-  specDone: (spec) => {
+  specDone: spec => {
     console.log(
       `EQUIVALENCE: ${spec.description}, ` +
-      `status: ${spec.status}, ` +
-      `numExpectations: ${numExpectations}`
+        `status: ${spec.status}, ` +
+        `numExpectations: ${numExpectations}`
     );
   },
 });
diff --git a/scripts/jest/test-framework-setup.js b/scripts/jest/test-framework-setup.js
index 0a01de3e6cd4c..24601948d9d43 100644
--- a/scripts/jest/test-framework-setup.js
+++ b/scripts/jest/test-framework-setup.js
@@ -67,9 +67,8 @@ env.beforeEach(() => {
         compare(actual) {
           return {
             pass: callCount === 0,
-            message:
-              'Expected test not to warn. If the warning is expected, mock ' +
-              'it out using spyOn(console, \'error\'); and test that the ' +
+            message: 'Expected test not to warn. If the warning is expected, mock ' +
+              "it out using spyOn(console, 'error'); and test that the " +
               'warning occurs.',
           };
         },
@@ -96,7 +95,7 @@ function wrapDevMatcher(obj, name) {
 const expectDev = function expectDev(actual) {
   const expectation = expect(actual);
   if (global.__suppressDevFailures) {
-    Object.keys(expectation).forEach((name) => {
+    Object.keys(expectation).forEach(name => {
       wrapDevMatcher(expectation, name);
       wrapDevMatcher(expectation.not, name);
     });
diff --git a/scripts/jest/ts-preprocessor.js b/scripts/jest/ts-preprocessor.js
index 0b27f226bbea7..b4fe74552c40f 100644
--- a/scripts/jest/ts-preprocessor.js
+++ b/scripts/jest/ts-preprocessor.js
@@ -10,12 +10,11 @@ var tsOptions = {
 };
 
 function formatErrorMessage(error) {
-  return (
-    error.file.filename + '(' +
+  return error.file.filename +
+    '(' +
     error.file.getLineAndCharacterOfPosition(error.start).line +
     '): ' +
-    error.messageText
-  );
+    error.messageText;
 }
 
 function compile(content, contentFilename) {
@@ -30,13 +29,11 @@ function compile(content, contentFilename) {
       // the file path into backslashes on Windows.
       filename = path.normalize(filename);
       if (filename === 'lib.d.ts') {
-        source = fs.readFileSync(
-          require.resolve('typescript/lib/lib.d.ts')
-        ).toString();
+        source = fs
+          .readFileSync(require.resolve('typescript/lib/lib.d.ts'))
+          .toString();
       } else if (filename.match(jestRegex)) {
-        source = fs.readFileSync(
-          path.join(__dirname, 'jest.d.ts')
-        ).toString();
+        source = fs.readFileSync(path.join(__dirname, 'jest.d.ts')).toString();
       } else if (filename === contentFilename) {
         source = content;
       } else if (reactRegex.test(filename)) {
@@ -79,11 +76,11 @@ function compile(content, contentFilename) {
       return ts.sys.useCaseSensitiveFileNames;
     },
   };
-  var program = ts.createProgram([
-    'lib.d.ts',
-    'jest.d.ts',
-    contentFilename,
-  ], tsOptions, compilerHost);
+  var program = ts.createProgram(
+    ['lib.d.ts', 'jest.d.ts', contentFilename],
+    tsOptions,
+    compilerHost
+  );
   var emitResult = program.emit();
   var errors = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
   if (errors.length) {
diff --git a/scripts/prettier/index.js b/scripts/prettier/index.js
index 85af4bcf87a41..ce2ac8dfbb44a 100644
--- a/scripts/prettier/index.js
+++ b/scripts/prettier/index.js
@@ -18,7 +18,10 @@ const execFileSync = require('child_process').execFileSync;
 const shouldWrite = process.argv[2] === 'write';
 const isWindows = process.platform === 'win32';
 const prettier = isWindows ? 'prettier.cmd' : 'prettier';
-const prettierCmd = path.resolve(__dirname, '../../node_modules/.bin/' + prettier);
+const prettierCmd = path.resolve(
+  __dirname,
+  '../../node_modules/.bin/' + prettier
+);
 const defaultOptions = {
   'bracket-spacing': 'false',
   'single-quote': 'true',
@@ -29,10 +32,14 @@ const defaultOptions = {
 const config = {
   default: {
     patterns: ['src/**/*.js'],
-    ignore: [
-      '**/third_party/**',
-      '**/node_modules/**',
-    ],
+    ignore: ['**/third_party/**', '**/node_modules/**'],
+  },
+  scripts: {
+    patterns: ['scripts/**/*.js'],
+    ignore: ['**/bench/**'],
+    options: {
+      'trailing-comma': 'es5',
+    },
   },
 };
 
@@ -63,9 +70,9 @@ Object.keys(config).forEach(key => {
     if (!shouldWrite) {
       console.log(
         '\n' +
-        chalk.red(
-          `  This project uses prettier to format all JavaScript code.\n`
-        ) +
+          chalk.red(
+            `  This project uses prettier to format all JavaScript code.\n`
+          ) +
           chalk.dim(`    Please run `) +
           chalk.reset('yarn prettier') +
           chalk.dim(` and add changes to files listed above to your commit.`) +
diff --git a/scripts/release-manager/Readme.md b/scripts/release-manager/Readme.md
index e0e4103dd6247..54453fe3acc27 100644
--- a/scripts/release-manager/Readme.md
+++ b/scripts/release-manager/Readme.md
@@ -149,7 +149,7 @@ If you’re just cutting an alpha, you should skip it.
 Run this so that `scripts/error-codes/codes.json` is up to date:
 
 ```
-./node_modules/.bin/gulp react:extract-errors
+npm run build -- --extractErrors
 ```
 
 Check `git diff`. Do changes, if any, look sensible?
@@ -268,7 +268,7 @@ npm run build
 
 ### Verify the Build Works
 
-At the very least, open `fixtures/packaging/globals.html` in the browser. You should see a “Hello, World!” fading in, and the console should have no errors.
+At the very least, open `fixtures/packaging/index.html` in the browser. You should see a “Hello, World!” fading in on each iframe, and the console should have no errors.
 
 If you changed anything related to how packages are created, I recommend following the instructions in `fixtures/packaging/README.md` and verifying that each of those manual tests works. You can skip the “build React” step in it but still need to build the fixtures.
 
@@ -386,10 +386,10 @@ Copy your new release notes from `CHANGELOG.md` and [create a new Release](https
 
 Finally, attach these files to the release:
 
-* `build/react.js`
-* `build/react.min.js`
-* `build/react-dom.js`
-* `build/react-dom.min.js`
+* `build/dist/react.dev.js`
+* `build/dist/react.min.prod.js`
+* `build/dist/react-dom.dev.js`
+* `build/dist/react-dom.prod.min.js`
 
 ### Force-Updating the Website
 
diff --git a/scripts/release-manager/cli.js b/scripts/release-manager/cli.js
index fde7553e4b6bc..de06b49a4926c 100755
--- a/scripts/release-manager/cli.js
+++ b/scripts/release-manager/cli.js
@@ -21,7 +21,10 @@ const vorpal = new Vorpal();
 // TODO: Make this an argument to the script
 let PATH_TO_REPO = null;
 
-const PATH_TO_CONFIG = path.resolve(os.homedir(), '.react-release-manager.json');
+const PATH_TO_CONFIG = path.resolve(
+  os.homedir(),
+  '.react-release-manager.json'
+);
 
 const DEFAULT_CONFIG = {
   githubToken: null,
@@ -45,7 +48,6 @@ const COMMANDS = [
   'start-release',
 ];
 
-
 // HELPERS
 
 // Simple helper to write out some JSON for debugging
@@ -55,10 +57,7 @@ function writeTo(file, data) {
     fs.mkdirSync(folder);
   }
 
-  fs.writeFile(
-    path.join(folder, file),
-    JSON.stringify(data, null, 2)
-  );
+  fs.writeFile(path.join(folder, file), JSON.stringify(data, null, 2));
 }
 
 // Wrapper around exec so we don't have to worry about paths
@@ -75,9 +74,10 @@ function execInRepo(command) {
   }).trim();
 }
 
-
 function getReactVersion() {
-  return (JSON.parse(fs.readFileSync(path.join(PATH_TO_REPO, 'package.json'), 'utf8'))).version;
+  return JSON.parse(
+    fs.readFileSync(path.join(PATH_TO_REPO, 'package.json'), 'utf8')
+  ).version;
 }
 
 const app = {
@@ -100,8 +100,8 @@ const app = {
     } catch (e) {
       console.error(
         'Attempt to load config file failed. Please run `init` command for initial setup or make sure ' +
-        '~/.react-release-manager.json is valid JSON. Using a default config which may not work ' +
-        'properly.'
+          '~/.react-release-manager.json is valid JSON. Using a default config which may not work ' +
+          'properly.'
       );
       return DEFAULT_CONFIG;
     }
@@ -125,16 +125,13 @@ const app = {
     this.getReactVersion = getReactVersion;
 
     // Register commands
-    COMMANDS.forEach((command) => {
+    COMMANDS.forEach(command => {
       vorpal.use(require(`./commands/${command}`)(vorpal, app));
     });
 
-    var v = vorpal
-      .history('react-release-manager')
-      .delimiter('rrm \u2234');
+    var v = vorpal.history('react-release-manager').delimiter('rrm \u2234');
     v.exec('help');
     v.show();
-
   },
 };
 
diff --git a/scripts/release-manager/commands/docs-prs.js b/scripts/release-manager/commands/docs-prs.js
index 41f5038eddda8..b1d970f49fb36 100644
--- a/scripts/release-manager/commands/docs-prs.js
+++ b/scripts/release-manager/commands/docs-prs.js
@@ -20,18 +20,19 @@ const DOCS_LABEL = 'Documentation: needs merge to stable';
 //        https://github.com/facebook/react/issues?q=label%3A%22Documentation%3A+needs+merge+to+stable%22+is%3Aclosed
 //        and say manual step to remove label
 
-
 module.exports = function(vorpal, app) {
   vorpal
     .command('docs-prs')
-    .description('Get list of documentation pull requests that need to be merged to the stable branch')
+    .description(
+      'Get list of documentation pull requests that need to be merged to the stable branch'
+    )
     .action(function(args, actionCB) {
       const branch = git.getBranch(app);
       if (!branch.match(/-stable$/)) {
         this.log(chalk.red('Aborting...'));
         this.log(
           `You need to be on the latest stable branch in the React repo ` +
-          `to execute this command.\nYou are currently in ${branch}.`
+            `to execute this command.\nYou are currently in ${branch}.`
         );
         actionCB();
         return;
@@ -51,11 +52,11 @@ module.exports = function(vorpal, app) {
 
         // This API *could* return issues that aren't pull requests, so filter out
         // issues that don't have pull_request set.
-        const pulls = body.filter((issue) => issue.pull_request);
+        const pulls = body.filter(issue => issue.pull_request);
 
         // We don't enough data about the pull request (merge sha or merge time) so we
         // need to fetch more. We'll use promises so we don't have to count completions.
-        const pullPromises = pulls.map((pr) => {
+        const pullPromises = pulls.map(pr => {
           return new Promise((resolve, reject) => {
             app.ghrepo.getPullRequest(pr.number, (err, body) => {
               if (err) {
@@ -71,70 +72,79 @@ module.exports = function(vorpal, app) {
             });
           });
         });
-        Promise.all(pullPromises).then((richPulls) => {
-          richPulls.forEach((pr) => {
+        Promise.all(pullPromises).then(richPulls => {
+          richPulls.forEach(pr => {
             // Convert merged_at to real Date for sorting
             pr.merged_at_date = new Date(pr.merged_at);
           });
 
-          richPulls = richPulls.sort((a, b) => a.merged_at_date - b.merged_at_date);
+          richPulls = richPulls.sort(
+            (a, b) => a.merged_at_date - b.merged_at_date
+          );
 
           this.log(`Found ${chalk.bold(richPulls.length)} pull requests:`);
-          richPulls.forEach((pr) => {
+          richPulls.forEach(pr => {
             this.log(`${pr.html_url}: ${chalk.bold(pr.title)}`);
           });
 
-          this.prompt({
-            name: 'merge',
-            type: 'confirm',
-            message: `Merge these ${richPulls.length} pull requests?`,
-          }, (res) => {
-            if (res.merge) {
-              richPulls.forEach((pr) => {
-                git.cherryPickMerge(app, pr.merge_commit_sha);
-              });
-
-              this.prompt({
-                name: 'push',
-                type: 'confirm',
-                message: 'Push these commits upstream?',
-              }, (res) => {
-                if (res.push) {
-                  git.push(app);
-                  this.log(`Pushed upstream! Removing "${DOCS_LABEL}" label from pull requests.`);
-                }
-
-                // TODO: actually test this
-                var removeLabelsPromises = richPulls.map((pr) => {
-                  return new Promise((resolve, reject) => {
-                    const updatedLabels = pr.__originalIssue.labels
-                      .filter((label) => label.name !== DOCS_LABEL)
-                      .map(label => label.name);
-                    app.ghissues.editIssue(pr.number, {labels: updatedLabels}, (err, body) => {
-                      if (err) {
-                        reject(err);
-                      } else {
-                        resolve(pr);
-                      }
-                    });
-                  });
+          this.prompt(
+            {
+              name: 'merge',
+              type: 'confirm',
+              message: `Merge these ${richPulls.length} pull requests?`,
+            },
+            res => {
+              if (res.merge) {
+                richPulls.forEach(pr => {
+                  git.cherryPickMerge(app, pr.merge_commit_sha);
                 });
 
-                Promise.all(removeLabelsPromises).then(() => {
-                  this.log('Done!');
-                  actionCB();
-                });
-              });
+                this.prompt(
+                  {
+                    name: 'push',
+                    type: 'confirm',
+                    message: 'Push these commits upstream?',
+                  },
+                  res => {
+                    if (res.push) {
+                      git.push(app);
+                      this.log(
+                        `Pushed upstream! Removing "${DOCS_LABEL}" label from pull requests.`
+                      );
+                    }
+
+                    // TODO: actually test this
+                    var removeLabelsPromises = richPulls.map(pr => {
+                      return new Promise((resolve, reject) => {
+                        const updatedLabels = pr.__originalIssue.labels
+                          .filter(label => label.name !== DOCS_LABEL)
+                          .map(label => label.name);
+                        app.ghissues.editIssue(
+                          pr.number,
+                          {labels: updatedLabels},
+                          (err, body) => {
+                            if (err) {
+                              reject(err);
+                            } else {
+                              resolve(pr);
+                            }
+                          }
+                        );
+                      });
+                    });
 
-            } else {
-              actionCB();
+                    Promise.all(removeLabelsPromises).then(() => {
+                      this.log('Done!');
+                      actionCB();
+                    });
+                  }
+                );
+              } else {
+                actionCB();
+              }
             }
-          });
-
-
+          );
         });
-
       });
-
     });
 };
diff --git a/scripts/release-manager/commands/init.js b/scripts/release-manager/commands/init.js
index ae0b67d9d2c97..5b392b7c1cfe6 100644
--- a/scripts/release-manager/commands/init.js
+++ b/scripts/release-manager/commands/init.js
@@ -33,7 +33,7 @@ module.exports = function(vorpal, app) {
               name: 'reactPath',
               type: 'input',
               message: `${chalk.bold('Location of local React checkout?')} `,
-              validate: (input) => {
+              validate: input => {
                 let npath = path.normalize(untildify(input));
 
                 if (npath === '.') {
@@ -55,14 +55,18 @@ module.exports = function(vorpal, app) {
                 return true;
               },
             },
-          ]).then((answers) => {
-            fs.writeFile(app.PATH_TO_CONFIG, JSON.stringify(answers, null, 2), (err) => {
-              if (err) {
-                this.log('Error writing config file.', err);
-                reject();
+          ]).then(answers => {
+            fs.writeFile(
+              app.PATH_TO_CONFIG,
+              JSON.stringify(answers, null, 2),
+              err => {
+                if (err) {
+                  this.log('Error writing config file.', err);
+                  reject();
+                }
+                resolve();
               }
-              resolve();
-            });
+            );
           });
         });
       });
diff --git a/scripts/release-manager/commands/npm-check-access.js b/scripts/release-manager/commands/npm-check-access.js
index ee0de8299c5de..cfc8c3a4f2d50 100644
--- a/scripts/release-manager/commands/npm-check-access.js
+++ b/scripts/release-manager/commands/npm-check-access.js
@@ -14,18 +14,21 @@ module.exports = function(vorpal, app) {
         if (!username) {
           return reject(
             `${chalk.red('FAILED')} You aren't logged in to npm. Please run ` +
-            `${chalk.underline(`npm adduser`)} and try again.`
+              `${chalk.underline(`npm adduser`)} and try again.`
           );
         }
 
         this.log(`${chalk.green('OK')} Logged in as ${chalk.bold(username)}`);
 
-        const packagesNeedingAccess = npmUtils.packagesNeedingAccess(app, username);
+        const packagesNeedingAccess = npmUtils.packagesNeedingAccess(
+          app,
+          username
+        );
 
         if (packagesNeedingAccess.length) {
           this.log(
             `${chalk.red('FAILED')} You don't have access to all of the packages ` +
-            `you need. We just opened a URL to file a new issue requesting access.`
+              `you need. We just opened a URL to file a new issue requesting access.`
           );
           opn(
             npmUtils.generateAccessNeededIssue(username, packagesNeedingAccess),
diff --git a/scripts/release-manager/commands/npm-grant-access.js b/scripts/release-manager/commands/npm-grant-access.js
index a8360c877a1ad..0a1ffd3d26be7 100644
--- a/scripts/release-manager/commands/npm-grant-access.js
+++ b/scripts/release-manager/commands/npm-grant-access.js
@@ -6,30 +6,40 @@ const chalk = require('chalk');
 module.exports = function(vorpal, app) {
   vorpal
     .command('npm-grant-access')
-    .description('Grant access to somebody to publish React. Assumes you ran "npm-check-access" first.')
+    .description(
+      'Grant access to somebody to publish React. Assumes you ran "npm-check-access" first.'
+    )
     .action(function(args) {
       return new Promise((resolve, reject) => {
         this.prompt({
           type: 'input',
           message: 'Who would you like to grant access to? ',
           name: 'username',
-        }).then((answers) => {
+        }).then(answers => {
           if (!answers.username) {
             return reject('ABORTING');
           }
 
-          const packagesNeedingAccess = npmUtils.packagesNeedingAccess(app, answers.username);
+          const packagesNeedingAccess = npmUtils.packagesNeedingAccess(
+            app,
+            answers.username
+          );
 
           if (packagesNeedingAccess.length) {
-            this.log(`${chalk.yellow('PENDING')} Granting access to ${packagesNeedingAccess}`);
+            this.log(
+              `${chalk.yellow('PENDING')} Granting access to ${packagesNeedingAccess}`
+            );
             npmUtils.grantAccess(app, answers.username, packagesNeedingAccess);
-            this.log(`${chalk.green('OK')} Access has been granted to ${answers.username}.`);
+            this.log(
+              `${chalk.green('OK')} Access has been granted to ${answers.username}.`
+            );
             resolve();
           } else {
-            this.log(`${chalk.green('OK')} ${answers.username} already has access.`);
+            this.log(
+              `${chalk.green('OK')} ${answers.username} already has access.`
+            );
             resolve();
           }
-
         });
       });
     });
diff --git a/scripts/release-manager/commands/npm-publish.js b/scripts/release-manager/commands/npm-publish.js
index 4e4e1d3344623..5267a8693741e 100644
--- a/scripts/release-manager/commands/npm-publish.js
+++ b/scripts/release-manager/commands/npm-publish.js
@@ -1,10 +1,8 @@
-
 // Publishes the built npm packages from build/packages
 // 1. Show checklist (automate later)
 // 2. Prompt to ensure build is complete
 // 3. Prompt for dist-tag?
 
-
 'use strict';
 
 const path = require('path');
@@ -12,11 +10,10 @@ const semver = require('semver');
 
 const glob = require('glob');
 
-
 module.exports = function(vorpal, app) {
   vorpal
     .command('npm-publish')
-    .description('After you\'ve run grunt release, publishes the npm packages')
+    .description("After you've run grunt release, publishes the npm packages")
     .action(function(args) {
       return new Promise((resolve, reject) => {
         const currentVersion = app.getReactVersion();
@@ -35,7 +32,7 @@ module.exports = function(vorpal, app) {
             default: false,
             name: 'checklist',
           },
-        ]).then((answers) => {
+        ]).then(answers => {
           if (!answers.checklist) {
             return reject('Complete the build process first');
           }
@@ -55,20 +52,23 @@ module.exports = function(vorpal, app) {
           }
 
           // TODO: track success
-          tgz.forEach((file) => {
+          tgz.forEach(file => {
             this.log(app.execInRepo(`npm publish ${file} --tag=next`));
           });
 
           if (isStable) {
-            tgz.forEach((file) => {
+            tgz.forEach(file => {
               const pkg = path.parse(file).name;
-              this.log(app.execInRepo(`npm dist-tag add ${pkg}@${currentVersion} latest`));
+              this.log(
+                app.execInRepo(
+                  `npm dist-tag add ${pkg}@${currentVersion} latest`
+                )
+              );
             });
           }
 
           resolve();
         });
       });
-
     });
 };
diff --git a/scripts/release-manager/commands/q.js b/scripts/release-manager/commands/q.js
index 2da5f580bbabc..c32a27c579b3a 100644
--- a/scripts/release-manager/commands/q.js
+++ b/scripts/release-manager/commands/q.js
@@ -5,10 +5,7 @@
 'use strict';
 
 module.exports = function(vorpal, config) {
-  vorpal
-    .command('q')
-    .hidden()
-    .action((args, cb) => {
-      vorpal.exec('exit').then(cb);
-    });
+  vorpal.command('q').hidden().action((args, cb) => {
+    vorpal.exec('exit').then(cb);
+  });
 };
diff --git a/scripts/release-manager/commands/stable-prs.js b/scripts/release-manager/commands/stable-prs.js
index cd5118f9264e3..586232adabfdd 100644
--- a/scripts/release-manager/commands/stable-prs.js
+++ b/scripts/release-manager/commands/stable-prs.js
@@ -12,12 +12,12 @@ const SEMVER_LABELS = [
   'semver-exempt',
 ];
 
-
-
 module.exports = function(vorpal, app) {
   vorpal
     .command('stable-prs')
-    .description('Get list of stable pull requests that need to be merged to the stable branch')
+    .description(
+      'Get list of stable pull requests that need to be merged to the stable branch'
+    )
     .action(function(args) {
       // This makes the chaining easier but obfuscates the actual API, which is
       // unfortunate. The standalone API will return the right data but
@@ -31,177 +31,187 @@ module.exports = function(vorpal, app) {
       let targetMilestone = null;
 
       return new Promise((resolveAction, rejectAction) => {
-        listMilestones(null).then((milestones) => {
-          app.writeTo('milestones.json', milestones);
+        listMilestones(null)
+          .then(milestones => {
+            app.writeTo('milestones.json', milestones);
 
-          // Turn the milestones into choices for Inquirer
-          let milestoneChoices = milestones.map((milestone) => {
-            return {
-              value: milestone.number,
-              name: milestone.title,
-            };
-          });
+            // Turn the milestones into choices for Inquirer
+            let milestoneChoices = milestones.map(milestone => {
+              return {
+                value: milestone.number,
+                name: milestone.title,
+              };
+            });
 
-          // We need label choices too
-          let labelChoices = SEMVER_LABELS.map((label) => {
-            return {
-              value: label,
-              name: label.split('-')[1], // "major" instead of "semver-major"
-            };
-          });
+            // We need label choices too
+            let labelChoices = SEMVER_LABELS.map(label => {
+              return {
+                value: label,
+                name: label.split('-')[1], // "major" instead of "semver-major"
+              };
+            });
 
-          // Ask about source milestone
-          // Ask about dest milestone
-          // TODO: allow creation of milestone here.
-          // Ask about which labels to pull from
+            // Ask about source milestone
+            // Ask about dest milestone
+            // TODO: allow creation of milestone here.
+            // Ask about which labels to pull from
 
-          return this.prompt([
-            {
-              name: 'srcMilestone',
-              type: 'list',
-              message: 'Which milestone should we pull PRs from?',
-              choices: milestoneChoices,
-            },
-            {
-              name: 'destMilestone',
-              type: 'list',
-              message: 'Which milestone should we assign PRs to upon completion?',
-              choices: milestoneChoices,
-            },
-            {
-              name: 'labels',
-              type: 'checkbox',
-              message: 'Which PRs should we select (use spacebar to check all that apply)',
-              choices: labelChoices,
-            },
-          ]).then((answers) => {
-            // this.log(JSON.stringify(answers, null, 2));
-            targetMilestone = answers.destMilestone;
-            let labels = {};
-            answers.labels.forEach((label) => {
-              labels[label] = true;
-            });
-            return {
-              labels: labels,
-              query: {
-                milestone: answers.srcMilestone,
-                per_page: 100,
-                state: 'closed',
+            return this.prompt([
+              {
+                name: 'srcMilestone',
+                type: 'list',
+                message: 'Which milestone should we pull PRs from?',
+                choices: milestoneChoices,
               },
-            };
-          });
-        })
-        // Request issues, filter to applicable PRs
-        .then(({labels, query}) => {
-          return listIssues(query).then((issues) => {
-            app.writeTo('stable-issues.json', issues);
+              {
+                name: 'destMilestone',
+                type: 'list',
+                message: 'Which milestone should we assign PRs to upon completion?',
+                choices: milestoneChoices,
+              },
+              {
+                name: 'labels',
+                type: 'checkbox',
+                message: 'Which PRs should we select (use spacebar to check all that apply)',
+                choices: labelChoices,
+              },
+            ]).then(answers => {
+              // this.log(JSON.stringify(answers, null, 2));
+              targetMilestone = answers.destMilestone;
+              let labels = {};
+              answers.labels.forEach(label => {
+                labels[label] = true;
+              });
+              return {
+                labels: labels,
+                query: {
+                  milestone: answers.srcMilestone,
+                  per_page: 100,
+                  state: 'closed',
+                },
+              };
+            });
+          })
+          // Request issues, filter to applicable PRs
+          .then(({labels, query}) => {
+            return (
+              listIssues(query)
+                .then(issues => {
+                  app.writeTo('stable-issues.json', issues);
 
-            // This API *could* return issues that aren't pull requests, so filter out
-            // issues that don't have pull_request set. Also filter out issues that
-            // aren't the right level of semver (eg if running a patch release)
-            let filteringLabels = Object.keys(labels).length > 0;
-            const pulls = issues.filter((issue) => {
-              if (!issue.pull_request) {
-                return false;
-              }
+                  // This API *could* return issues that aren't pull requests, so filter out
+                  // issues that don't have pull_request set. Also filter out issues that
+                  // aren't the right level of semver (eg if running a patch release)
+                  let filteringLabels = Object.keys(labels).length > 0;
+                  const pulls = issues.filter(issue => {
+                    if (!issue.pull_request) {
+                      return false;
+                    }
 
-              if (!filteringLabels) {
-                return true;
-              }
+                    if (!filteringLabels) {
+                      return true;
+                    }
+
+                    return issue.labels.some(label => labels[label.name]);
+                  });
+                  app.writeTo('stable-prs.json', pulls);
+                  return pulls;
+                })
+                // We need to convert the issues to PRs. We don't actually have enough
+                // info for the pull request data, so we need to get more. Then we'll
+                // do some filtering and sorting to make sure we apply merged PRs in
+                // the order they were originally committed to avoid conflicts as much
+                // as possible.
+                .then(pulls => {
+                  return Promise.all(
+                    pulls.map(pr => {
+                      return getPullRequest(pr.number).then(richPR => {
+                        app.writeTo(`pr-${pr.number}.json`, richPR);
+                        richPR.__originalIssue = pr;
+                        return richPR;
+                      });
+                    })
+                  ).then(richPRs => {
+                    return richPRs
+                      .filter(pr => {
+                        if (!pr.merged_at) {
+                          this.log(
+                            `${chalk.yellow.bold('WARNING')} ${pr.html_url} was not merged,` +
+                              ` should have the milestone unset.`
+                          );
+                          return false;
+                        }
+                        return true;
+                      })
+                      .map(pr => {
+                        pr.merged_at_date = new Date(pr.merged_at);
+                        return pr;
+                      })
+                      .sort((a, b) => a.merged_at_date - b.merged_at_date);
+                  });
+                })
+            );
+          })
+          // Quick prompt to double check that we should proceed.
+          .then(pulls => {
+            this.log(`Found ${chalk.bold(pulls.length)} pull requests:`);
+            pulls.forEach(pr => {
+              this.log(`${pr.html_url}: ${chalk.bold(pr.title)}`);
+            });
 
-              return issue.labels.some((label) => labels[label.name]);
+            return this.prompt({
+              name: 'merge',
+              type: 'confirm',
+              message: `Merge these ${pulls.length} pull requests?`,
+            }).then(answers => {
+              return answers.merge ? pulls : rejectAction('cancelled');
             });
-            app.writeTo('stable-prs.json', pulls);
-            return pulls;
           })
-          // We need to convert the issues to PRs. We don't actually have enough
-          // info for the pull request data, so we need to get more. Then we'll
-          // do some filtering and sorting to make sure we apply merged PRs in
-          // the order they were originally committed to avoid conflicts as much
-          // as possible.
-          .then((pulls) => {
-            return Promise.all(pulls.map((pr) => {
-              return getPullRequest(pr.number)
-                .then((richPR) => {
-                  app.writeTo(`pr-${pr.number}.json`, richPR);
-                  richPR.__originalIssue = pr;
-                  return richPR;
-                });
-            }))
-            .then((richPRs) => {
-              return richPRs.filter((pr) => {
-                if (!pr.merged_at) {
+          // Ok, now we finally have rich pull request data. We can start cherry picking…
+          .then(pulls => {
+            // We're going to do some error handling here so we don't get into a
+            // terrible state.
+            this.log(`Found ${chalk.bold(pulls.length)} pull requests:`);
+            return new Promise((resolve, reject) => {
+              cherryPickPRs
+                .call(this, app, pulls)
+                .then(results => {
+                  resolve(results);
+                })
+                .catch(err => {
                   this.log(
-                    `${chalk.yellow.bold('WARNING')} ${pr.html_url} was not merged,` +
-                     ` should have the milestone unset.`
+                    `${chalk.red.bold('ERROR')} Something went wrong and your repo is` +
+                      ` probably in a bad state. Sorry.`
                   );
-                  return false;
-                }
-                return true;
-              }).map((pr) => {
-                pr.merged_at_date = new Date(pr.merged_at);
-                return pr;
-              }).sort((a, b) => a.merged_at_date - b.merged_at_date);
+                  resolve({
+                    successful: [],
+                    skipped: [],
+                    didAbort: true,
+                  });
+                });
             });
-          });
-        })
-        // Quick prompt to double check that we should proceed.
-        .then((pulls) => {
-          this.log(`Found ${chalk.bold(pulls.length)} pull requests:`);
-          pulls.forEach((pr) => {
-            this.log(`${pr.html_url}: ${chalk.bold(pr.title)}`);
-          });
+          })
+          // Update the milestone on successful PRs
+          // TODO: maybe handle didAbort and git reset --hard to a rev we read when we start the process?
+          .then(({successful, aborted, didAbort}) => {
+            if (didAbort) {
+              return undefined;
+            }
 
-          return this.prompt({
-            name: 'merge',
-            type: 'confirm',
-            message: `Merge these ${pulls.length} pull requests?`,
-          }).then((answers) => {
-            return answers.merge ? pulls : rejectAction('cancelled');
-          });
-        })
-        // Ok, now we finally have rich pull request data. We can start cherry picking…
-        .then((pulls) => {
-          // We're going to do some error handling here so we don't get into a
-          // terrible state.
-          this.log(`Found ${chalk.bold(pulls.length)} pull requests:`);
-          return new Promise((resolve, reject) => {
-            cherryPickPRs.call(this, app, pulls)
-              .then((results) => {
-                resolve(results);
+            return Promise.all(
+              successful.map(pr => {
+                return editIssue(pr.number, {milestone: targetMilestone});
               })
-              .catch((err) => {
-                this.log(
-                  `${chalk.red.bold('ERROR')} Something went wrong and your repo is` +
-                   ` probably in a bad state. Sorry.`
-                );
-                resolve({
-                  successful: [],
-                  skipped: [],
-                  didAbort: true,
-                });
-              });
+            );
+          })
+          // yay, we're done
+          .then(() => {
+            resolveAction();
+          })
+          .catch(err => {
+            this.log('ERROR', err);
+            rejectAction();
           });
-        })
-        // Update the milestone on successful PRs
-        // TODO: maybe handle didAbort and git reset --hard to a rev we read when we start the process?
-        .then(({successful, aborted, didAbort}) => {
-          if (didAbort) {
-            return undefined;
-          }
-
-          return Promise.all(successful.map((pr) => {
-            return editIssue(pr.number, {milestone: targetMilestone});
-          }));
-        })
-        // yay, we're done
-        .then(() => {
-          resolveAction();
-        })
-        .catch((err) => {
-          this.log('ERROR', err);
-          rejectAction();
-        });
       });
     });
 };
@@ -211,45 +221,51 @@ function cherryPickPRs(app, prs) {
   let skipped = [];
   return new Promise((resolve, reject) => {
     // Build array of thenables
-    let promises = prs.map((pr) => {
-      return () => new Promise((res, rej) => {
-        this.log(chalk.yellow(`Cherry-picking #${pr.number} (${pr.title})...`));
-        let failed = false;
-        try {
-          git.cherryPickMerge(app, pr.merge_commit_sha);
-        } catch (e) {
-          failed = true;
-        }
-
-        if (!failed) {
-          this.log(chalk.green`Success`);
-          successful.push(pr);
-          return res();
-        }
+    let promises = prs.map(pr => {
+      return () =>
+        new Promise((res, rej) => {
+          this.log(
+            chalk.yellow(`Cherry-picking #${pr.number} (${pr.title})...`)
+          );
+          let failed = false;
+          try {
+            git.cherryPickMerge(app, pr.merge_commit_sha);
+          } catch (e) {
+            failed = true;
+          }
 
-        return this.prompt({
-          name: 'handle',
-          type: 'list',
-          message: `${chalk.red`Failed!`} ${chalk.yellow('This must be resolved manually!')}`,
-          choices: [
-            {value: 'ok', name: 'Continue, mark successful'},
-            {value: 'skip', name: 'Continue, mark skipped'},
-            {value: 'abort', name: 'Abort process. Will require manual resetting of git state.'},
-          ],
-        }).then((answers) => {
-          switch (answers.handle) {
-            case 'ok':
-              successful.push(pr);
-              break;
-            case 'skip':
-              skipped.push(pr);
-              break;
-            case 'abort':
-              return rej(pr.number);
+          if (!failed) {
+            this.log(chalk.green`Success`);
+            successful.push(pr);
+            return res();
           }
-          res(pr.number);
+
+          return this.prompt({
+            name: 'handle',
+            type: 'list',
+            message: `${chalk.red`Failed!`} ${chalk.yellow('This must be resolved manually!')}`,
+            choices: [
+              {value: 'ok', name: 'Continue, mark successful'},
+              {value: 'skip', name: 'Continue, mark skipped'},
+              {
+                value: 'abort',
+                name: 'Abort process. Will require manual resetting of git state.',
+              },
+            ],
+          }).then(answers => {
+            switch (answers.handle) {
+              case 'ok':
+                successful.push(pr);
+                break;
+              case 'skip':
+                skipped.push(pr);
+                break;
+              case 'abort':
+                return rej(pr.number);
+            }
+            res(pr.number);
+          });
         });
-      });
     });
 
     // Since promises run on creation and we don't actually want that, we create
@@ -259,11 +275,12 @@ function cherryPickPRs(app, prs) {
     for (let i = 1; i < promises.length; i++) {
       p = p.then(() => promises[i]());
     }
-    p.then(() => {
-      resolve({successful, skipped, didAbort: false});
-    }).catch((e) => {
-      resolve({successful, skipped, didAbort: true});
-    });
-
+    p
+      .then(() => {
+        resolve({successful, skipped, didAbort: false});
+      })
+      .catch(e => {
+        resolve({successful, skipped, didAbort: true});
+      });
   });
 }
diff --git a/scripts/release-manager/commands/start-release.js b/scripts/release-manager/commands/start-release.js
index 79d6c11ecaa6d..fcf014107de12 100644
--- a/scripts/release-manager/commands/start-release.js
+++ b/scripts/release-manager/commands/start-release.js
@@ -37,7 +37,9 @@ module.exports = function(vorpal, app) {
         git.merge(app, 'upstream/15-stable', false);
 
         this.log(chalk.green.bold(`OK!`));
-        this.log(`You can now start cherry-picking commits to this branch using the "stable-prs" command.`);
+        this.log(
+          `You can now start cherry-picking commits to this branch using the "stable-prs" command.`
+        );
         resolve();
       });
     });
diff --git a/scripts/release-manager/commands/utils/git.js b/scripts/release-manager/commands/utils/git.js
index 331304d17429c..c9d3f65a72a4e 100644
--- a/scripts/release-manager/commands/utils/git.js
+++ b/scripts/release-manager/commands/utils/git.js
@@ -26,9 +26,7 @@ function pull(app, ref) {
 }
 
 function merge(app, ref, ff, msg) {
-  let opts = [
-    ff ? '--ff-only' : '--no-ff',
-  ];
+  let opts = [ff ? '--ff-only' : '--no-ff'];
   if (!msg) {
     opts.push('--no-edit');
   } else {
@@ -47,11 +45,7 @@ function commit(app, msg, all) {
 }
 
 function push(app, remote, refspec, tags) {
-  let opts = [
-    remote,
-    refspec,
-    tags ? '--tags' : '',
-  ];
+  let opts = [remote, refspec, tags ? '--tags' : ''];
   return app.execInRepo(`git push ${opts.join(' ')}`);
 }
 
diff --git a/scripts/release-manager/commands/utils/npm.js b/scripts/release-manager/commands/utils/npm.js
index 65c87d33cc7dc..8126a9caa2eac 100644
--- a/scripts/release-manager/commands/utils/npm.js
+++ b/scripts/release-manager/commands/utils/npm.js
@@ -14,21 +14,23 @@ function whoami(app) {
 }
 
 function packagesNeedingAccess(app, username) {
-  let packages = JSON.parse(app.execInRepo(`npm access ls-packages ${username}`));
-  return PACKAGES.filter((pkg) => packages[pkg] !== 'read-write');
+  let packages = JSON.parse(
+    app.execInRepo(`npm access ls-packages ${username}`)
+  );
+  return PACKAGES.filter(pkg => packages[pkg] !== 'read-write');
 }
 
 function generateAccessNeededIssue(username, packages) {
   let data = {
     title: `npm access request: ${username}`,
     body: `In order to publish React to npm I need access to the following repositories:
-${packages.map((pkg) => `- [${pkg}](https://npm.im/${pkg})`).join('\n')}`,
+${packages.map(pkg => `- [${pkg}](https://npm.im/${pkg})`).join('\n')}`,
   };
   return `https://github.com/facebook/react/issues/new?${querystring.stringify(data)}`;
 }
 
 function grantAccess(app, username, packages) {
-  packages.forEach((pkg) => {
+  packages.forEach(pkg => {
     app.execInRepo(`npm owner add ${username} ${pkg}`);
   });
 }
diff --git a/scripts/release-manager/commands/version.js b/scripts/release-manager/commands/version.js
index 0eaf72fce5986..8e1f5532afaaf 100644
--- a/scripts/release-manager/commands/version.js
+++ b/scripts/release-manager/commands/version.js
@@ -8,7 +8,6 @@ const chalk = require('chalk');
 
 const git = require('./utils/git');
 
-
 // Overview
 // 1. Display current version
 // 2. Prompt for new version
@@ -23,7 +22,6 @@ const git = require('./utils/git');
 //    - src/ReactVersion.js (module.exports)
 // 4. Commit?
 
-
 function updateJSON(path, fields, value) {
   let data;
   try {
@@ -32,7 +30,7 @@ function updateJSON(path, fields, value) {
     this.log(chalk.red('ERROR') + ` ${path} doesn't exist… skipping.`);
     return;
   }
-  fields.forEach((field) => {
+  fields.forEach(field => {
     let fieldPath = field.split('.');
     if (fieldPath.length === 1) {
       data[field] = value;
@@ -45,24 +43,22 @@ function updateJSON(path, fields, value) {
   fs.writeFileSync(path, JSON.stringify(data, null, 2) + '\n');
 }
 
-
 module.exports = function(vorpal, app) {
   vorpal
     .command('version')
     .description('Update the version of React, useful while publishing')
     .action(function(args, actionCB) {
-
       let currentVersion = app.getReactVersion();
 
       // TODO: See if we can do a better job for handling pre* bumps. The ones
       // semver adds are of the form -0, but we've used -alpha.0 or -rc.0.
       // 'prerelease' will increment those properly (but otherwise has the same problem).
       // Live with it for now since it won't be super common. Write docs.
-      let choices = ['prerelease', 'patch', 'minor', 'major'].map((release) => {
+      let choices = ['prerelease', 'patch', 'minor', 'major'].map(release => {
         let version = semver.inc(currentVersion, release);
         return {
           value: version,
-          name:`${chalk.bold(version)} (${release})`,
+          name: `${chalk.bold(version)} (${release})`,
         };
       });
       choices.push('Other');
@@ -78,13 +74,15 @@ module.exports = function(vorpal, app) {
           type: 'input',
           name: 'version',
           message: `New version (currently ${chalk.bold(currentVersion)}): `,
-          when: (res) => res.version === 'Other',
+          when: res => res.version === 'Other',
         },
-      ]).then((res) => {
+      ]).then(res => {
         let newVersion = semver.valid(res.version);
 
         if (!newVersion) {
-          return actionCB(`${chalk.red('ERROR')} ${res.version} is not a semver-valid version`);
+          return actionCB(
+            `${chalk.red('ERROR')} ${res.version} is not a semver-valid version`
+          );
         }
 
         this.log(`Updating to ${newVersion}`);
@@ -123,19 +121,31 @@ module.exports = function(vorpal, app) {
             file: 'packages/react-test-renderer/package.json',
             fields: ['version', 'peerDependencies.react'],
           },
-        ].forEach((opts) => {
-          updateJSON.apply(this, [path.join(app.config.reactPath, opts.file), opts.fields, newVersion]);
+        ].forEach(opts => {
+          updateJSON.apply(this, [
+            path.join(app.config.reactPath, opts.file),
+            opts.fields,
+            newVersion,
+          ]);
         });
 
         // We also need to update src/ReactVersion.js which has the version in
         // string form in JS code. We'll just do a string replace.
 
-        const PATH_TO_REACTVERSION = path.join(app.config.reactPath, 'src/ReactVersion.js');
+        const PATH_TO_REACTVERSION = path.join(
+          app.config.reactPath,
+          'src/ReactVersion.js'
+        );
 
-        let reactVersionContents = fs.readFileSync(PATH_TO_REACTVERSION, 'utf8');
+        let reactVersionContents = fs.readFileSync(
+          PATH_TO_REACTVERSION,
+          'utf8'
+        );
 
-        reactVersionContents =
-          reactVersionContents.replace(currentVersion, newVersion);
+        reactVersionContents = reactVersionContents.replace(
+          currentVersion,
+          newVersion
+        );
         fs.writeFileSync(PATH_TO_REACTVERSION, reactVersionContents);
 
         this.prompt([
@@ -150,9 +160,9 @@ module.exports = function(vorpal, app) {
             type: 'confirm',
             message: 'Tag the version commit (not necessary for non-stable releases)?',
             default: true,
-            when: (res) => res.commit,
+            when: res => res.commit,
           },
-        ]).then((res) => {
+        ]).then(res => {
           if (res.commit) {
             git.commit(app, newVersion, true);
           }
@@ -162,6 +172,5 @@ module.exports = function(vorpal, app) {
           actionCB();
         });
       });
-
     });
 };
diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js
new file mode 100644
index 0000000000000..fcc139b04b983
--- /dev/null
+++ b/scripts/rollup/build.js
@@ -0,0 +1,423 @@
+'use strict';
+
+const rollup = require('rollup').rollup;
+const babel = require('rollup-plugin-babel');
+const commonjs = require('rollup-plugin-commonjs');
+const alias = require('rollup-plugin-alias');
+const uglify = require('rollup-plugin-uglify');
+const replace = require('rollup-plugin-replace');
+const chalk = require('chalk');
+const escapeStringRegexp = require('escape-string-regexp');
+const join = require('path').join;
+const resolve = require('path').resolve;
+const fs = require('fs');
+const rimraf = require('rimraf');
+const argv = require('minimist')(process.argv.slice(2));
+const Modules = require('./modules');
+const Bundles = require('./bundles');
+const propertyMangleWhitelist = require('./mangle').propertyMangleWhitelist;
+const sizes = require('./plugins/sizes-plugin');
+const Stats = require('./stats');
+const Packaging = require('./packaging');
+const Header = require('./header');
+
+const UMD_DEV = Bundles.bundleTypes.UMD_DEV;
+const UMD_PROD = Bundles.bundleTypes.UMD_PROD;
+const NODE_DEV = Bundles.bundleTypes.NODE_DEV;
+const NODE_PROD = Bundles.bundleTypes.NODE_PROD;
+const FB_DEV = Bundles.bundleTypes.FB_DEV;
+const FB_PROD = Bundles.bundleTypes.FB_PROD;
+const RN_DEV = Bundles.bundleTypes.RN_DEV;
+const RN_PROD = Bundles.bundleTypes.RN_PROD;
+
+const reactVersion = require('../../package.json').version;
+const inputBundleType = argv.type;
+
+// used for when we property mangle with uglify/gcc
+const mangleRegex = new RegExp(
+  `^(?${propertyMangleWhitelist
+    .map(prop => `!${escapeStringRegexp(prop)}`)
+    .join('|')}$).*$`,
+  'g'
+);
+
+function getBanner(bundleType, hasteName, filename) {
+  switch (bundleType) {
+    case FB_DEV:
+    case FB_PROD:
+    case RN_DEV:
+    case RN_PROD:
+      let hasteFinalName = hasteName;
+      switch (bundleType) {
+        case FB_DEV:
+          hasteFinalName += '-dev';
+          break;
+        case FB_PROD:
+          hasteFinalName += '-prod';
+          break;
+      }
+      const fbDevCode = `\n\n'use strict';\n\n` + `\nif (__DEV__) {\n`;
+      return Header.getProvidesHeader(hasteFinalName, bundleType, fbDevCode);
+    case UMD_DEV:
+    case UMD_PROD:
+      return Header.getUMDHeader(filename, reactVersion);
+    default:
+      return '';
+  }
+}
+
+function getFooter(bundleType) {
+  if (bundleType === FB_DEV) {
+    return '\n}\n';
+  }
+  return '';
+}
+
+function updateBabelConfig(babelOpts, bundleType) {
+  let newOpts;
+
+  switch (bundleType) {
+    case UMD_DEV:
+    case UMD_PROD:
+    case NODE_DEV:
+    case NODE_PROD:
+    case RN_DEV:
+    case RN_PROD:
+      newOpts = Object.assign({}, babelOpts);
+      // we add the objectAssign transform for these bundles
+      newOpts.plugins = newOpts.plugins.slice();
+      newOpts.plugins.push(
+        resolve('./scripts/babel/transform-object-assign-require')
+      );
+      return newOpts;
+    case FB_DEV:
+    case FB_PROD:
+      newOpts = Object.assign({}, babelOpts);
+      // for FB, we don't want the devExpressionWithCodes plugin to run
+      newOpts.plugins = [];
+      return newOpts;
+  }
+}
+
+function handleRollupWarnings(warning) {
+  if (warning.code === 'UNRESOLVED_IMPORT') {
+    console.error(warning.message);
+    process.exit(1);
+  }
+  console.warn(warning.message || warning);
+}
+
+function updateBundleConfig(config, filename, format, bundleType, hasteName) {
+  return Object.assign({}, config, {
+    banner: getBanner(bundleType, hasteName, filename),
+    dest: Packaging.getPackageDestination(config, bundleType, filename),
+    footer: getFooter(bundleType),
+    format,
+    interop: false,
+  });
+}
+
+function stripEnvVariables(production) {
+  return {
+    __DEV__: production ? 'false' : 'true',
+    'process.env.NODE_ENV': production ? "'production'" : "'development'",
+  };
+}
+
+function getFormat(bundleType) {
+  switch (bundleType) {
+    case UMD_DEV:
+    case UMD_PROD:
+      return `umd`;
+    case NODE_DEV:
+    case NODE_PROD:
+    case FB_DEV:
+    case FB_PROD:
+    case RN_DEV:
+    case RN_PROD:
+      return `cjs`;
+  }
+}
+
+function getFilename(name, hasteName, bundleType) {
+  // we do this to replace / to -, for react-dom/server
+  name = name.replace('/', '-');
+  switch (bundleType) {
+    case UMD_DEV:
+      return `${name}.development.js`;
+    case UMD_PROD:
+      return `${name}.production.min.js`;
+    case NODE_DEV:
+      return `${name}.development.js`;
+    case NODE_PROD:
+      return `${name}.production.min.js`;
+    case FB_DEV:
+    case RN_DEV:
+      return `${hasteName}-dev.js`;
+    case FB_PROD:
+    case RN_PROD:
+      return `${hasteName}-prod.js`;
+  }
+}
+
+function uglifyConfig(mangle, manglePropertiesOnProd, preserveVersionHeader) {
+  return {
+    warnings: false,
+    compress: {
+      screw_ie8: true,
+      dead_code: true,
+      unused: true,
+      drop_debugger: true,
+      // we have a string literal <script> that we don't want to evaluate
+      // for FB prod bundles (where we disable mangling)
+      evaluate: mangle,
+      booleans: true,
+      // Our www inline transform combined with Jest resetModules is confused
+      // in some rare cases unless we keep all requires at the top:
+      hoist_funs: mangle,
+    },
+    output: {
+      beautify: !mangle,
+      comments(node, comment) {
+        if (preserveVersionHeader && comment.pos === 0 && comment.col === 0) {
+          // Keep the very first comment (the bundle header) in prod bundles.
+          if (comment.value.indexOf(reactVersion) === -1) {
+            // Sanity check: this doesn't look like the bundle header!
+            throw new Error(
+              'Expected the first comment to be the file header but got: ' +
+                comment.value
+            );
+          }
+          return true;
+        }
+        // Keep all comments in FB bundles.
+        return !mangle;
+      },
+    },
+    mangleProperties: mangle && manglePropertiesOnProd
+      ? {
+          ignore_quoted: true,
+          regex: mangleRegex,
+        }
+      : false,
+    mangle: mangle
+      ? {
+          toplevel: true,
+          screw_ie8: true,
+        }
+      : false,
+  };
+}
+
+function getCommonJsConfig(bundleType) {
+  switch (bundleType) {
+    case UMD_DEV:
+    case UMD_PROD:
+    case NODE_DEV:
+    case NODE_PROD:
+      return {};
+    case RN_DEV:
+    case RN_PROD:
+      return {
+        ignore: Modules.ignoreReactNativeModules(),
+      };
+    case FB_DEV:
+    case FB_PROD:
+      // Modules we don't want to inline in the bundle.
+      // Force them to stay as require()s in the output.
+      return {
+        ignore: Modules.ignoreFBModules(),
+      };
+  }
+}
+
+function getPlugins(
+  entry,
+  babelOpts,
+  paths,
+  filename,
+  bundleType,
+  isRenderer,
+  manglePropertiesOnProd
+) {
+  const plugins = [
+    replace(Modules.getDefaultReplaceModules(bundleType)),
+    babel(updateBabelConfig(babelOpts, bundleType)),
+    alias(
+      Modules.getAliases(paths, bundleType, isRenderer, argv.extractErrors)
+    ),
+  ];
+  switch (bundleType) {
+    case UMD_DEV:
+    case NODE_DEV:
+    case FB_DEV:
+    case RN_DEV:
+      plugins.push(
+        replace(stripEnvVariables(false)),
+        // needs to happen after strip env
+        commonjs(getCommonJsConfig(bundleType))
+      );
+      break;
+    case UMD_PROD:
+    case NODE_PROD:
+    case FB_PROD:
+    case RN_PROD:
+      plugins.push(
+        replace(stripEnvVariables(true)),
+        // needs to happen after strip env
+        commonjs(getCommonJsConfig(bundleType)),
+        uglify(
+          uglifyConfig(
+            bundleType !== FB_PROD,
+            manglePropertiesOnProd,
+            bundleType === UMD_PROD
+          )
+        )
+      );
+      break;
+  }
+  // this needs to come last or it doesn't report sizes correctly
+  plugins.push(
+    sizes({
+      getSize: (size, gzip) => {
+        const key = `${filename} (${bundleType})`;
+        Stats.currentBuildResults.bundleSizes[key] = {
+          size,
+          gzip,
+        };
+      },
+    })
+  );
+
+  return plugins;
+}
+
+function createBundle(bundle, bundleType) {
+  if (
+    (inputBundleType && bundleType.indexOf(inputBundleType) === -1) ||
+    bundle.bundleTypes.indexOf(bundleType) === -1
+  ) {
+    // Skip this bundle because its config doesn't specify this target.
+    return Promise.resolve();
+  }
+
+  const filename = getFilename(bundle.name, bundle.hasteName, bundleType);
+  const logKey = chalk.white.bold(filename) +
+    chalk.dim(` (${bundleType.toLowerCase()})`);
+  const format = getFormat(bundleType);
+  const packageName = Packaging.getPackageName(bundle.name);
+
+  console.log(`${chalk.bgYellow.black(' STARTING ')} ${logKey}`);
+  return rollup({
+    entry: bundleType === FB_DEV || bundleType === FB_PROD
+      ? bundle.fbEntry
+      : bundle.entry,
+    external: Modules.getExternalModules(
+      bundle.externals,
+      bundleType,
+      bundle.isRenderer
+    ),
+    onwarn: handleRollupWarnings,
+    plugins: getPlugins(
+      bundle.entry,
+      bundle.babelOpts,
+      bundle.paths,
+      filename,
+      bundleType,
+      bundle.isRenderer,
+      bundle.manglePropertiesOnProd
+    ),
+  })
+    .then(result =>
+      result.write(
+        updateBundleConfig(
+          bundle.config,
+          filename,
+          format,
+          bundleType,
+          bundle.hasteName
+        )
+      ))
+    .then(() => Packaging.createNodePackage(bundleType, packageName, filename))
+    .then(() => {
+      console.log(`${chalk.bgGreen.black(' COMPLETE ')} ${logKey}\n`);
+    })
+    .catch(error => {
+      if (error.code) {
+        console.error(`\x1b[31m-- ${error.code} (${error.plugin}) --`);
+        console.error(error.message);
+        console.error(error.loc);
+        console.error(error.codeFrame);
+      } else {
+        console.error(error);
+      }
+      process.exit(1);
+    });
+}
+
+// clear the build directory
+rimraf('build', () => {
+  // create a new build directory
+  fs.mkdirSync('build');
+  // create the packages folder for NODE+UMD bundles
+  fs.mkdirSync(join('build', 'packages'));
+  // create the dist folder for UMD bundles
+  fs.mkdirSync(join('build', 'dist'));
+
+  const tasks = [
+    Packaging.createFacebookWWWBuild,
+    Packaging.createReactNativeBuild,
+  ];
+  for (const bundle of Bundles.bundles) {
+    tasks.push(
+      () => createBundle(bundle, UMD_DEV),
+      () => createBundle(bundle, UMD_PROD),
+      () => createBundle(bundle, NODE_DEV),
+      () => createBundle(bundle, NODE_PROD),
+      () => createBundle(bundle, FB_DEV),
+      () => createBundle(bundle, FB_PROD),
+      () => createBundle(bundle, RN_DEV),
+      () => createBundle(bundle, RN_PROD)
+    );
+  }
+  // rather than run concurently, opt to run them serially
+  // this helps improve console/warning/error output
+  // and fixes a bunch of IO failures that sometimes occured
+  return runWaterfall(tasks)
+    .then(() => {
+      // output the results
+      console.log(Stats.printResults());
+      // save the results for next run
+      Stats.saveResults();
+      if (argv.extractErrors) {
+        console.warn(
+          '\nWarning: this build was created with --extractErrors enabled.\n' +
+            'this will result in extremely slow builds and should only be\n' +
+            'used when the error map needs to be rebuilt.\n'
+        );
+      }
+    })
+    .catch(err => {
+      console.error(err);
+      process.exit(1);
+    });
+});
+
+function runWaterfall(promiseFactories) {
+  if (promiseFactories.length === 0) {
+    return Promise.resolve();
+  }
+
+  const head = promiseFactories[0];
+  const tail = promiseFactories.slice(1);
+
+  const nextPromiseFactory = head;
+  const nextPromise = nextPromiseFactory();
+  if (!nextPromise || typeof nextPromise.then !== 'function') {
+    throw new Error('runWaterfall() received something that is not a Promise.');
+  }
+
+  return nextPromise.then(() => {
+    return runWaterfall(tail);
+  });
+}
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
new file mode 100644
index 0000000000000..012f8c08b2e20
--- /dev/null
+++ b/scripts/rollup/bundles.js
@@ -0,0 +1,382 @@
+'use strict';
+
+const devExpressionWithCodes = require('../error-codes/dev-expression-with-codes');
+
+const bundleTypes = {
+  UMD_DEV: 'UMD_DEV',
+  UMD_PROD: 'UMD_PROD',
+  NODE_DEV: 'NODE_DEV',
+  NODE_PROD: 'NODE_PROD',
+  FB_DEV: 'FB_DEV',
+  FB_PROD: 'FB_PROD',
+  RN_DEV: 'RN_DEV',
+  RN_PROD: 'RN_PROD',
+};
+
+const UMD_DEV = bundleTypes.UMD_DEV;
+const UMD_PROD = bundleTypes.UMD_PROD;
+const NODE_DEV = bundleTypes.NODE_DEV;
+const NODE_PROD = bundleTypes.NODE_PROD;
+const FB_DEV = bundleTypes.FB_DEV;
+const FB_PROD = bundleTypes.FB_PROD;
+// const RN_DEV = bundleTypes.RN_DEV;
+// const RN_PROD = bundleTypes.RN_PROD;
+
+const babelOptsReact = {
+  exclude: 'node_modules/**',
+  plugins: [
+    devExpressionWithCodes, // this pass has to run before `rewrite-modules`
+  ],
+};
+
+const babelOptsReactART = Object.assign({}, babelOptsReact, {
+  // Include JSX
+  presets: [require.resolve('babel-preset-react')],
+});
+
+const bundles = [
+  /******* Isomorphic *******/
+  {
+    babelOpts: babelOptsReact,
+    bundleTypes: [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD, FB_DEV, FB_PROD],
+    config: {
+      destDir: 'build/',
+      moduleName: 'React',
+      sourceMap: false,
+    },
+    entry: 'src/umd/ReactUMDEntry.js',
+    externals: [],
+    fbEntry: 'src/fb/ReactFBEntry.js',
+    hasteName: 'React',
+    isRenderer: false,
+    manglePropertiesOnProd: false,
+    name: 'react',
+    paths: [
+      'src/umd/ReactUMDEntry.js',
+      'src/umd/ReactWithAddonsUMDEntry.js',
+      'src/umd/shims/**/*.js',
+
+      'src/isomorphic/**/*.js',
+      'src/addons/**/*.js',
+
+      'src/ReactVersion.js',
+      'src/shared/**/*.js',
+    ],
+  },
+
+  /******* React DOM *******/
+  {
+    babelOpts: babelOptsReact,
+    bundleTypes: [FB_DEV, FB_PROD],
+    config: {
+      destDir: 'build/',
+      globals: {
+        react: 'React',
+      },
+      moduleName: 'ReactDOM',
+      sourceMap: false,
+    },
+    entry: 'src/umd/ReactDOMUMDEntry.js',
+    externals: [],
+    fbEntry: 'src/fb/ReactDOMFBEntry.js',
+    hasteName: 'ReactDOMStack',
+    isRenderer: true,
+    manglePropertiesOnProd: false,
+    name: 'react-dom-stack',
+    paths: [
+      'src/umd/ReactDOMUMDEntry.js',
+
+      'src/renderers/dom/**/*.js',
+      'src/renderers/shared/**/*.js',
+      'src/test/**/*.js', // ReactTestUtils is currently very coupled to DOM.
+
+      'src/ReactVersion.js',
+      'src/shared/**/*.js',
+    ],
+  },
+  {
+    babelOpts: babelOptsReact,
+    bundleTypes: [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD, FB_DEV, FB_PROD],
+    config: {
+      destDir: 'build/',
+      globals: {
+        react: 'React',
+      },
+      moduleName: 'ReactDOM',
+      sourceMap: false,
+    },
+    entry: 'src/umd/ReactDOMUMDEntry.js',
+    externals: [],
+    fbEntry: 'src/fb/ReactDOMFiberFBEntry.js',
+    hasteName: 'ReactDOMFiber',
+    isRenderer: true,
+    manglePropertiesOnProd: false,
+    name: 'react-dom',
+    paths: [
+      'src/umd/ReactDOMUMDEntry.js',
+
+      'src/renderers/dom/**/*.js',
+      'src/renderers/shared/**/*.js',
+      'src/test/**/*.js', // ReactTestUtils is currently very coupled to DOM.
+
+      'src/ReactVersion.js',
+      'src/shared/**/*.js',
+    ],
+  },
+
+  /******* React DOM Server *******/
+  {
+    babelOpts: babelOptsReact,
+    // TODO: deal with the Node version of react-dom-server package
+    bundleTypes: [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD, FB_DEV, FB_PROD],
+    config: {
+      destDir: 'build/',
+      globals: {
+        react: 'React',
+      },
+      moduleName: 'ReactDOMServer',
+      sourceMap: false,
+    },
+    entry: 'src/umd/ReactDOMServerUMDEntry.js',
+    externals: [],
+    fbEntry: 'src/umd/ReactDOMServerUMDEntry.js',
+    hasteName: 'ReactDOMServerStack',
+    isRenderer: true,
+    manglePropertiesOnProd: false,
+    name: 'react-dom/server',
+    paths: [
+      'src/umd/ReactDOMServerUMDEntry.js',
+
+      'src/renderers/dom/**/*.js',
+      'src/renderers/shared/**/*.js',
+
+      'src/ReactVersion.js',
+      'src/shared/**/*.js',
+    ],
+  },
+  // TODO: there is no Fiber version of ReactDOMServer.
+
+  /******* React ART *******/
+  {
+    babelOpts: babelOptsReactART,
+    // TODO: we merge react-art repo into this repo so the NODE_DEV and NODE_PROD
+    // builds sync up to the building of the package directories
+    bundleTypes: [FB_DEV, FB_PROD],
+    config: {
+      destDir: 'build/',
+      globals: {
+        react: 'React',
+      },
+      moduleName: 'ReactART',
+      sourceMap: false,
+    },
+    entry: 'src/renderers/art/ReactARTStack.js',
+    externals: [
+      'art/modes/current',
+      'art/modes/fast-noSideEffects',
+      'art/core/transform',
+    ],
+    fbEntry: 'src/renderers/art/ReactARTStack.js',
+    hasteName: 'ReactARTStack',
+    isRenderer: true,
+    manglePropertiesOnProd: false,
+    name: 'react-art',
+    paths: [
+      // TODO: it relies on ReactDOMFrameScheduling. Need to move to shared/?
+      'src/renderers/dom/**/*.js',
+      'src/renderers/art/**/*.js',
+      'src/renderers/shared/**/*.js',
+
+      'src/ReactVersion.js',
+      'src/shared/**/*.js',
+    ],
+  },
+  {
+    babelOpts: babelOptsReactART,
+    // TODO: we merge react-art repo into this repo so the NODE_DEV and NODE_PROD
+    // builds sync up to the building of the package directories
+    bundleTypes: [UMD_DEV, UMD_PROD, NODE_DEV, NODE_PROD, FB_DEV, FB_PROD],
+    config: {
+      destDir: 'build/',
+      globals: {
+        react: 'React',
+      },
+      moduleName: 'ReactART',
+      sourceMap: false,
+    },
+    entry: 'src/renderers/art/ReactARTFiber.js',
+    externals: [
+      'art/modes/current',
+      'art/modes/fast-noSideEffects',
+      'art/core/transform',
+    ],
+    fbEntry: 'src/renderers/art/ReactARTFiber.js',
+    hasteName: 'ReactARTFiber',
+    isRenderer: true,
+    manglePropertiesOnProd: false,
+    name: 'react-art',
+    paths: [
+      // TODO: it relies on ReactDOMFrameScheduling. Need to move to shared/?
+      'src/renderers/dom/**/*.js',
+      'src/renderers/art/**/*.js',
+      'src/renderers/shared/**/*.js',
+
+      'src/ReactVersion.js',
+      'src/shared/**/*.js',
+    ],
+  },
+
+  /******* React Native *******/
+  {
+    babelOpts: babelOptsReact,
+    bundleTypes: [
+      /* RN_DEV, RN_PROD */
+    ],
+    config: {
+      destDir: 'build/',
+      moduleName: 'ReactNativeStack',
+      sourceMap: false,
+    },
+    entry: 'src/renderers/native/ReactNativeStack.js',
+    externals: [
+      'ExceptionsManager',
+      'InitializeCore',
+      'ReactNativeFeatureFlags',
+      'RCTEventEmitter',
+      'TextInputState',
+      'UIManager',
+      'View',
+      'deepDiffer',
+      'deepFreezeAndThrowOnMutationInDev',
+      'flattenStyle',
+    ],
+    hasteName: 'ReactNativeStack',
+    isRenderer: true,
+    manglePropertiesOnProd: false,
+    name: 'react-native-renderer',
+    paths: [
+      'src/renderers/native/**/*.js',
+      'src/renderers/shared/**/*.js',
+
+      'src/ReactVersion.js',
+      'src/shared/**/*.js',
+    ],
+  },
+  {
+    babelOpts: babelOptsReact,
+    bundleTypes: [
+      /* RN_DEV, RN_PROD */
+    ],
+    config: {
+      destDir: 'build/',
+      moduleName: 'ReactNativeFiber',
+      sourceMap: false,
+    },
+    entry: 'src/renderers/native/ReactNativeFiber.js',
+    externals: [
+      'ExceptionsManager',
+      'InitializeCore',
+      'ReactNativeFeatureFlags',
+      'RCTEventEmitter',
+      'TextInputState',
+      'UIManager',
+      'View',
+      'deepDiffer',
+      'deepFreezeAndThrowOnMutationInDev',
+      'flattenStyle',
+    ],
+    hasteName: 'ReactNativeFiber',
+    isRenderer: true,
+    manglePropertiesOnProd: false,
+    name: 'react-native-renderer',
+    paths: [
+      'src/renderers/native/**/*.js',
+      'src/renderers/shared/**/*.js',
+
+      'src/ReactVersion.js',
+      'src/shared/**/*.js',
+    ],
+  },
+
+  /******* React Test Renderer *******/
+  {
+    babelOpts: babelOptsReact,
+    bundleTypes: [FB_DEV, NODE_DEV],
+    config: {
+      destDir: 'build/',
+      moduleName: 'ReactTestRenderer',
+      sourceMap: false,
+    },
+    entry: 'src/renderers/testing/ReactTestRendererFiber',
+    externals: [],
+    fbEntry: 'src/renderers/testing/ReactTestRendererFiber',
+    hasteName: 'ReactTestRendererFiber',
+    isRenderer: true,
+    manglePropertiesOnProd: false,
+    name: 'react-test-renderer',
+    paths: [
+      'src/renderers/native/**/*.js',
+      'src/renderers/shared/**/*.js',
+      'src/renderers/testing/**/*.js',
+
+      'src/ReactVersion.js',
+      'src/shared/**/*.js',
+    ],
+  },
+
+  {
+    babelOpts: babelOptsReact,
+    bundleTypes: [FB_DEV],
+    config: {
+      destDir: 'build/',
+      moduleName: 'ReactTestRenderer',
+      sourceMap: false,
+    },
+    entry: 'src/renderers/testing/stack/ReactTestRendererStack',
+    externals: [],
+    fbEntry: 'src/renderers/testing/stack/ReactTestRendererStack',
+    hasteName: 'ReactTestRendererStack',
+    isRenderer: true,
+    manglePropertiesOnProd: false,
+    name: 'react-test-renderer-stack',
+    paths: [
+      'src/renderers/native/**/*.js',
+      'src/renderers/shared/**/*.js',
+      'src/renderers/testing/**/*.js',
+
+      'src/ReactVersion.js',
+      'src/shared/**/*.js',
+    ],
+  },
+
+  /******* React Noop Renderer (used only for fixtures/fiber-debugger) *******/
+  {
+    babelOpts: babelOptsReact,
+    bundleTypes: [NODE_DEV],
+    config: {
+      destDir: 'build/',
+      globals: {
+        react: 'React',
+      },
+      moduleName: 'ReactNoop',
+      sourceMap: false,
+    },
+    entry: 'src/renderers/noop/ReactNoop.js',
+    externals: [],
+    isRenderer: true,
+    manglePropertiesOnProd: false,
+    name: 'react-noop-renderer',
+    paths: [
+      'src/renderers/noop/**/*.js',
+      'src/renderers/shared/**/*.js',
+
+      'src/ReactVersion.js',
+      'src/shared/**/*.js',
+    ],
+  },
+];
+
+module.exports = {
+  bundleTypes,
+  bundles,
+};
diff --git a/scripts/rollup/header.js b/scripts/rollup/header.js
new file mode 100644
index 0000000000000..182c5d386955e
--- /dev/null
+++ b/scripts/rollup/header.js
@@ -0,0 +1,29 @@
+const Bundles = require('./bundles');
+
+const FB_DEV = Bundles.bundleTypes.FB_DEV;
+
+function getProvidesHeader(hasteFinalName, bundleType, fbDevCode) {
+  return `/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ${hasteFinalName}
+ */${bundleType === FB_DEV ? fbDevCode : ''}
+`;
+}
+
+function getUMDHeader(filename, reactVersion) {
+  return `/**
+ * ${filename} v${reactVersion}
+ */
+`;
+}
+
+module.exports = {
+  getProvidesHeader,
+  getUMDHeader,
+};
diff --git a/scripts/rollup/mangle.js b/scripts/rollup/mangle.js
new file mode 100644
index 0000000000000..1acc08c5b362a
--- /dev/null
+++ b/scripts/rollup/mangle.js
@@ -0,0 +1,12 @@
+'use strict';
+
+// these are added as they are handled by rollup in some cases
+const propertyMangleWhitelist = [
+  // React
+  'React',
+  'ReactDOM',
+];
+
+module.exports = {
+  propertyMangleWhitelist,
+};
diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js
new file mode 100644
index 0000000000000..48abc1b6fbfb0
--- /dev/null
+++ b/scripts/rollup/modules.js
@@ -0,0 +1,366 @@
+'use strict';
+
+const resolve = require('path').resolve;
+const basename = require('path').basename;
+const sync = require('glob').sync;
+const bundleTypes = require('./bundles').bundleTypes;
+const extractErrorCodes = require('../error-codes/extract-errors');
+
+const exclude = [
+  'src/**/__benchmarks__/**/*.js',
+  'src/**/__tests__/**/*.js',
+  'src/**/__mocks__/**/*.js',
+];
+
+const UMD_DEV = bundleTypes.UMD_DEV;
+const UMD_PROD = bundleTypes.UMD_PROD;
+const NODE_DEV = bundleTypes.NODE_DEV;
+const NODE_PROD = bundleTypes.NODE_PROD;
+const FB_DEV = bundleTypes.FB_DEV;
+const FB_PROD = bundleTypes.FB_PROD;
+const RN_DEV = bundleTypes.RN_DEV;
+const RN_PROD = bundleTypes.RN_PROD;
+
+const errorCodeOpts = {
+  errorMapFilePath: 'scripts/error-codes/codes.json',
+};
+
+// these are the FBJS modules that are used throughout our bundles
+const fbjsModules = [
+  'fbjs/lib/warning',
+  'fbjs/lib/invariant',
+  'fbjs/lib/emptyFunction',
+  'fbjs/lib/emptyObject',
+  'fbjs/lib/hyphenateStyleName',
+  'fbjs/lib/getUnboundedScrollPosition',
+  'fbjs/lib/camelizeStyleName',
+  'fbjs/lib/containsNode',
+  'fbjs/lib/shallowEqual',
+  'fbjs/lib/getActiveElement',
+  'fbjs/lib/focusNode',
+  'fbjs/lib/EventListener',
+  'fbjs/lib/memoizeStringOnly',
+  'fbjs/lib/ExecutionEnvironment',
+  'fbjs/lib/createNodesFromMarkup',
+  'fbjs/lib/performanceNow',
+];
+
+const devOnlyFilesToStubOut = [
+  "'ReactComponentTreeHook'",
+  "'react/lib/ReactComponentTreeHook'",
+  "'react-dom/lib/ReactPerf'",
+  "'react-dom/lib/ReactTestUtils'",
+];
+
+// this function builds up a very niave Haste-like moduleMap
+// that works to create up an alias map for modules to link
+// up to their actual disk location so Rollup can properly
+// bundle them
+function createModuleMap(paths, extractErrors, bundleType) {
+  const moduleMap = {};
+
+  paths.forEach(path => {
+    const files = sync(path, exclude);
+
+    files.forEach(file => {
+      if (extractErrors) {
+        extractErrors(file);
+      }
+      const moduleName = basename(file, '.js');
+
+      moduleMap[moduleName] = resolve(file);
+    });
+  });
+  // if this is FB, we want to remove ReactCurrentOwner, so we can
+  // handle it with a different case
+  if (bundleType === FB_DEV || bundleType === FB_PROD) {
+    delete moduleMap.ReactCurrentOwner;
+  }
+  return moduleMap;
+}
+
+function getNodeModules(bundleType) {
+  // rather than adding the rollup node resolve plugin,
+  // we can instead deal with the only node module that is used
+  // for UMD bundles - object-assign
+  switch (bundleType) {
+    case UMD_DEV:
+    case UMD_PROD:
+      return {
+        'object-assign': resolve('./node_modules/object-assign/index.js'),
+        // include the ART package modules directly by aliasing them from node_modules
+        'art/modes/current': resolve('./node_modules/art/modes/current.js'),
+        'art/modes/fast-noSideEffects': resolve(
+          './node_modules/art/modes/fast-noSideEffects.js'
+        ),
+        'art/core/transform': resolve('./node_modules/art/core/transform.js'),
+      };
+    case NODE_DEV:
+    case NODE_PROD:
+    case FB_DEV:
+    case FB_PROD:
+    case RN_DEV:
+    case RN_PROD:
+      return {};
+  }
+}
+
+function ignoreFBModules() {
+  return [
+    // At FB, we don't know them statically:
+    'ReactFeatureFlags',
+    'ReactDOMFeatureFlags',
+    // In FB bundles, we preserve an inline require to ReactCurrentOwner.
+    // See the explanation in FB version of ReactCurrentOwner in www:
+    'react/lib/ReactCurrentOwner',
+    'ReactCurrentOwner',
+  ];
+}
+
+function ignoreReactNativeModules() {
+  return [
+    // This imports NativeMethodsMixin, causing
+    // a circular dependency.
+    'View',
+  ];
+}
+
+function getExternalModules(externals, bundleType, isRenderer) {
+  // external modules tell Rollup that we should not attempt
+  // to bundle these modules and instead treat them as
+  // external depedencies to the bundle. so for CJS bundles
+  // this means having a require("name-of-external-module") at
+  // the top of the bundle. for UMD bundles this means having
+  // both a require and a global check for them
+  let externalModules = externals;
+
+  switch (bundleType) {
+    case UMD_DEV:
+    case UMD_PROD:
+      if (isRenderer) {
+        externalModules.push('react');
+      }
+      break;
+    case NODE_DEV:
+    case NODE_PROD:
+    case RN_DEV:
+    case RN_PROD:
+      fbjsModules.forEach(module => externalModules.push(module));
+      externalModules.push('object-assign');
+
+      if (isRenderer) {
+        externalModules.push('react');
+      }
+      break;
+    case FB_DEV:
+    case FB_PROD:
+      fbjsModules.forEach(module => externalModules.push(module));
+      externalModules.push('react/lib/ReactCurrentOwner', 'ReactCurrentOwner');
+      if (isRenderer) {
+        externalModules.push('React');
+      }
+      break;
+  }
+  return externalModules;
+}
+
+function getInternalModules() {
+  // we tell Rollup where these files are located internally, otherwise
+  // it doesn't pick them up and assumes they're external
+  return {
+    reactProdInvariant: resolve('./src/shared/utils/reactProdInvariant.js'),
+    'react/lib/ReactDebugCurrentFrame': resolve(
+      './src/isomorphic/classic/element/ReactDebugCurrentFrame.js'
+    ),
+  };
+}
+
+function replaceInternalModules() {
+  // we inline these modules in the bundles rather than leave them as external
+  return {
+    'react-dom/lib/ReactPerf': resolve('./src/renderers/shared/ReactPerf.js'),
+    'react-dom/lib/ReactTestUtils': resolve('./src/test/ReactTestUtils.js'),
+    'react-dom/lib/ReactInstanceMap': resolve(
+      './src/renderers/shared/shared/ReactInstanceMap.js'
+    ),
+    'react-dom': resolve('./src/renderers/dom/ReactDOM.js'),
+  };
+}
+
+function getFbjsModuleAliases(bundleType) {
+  switch (bundleType) {
+    case UMD_DEV:
+    case UMD_PROD:
+      // we want to bundle these modules, so we re-alias them to the actual
+      // file so Rollup can bundle them up
+      const fbjsModulesAlias = {};
+      fbjsModules.forEach(fbjsModule => {
+        fbjsModulesAlias[fbjsModule] = resolve(`./node_modules/${fbjsModule}`);
+      });
+      return fbjsModulesAlias;
+    case NODE_DEV:
+    case NODE_PROD:
+    case FB_DEV:
+    case FB_PROD:
+    case RN_DEV:
+    case RN_PROD:
+      // for FB we don't want to bundle the above modules, instead keep them
+      // as external require() calls in the bundle
+      return {};
+  }
+}
+
+function replaceFbjsModuleAliases(bundleType) {
+  switch (bundleType) {
+    case UMD_DEV:
+    case UMD_PROD:
+    case NODE_DEV:
+    case NODE_PROD:
+    case RN_DEV:
+    case RN_PROD:
+      return {};
+    case FB_DEV:
+    case FB_PROD:
+      // additionally we add mappings for "react"
+      // so they work correctly on FB, this will change soon
+      return {
+        "'react'": "'React'",
+      };
+  }
+}
+
+// for renderers, we want them to require the __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner
+// on the React bundle itself rather than require module directly.
+// For the React bundle, ReactCurrentOwner should be bundled as part of the bundle
+// itself and exposed on __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED
+const shimReactCurrentOwner = resolve(
+  './scripts/rollup/shims/rollup/ReactCurrentOwnerRollupShim.js'
+);
+const realReactCurrentOwner = resolve(
+  './src/isomorphic/classic/element/ReactCurrentOwner.js'
+);
+
+function getReactCurrentOwnerModuleAlias(bundleType, isRenderer) {
+  if (bundleType === FB_DEV || bundleType === FB_DEV) {
+    return {};
+  }
+  if (isRenderer) {
+    return {
+      ReactCurrentOwner: shimReactCurrentOwner,
+      'react/lib/ReactCurrentOwner': shimReactCurrentOwner,
+    };
+  } else {
+    return {
+      ReactCurrentOwner: realReactCurrentOwner,
+      'react/lib/ReactCurrentOwner': realReactCurrentOwner,
+    };
+  }
+}
+
+// this works almost identically to the ReactCurrentOwner shim above
+const shimReactCheckPropTypes = resolve(
+  './scripts/rollup/shims/rollup/ReactCheckPropTypesRollupShim.js'
+);
+const realCheckPropTypes = resolve(
+  './src/isomorphic/classic/types/checkPropTypes.js'
+);
+
+function getReactCheckPropTypesModuleAlias(bundleType, isRenderer) {
+  if (isRenderer) {
+    return {
+      checkPropTypes: shimReactCheckPropTypes,
+      'react/lib/checkPropTypes': shimReactCheckPropTypes,
+    };
+  } else {
+    return {
+      checkPropTypes: realCheckPropTypes,
+      'react/lib/checkPropTypes': realCheckPropTypes,
+    };
+  }
+}
+
+// this works almost identically to the ReactCurrentOwner shim above
+const shimReactComponentTreeHook = resolve(
+  './scripts/rollup/shims/rollup/ReactComponentTreeHookRollupShim.js'
+);
+const realReactComponentTreeHook = resolve(
+  './src/isomorphic/hooks/ReactComponentTreeHook.js'
+);
+
+function getReactComponentTreeHookModuleAlias(bundleType, isRenderer) {
+  if (isRenderer) {
+    return {
+      ReactComponentTreeHook: shimReactComponentTreeHook,
+      'react/lib/ReactComponentTreeHook': shimReactComponentTreeHook,
+    };
+  } else {
+    return {
+      ReactComponentTreeHook: realReactComponentTreeHook,
+      'react/lib/ReactComponentTreeHook': realReactComponentTreeHook,
+    };
+  }
+}
+
+const devOnlyModuleStub = `'${resolve('./scripts/rollup/shims/rollup/DevOnlyStubShim.js')}'`;
+
+function replaceDevOnlyStubbedModules(bundleType) {
+  switch (bundleType) {
+    case UMD_DEV:
+    case NODE_DEV:
+    case FB_DEV:
+    case RN_DEV:
+    case RN_PROD:
+      return {};
+    case FB_PROD:
+    case UMD_PROD:
+    case NODE_PROD:
+      const devOnlyModuleAliases = {};
+      devOnlyFilesToStubOut.forEach(devOnlyModule => {
+        devOnlyModuleAliases[devOnlyModule] = devOnlyModuleStub;
+      });
+      return devOnlyModuleAliases;
+  }
+}
+
+function getAliases(paths, bundleType, isRenderer, extractErrors) {
+  return Object.assign(
+    getReactCurrentOwnerModuleAlias(bundleType, isRenderer),
+    getReactCheckPropTypesModuleAlias(bundleType, isRenderer),
+    getReactComponentTreeHookModuleAlias(bundleType, isRenderer),
+    createModuleMap(
+      paths,
+      extractErrors && extractErrorCodes(errorCodeOpts),
+      bundleType
+    ),
+    getInternalModules(),
+    getNodeModules(bundleType),
+    getFbjsModuleAliases(bundleType)
+  );
+}
+
+function getDefaultReplaceModules(bundleType) {
+  return Object.assign(
+    {},
+    replaceInternalModules(),
+    replaceFbjsModuleAliases(bundleType),
+    replaceDevOnlyStubbedModules(bundleType)
+  );
+}
+
+module.exports = {
+  getDefaultReplaceModules,
+  getAliases,
+  createModuleMap,
+  getNodeModules,
+  replaceInternalModules,
+  getInternalModules,
+  getFbjsModuleAliases,
+  replaceFbjsModuleAliases,
+  ignoreFBModules,
+  ignoreReactNativeModules,
+  getExternalModules,
+  getReactCurrentOwnerModuleAlias,
+  getReactCheckPropTypesModuleAlias,
+  getReactComponentTreeHookModuleAlias,
+  replaceDevOnlyStubbedModules,
+};
diff --git a/scripts/rollup/packaging.js b/scripts/rollup/packaging.js
new file mode 100644
index 0000000000000..46d1c5ecfc59b
--- /dev/null
+++ b/scripts/rollup/packaging.js
@@ -0,0 +1,163 @@
+'use strict';
+
+const basename = require('path').basename;
+const ncp = require('ncp').ncp;
+const fs = require('fs');
+const join = require('path').join;
+const resolve = require('path').resolve;
+const Bundles = require('./bundles');
+
+const UMD_DEV = Bundles.bundleTypes.UMD_DEV;
+const UMD_PROD = Bundles.bundleTypes.UMD_PROD;
+const NODE_DEV = Bundles.bundleTypes.NODE_DEV;
+const NODE_PROD = Bundles.bundleTypes.NODE_PROD;
+const FB_DEV = Bundles.bundleTypes.FB_DEV;
+const FB_PROD = Bundles.bundleTypes.FB_PROD;
+const RN_DEV = Bundles.bundleTypes.RN_DEV;
+const RN_PROD = Bundles.bundleTypes.RN_PROD;
+
+const facebookWWW = 'facebook-www';
+// these files need to be copied to the facebook-www build
+const facebookWWWSrcDependencies = [
+  'src/test/reactComponentExpect.js',
+  'src/renderers/dom/shared/eventPlugins/TapEventPlugin.js',
+];
+
+function asyncCopyTo(from, to) {
+  return new Promise(_resolve => {
+    ncp(from, to, error => {
+      if (error) {
+        console.error(error);
+        process.exit(1);
+      }
+      _resolve();
+    });
+  });
+}
+
+function getPackageName(name) {
+  if (name.indexOf('/') !== -1) {
+    return name.split('/')[0];
+  }
+  return name;
+}
+
+function createReactNativeBuild() {
+  // create the react-native folder for FB bundles
+  fs.mkdirSync(join('build', 'react-native'));
+  // create the react-native shims folder for FB shims
+  fs.mkdirSync(join('build', 'react-native', 'shims'));
+  // copy in all the shims from build/rollup/shims/react-native
+  const from = join('scripts', 'rollup', 'shims', 'react-native');
+  const to = join('build', 'react-native', 'shims');
+
+  return asyncCopyTo(from, to);
+}
+
+function createFacebookWWWBuild() {
+  // create the facebookWWW folder for FB bundles
+  fs.mkdirSync(join('build', facebookWWW));
+  // create the facebookWWW shims folder for FB shims
+  fs.mkdirSync(join('build', facebookWWW, 'shims'));
+  // copy in all the shims from build/rollup/shims/facebook-www
+  const from = join('scripts', 'rollup', 'shims', facebookWWW);
+  const to = join('build', facebookWWW, 'shims');
+
+  return asyncCopyTo(from, to).then(() => {
+    let promises = [];
+    // we also need to copy over some specific files from src
+    // defined in facebookWWWSrcDependencies
+    for (const srcDependency of facebookWWWSrcDependencies) {
+      promises.push(
+        asyncCopyTo(resolve(srcDependency), join(to, basename(srcDependency)))
+      );
+    }
+    return Promise.all(promises);
+  });
+}
+
+function copyBundleIntoNodePackage(packageName, filename, bundleType) {
+  const packageDirectory = resolve(`./build/packages/${packageName}`);
+
+  if (fs.existsSync(packageDirectory)) {
+    let from = resolve(`./build/${filename}`);
+    let to = `${packageDirectory}/${filename}`;
+    // for UMD bundles we have to move the files into a umd directory
+    // within the package directory. we also need to set the from
+    // to be the root build from directory
+    if (bundleType === UMD_DEV || bundleType === UMD_PROD) {
+      const distDirectory = `${packageDirectory}/umd`;
+      // create a dist directory if not created
+      if (!fs.existsSync(distDirectory)) {
+        fs.mkdirSync(distDirectory);
+      }
+      from = resolve(`./build/dist/${filename}`);
+      to = `${packageDirectory}/umd/${filename}`;
+    }
+    // for NODE bundles we have to move the files into a cjs directory
+    // within the package directory. we also need to set the from
+    // to be the root build from directory
+    if (bundleType === NODE_DEV || bundleType === NODE_PROD) {
+      const distDirectory = `${packageDirectory}/cjs`;
+      // create a dist directory if not created
+      if (!fs.existsSync(distDirectory)) {
+        fs.mkdirSync(distDirectory);
+      }
+      to = `${packageDirectory}/cjs/${filename}`;
+    }
+    return asyncCopyTo(from, to).then(() => {
+      // delete the old file if this is a not a UMD bundle
+      if (bundleType !== UMD_DEV && bundleType !== UMD_PROD) {
+        fs.unlinkSync(from);
+      }
+    });
+  } else {
+    return Promise.resolve();
+  }
+}
+
+function copyNodePackageTemplate(packageName) {
+  const from = resolve(`./packages/${packageName}`);
+  const to = resolve(`./build/packages/${packageName}`);
+
+  // if the package directory already exists, we skip copying to it
+  if (!fs.existsSync(to) && fs.existsSync(from)) {
+    return asyncCopyTo(from, to).then(() =>
+      Promise.all([
+        asyncCopyTo(resolve('./LICENSE'), `${to}/LICENSE`),
+        asyncCopyTo(resolve('./PATENTS'), `${to}/PATENTS`),
+      ]));
+  } else {
+    return Promise.resolve();
+  }
+}
+
+function createNodePackage(bundleType, packageName, filename) {
+  // the only case where we don't want to copy the package is for FB bundles
+  if (bundleType !== FB_DEV && bundleType !== FB_PROD) {
+    return copyNodePackageTemplate(packageName).then(() =>
+      copyBundleIntoNodePackage(packageName, filename, bundleType));
+  }
+  return Promise.resolve();
+}
+
+function getPackageDestination(config, bundleType, filename) {
+  let dest = config.destDir + filename;
+
+  if (bundleType === FB_DEV || bundleType === FB_PROD) {
+    dest = `${config.destDir}${facebookWWW}/${filename}`;
+  } else if (bundleType === UMD_DEV || bundleType === UMD_PROD) {
+    dest = `${config.destDir}dist/${filename}`;
+  } else if (bundleType === RN_DEV || bundleType === RN_PROD) {
+    dest = `${config.destDir}react-native/${filename}`;
+  }
+  return dest;
+}
+
+module.exports = {
+  getPackageDestination,
+  createNodePackage,
+  getPackageName,
+  createFacebookWWWBuild,
+  createReactNativeBuild,
+};
diff --git a/scripts/rollup/plugins/sizes-plugin.js b/scripts/rollup/plugins/sizes-plugin.js
new file mode 100644
index 0000000000000..c891d436b27e0
--- /dev/null
+++ b/scripts/rollup/plugins/sizes-plugin.js
@@ -0,0 +1,12 @@
+const gzip = require('gzip-size');
+
+module.exports = function sizes(options) {
+  return {
+    ongenerate(bundle, obj) {
+      const size = Buffer.byteLength(obj.code);
+      const gzipSize = gzip.sync(obj.code);
+
+      options.getSize(size, gzipSize);
+    },
+  };
+};
diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
new file mode 100644
index 0000000000000..48bef38a8b160
--- /dev/null
+++ b/scripts/rollup/results.json
@@ -0,0 +1,141 @@
+{
+  "branch": "rollup",
+  "bundleSizes": {
+    "react.development.js (UMD_DEV)": {
+      "size": 116402,
+      "gzip": 29598
+    },
+    "react.production.min.js (UMD_PROD)": {
+      "size": 13719,
+      "gzip": 5080
+    },
+    "react-dom.development.js (UMD_DEV)": {
+      "size": 565236,
+      "gzip": 130605
+    },
+    "react-dom.production.min.js (UMD_PROD)": {
+      "size": 120184,
+      "gzip": 37868
+    },
+    "react-dom-server.development.js (UMD_DEV)": {
+      "size": 477786,
+      "gzip": 115723
+    },
+    "react-dom-server.production.min.js (UMD_PROD)": {
+      "size": 106410,
+      "gzip": 33019
+    },
+    "react-art.development.js (UMD_DEV)": {
+      "size": 341133,
+      "gzip": 76276
+    },
+    "react-art.production.min.js (UMD_PROD)": {
+      "size": 94939,
+      "gzip": 28977
+    },
+    "react.development.js (NODE_DEV)": {
+      "size": 109416,
+      "gzip": 27554
+    },
+    "react.production.min.js (NODE_PROD)": {
+      "size": 12615,
+      "gzip": 4659
+    },
+    "React-dev.js (FB_DEV)": {
+      "size": 110901,
+      "gzip": 28115
+    },
+    "React-prod.js (FB_PROD)": {
+      "size": 56205,
+      "gzip": 14328
+    },
+    "ReactDOMStack-dev.js (FB_DEV)": {
+      "size": 523977,
+      "gzip": 125062
+    },
+    "ReactDOMStack-prod.js (FB_PROD)": {
+      "size": 351653,
+      "gzip": 84412
+    },
+    "react-dom.development.js (NODE_DEV)": {
+      "size": 543610,
+      "gzip": 125563
+    },
+    "react-dom.production.min.js (NODE_PROD)": {
+      "size": 116863,
+      "gzip": 36727
+    },
+    "ReactDOMFiber-dev.js (FB_DEV)": {
+      "size": 798188,
+      "gzip": 184347
+    },
+    "ReactDOMFiber-prod.js (FB_PROD)": {
+      "size": 407208,
+      "gzip": 93465
+    },
+    "react-dom-server.development.js (NODE_DEV)": {
+      "size": 447187,
+      "gzip": 108026
+    },
+    "react-dom-server.production.min.js (NODE_PROD)": {
+      "size": 101265,
+      "gzip": 31247
+    },
+    "ReactDOMServerStack-dev.js (FB_DEV)": {
+      "size": 445938,
+      "gzip": 107881
+    },
+    "ReactDOMServerStack-prod.js (FB_PROD)": {
+      "size": 332920,
+      "gzip": 80268
+    },
+    "ReactARTStack-dev.js (FB_DEV)": {
+      "size": 494749,
+      "gzip": 118999
+    },
+    "ReactARTStack-prod.js (FB_PROD)": {
+      "size": 365061,
+      "gzip": 87642
+    },
+    "react-art.development.js (NODE_DEV)": {
+      "size": 266368,
+      "gzip": 57200
+    },
+    "react-art.production.min.js (NODE_PROD)": {
+      "size": 56517,
+      "gzip": 17109
+    },
+    "ReactARTFiber-dev.js (FB_DEV)": {
+      "size": 265543,
+      "gzip": 57024
+    },
+    "ReactARTFiber-prod.js (FB_PROD)": {
+      "size": 205194,
+      "gzip": 43039
+    },
+    "ReactNativeStack.js (RN)": {
+      "size": 233993,
+      "gzip": 55044
+    },
+    "ReactNativeFiber.js (RN)": {
+      "size": 387155,
+      "gzip": 84001
+    },
+    "ReactTestRendererFiber-dev.js (FB_DEV)": {
+      "size": 263434,
+      "gzip": 55987
+    },
+    "ReactTestRendererStack-dev.js (FB_DEV)": {
+      "size": 155204,
+      "gzip": 35682
+    },
+    "react-noop-renderer.development.js (NODE_DEV)": {
+      "size": 255429,
+      "gzip": 53949
+    },
+    "react-test-renderer.development.js (NODE_DEV)": {
+      "size": 264268,
+      "gzip": 56169
+    }
+  }
+}
\ No newline at end of file
diff --git a/scripts/rollup/shims/facebook-www/DOMProperty.js b/scripts/rollup/shims/facebook-www/DOMProperty.js
new file mode 100644
index 0000000000000..09bbc5012cda7
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/DOMProperty.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule DOMProperty
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.DOMProperty;
diff --git a/scripts/rollup/shims/facebook-www/EventPluginHub.js b/scripts/rollup/shims/facebook-www/EventPluginHub.js
new file mode 100644
index 0000000000000..e332f5ec802c2
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/EventPluginHub.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule EventPluginHub
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.EventPluginHub;
diff --git a/scripts/rollup/shims/facebook-www/EventPluginUtils.js b/scripts/rollup/shims/facebook-www/EventPluginUtils.js
new file mode 100644
index 0000000000000..610db82c3adb8
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/EventPluginUtils.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule EventPluginUtils
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.EventPluginUtils;
diff --git a/scripts/rollup/shims/facebook-www/EventPropagators.js b/scripts/rollup/shims/facebook-www/EventPropagators.js
new file mode 100644
index 0000000000000..a7c17e26561cf
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/EventPropagators.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule EventPropagators
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.EventPropagators;
diff --git a/scripts/rollup/shims/facebook-www/PooledClass.js b/scripts/rollup/shims/facebook-www/PooledClass.js
new file mode 100644
index 0000000000000..c93757440c4e5
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/PooledClass.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule PooledClass
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.PooledClass;
diff --git a/scripts/rollup/shims/facebook-www/ReactBrowserEventEmitter.js b/scripts/rollup/shims/facebook-www/ReactBrowserEventEmitter.js
new file mode 100644
index 0000000000000..ce214f4ea198c
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/ReactBrowserEventEmitter.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactBrowserEventEmitter
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactBrowserEventEmitter;
diff --git a/scripts/rollup/shims/facebook-www/ReactChildren.js b/scripts/rollup/shims/facebook-www/ReactChildren.js
new file mode 100644
index 0000000000000..021b8e6262816
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/ReactChildren.js
@@ -0,0 +1,20 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactChildren
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('React');
+
+// TODO: can't reexport public API because of
+// mapIntoWithKeyPrefixInternal() dependency in an addon.
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactChildren;
diff --git a/scripts/rollup/shims/facebook-www/ReactDOMComponentTree.js b/scripts/rollup/shims/facebook-www/ReactDOMComponentTree.js
new file mode 100644
index 0000000000000..9f3f214d6a00e
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/ReactDOMComponentTree.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactDOMComponentTree
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactDOMComponentTree;
diff --git a/scripts/rollup/shims/facebook-www/ReactDOMInputSelection.js b/scripts/rollup/shims/facebook-www/ReactDOMInputSelection.js
new file mode 100644
index 0000000000000..2725fd4d6ca8a
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/ReactDOMInputSelection.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactDOMInputSelection
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactDOMInputSelection;
diff --git a/scripts/rollup/shims/facebook-www/ReactDOMSelection.js b/scripts/rollup/shims/facebook-www/ReactDOMSelection.js
new file mode 100644
index 0000000000000..71c5fd1a60cc2
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/ReactDOMSelection.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactDOMSelection
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactDOMSelection;
diff --git a/scripts/rollup/shims/facebook-www/ReactElement.js b/scripts/rollup/shims/facebook-www/ReactElement.js
new file mode 100644
index 0000000000000..6a872652c1a76
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/ReactElement.js
@@ -0,0 +1,23 @@
+/**
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactElement
+ */
+'use strict';
+
+const {
+  createElement,
+  createFactory,
+  isValidElement,
+} = require('React');
+
+module.exports = {
+  createElement,
+  createFactory,
+  isValidElement,
+};
diff --git a/scripts/rollup/shims/facebook-www/ReactErrorUtils.js b/scripts/rollup/shims/facebook-www/ReactErrorUtils.js
new file mode 100644
index 0000000000000..0adabdd3974ee
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/ReactErrorUtils.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactErrorUtils
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactErrorUtils;
diff --git a/scripts/rollup/shims/facebook-www/ReactFiberErrorLogger.js b/scripts/rollup/shims/facebook-www/ReactFiberErrorLogger.js
new file mode 100644
index 0000000000000..a66686a9c4b39
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/ReactFiberErrorLogger.js
@@ -0,0 +1,26 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactFiberErrorLogger
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+// TODO: remove this when we delete Stack
+const ReactFiberErrorLoggerStackShim = {
+  injection: {
+    injectDialog() {},
+  },
+};
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactFiberErrorLogger ||
+  ReactFiberErrorLoggerStackShim;
diff --git a/scripts/rollup/shims/facebook-www/ReactInputSelection.js b/scripts/rollup/shims/facebook-www/ReactInputSelection.js
new file mode 100644
index 0000000000000..a43bf82265a83
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/ReactInputSelection.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactInputSelection
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactInputSelection;
diff --git a/scripts/rollup/shims/facebook-www/ReactInstanceMap.js b/scripts/rollup/shims/facebook-www/ReactInstanceMap.js
new file mode 100644
index 0000000000000..4543e981857d3
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/ReactInstanceMap.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactInstanceMap
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactInstanceMap;
diff --git a/scripts/rollup/shims/facebook-www/ReactPerf.js b/scripts/rollup/shims/facebook-www/ReactPerf.js
new file mode 100644
index 0000000000000..6dc81d72b8852
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/ReactPerf.js
@@ -0,0 +1,38 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactPerf
+ */
+
+'use strict';
+
+const emptyFunction = require('fbjs/lib/emptyFunction');
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+// TODO: remove this whole module when we delete Stack
+const ReactPerfFiberShim = {
+  getLastMeasurements: emptyFunction,
+  getExclusive: emptyFunction,
+  getInclusive: emptyFunction,
+  getWasted: emptyFunction,
+  getOperations: emptyFunction,
+  printExclusive: emptyFunction,
+  printInclusive: emptyFunction,
+  printWasted: emptyFunction,
+  printOperations: emptyFunction,
+  start: emptyFunction,
+  stop: emptyFunction,
+  isRunning: emptyFunction,
+  printDOM: emptyFunction,
+  getMeasurementsSummaryMap: emptyFunction,
+};
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactPerf ||
+  ReactPerfFiberShim;
diff --git a/scripts/rollup/shims/facebook-www/ReactTestUtils.js b/scripts/rollup/shims/facebook-www/ReactTestUtils.js
new file mode 100644
index 0000000000000..dafb421d1d187
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/ReactTestUtils.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactTestUtils
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactTestUtils;
diff --git a/scripts/rollup/shims/facebook-www/SyntheticEvent.js b/scripts/rollup/shims/facebook-www/SyntheticEvent.js
new file mode 100644
index 0000000000000..dc59584824220
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/SyntheticEvent.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule SyntheticEvent
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.SyntheticEvent;
diff --git a/scripts/rollup/shims/facebook-www/SyntheticKeyboardEvent.js b/scripts/rollup/shims/facebook-www/SyntheticKeyboardEvent.js
new file mode 100644
index 0000000000000..f5ce292759126
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/SyntheticKeyboardEvent.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule SyntheticKeyboardEvent
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.SyntheticKeyboardEvent;
diff --git a/scripts/rollup/shims/facebook-www/SyntheticMouseEvent.js b/scripts/rollup/shims/facebook-www/SyntheticMouseEvent.js
new file mode 100644
index 0000000000000..0d371be43dde4
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/SyntheticMouseEvent.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule SyntheticMouseEvent
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.SyntheticMouseEvent;
diff --git a/scripts/rollup/shims/facebook-www/SyntheticUIEvent.js b/scripts/rollup/shims/facebook-www/SyntheticUIEvent.js
new file mode 100644
index 0000000000000..82a98fb3e3a8e
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/SyntheticUIEvent.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule SyntheticUIEvent
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.SyntheticUIEvent;
diff --git a/scripts/rollup/shims/facebook-www/adler32.js b/scripts/rollup/shims/facebook-www/adler32.js
new file mode 100644
index 0000000000000..e0db6a55621c7
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/adler32.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule adler32
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.adler32;
diff --git a/scripts/rollup/shims/facebook-www/findDOMNode.js b/scripts/rollup/shims/facebook-www/findDOMNode.js
new file mode 100644
index 0000000000000..4ce72fd0d9643
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/findDOMNode.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule findDOMNode
+ */
+
+'use strict';
+
+const {
+  findDOMNode,
+} = require('ReactDOM-fb');
+
+module.exports = findDOMNode;
diff --git a/scripts/rollup/shims/facebook-www/flattenChildren.js b/scripts/rollup/shims/facebook-www/flattenChildren.js
new file mode 100644
index 0000000000000..e0e76d6f17c72
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/flattenChildren.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule flattenChildren
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('React');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.flattenChildren;
diff --git a/scripts/rollup/shims/facebook-www/getComponentName.js b/scripts/rollup/shims/facebook-www/getComponentName.js
new file mode 100644
index 0000000000000..9dcdbb8f9afb4
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/getComponentName.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule getComponentName
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('React');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.getComponentName;
diff --git a/scripts/rollup/shims/facebook-www/getEventCharCode.js b/scripts/rollup/shims/facebook-www/getEventCharCode.js
new file mode 100644
index 0000000000000..dcaf75734cb96
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/getEventCharCode.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule getEventCharCode
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.getEventCharCode;
diff --git a/scripts/rollup/shims/facebook-www/getEventKey.js b/scripts/rollup/shims/facebook-www/getEventKey.js
new file mode 100644
index 0000000000000..d32166e4ac26b
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/getEventKey.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule getEventKey
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.getEventKey;
diff --git a/scripts/rollup/shims/facebook-www/getEventTarget.js b/scripts/rollup/shims/facebook-www/getEventTarget.js
new file mode 100644
index 0000000000000..c7ab395956e15
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/getEventTarget.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule getEventTarget
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.getEventTarget;
diff --git a/scripts/rollup/shims/facebook-www/getVendorPrefixedEventName.js b/scripts/rollup/shims/facebook-www/getVendorPrefixedEventName.js
new file mode 100644
index 0000000000000..fa4a5b1a8e3de
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/getVendorPrefixedEventName.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule getVendorPrefixedEventName
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.getVendorPrefixedEventName;
diff --git a/scripts/rollup/shims/facebook-www/isEventSupported.js b/scripts/rollup/shims/facebook-www/isEventSupported.js
new file mode 100644
index 0000000000000..0de4f444a26f2
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/isEventSupported.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule isEventSupported
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.isEventSupported;
diff --git a/grunt/data/header-template-extended.txt b/scripts/rollup/shims/facebook-www/onlyChild.js
similarity index 73%
rename from grunt/data/header-template-extended.txt
rename to scripts/rollup/shims/facebook-www/onlyChild.js
index 83bcca41ccee8..eb706ab47828b 100644
--- a/grunt/data/header-template-extended.txt
+++ b/scripts/rollup/shims/facebook-www/onlyChild.js
@@ -1,6 +1,4 @@
 /**
- * <%= package %> v<%= version %>
- *
  * Copyright 2013-present, Facebook, Inc.
  * All rights reserved.
  *
@@ -8,4 +6,10 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
+ * @providesModule onlyChild
  */
+'use strict';
+
+var {Children} = require('React');
+
+module.exports = Children.only;
diff --git a/scripts/rollup/shims/facebook-www/renderSubtreeIntoContainer.js b/scripts/rollup/shims/facebook-www/renderSubtreeIntoContainer.js
new file mode 100644
index 0000000000000..f2d3758888a7d
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/renderSubtreeIntoContainer.js
@@ -0,0 +1,16 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule renderSubtreeIntoContainer
+ */
+
+'use strict';
+
+var ReactDOM = require('ReactDOM-fb');
+
+module.exports = ReactDOM.unstable_renderSubtreeIntoContainer;
diff --git a/scripts/rollup/shims/facebook-www/setInnerHTML.js b/scripts/rollup/shims/facebook-www/setInnerHTML.js
new file mode 100644
index 0000000000000..99c074803afee
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/setInnerHTML.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule setInnerHTML
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.setInnerHTML;
diff --git a/scripts/rollup/shims/facebook-www/setTextContent.js b/scripts/rollup/shims/facebook-www/setTextContent.js
new file mode 100644
index 0000000000000..76ed7088d0073
--- /dev/null
+++ b/scripts/rollup/shims/facebook-www/setTextContent.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule setTextContent
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactDOM-fb');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.setTextContent;
diff --git a/scripts/rollup/shims/react-native/NativeMethodsMixin.js b/scripts/rollup/shims/react-native/NativeMethodsMixin.js
new file mode 100644
index 0000000000000..786c903600445
--- /dev/null
+++ b/scripts/rollup/shims/react-native/NativeMethodsMixin.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule NativeMethodsMixin
+ * @flow
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactNative');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.NativeMethodsMixin;
diff --git a/scripts/rollup/shims/react-native/PooledClass.js b/scripts/rollup/shims/react-native/PooledClass.js
new file mode 100644
index 0000000000000..269ce9cd36d1b
--- /dev/null
+++ b/scripts/rollup/shims/react-native/PooledClass.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule PooledClass
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactNative');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.PooledClass;
diff --git a/scripts/rollup/shims/react-native/ReactDebugTool.js b/scripts/rollup/shims/react-native/ReactDebugTool.js
new file mode 100644
index 0000000000000..883a254093b81
--- /dev/null
+++ b/scripts/rollup/shims/react-native/ReactDebugTool.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactDebugTool
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactNative');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactDebugTool;
diff --git a/scripts/rollup/shims/react-native/ReactErrorUtils.js b/scripts/rollup/shims/react-native/ReactErrorUtils.js
new file mode 100644
index 0000000000000..441a9b81c83c7
--- /dev/null
+++ b/scripts/rollup/shims/react-native/ReactErrorUtils.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactErrorUtils
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactNative');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactErrorUtils;
diff --git a/scripts/rollup/shims/react-native/ReactNativeComponentTree.js b/scripts/rollup/shims/react-native/ReactNativeComponentTree.js
new file mode 100644
index 0000000000000..54192a5d9de85
--- /dev/null
+++ b/scripts/rollup/shims/react-native/ReactNativeComponentTree.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactNativeComponentTree
+ * @flow
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactNative');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactNativeComponentTree;
diff --git a/scripts/rollup/shims/react-native/ReactNativePropRegistry.js b/scripts/rollup/shims/react-native/ReactNativePropRegistry.js
new file mode 100644
index 0000000000000..e4cfeb3ed9cbb
--- /dev/null
+++ b/scripts/rollup/shims/react-native/ReactNativePropRegistry.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactNativePropRegistry
+ * @flow
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactNative');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactNativePropRegistry;
diff --git a/scripts/rollup/shims/react-native/ReactPerf.js b/scripts/rollup/shims/react-native/ReactPerf.js
new file mode 100644
index 0000000000000..e879d267a80ca
--- /dev/null
+++ b/scripts/rollup/shims/react-native/ReactPerf.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactPerf
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactNative');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactPerf;
diff --git a/scripts/rollup/shims/react-native/TouchHistoryMath.js b/scripts/rollup/shims/react-native/TouchHistoryMath.js
new file mode 100644
index 0000000000000..f0e6bc2ae9c58
--- /dev/null
+++ b/scripts/rollup/shims/react-native/TouchHistoryMath.js
@@ -0,0 +1,18 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule TouchHistoryMath
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactNative');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.TouchHistoryMath;
diff --git a/scripts/rollup/shims/react-native/createReactNativeComponentClass.js b/scripts/rollup/shims/react-native/createReactNativeComponentClass.js
new file mode 100644
index 0000000000000..3302f061b4195
--- /dev/null
+++ b/scripts/rollup/shims/react-native/createReactNativeComponentClass.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule createReactNativeComponentClass
+ * @flow
+ */
+
+'use strict';
+
+const {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+} = require('ReactNative');
+
+module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.createReactNativeComponentClass;
diff --git a/scripts/rollup/shims/react-native/findNodeHandle.js b/scripts/rollup/shims/react-native/findNodeHandle.js
new file mode 100644
index 0000000000000..7570b832c870c
--- /dev/null
+++ b/scripts/rollup/shims/react-native/findNodeHandle.js
@@ -0,0 +1,29 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule findNodeHandle
+ * @flow
+ */
+
+'use strict';
+
+// While ReactNative renderer bundle is initializing, some
+// code (e.g. UIManager) imports from ReactNative.
+
+// We use an indirection to avoid a circular dependency.
+
+let realFindNodeHandle = null;
+
+function findNodeHandle(componentOrHandle: any): ?number {
+  if (realFindNodeHandle === null) {
+    realFindNodeHandle = require('ReactNative').__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.findNodeHandle;
+  }
+  return realFindNodeHandle(componentOrHandle);
+}
+
+module.exports = findNodeHandle;
diff --git a/scripts/rollup/shims/rollup/DevOnlyStubShim.js b/scripts/rollup/shims/rollup/DevOnlyStubShim.js
new file mode 100644
index 0000000000000..b894a23a24d56
--- /dev/null
+++ b/scripts/rollup/shims/rollup/DevOnlyStubShim.js
@@ -0,0 +1 @@
+module.exports = null;
diff --git a/scripts/rollup/shims/rollup/ReactCheckPropTypesRollupShim.js b/scripts/rollup/shims/rollup/ReactCheckPropTypesRollupShim.js
new file mode 100644
index 0000000000000..f8866b76e6f1d
--- /dev/null
+++ b/scripts/rollup/shims/rollup/ReactCheckPropTypesRollupShim.js
@@ -0,0 +1,3 @@
+var React = require('react');
+
+module.exports = React.checkPropTypes;
diff --git a/scripts/rollup/shims/rollup/ReactComponentTreeHookRollupShim.js b/scripts/rollup/shims/rollup/ReactComponentTreeHookRollupShim.js
new file mode 100644
index 0000000000000..bcdc4d8787409
--- /dev/null
+++ b/scripts/rollup/shims/rollup/ReactComponentTreeHookRollupShim.js
@@ -0,0 +1,3 @@
+var ReactInternals = require('react').__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+
+module.exports = ReactInternals.ReactComponentTreeHook;
diff --git a/scripts/rollup/shims/rollup/ReactCurrentOwnerRollupShim.js b/scripts/rollup/shims/rollup/ReactCurrentOwnerRollupShim.js
new file mode 100644
index 0000000000000..3e5579b86c5af
--- /dev/null
+++ b/scripts/rollup/shims/rollup/ReactCurrentOwnerRollupShim.js
@@ -0,0 +1,3 @@
+var ReactInternals = require('react').__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+
+module.exports = ReactInternals.ReactCurrentOwner;
diff --git a/scripts/rollup/stats.js b/scripts/rollup/stats.js
new file mode 100644
index 0000000000000..3cbac43796f92
--- /dev/null
+++ b/scripts/rollup/stats.js
@@ -0,0 +1,76 @@
+'use strict';
+
+const Table = require('cli-table');
+const filesize = require('filesize');
+const branch = require('git-branch');
+const chalk = require('chalk');
+const join = require('path').join;
+const fs = require('fs');
+const prevBuildResults = require('./results.json');
+
+const currentBuildResults = {
+  branch: branch.sync(),
+  // Mutated during the build.
+  bundleSizes: Object.assign({}, prevBuildResults.bundleSizes),
+};
+
+function saveResults() {
+  fs.writeFileSync(
+    join('scripts', 'rollup', 'results.json'),
+    JSON.stringify(currentBuildResults, null, 2)
+  );
+}
+
+function percentChange(prev, current) {
+  const change = Math.floor((current - prev) / prev * 100);
+
+  if (change > 0) {
+    return chalk.red.bold(`+${change} %`);
+  } else if (change <= 0) {
+    return chalk.green.bold(change + ' %');
+  }
+}
+
+function printResults() {
+  const table = new Table({
+    head: [
+      chalk.gray.yellow('Bundle'),
+      chalk.gray.yellow('Prev Size'),
+      chalk.gray.yellow('Current Size'),
+      chalk.gray.yellow('Diff'),
+      chalk.gray.yellow('Prev Gzip'),
+      chalk.gray.yellow('Current Gzip'),
+      chalk.gray.yellow('Diff'),
+    ],
+  });
+  Object.keys(currentBuildResults.bundleSizes).forEach(key => {
+    const result = currentBuildResults.bundleSizes[key];
+    const prev = prevBuildResults.bundleSizes[key];
+    if (result === prev) {
+      // We didn't rebuild this bundle.
+      return;
+    }
+
+    const size = result.size;
+    const gzip = result.gzip;
+    let prevSize = prev ? prev.size : 0;
+    let prevGzip = prev ? prev.gzip : 0;
+    table.push([
+      chalk.white.bold(key),
+      chalk.gray.bold(filesize(prevSize)),
+      chalk.white.bold(filesize(size)),
+      percentChange(prevSize, size),
+      chalk.gray.bold(filesize(prevGzip)),
+      chalk.white.bold(filesize(gzip)),
+      percentChange(prevGzip, gzip),
+    ]);
+  });
+  return table.toString() +
+    `\n\nThe difference was compared to the last build on "${chalk.green.bold(prevBuildResults.branch)}" branch.\n`;
+}
+
+module.exports = {
+  printResults,
+  saveResults,
+  currentBuildResults,
+};
diff --git a/scripts/tasks/eslint.js b/scripts/tasks/eslint.js
new file mode 100644
index 0000000000000..37daad217372d
--- /dev/null
+++ b/scripts/tasks/eslint.js
@@ -0,0 +1,27 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+'use strict';
+
+var path = require('path');
+var spawn = require('child_process').spawn;
+
+var extension = process.platform === 'win32' ? '.cmd' : '';
+
+spawn(path.join('node_modules', '.bin', 'eslint' + extension), ['.'], {
+  // Allow colors to pass through
+  stdio: 'inherit',
+}).on('close', function(code) {
+  if (code !== 0) {
+    console.error('Lint failed');
+    process.exit(code);
+  }
+
+  console.log('Lint passed');
+});
diff --git a/scripts/tasks/flow.js b/scripts/tasks/flow.js
new file mode 100644
index 0000000000000..4c0abb819c083
--- /dev/null
+++ b/scripts/tasks/flow.js
@@ -0,0 +1,26 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+'use strict';
+
+var path = require('path');
+var spawn = require('child_process').spawn;
+
+var extension = process.platform === 'win32' ? '.cmd' : '';
+
+spawn(path.join('node_modules', '.bin', 'flow' + extension), ['check', '.'], {
+  // Allow colors to pass through
+  stdio: 'inherit',
+}).on('close', function(code) {
+  if (code !== 0) {
+    console.log('Flow failed');
+    process.exit(code);
+  }
+  console.log('Flow passed');
+});
diff --git a/scripts/tasks/jest.js b/scripts/tasks/jest.js
new file mode 100644
index 0000000000000..73d1f11064097
--- /dev/null
+++ b/scripts/tasks/jest.js
@@ -0,0 +1,31 @@
+'use strict';
+
+const path = require('path');
+const spawn = require('child_process').spawn;
+const argv = require('minimist')(process.argv.slice(2));
+
+console.log('Running Jest');
+
+const args = [
+  path.join('node_modules', 'jest-cli', 'bin', 'jest'),
+  '--runInBand',
+];
+if (argv.coverage) {
+  args.push('--coverage');
+}
+
+const jest = spawn('node', args, {
+  stdio: 'inherit',
+  env: Object.assign({}, process.env, {
+    NODE_ENV: 'test',
+  }),
+});
+
+jest.on('close', code => {
+  if (code === 1) {
+    console.error('Jest failed!');
+  } else {
+    console.log('Jest passed!');
+  }
+  process.exit(0);
+});
diff --git a/scripts/tasks/version-check.js b/scripts/tasks/version-check.js
new file mode 100644
index 0000000000000..d8fa30bf6dcb5
--- /dev/null
+++ b/scripts/tasks/version-check.js
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+'use strict';
+
+const reactVersion = require('../../package.json').version;
+const versions = {
+  'packages/react/package.json': require('../../packages/react/package.json').version,
+  'packages/react-dom/package.json': require('../../packages/react-dom/package.json').version,
+  'packages/react-test-renderer/package.json': require('../../packages/react-test-renderer/package.json').version,
+  'src/ReactVersion.js': require('../../src/ReactVersion'),
+};
+
+let allVersionsMatch = true;
+Object.keys(versions).forEach(function(name) {
+  const version = versions[name];
+  if (version !== reactVersion) {
+    allVersionsMatch = false;
+    console.log(
+      '%s version does not match package.json. Expected %s, saw %s.',
+      name,
+      reactVersion,
+      version
+    );
+  }
+});
+
+if (!allVersionsMatch) {
+  process.exit(1);
+}
diff --git a/src/fb/ReactDOMFBEntry.js b/src/fb/ReactDOMFBEntry.js
new file mode 100644
index 0000000000000..7545c5ce3feec
--- /dev/null
+++ b/src/fb/ReactDOMFBEntry.js
@@ -0,0 +1,54 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+'use strict';
+
+var ReactDOM = require('ReactDOM');
+
+ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
+  // These should be easy to copy into react_contrib and remove from here:
+  adler32: require('adler32'),
+  getVendorPrefixedEventName: require('getVendorPrefixedEventName'),
+  getEventCharCode: require('getEventCharCode'),
+  getEventKey: require('getEventKey'),
+  getEventTarget: require('getEventTarget'),
+  isEventSupported: require('isEventSupported'),
+  setInnerHTML: require('setInnerHTML'),
+  setTextContent: require('setTextContent'),
+  PooledClass: require('PooledClass'),
+  ReactDOMSelection: require('ReactDOMSelection'),
+  ReactInputSelection: require('ReactInputSelection'),
+  // These are mostly used in incorrect Flow typings and are codemoddable:
+  SyntheticEvent: require('SyntheticEvent'),
+  SyntheticKeyboardEvent: require('SyntheticKeyboardEvent'),
+  SyntheticMouseEvent: require('SyntheticMouseEvent'),
+  // These are real internal dependencies that are trickier to remove:
+  EventPluginHub: require('EventPluginHub'),
+  ReactBrowserEventEmitter: require('ReactBrowserEventEmitter'),
+  ReactErrorUtils: require('ReactErrorUtils'),
+  ReactDOMComponentTree: require('ReactDOMComponentTree'),
+  ReactInstanceMap: require('react-dom/lib/ReactInstanceMap'),
+  // This is used for ajaxify on www:
+  DOMProperty: require('DOMProperty'),
+  // These are dependencies of TapEventPlugin:
+  EventPluginUtils: require('EventPluginUtils'),
+  EventPropagators: require('EventPropagators'),
+  SyntheticUIEvent: require('SyntheticUIEvent'),
+};
+
+if (__DEV__) {
+  Object.assign(ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, {
+    // ReactPerf and ReactTestUtils currently only work with the DOM renderer
+    // so we expose them from here, but only in DEV mode.
+    ReactPerf: require('react-dom/lib/ReactPerf'),
+    ReactTestUtils: require('react-dom/lib/ReactTestUtils'),
+  });
+}
+
+module.exports = ReactDOM;
diff --git a/src/fb/ReactDOMFiberFBEntry.js b/src/fb/ReactDOMFiberFBEntry.js
new file mode 100644
index 0000000000000..c019d38c00424
--- /dev/null
+++ b/src/fb/ReactDOMFiberFBEntry.js
@@ -0,0 +1,57 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+'use strict';
+
+var ReactDOMFiber = require('ReactDOMFiber');
+
+ReactDOMFiber.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
+  // These should be easy to copy into react_contrib and remove from here:
+  adler32: require('adler32'),
+  getVendorPrefixedEventName: require('getVendorPrefixedEventName'),
+  getEventCharCode: require('getEventCharCode'),
+  getEventKey: require('getEventKey'),
+  getEventTarget: require('getEventTarget'),
+  isEventSupported: require('isEventSupported'),
+  setInnerHTML: require('setInnerHTML'),
+  setTextContent: require('setTextContent'),
+  PooledClass: require('PooledClass'),
+  ReactDOMSelection: require('ReactDOMSelection'),
+  ReactInputSelection: require('ReactInputSelection'),
+  // These are mostly used in incorrect Flow typings and are codemoddable:
+  SyntheticEvent: require('SyntheticEvent'),
+  SyntheticKeyboardEvent: require('SyntheticKeyboardEvent'),
+  SyntheticMouseEvent: require('SyntheticMouseEvent'),
+  // These are real internal dependencies that are trickier to remove:
+  EventPluginHub: require('EventPluginHub'),
+  ReactBrowserEventEmitter: require('ReactBrowserEventEmitter'),
+  ReactErrorUtils: require('ReactErrorUtils'),
+  ReactFiberErrorLogger: require('ReactFiberErrorLogger'),
+  ReactDOMComponentTree: require('ReactDOMComponentTree'),
+  ReactInstanceMap: require('react-dom/lib/ReactInstanceMap'),
+  // This is used for ajaxify on www:
+  DOMProperty: require('DOMProperty'),
+  // These are dependencies of TapEventPlugin:
+  EventPluginUtils: require('EventPluginUtils'),
+  EventPropagators: require('EventPropagators'),
+  SyntheticUIEvent: require('SyntheticUIEvent'),
+};
+
+if (__DEV__) {
+  Object.assign(
+    ReactDOMFiber.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+    {
+      // ReactPerf and ReactTestUtils currently only work with the DOM renderer
+      // so we expose them from here, but only in DEV mode.
+      ReactTestUtils: require('react-dom/lib/ReactTestUtils'),
+    },
+  );
+}
+
+module.exports = ReactDOMFiber;
diff --git a/src/fb/ReactFBEntry.js b/src/fb/ReactFBEntry.js
new file mode 100644
index 0000000000000..74add5c91bc8b
--- /dev/null
+++ b/src/fb/ReactFBEntry.js
@@ -0,0 +1,36 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+'use strict';
+
+var React = require('React');
+
+// `version` will be added here by the React module.
+var ReactFBEntry = Object.assign(
+  {
+    __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
+      ReactChildren: require('ReactChildren'),
+      getComponentName: require('getComponentName'),
+      flattenChildren: require('flattenChildren'),
+    },
+  },
+  React,
+);
+
+if (__DEV__) {
+  Object.assign(
+    ReactFBEntry.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+    {
+      // ReactComponentTreeHook should not be included in production.
+      ReactComponentTreeHook: require('react/lib/ReactComponentTreeHook'),
+    },
+  );
+}
+
+module.exports = ReactFBEntry;
diff --git a/src/renderers/art/ReactARTStack.js b/src/renderers/art/ReactARTStack.js
index e8144f04a6622..db1d22a885e86 100644
--- a/src/renderers/art/ReactARTStack.js
+++ b/src/renderers/art/ReactARTStack.js
@@ -19,6 +19,7 @@ const Transform = require('art/core/transform');
 const Mode = require('art/modes/current');
 
 const React = require('react');
+const ReactDefaultBatchingStrategy = require('ReactDefaultBatchingStrategy');
 const ReactDOM = require('react-dom');
 const ReactInstanceMap = require('ReactInstanceMap');
 const ReactMultiChild = require('ReactMultiChild');
@@ -27,7 +28,6 @@ const ReactUpdates = require('ReactUpdates');
 const emptyObject = require('fbjs/lib/emptyObject');
 const invariant = require('fbjs/lib/invariant');
 
-const assign = require('object-assign');
 const pooledTransform = new Transform();
 
 // Utilities
@@ -56,7 +56,7 @@ function createComponent(name) {
   };
   ReactARTComponent.displayName = name;
   for (let i = 1, l = arguments.length; i < l; i++) {
-    assign(ReactARTComponent.prototype, arguments[i]);
+    Object.assign(ReactARTComponent.prototype, arguments[i]);
   }
 
   return ReactARTComponent;
@@ -94,7 +94,7 @@ function injectAfter(parentNode, referenceNode, node) {
 
 // ContainerMixin for components that can hold ART nodes
 
-const ContainerMixin = assign({}, ReactMultiChild, {
+const ContainerMixin = Object.assign({}, ReactMultiChild, {
   /**
    * Moves a child component to the supplied index.
    *
@@ -199,15 +199,23 @@ const Surface = React.createClass({
       node.resize(+this.props.width, +this.props.height);
     }
 
-    const transaction = ReactUpdates.ReactReconcileTransaction.getPooled();
-    transaction.perform(
-      this.updateChildren,
-      this,
-      this.props.children,
-      transaction,
-      ReactInstanceMap.get(this)._context,
-    );
-    ReactUpdates.ReactReconcileTransaction.release(transaction);
+    const doUpdate = () => {
+      const transaction = ReactUpdates.ReactReconcileTransaction.getPooled();
+      transaction.perform(
+        this.updateChildren,
+        this,
+        this.props.children,
+        transaction,
+        ReactInstanceMap.get(this)._context,
+      );
+      ReactUpdates.ReactReconcileTransaction.release(transaction);
+    };
+
+    if (ReactDefaultBatchingStrategy.isBatchingUpdates) {
+      doUpdate();
+    } else {
+      ReactUpdates.batchedUpdates(doUpdate);
+    }
 
     if (node.render) {
       node.render();
@@ -444,7 +452,7 @@ const ClippingRectangle = createComponent(
 
 // Renderables
 
-const RenderableMixin = assign({}, NodeMixin, {
+const RenderableMixin = Object.assign({}, NodeMixin, {
   applyRenderableProps: function(oldProps, props) {
     if (oldProps.fill !== props.fill) {
       if (props.fill && props.fill.applyFill) {
diff --git a/src/renderers/dom/shared/eventPlugins/TapEventPlugin.js b/src/renderers/dom/shared/eventPlugins/TapEventPlugin.js
index e3badd714afb2..8edd53ae60a56 100644
--- a/src/renderers/dom/shared/eventPlugins/TapEventPlugin.js
+++ b/src/renderers/dom/shared/eventPlugins/TapEventPlugin.js
@@ -20,10 +20,6 @@ var TouchEventUtils = require('fbjs/lib/TouchEventUtils');
 var isStartish = EventPluginUtils.isStartish;
 var isEndish = EventPluginUtils.isEndish;
 
-import type {EventTypes, PluginModule} from 'PluginModuleType';
-import type {ReactInstance} from 'ReactInstanceType';
-import type {TopLevelTypes} from 'EventConstants';
-
 /**
  * We are extending the Flow 'Touch' declaration to enable using bracket
  * notation to access properties.
@@ -96,7 +92,7 @@ var dependencies = ['topMouseDown', 'topMouseMove', 'topMouseUp'].concat(
   touchEvents,
 );
 
-var eventTypes: EventTypes = {
+var eventTypes = {
   touchTap: {
     phasedRegistrationNames: {
       bubbled: 'onTouchTap',
@@ -110,14 +106,14 @@ var usedTouch = false;
 var usedTouchTime = 0;
 var TOUCH_DELAY = 1000;
 
-var TapEventPlugin: PluginModule<_Touch> = {
+var TapEventPlugin = {
   tapMoveThreshold: tapMoveThreshold,
 
   eventTypes: eventTypes,
 
   extractEvents: function(
-    topLevelType: TopLevelTypes,
-    targetInst: ReactInstance,
+    topLevelType: mixed,
+    targetInst: mixed,
     nativeEvent: _Touch,
     nativeEventTarget: EventTarget,
   ) {
diff --git a/src/renderers/noop/ReactNoop.js b/src/renderers/noop/ReactNoop.js
index 54f411dabeaef..331eed4928a3b 100644
--- a/src/renderers/noop/ReactNoop.js
+++ b/src/renderers/noop/ReactNoop.js
@@ -22,6 +22,7 @@
 import type {Fiber} from 'ReactFiber';
 import type {UpdateQueue} from 'ReactFiberUpdateQueue';
 
+var ReactFiberInstrumentation = require('ReactFiberInstrumentation');
 var ReactFiberReconciler = require('ReactFiberReconciler');
 var ReactInstanceMap = require('ReactInstanceMap');
 var {
@@ -413,6 +414,12 @@ var ReactNoop = {
       failInBeginPhase = false;
     }
   },
+
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
+    // Private. Used only by fixtures/fiber-debugger.
+    // (To be fair, it's the only place where `react-noop-renderer` package is used at all.)
+    ReactFiberInstrumentation,
+  },
 };
 
 module.exports = ReactNoop;
diff --git a/src/renderers/shared/fiber/ReactFiberErrorLogger.js b/src/renderers/shared/fiber/ReactFiberErrorLogger.js
index 7eb1f746b1e60..093439b6389e4 100644
--- a/src/renderers/shared/fiber/ReactFiberErrorLogger.js
+++ b/src/renderers/shared/fiber/ReactFiberErrorLogger.js
@@ -98,7 +98,7 @@ function logCapturedError(capturedError: CapturedError): void {
 
 exports.injection = {
   /**
-   * Display custom dialog for lifecycle errors.
+   * Display custom dialog for lifecycle errors.
    * Return false to prevent default behavior of logging to console.error.
    */
   injectDialog(fn: (e: CapturedError) => boolean) {
diff --git a/src/shared/utils/getComponentName.js b/src/shared/utils/getComponentName.js
index 76ee7278e1dc6..b5360efc230b7 100644
--- a/src/shared/utils/getComponentName.js
+++ b/src/shared/utils/getComponentName.js
@@ -6,8 +6,8 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
- * @flow
  * @providesModule getComponentName
+ * @flow
  */
 
 'use strict';
diff --git a/src/test/reactComponentExpect.js b/src/test/reactComponentExpect.js
index ddf013ab92241..a88c7d3427aad 100644
--- a/src/test/reactComponentExpect.js
+++ b/src/test/reactComponentExpect.js
@@ -11,13 +11,10 @@
 
 'use strict';
 
-var ReactInstanceMap = require('react-dom/lib/ReactInstanceMap');
-var ReactTestUtils = require('react-dom/lib/ReactTestUtils');
-var ReactTypeOfWork = require('ReactTypeOfWork');
+var ReactInstanceMap = require('ReactInstanceMap');
+var ReactTestUtils = require('ReactTestUtils');
 
-var {
-  HostText,
-} = ReactTypeOfWork;
+var HostText = 6; // ReactTypeOfWork
 
 var invariant = require('fbjs/lib/invariant');
 
diff --git a/src/umd/ReactDOMUMDEntry.js b/src/umd/ReactDOMUMDEntry.js
index 5ab5d8a0202cc..1749f30acc484 100644
--- a/src/umd/ReactDOMUMDEntry.js
+++ b/src/umd/ReactDOMUMDEntry.js
@@ -11,17 +11,13 @@
 
 'use strict';
 
-var ReactDOM = require('react-dom');
+var ReactDOM = require('ReactDOMFiber');
 
-var ReactDOMUMDEntry = ReactDOM;
-
-if (__DEV__) {
-  ReactDOMUMDEntry.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
-    // ReactPerf and ReactTestUtils currently only work with the DOM renderer
-    // so we expose them from here, but only in DEV mode.
-    ReactPerf: require('react-dom/lib/ReactPerf'),
-    ReactTestUtils: require('react-dom/lib/ReactTestUtils'),
-  };
-}
+var ReactDOMUMDEntry = Object.assign(ReactDOM, {
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
+    // For TapEventPlugin which is popular in open source
+    EventPluginHub: require('EventPluginHub'),
+  },
+});
 
 module.exports = ReactDOMUMDEntry;
diff --git a/yarn.lock b/yarn.lock
index a04c53eeee773..a2185e1948fbb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3,8 +3,8 @@
 
 
 JSONStream@^1.0.3:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.0.tgz#680ab9ac6572a8a1a207e0b38721db1c77b215e5"
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.1.tgz#707f761e01dae9e16f1bcf93703b78c70966579a"
   dependencies:
     jsonparse "^1.2.0"
     through ">=2.2.7 <3"
@@ -14,8 +14,8 @@ abab@^1.0.3:
   resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.3.tgz#b81de5f7274ec4e756d797cd834f303642724e5d"
 
 abbrev@1:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"
 
 acorn-globals@^3.1.0:
   version "3.1.0"
@@ -29,33 +29,29 @@ acorn-jsx@^3.0.0:
   dependencies:
     acorn "^3.0.4"
 
-acorn@4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a"
-
 acorn@^1.0.3:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-1.2.2.tgz#c8ce27de0acc76d896d2b1fad3df588d9e82f014"
 
-acorn@^2.1.0, acorn@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-2.7.0.tgz#ab6e7d9d886aaca8b085bc3312b79a198433f0e7"
-
-acorn@^3.0.0, acorn@^3.0.4, acorn@^3.1.0:
+acorn@^3.0.4:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
-acorn@^4.0.3, acorn@^4.0.4:
+acorn@^4.0.1, acorn@^4.0.3, acorn@^4.0.4:
   version "4.0.11"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.11.tgz#edcda3bd937e7556410d42ed5860f67399c794c0"
 
+acorn@^5.0.0, acorn@^5.0.1:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.0.3.tgz#c460df08491463f028ccb82eab3730bf01087b3d"
+
 ajv-keywords@^1.0.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
 
-ajv@^4.7.0:
-  version "4.11.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.2.tgz#f166c3c11cbc6cb9dcc102a5bcfe5b72c95287e6"
+ajv@^4.7.0, ajv@^4.9.1:
+  version "4.11.5"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.5.tgz#b6ee74657b993a01dce44b7944d56f485828d5bd"
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"
@@ -119,10 +115,6 @@ aproba@^1.0.3:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.1.1.tgz#95d3600f07710aa0e9298c726ad5ecf2eacbabab"
 
-archy@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
-
 are-we-there-yet@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz#80e470e95a084794fe1899262c5667c6e88de1b3"
@@ -136,13 +128,6 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
-"argparse@~ 0.1.11":
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-0.1.16.tgz#cfd01e0fbba3d6caed049fbd758d40f65196f57c"
-  dependencies:
-    underscore "~1.7.0"
-    underscore.string "~2.4.0"
-
 arr-diff@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
@@ -188,8 +173,8 @@ array-unique@^0.2.1:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
 
 array.prototype.find@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.3.tgz#08c3ec33e32ec4bab362a2958e686ae92f59271d"
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/array.prototype.find/-/array.prototype.find-2.0.4.tgz#556a5c5362c08648323ddaeb9de9d14bc1864c90"
   dependencies:
     define-properties "^1.1.2"
     es-abstract "^1.7.0"
@@ -218,14 +203,14 @@ asn1@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
 
+assert-plus@1.0.0, assert-plus@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
+
 assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
 
-assert-plus@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-
 assert@^1.4.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
@@ -240,6 +225,10 @@ ast-types@0.8.12:
   version "0.8.12"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.12.tgz#a0d90e4351bb887716c83fd637ebf818af4adfcc"
 
+ast-types@0.8.15:
+  version "0.8.15"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.15.tgz#8eef0827f04dff0ec8857ba925abe3fea6194e52"
+
 ast-types@0.8.18:
   version "0.8.18"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.18.tgz#c8b98574898e8914e9d8de74b947564a9fe929af"
@@ -248,38 +237,30 @@ ast-types@0.9.4:
   version "0.9.4"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.4.tgz#410d1f81890aeb8e0a38621558ba5869ae53c91b"
 
-ast-types@0.9.5:
-  version "0.9.5"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.5.tgz#1a660a09945dbceb1f9c9cbb715002617424e04a"
+ast-types@0.9.6:
+  version "0.9.6"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
 
 astw@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/astw/-/astw-2.0.0.tgz#08121ac8288d35611c0ceec663f6cd545604897d"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/astw/-/astw-2.2.0.tgz#7bd41784d32493987aeb239b6b4e1c57a873b917"
   dependencies:
-    acorn "^1.0.3"
+    acorn "^4.0.3"
 
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
-async@^1.4.0, async@^1.4.2, async@^1.5.0:
+async@^1.4.0, async@^1.5.0:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
 async@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.1.4.tgz#2d2160c7788032e4dd6cbe2502f1f9a2c8f6cde4"
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-2.3.0.tgz#1013d1051047dd320fe24e494d5c66ecaf6147d9"
   dependencies:
     lodash "^4.14.0"
 
-async@~0.1.22:
-  version "0.1.22"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.1.22.tgz#0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061"
-
-async@~0.2.6:
-  version "0.2.10"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.2.10.tgz#b6bbe0b0674b9d719708ca38de8c237cb526c3d1"
-
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -293,12 +274,12 @@ aws4@^1.2.1:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
 
 babel-cli@^6.6.5:
-  version "6.22.2"
-  resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.22.2.tgz#3f814c8acf52759082b8fedd9627f938936ab559"
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-cli/-/babel-cli-6.24.0.tgz#a05ffd210dca0c288a26d5319c5ac8669a265ad0"
   dependencies:
-    babel-core "^6.22.1"
-    babel-polyfill "^6.22.0"
-    babel-register "^6.22.0"
+    babel-core "^6.24.0"
+    babel-polyfill "^6.23.0"
+    babel-register "^6.24.0"
     babel-runtime "^6.22.0"
     commander "^2.8.1"
     convert-source-map "^1.1.0"
@@ -321,6 +302,30 @@ babel-code-frame@6.22.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
+babel-core@6, babel-core@^6.0.0, babel-core@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.0.tgz#8f36a0a77f5c155aed6f920b844d23ba56742a02"
+  dependencies:
+    babel-code-frame "^6.22.0"
+    babel-generator "^6.24.0"
+    babel-helpers "^6.23.0"
+    babel-messages "^6.23.0"
+    babel-register "^6.24.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.23.0"
+    babel-traverse "^6.23.1"
+    babel-types "^6.23.0"
+    babylon "^6.11.0"
+    convert-source-map "^1.1.0"
+    debug "^2.1.1"
+    json5 "^0.5.0"
+    lodash "^4.2.0"
+    minimatch "^3.0.2"
+    path-is-absolute "^1.0.0"
+    private "^0.1.6"
+    slash "^1.0.0"
+    source-map "^0.5.0"
+
 babel-core@^5.6.21:
   version "5.8.38"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-5.8.38.tgz#1fcaee79d7e61b750b00b8e54f6dfc9d0af86558"
@@ -372,58 +377,34 @@ babel-core@^5.6.21:
     trim-right "^1.0.0"
     try-resolve "^1.0.0"
 
-babel-core@^6.0.0, babel-core@^6.0.2, babel-core@^6.22.0, babel-core@^6.22.1:
-  version "6.22.1"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.22.1.tgz#9c5fd658ba1772d28d721f6d25d968fc7ae21648"
-  dependencies:
-    babel-code-frame "^6.22.0"
-    babel-generator "^6.22.0"
-    babel-helpers "^6.22.0"
-    babel-messages "^6.22.0"
-    babel-register "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-    babel-traverse "^6.22.1"
-    babel-types "^6.22.0"
-    babylon "^6.11.0"
-    convert-source-map "^1.1.0"
-    debug "^2.1.1"
-    json5 "^0.5.0"
-    lodash "^4.2.0"
-    minimatch "^3.0.2"
-    path-is-absolute "^1.0.0"
-    private "^0.1.6"
-    slash "^1.0.0"
-    source-map "^0.5.0"
-
 babel-eslint@^7.1.0:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.1.1.tgz#8a6a884f085aa7060af69cfc77341c2f99370fb2"
+  version "7.2.1"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.2.1.tgz#079422eb73ba811e3ca0865ce87af29327f8c52f"
   dependencies:
-    babel-code-frame "^6.16.0"
-    babel-traverse "^6.15.0"
-    babel-types "^6.15.0"
-    babylon "^6.13.0"
-    lodash.pickby "^4.6.0"
+    babel-code-frame "^6.22.0"
+    babel-traverse "^6.23.1"
+    babel-types "^6.23.0"
+    babylon "^6.16.1"
 
-babel-generator@^6.18.0, babel-generator@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.22.0.tgz#d642bf4961911a8adc7c692b0c9297f325cda805"
+babel-generator@^6.18.0, babel-generator@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.24.0.tgz#eba270a8cc4ce6e09a61be43465d7c62c1f87c56"
   dependencies:
-    babel-messages "^6.22.0"
+    babel-messages "^6.23.0"
     babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
+    babel-types "^6.23.0"
     detect-indent "^4.0.0"
     jsesc "^1.3.0"
     lodash "^4.2.0"
     source-map "^0.5.0"
+    trim-right "^1.0.1"
 
-babel-helper-builder-react-jsx@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.22.0.tgz#aafb31913e47761fd4d0b6987756a144a65fca0d"
+babel-helper-builder-react-jsx@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.23.0.tgz#d53fc8c996e0bc56d0de0fc4cc55a7138395ea4b"
   dependencies:
     babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
+    babel-types "^6.23.0"
     esutils "^2.0.0"
     lodash "^4.2.0"
 
@@ -436,24 +417,24 @@ babel-helper-call-delegate@^6.22.0:
     babel-traverse "^6.22.0"
     babel-types "^6.22.0"
 
-babel-helper-define-map@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.22.0.tgz#9544e9502b2d6dfe7d00ff60e82bd5a7a89e95b7"
+babel-helper-define-map@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-define-map/-/babel-helper-define-map-6.23.0.tgz#1444f960c9691d69a2ced6a205315f8fd00804e7"
   dependencies:
-    babel-helper-function-name "^6.22.0"
+    babel-helper-function-name "^6.23.0"
     babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
+    babel-types "^6.23.0"
     lodash "^4.2.0"
 
-babel-helper-function-name@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.22.0.tgz#51f1bdc4bb89b15f57a9b249f33d742816dcbefc"
+babel-helper-function-name@^6.22.0, babel-helper-function-name@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-function-name/-/babel-helper-function-name-6.23.0.tgz#25742d67175c8903dbe4b6cb9d9e1fcb8dcf23a6"
   dependencies:
     babel-helper-get-function-arity "^6.22.0"
     babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-    babel-traverse "^6.22.0"
-    babel-types "^6.22.0"
+    babel-template "^6.23.0"
+    babel-traverse "^6.23.0"
+    babel-types "^6.23.0"
 
 babel-helper-get-function-arity@^6.22.0:
   version "6.22.0"
@@ -469,12 +450,12 @@ babel-helper-hoist-variables@^6.22.0:
     babel-runtime "^6.22.0"
     babel-types "^6.22.0"
 
-babel-helper-optimise-call-expression@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.22.0.tgz#f8d5d4b40a6e2605a6a7f9d537b581bea3756d15"
+babel-helper-optimise-call-expression@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.23.0.tgz#f3ee7eed355b4282138b33d02b78369e470622f5"
   dependencies:
     babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
+    babel-types "^6.23.0"
 
 babel-helper-remap-async-to-generator@^6.22.0:
   version "6.22.0"
@@ -486,23 +467,23 @@ babel-helper-remap-async-to-generator@^6.22.0:
     babel-traverse "^6.22.0"
     babel-types "^6.22.0"
 
-babel-helper-replace-supers@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.22.0.tgz#1fcee2270657548908c34db16bcc345f9850cf42"
+babel-helper-replace-supers@^6.22.0, babel-helper-replace-supers@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helper-replace-supers/-/babel-helper-replace-supers-6.23.0.tgz#eeaf8ad9b58ec4337ca94223bacdca1f8d9b4bfd"
   dependencies:
-    babel-helper-optimise-call-expression "^6.22.0"
-    babel-messages "^6.22.0"
+    babel-helper-optimise-call-expression "^6.23.0"
+    babel-messages "^6.23.0"
     babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-    babel-traverse "^6.22.0"
-    babel-types "^6.22.0"
+    babel-template "^6.23.0"
+    babel-traverse "^6.23.0"
+    babel-types "^6.23.0"
 
-babel-helpers@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.22.0.tgz#d275f55f2252b8101bff07bc0c556deda657392c"
+babel-helpers@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.23.0.tgz#4f8f2e092d0b6a8808a4bde79c27f1e2ecf0d992"
   dependencies:
     babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
+    babel-template "^6.23.0"
 
 babel-jest@^19.0.0:
   version "19.0.0"
@@ -512,12 +493,6 @@ babel-jest@^19.0.0:
     babel-plugin-istanbul "^4.0.0"
     babel-preset-jest "^19.0.0"
 
-babel-messages@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.22.0.tgz#36066a214f1217e4ed4164867669ecb39e3ea575"
-  dependencies:
-    babel-runtime "^6.22.0"
-
 babel-messages@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.23.0.tgz#f3cdf4703858035b2a2951c6ec5edf6c62f2630e"
@@ -542,17 +517,23 @@ babel-plugin-eval@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-eval/-/babel-plugin-eval-1.0.1.tgz#a2faed25ce6be69ade4bfec263f70169195950da"
 
+babel-plugin-external-helpers@^6.22.0:
+  version "6.22.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-external-helpers/-/babel-plugin-external-helpers-6.22.0.tgz#2285f48b02bd5dede85175caf8c62e86adccefa1"
+  dependencies:
+    babel-runtime "^6.22.0"
+
 babel-plugin-inline-environment-variables@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-inline-environment-variables/-/babel-plugin-inline-environment-variables-1.0.1.tgz#1f58ce91207ad6a826a8bf645fafe68ff5fe3ffe"
 
 babel-plugin-istanbul@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.0.0.tgz#36bde8fbef4837e5ff0366531a2beabd7b1ffa10"
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.1.tgz#c12de0fc6fe42adfb16be56f1ad11e4a9782eca9"
   dependencies:
     find-up "^2.1.0"
-    istanbul-lib-instrument "^1.4.2"
-    test-exclude "^4.0.0"
+    istanbul-lib-instrument "^1.6.2"
+    test-exclude "^4.0.3"
 
 babel-plugin-jest-hoist@^19.0.0:
   version "19.0.0"
@@ -604,7 +585,7 @@ babel-plugin-syntax-class-properties@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
 
-babel-plugin-syntax-flow@^6.18.0, babel-plugin-syntax-flow@^6.3.13:
+babel-plugin-syntax-flow@^6.18.0:
   version "6.18.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d"
 
@@ -629,13 +610,13 @@ babel-plugin-transform-async-to-generator@^6.22.0:
     babel-runtime "^6.22.0"
 
 babel-plugin-transform-class-properties@^6.11.5:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.22.0.tgz#aa78f8134495c7de06c097118ba061844e1dc1d8"
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.23.0.tgz#187b747ee404399013563c993db038f34754ac3b"
   dependencies:
-    babel-helper-function-name "^6.22.0"
+    babel-helper-function-name "^6.23.0"
     babel-plugin-syntax-class-properties "^6.8.0"
     babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
+    babel-template "^6.23.0"
 
 babel-plugin-transform-es2015-arrow-functions@^6.5.2:
   version "6.22.0"
@@ -659,19 +640,19 @@ babel-plugin-transform-es2015-block-scoping@^6.23.0:
     babel-types "^6.23.0"
     lodash "^4.2.0"
 
-babel-plugin-transform-es2015-classes@^6.5.2:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.22.0.tgz#54d44998fd823d9dca15292324161c331c1b6f14"
+babel-plugin-transform-es2015-classes@^6.5.2, babel-plugin-transform-es2015-classes@^6.9.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.23.0.tgz#49b53f326202a2fd1b3bbaa5e2edd8a4f78643c1"
   dependencies:
-    babel-helper-define-map "^6.22.0"
-    babel-helper-function-name "^6.22.0"
-    babel-helper-optimise-call-expression "^6.22.0"
-    babel-helper-replace-supers "^6.22.0"
-    babel-messages "^6.22.0"
+    babel-helper-define-map "^6.23.0"
+    babel-helper-function-name "^6.23.0"
+    babel-helper-optimise-call-expression "^6.23.0"
+    babel-helper-replace-supers "^6.23.0"
+    babel-messages "^6.23.0"
     babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-    babel-traverse "^6.22.0"
-    babel-types "^6.22.0"
+    babel-template "^6.23.0"
+    babel-traverse "^6.23.0"
+    babel-types "^6.23.0"
 
 babel-plugin-transform-es2015-computed-properties@^6.5.2:
   version "6.22.0"
@@ -681,14 +662,14 @@ babel-plugin-transform-es2015-computed-properties@^6.5.2:
     babel-template "^6.22.0"
 
 babel-plugin-transform-es2015-destructuring@^6.5.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.22.0.tgz#8e0af2f885a0b2cf999d47c4c1dd23ce88cfa4c6"
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz#997bb1f1ab967f682d2b0876fe358d60e765c56d"
   dependencies:
     babel-runtime "^6.22.0"
 
 babel-plugin-transform-es2015-for-of@^6.5.2:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.22.0.tgz#180467ad63aeea592a1caeee4bf1c8b3e2616265"
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz#f47c95b2b613df1d3ecc2fdb7573623c75248691"
   dependencies:
     babel-runtime "^6.22.0"
 
@@ -699,13 +680,13 @@ babel-plugin-transform-es2015-literals@^6.5.0:
     babel-runtime "^6.22.0"
 
 babel-plugin-transform-es2015-modules-commonjs@^6.5.2:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.22.0.tgz#6ca04e22b8e214fb50169730657e7a07dc941145"
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.0.tgz#e921aefb72c2cc26cb03d107626156413222134f"
   dependencies:
     babel-plugin-transform-strict-mode "^6.22.0"
     babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-    babel-types "^6.22.0"
+    babel-template "^6.23.0"
+    babel-types "^6.23.0"
 
 babel-plugin-transform-es2015-object-super@^6.5.0:
   version "6.22.0"
@@ -715,15 +696,15 @@ babel-plugin-transform-es2015-object-super@^6.5.0:
     babel-runtime "^6.22.0"
 
 babel-plugin-transform-es2015-parameters@^6.5.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.22.0.tgz#57076069232019094f27da8c68bb7162fe208dbb"
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.23.0.tgz#3a2aabb70c8af945d5ce386f1a4250625a83ae3b"
   dependencies:
     babel-helper-call-delegate "^6.22.0"
     babel-helper-get-function-arity "^6.22.0"
     babel-runtime "^6.22.0"
-    babel-template "^6.22.0"
-    babel-traverse "^6.22.0"
-    babel-types "^6.22.0"
+    babel-template "^6.23.0"
+    babel-traverse "^6.23.0"
+    babel-types "^6.23.0"
 
 babel-plugin-transform-es2015-shorthand-properties@^6.5.0:
   version "6.22.0"
@@ -764,15 +745,15 @@ babel-plugin-transform-flow-strip-types@^6.22.0:
     babel-runtime "^6.22.0"
 
 babel-plugin-transform-object-rest-spread@^6.6.5:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.22.0.tgz#1d419b55e68d2e4f64a5ff3373bd67d73c8e83bc"
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz#875d6bc9be761c58a2ae3feee5dc4895d8c7f921"
   dependencies:
     babel-plugin-syntax-object-rest-spread "^6.8.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-react-display-name@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.22.0.tgz#077197520fa8562b8d3da4c3c4b0b1bdd7853f26"
+babel-plugin-transform-react-display-name@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.23.0.tgz#4398910c358441dc4cef18787264d0412ed36b37"
   dependencies:
     babel-runtime "^6.22.0"
 
@@ -790,11 +771,11 @@ babel-plugin-transform-react-jsx-source@^6.22.0, babel-plugin-transform-react-js
     babel-plugin-syntax-jsx "^6.8.0"
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-react-jsx@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.22.0.tgz#48556b7dd4c3fe97d1c943bcd54fc3f2561c1817"
+babel-plugin-transform-react-jsx@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.23.0.tgz#23e892f7f2e759678eb5e4446a8f8e94e81b3470"
   dependencies:
-    babel-helper-builder-react-jsx "^6.22.0"
+    babel-helper-builder-react-jsx "^6.23.0"
     babel-plugin-syntax-jsx "^6.8.0"
     babel-runtime "^6.22.0"
 
@@ -815,14 +796,20 @@ babel-plugin-undefined-to-void@^1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/babel-plugin-undefined-to-void/-/babel-plugin-undefined-to-void-1.1.6.tgz#7f578ef8b78dfae6003385d8417a61eda06e2f81"
 
-babel-polyfill@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.22.0.tgz#1ac99ebdcc6ba4db1e2618c387b2084a82154a3b"
+babel-polyfill@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.23.0.tgz#8364ca62df8eafb830499f699177466c3b03499d"
   dependencies:
     babel-runtime "^6.22.0"
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
+babel-preset-flow@^6.23.0:
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d"
+  dependencies:
+    babel-plugin-transform-flow-strip-types "^6.22.0"
+
 babel-preset-jest@^19.0.0:
   version "19.0.0"
   resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-19.0.0.tgz#22d67201d02324a195811288eb38294bb3cac396"
@@ -830,22 +817,21 @@ babel-preset-jest@^19.0.0:
     babel-plugin-jest-hoist "^19.0.0"
 
 babel-preset-react@^6.5.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.22.0.tgz#7bc97e2d73eec4b980fb6b4e4e0884e81ccdc165"
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.23.0.tgz#eb7cee4de98a3f94502c28565332da9819455195"
   dependencies:
-    babel-plugin-syntax-flow "^6.3.13"
     babel-plugin-syntax-jsx "^6.3.13"
-    babel-plugin-transform-flow-strip-types "^6.22.0"
-    babel-plugin-transform-react-display-name "^6.22.0"
-    babel-plugin-transform-react-jsx "^6.22.0"
+    babel-plugin-transform-react-display-name "^6.23.0"
+    babel-plugin-transform-react-jsx "^6.23.0"
     babel-plugin-transform-react-jsx-self "^6.22.0"
     babel-plugin-transform-react-jsx-source "^6.22.0"
+    babel-preset-flow "^6.23.0"
 
-babel-register@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.22.0.tgz#a61dd83975f9ca4a9e7d6eff3059494cd5ea4c63"
+babel-register@^6.24.0:
+  version "6.24.0"
+  resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.24.0.tgz#5e89f8463ba9970356d02eb07dabe3308b080cfd"
   dependencies:
-    babel-core "^6.22.0"
+    babel-core "^6.24.0"
     babel-runtime "^6.22.0"
     core-js "^2.4.0"
     home-or-tmp "^2.0.0"
@@ -854,13 +840,13 @@ babel-register@^6.22.0:
     source-map-support "^0.4.2"
 
 babel-runtime@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.22.0.tgz#1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611"
+  version "6.23.0"
+  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.23.0.tgz#0a9489f144de70efb3ce4300accdb329e2fc543b"
   dependencies:
     core-js "^2.4.0"
     regenerator-runtime "^0.10.0"
 
-babel-template@^6.16.0, babel-template@^6.23.0:
+babel-template@^6.16.0, babel-template@^6.22.0, babel-template@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.23.0.tgz#04d4f270adbb3aa704a8143ae26faa529238e638"
   dependencies:
@@ -870,31 +856,7 @@ babel-template@^6.16.0, babel-template@^6.23.0:
     babylon "^6.11.0"
     lodash "^4.2.0"
 
-babel-template@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.22.0.tgz#403d110905a4626b317a2a1fcb8f3b73204b2edb"
-  dependencies:
-    babel-runtime "^6.22.0"
-    babel-traverse "^6.22.0"
-    babel-types "^6.22.0"
-    babylon "^6.11.0"
-    lodash "^4.2.0"
-
-babel-traverse@^6.15.0, babel-traverse@^6.22.1, babel-traverse@^6.9.0:
-  version "6.22.1"
-  resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.22.1.tgz#3b95cd6b7427d6f1f757704908f2fc9748a5f59f"
-  dependencies:
-    babel-code-frame "^6.22.0"
-    babel-messages "^6.22.0"
-    babel-runtime "^6.22.0"
-    babel-types "^6.22.0"
-    babylon "^6.15.0"
-    debug "^2.2.0"
-    globals "^9.0.0"
-    invariant "^2.2.0"
-    lodash "^4.2.0"
-
-babel-traverse@^6.18.0, babel-traverse@^6.22.0, babel-traverse@^6.23.0:
+babel-traverse@^6.18.0, babel-traverse@^6.22.0, babel-traverse@^6.23.0, babel-traverse@^6.23.1, babel-traverse@^6.9.0:
   version "6.23.1"
   resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.23.1.tgz#d3cb59010ecd06a97d81310065f966b699e14f48"
   dependencies:
@@ -908,16 +870,7 @@ babel-traverse@^6.18.0, babel-traverse@^6.22.0, babel-traverse@^6.23.0:
     invariant "^2.2.0"
     lodash "^4.2.0"
 
-babel-types@^6.15.0, babel-types@^6.22.0:
-  version "6.22.0"
-  resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.22.0.tgz#2a447e8d0ea25d2512409e4175479fd78cc8b1db"
-  dependencies:
-    babel-runtime "^6.22.0"
-    esutils "^2.0.2"
-    lodash "^4.2.0"
-    to-fast-properties "^1.0.1"
-
-babel-types@^6.18.0, babel-types@^6.23.0:
+babel-types@^6.18.0, babel-types@^6.22.0, babel-types@^6.23.0:
   version "6.23.0"
   resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.23.0.tgz#bb17179d7538bad38cd0c9e115d340f77e7e9acf"
   dependencies:
@@ -943,7 +896,7 @@ babel@^5.4.7:
     slash "^1.0.0"
     source-map "^0.5.0"
 
-babylon@6.15.0, babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0:
+babylon@6.15.0:
   version "6.15.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e"
 
@@ -951,6 +904,10 @@ babylon@^5.8.38:
   version "5.8.38"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-5.8.38.tgz#ec9b120b11bf6ccd4173a18bf217e60b79859ffd"
 
+babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0, babylon@^6.16.1:
+  version "6.16.1"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.16.1.tgz#30c5a22f481978a9e7f8cdfdf496b11d94b404d3"
+
 balanced-match@^0.4.1:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
@@ -1013,8 +970,8 @@ breakable@~1.0.0:
   resolved "https://registry.yarnpkg.com/breakable/-/breakable-1.0.0.tgz#784a797915a38ead27bad456b5572cb4bbaa78c1"
 
 brorand@^1.0.1:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.0.7.tgz#6677fa5e4901bdbf9c9ec2a748e28dca407a9bfc"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
 
 browser-pack@^5.0.1:
   version "5.0.1"
@@ -1043,10 +1000,10 @@ browser-resolve@^1.11.0, browser-resolve@^1.11.2, browser-resolve@^1.7.0:
     resolve "1.1.7"
 
 browser-unpack@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/browser-unpack/-/browser-unpack-1.1.1.tgz#42d1423bf719074c1ef88d82e6b94752a41882bd"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/browser-unpack/-/browser-unpack-1.2.0.tgz#357aee31fc467831684d063e4355e070a782970d"
   dependencies:
-    acorn "^2.1.0"
+    acorn "^4.0.3"
     browser-pack "^5.0.1"
     concat-stream "^1.5.0"
     minimist "^1.1.1"
@@ -1085,8 +1042,8 @@ browserify-rsa@^4.0.0:
     randombytes "^2.0.1"
 
 browserify-sign@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.0.tgz#10773910c3c206d5420a46aad8694f820b85968f"
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz#aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"
   dependencies:
     bn.js "^4.1.1"
     browserify-rsa "^4.0.0"
@@ -1189,7 +1146,7 @@ buffer@^4.1.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-builtin-modules@^1.0.0:
+builtin-modules@^1.0.0, builtin-modules@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
@@ -1209,8 +1166,8 @@ bundle-collapser@^1.1.1:
     through2 "^2.0.0"
 
 cached-path-relative@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.0.tgz#d1094c577fbd9a8b8bd43c96af6188aa205d05f4"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.1.tgz#d09c4b52800aa4c078e2dd81a869aac90d2e54e7"
 
 caller-path@^0.1.0:
   version "0.1.0"
@@ -1238,6 +1195,10 @@ caseless@~0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
 
+caseless@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+
 center-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
@@ -1290,6 +1251,12 @@ cli-cursor@^1.0.1:
   dependencies:
     restore-cursor "^1.0.1"
 
+cli-table@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23"
+  dependencies:
+    colors "1.0.3"
+
 cli-width@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.1.0.tgz#b234ca209b29ef66fc518d9b98d5847b00edf00a"
@@ -1314,11 +1281,7 @@ clone-stats@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
 
-clone@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
-
-clone@^1.0.0, clone@^1.0.2:
+clone@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.2.tgz#260b7a99ebb1edfe247538175f783243cb19d149"
 
@@ -1331,12 +1294,8 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
 coffee-script@^1.8.0:
-  version "1.12.3"
-  resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.3.tgz#de5f4b1b934a4e9f915c57acd7ad323f68f715db"
-
-coffee-script@~1.3.3:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.3.3.tgz#150d6b4cb522894369efed6a2101c20bc7f4a4f4"
+  version "1.12.4"
+  resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.4.tgz#fe1bced97fe1fb3927b998f2b45616e0658be1ff"
 
 color-convert@^1.0.0:
   version "1.9.0"
@@ -1345,12 +1304,12 @@ color-convert@^1.0.0:
     color-name "^1.1.1"
 
 color-name@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.1.tgz#4b1415304cf50028ea81643643bd82ea05803689"
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
 
-colors@>=0.6.2, colors@~0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-0.6.2.tgz#2423fe6678ac0c5dae8852e5d0e5be08c997abcc"
+colors@1.0.3, colors@>=0.6.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
 
 combine-source-map@~0.6.1:
   version "0.6.1"
@@ -1400,7 +1359,15 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.0, concat-stream@~1.5.0, concat-stream@~1.5.1:
+concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.0, concat-stream@^1.5.2:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
+  dependencies:
+    inherits "^2.0.3"
+    readable-stream "^2.2.2"
+    typedarray "^0.0.6"
+
+concat-stream@~1.5.0, concat-stream@~1.5.1:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266"
   dependencies:
@@ -1427,8 +1394,8 @@ content-type-parser@^1.0.1:
   resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.1.tgz#c3e56988c53c65127fb46d4032a3a900246fdc94"
 
 convert-source-map@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.3.0.tgz#e9f3e9c6e2728efc2676696a70eb382f73106a67"
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
 
 convert-source-map@~1.1.0:
   version "1.1.3"
@@ -1447,8 +1414,8 @@ core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
 
 coveralls@^2.11.6:
-  version "2.11.16"
-  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-2.11.16.tgz#da9061265142ddee954f68379122be97be8ab4b1"
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/coveralls/-/coveralls-2.13.0.tgz#df933876e8c6f478efb04f4d3ab70dc96b7e5a8e"
   dependencies:
     js-yaml "3.6.1"
     lcov-parse "0.0.10"
@@ -1528,11 +1495,11 @@ cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
   dependencies:
     cssom "0.3.x"
 
-d@^0.1.1, d@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/d/-/d-0.1.1.tgz#da184c535d18d8ee7ba2aa229b914009fae11309"
+d@1:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
   dependencies:
-    es5-ext "~0.10.2"
+    es5-ext "^0.10.9"
 
 dashdash@^1.12.0:
   version "1.14.1"
@@ -1544,26 +1511,16 @@ date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
-dateformat@1.0.2-1.2.3:
-  version "1.0.2-1.2.3"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-1.0.2-1.2.3.tgz#b0220c02de98617433b72851cf47de3df2cdbee9"
-
 dateformat@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.0.0.tgz#2743e3abb5c3fc2462e527dca445e04e9f4dee17"
 
 debug@^2.1.1, debug@^2.2.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
+  version "2.6.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.3.tgz#0f7eb8c30965ec08c72accfa0130c8b79984141d"
   dependencies:
     ms "0.7.2"
 
-debug@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
-  dependencies:
-    ms "0.7.1"
-
 decamelize@^1.0.0, decamelize@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -1582,12 +1539,6 @@ default-require-extensions@^1.0.0:
   dependencies:
     strip-bom "^2.0.0"
 
-defaults@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
-  dependencies:
-    clone "^1.0.2"
-
 define-properties@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
@@ -1638,10 +1589,6 @@ delegates@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
 
-deprecated@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/deprecated/-/deprecated-0.0.1.tgz#f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"
-
 deps-sort@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.0.tgz#091724902e84658260eb910748cccd1af6e21fb5"
@@ -1668,12 +1615,6 @@ des.js@^1.0.0:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
 
-detect-file@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-0.1.0.tgz#4935dedfd9488648e006b0129566e9386711ea63"
-  dependencies:
-    fs-exists-sync "^0.1.0"
-
 detect-indent@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-3.0.1.tgz#9dc5e5ddbceef8325764b9451b02bc6d54084f75"
@@ -1689,10 +1630,10 @@ detect-indent@^4.0.0:
     repeating "^2.0.0"
 
 detective@^4.0.0, detective@^4.3.1:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/detective/-/detective-4.3.2.tgz#77697e2e7947ac3fe7c8e26a6d6f115235afa91c"
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/detective/-/detective-4.5.0.tgz#6e5a8c6b26e6c7a254b1c6b6d7490d98ec91edd1"
   dependencies:
-    acorn "^3.1.0"
+    acorn "^4.0.3"
     defined "^1.0.0"
 
 diff@^3.0.0:
@@ -1714,6 +1655,13 @@ doctrine@^1.2.2:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
+doctrine@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.0.0.tgz#c73d8d2909d22291e1a007a395804da8b665fe63"
+  dependencies:
+    esutils "^2.0.2"
+    isarray "^1.0.0"
+
 domain-browser@~1.1.0:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
@@ -1730,6 +1678,10 @@ duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2:
   dependencies:
     readable-stream "^2.0.2"
 
+duplexer@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
+
 duplexify@^3.1.2:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.5.0.tgz#1aa773002e1578457e9d9d4a50b0ccaaebcbd604"
@@ -1746,13 +1698,16 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
 
 elliptic@^6.0.0:
-  version "6.3.3"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.3.3.tgz#5482d9646d54bcb89fd7d994fc9e2e9568876e3f"
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.0.tgz#cac9af8762c85836187003c8dfe193e5e2eae5df"
   dependencies:
     bn.js "^4.4.0"
     brorand "^1.0.1"
     hash.js "^1.0.0"
+    hmac-drbg "^1.0.0"
     inherits "^2.0.1"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.0"
 
 encoding@^0.1.11:
   version "0.1.12"
@@ -1767,16 +1722,10 @@ end-of-stream@1.0.0:
     once "~1.3.0"
 
 end-of-stream@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.1.0.tgz#e9353258baa9108965efc41cb0ef8ade2f3cfb07"
-  dependencies:
-    once "~1.3.0"
-
-end-of-stream@~0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-0.1.5.tgz#8e177206c3c80837d85632e8b9359dfe8b2f6eaf"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.0.tgz#7a90d833efda6cfa6eac0f4949dbb0fad3a63206"
   dependencies:
-    once "~1.3.0"
+    once "^1.4.0"
 
 "errno@>=0.1.1 <0.2.0-0":
   version "0.1.4"
@@ -1785,8 +1734,8 @@ end-of-stream@~0.1.5:
     prr "~0.0.0"
 
 error-ex@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.0.tgz#e67b43f3e82c96ea3a584ffee0b9fc3325d802d9"
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"
   dependencies:
     is-arrayish "^0.2.1"
 
@@ -1807,57 +1756,57 @@ es-to-primitive@^1.1.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.1"
 
-es5-ext@^0.10.7, es5-ext@^0.10.8, es5-ext@~0.10.11, es5-ext@~0.10.2, es5-ext@~0.10.7:
-  version "0.10.12"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.12.tgz#aa84641d4db76b62abba5e45fd805ecbab140047"
+es5-ext@^0.10.14, es5-ext@^0.10.9, es5-ext@~0.10.14:
+  version "0.10.15"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.15.tgz#c330a5934c1ee21284a7c081a86e5fd937c91ea6"
   dependencies:
     es6-iterator "2"
     es6-symbol "~3.1"
 
-es6-iterator@2:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.0.tgz#bd968567d61635e33c0b80727613c9cb4b096bac"
+es6-iterator@2, es6-iterator@^2.0.1, es6-iterator@~2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.1.tgz#8e319c9f0453bf575d374940a655920e59ca5512"
   dependencies:
-    d "^0.1.1"
-    es5-ext "^0.10.7"
-    es6-symbol "3"
+    d "1"
+    es5-ext "^0.10.14"
+    es6-symbol "^3.1"
 
 es6-map@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.4.tgz#a34b147be224773a4d7da8072794cefa3632b897"
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
   dependencies:
-    d "~0.1.1"
-    es5-ext "~0.10.11"
-    es6-iterator "2"
-    es6-set "~0.1.3"
-    es6-symbol "~3.1.0"
-    event-emitter "~0.3.4"
+    d "1"
+    es5-ext "~0.10.14"
+    es6-iterator "~2.0.1"
+    es6-set "~0.1.5"
+    es6-symbol "~3.1.1"
+    event-emitter "~0.3.5"
 
-es6-set@~0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.4.tgz#9516b6761c2964b92ff479456233a247dc707ce8"
+es6-set@~0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
   dependencies:
-    d "~0.1.1"
-    es5-ext "~0.10.11"
-    es6-iterator "2"
-    es6-symbol "3"
-    event-emitter "~0.3.4"
+    d "1"
+    es5-ext "~0.10.14"
+    es6-iterator "~2.0.1"
+    es6-symbol "3.1.1"
+    event-emitter "~0.3.5"
 
-es6-symbol@3, es6-symbol@~3.1, es6-symbol@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.0.tgz#94481c655e7a7cad82eba832d97d5433496d7ffa"
+es6-symbol@3.1.1, es6-symbol@^3.1, es6-symbol@^3.1.1, es6-symbol@~3.1, es6-symbol@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
   dependencies:
-    d "~0.1.1"
-    es5-ext "~0.10.11"
+    d "1"
+    es5-ext "~0.10.14"
 
 es6-weak-map@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.1.tgz#0d2bbd8827eb5fb4ba8f97fbfea50d43db21ea81"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.2.tgz#5e3ab32251ffd1538a1f8e5ffa1357772f92d96f"
   dependencies:
-    d "^0.1.1"
-    es5-ext "^0.10.8"
-    es6-iterator "2"
-    es6-symbol "3"
+    d "1"
+    es5-ext "^0.10.14"
+    es6-iterator "^2.0.1"
+    es6-symbol "^3.1.1"
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
@@ -1892,8 +1841,8 @@ eslint-plugin-babel@^3.3.0:
   resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-3.3.0.tgz#2f494aedcf6f4aa4e75b9155980837bc1fbde193"
 
 eslint-plugin-flowtype@^2.25.0:
-  version "2.30.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.30.0.tgz#3054a265f9c8afe3046c3d41b72d32a736f9b4ae"
+  version "2.30.4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.30.4.tgz#771d6bb4578ab8598e9c58018fea2e1a22946249"
   dependencies:
     lodash "^4.15.0"
 
@@ -1901,24 +1850,27 @@ eslint-plugin-flowtype@^2.25.0:
   version "0.0.0"
 
 eslint-plugin-react@^6.7.1:
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.9.0.tgz#54c2e9906b76f9d10142030bdc34e9d6840a0bb2"
+  version "6.10.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-6.10.3.tgz#c5435beb06774e12c7db2f6abaddcbf900cd3f78"
   dependencies:
     array.prototype.find "^2.0.1"
     doctrine "^1.2.2"
+    has "^1.0.1"
     jsx-ast-utils "^1.3.4"
+    object.assign "^4.0.4"
 
 eslint@^3.10.2:
-  version "3.15.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.15.0.tgz#bdcc6a6c5ffe08160e7b93c066695362a91e30f2"
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
   dependencies:
     babel-code-frame "^6.16.0"
     chalk "^1.1.3"
-    concat-stream "^1.4.6"
+    concat-stream "^1.5.2"
     debug "^2.1.1"
-    doctrine "^1.2.2"
+    doctrine "^2.0.0"
     escope "^3.6.0"
     espree "^3.4.0"
+    esquery "^1.0.0"
     estraverse "^4.2.0"
     esutils "^2.0.2"
     file-entry-cache "^2.0.0"
@@ -1948,10 +1900,10 @@ eslint@^3.10.2:
     user-home "^2.0.0"
 
 espree@^3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.0.tgz#41656fa5628e042878025ef467e78f125cb86e1d"
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.4.1.tgz#28a83ab4aaed71ed8fe0f5efe61b76a05c13c4d2"
   dependencies:
-    acorn "4.0.4"
+    acorn "^5.0.1"
     acorn-jsx "^3.0.0"
 
 esprima-fb@~15001.1001.0-dev-harmony-fb:
@@ -1966,9 +1918,11 @@ esprima@^3.1.1, esprima@~3.1.0:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
 
-"esprima@~ 1.0.2":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-1.0.4.tgz#9f557e08fc3b4d26ece9dd34f8fbf476b62585ad"
+esquery@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
+  dependencies:
+    estraverse "^4.0.0"
 
 esrecurse@^4.1.0:
   version "4.1.0"
@@ -1981,7 +1935,7 @@ estraverse@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
 
-estraverse@^4.1.1, estraverse@^4.2.0:
+estraverse@^4.0.0, estraverse@^4.1.1, estraverse@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
 
@@ -1989,20 +1943,24 @@ estraverse@~4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.1.1.tgz#f6caca728933a850ef90661d0e17982ba47111a2"
 
+estree-walker@^0.2.0, estree-walker@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e"
+
+estree-walker@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa"
+
 esutils@2.0.2, esutils@^2.0.0, esutils@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
 
-event-emitter@~0.3.4:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.4.tgz#8d63ddfb4cfe1fae3b32ca265c4c720222080bb5"
+event-emitter@~0.3.5:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
   dependencies:
-    d "~0.1.1"
-    es5-ext "~0.10.7"
-
-eventemitter2@~0.4.13:
-  version "0.4.14"
-  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-0.4.14.tgz#8f61b75cde012b2e9eb284d4545583b5643b61ab"
+    d "1"
+    es5-ext "~0.10.14"
 
 events@~1.1.0:
   version "1.1.1"
@@ -2024,10 +1982,6 @@ exit-hook@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
 
-exit@~0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
@@ -2040,12 +1994,6 @@ expand-range@^1.8.1:
   dependencies:
     fill-range "^2.1.0"
 
-expand-tilde@^1.2.1, expand-tilde@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-1.2.2.tgz#0b81eba897e5a3d31d1c3d102f8f01441e559449"
-  dependencies:
-    os-homedir "^1.0.1"
-
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -2080,15 +2028,15 @@ falafel@^1.2.0:
     object-keys "^1.0.6"
 
 falafel@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.0.0.tgz#757d47c53598203bedc55dc2f8015f43b82d58b0"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.1.0.tgz#96bb17761daba94f46d001738b3cedf3a67fe06c"
   dependencies:
-    acorn "^3.0.0"
+    acorn "^5.0.0"
     foreach "^2.0.5"
     isarray "0.0.1"
     object-keys "^1.0.6"
 
-fancy-log@^1.1.0, fancy-log@^1.2.0:
+fancy-log@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.0.tgz#45be17d02bb9917d60ccffd4995c999e6c8c9948"
   dependencies:
@@ -2124,8 +2072,8 @@ fbjs-scripts@^0.6.0:
     through2 "^2.0.0"
 
 fbjs@^0.8.9:
-  version "0.8.9"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.9.tgz#180247fbd347dcc9004517b904f865400a0c8f14"
+  version "0.8.12"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.12.tgz#10b5d92f76d45575fd63a217d4ea02bea2f8ed04"
   dependencies:
     core-js "^1.0.0"
     isomorphic-fetch "^2.1.1"
@@ -2160,6 +2108,10 @@ fileset@^2.0.2:
     glob "^7.0.3"
     minimatch "^3.0.3"
 
+filesize@^3.5.6:
+  version "3.5.6"
+  resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.6.tgz#5fd98f3eac94ec9516ef8ed5782fad84a01a0a1a"
+
 fill-range@^2.1.0:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723"
@@ -2170,10 +2122,6 @@ fill-range@^2.1.0:
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
-find-index@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/find-index/-/find-index-0.1.1.tgz#675d358b2ca3892d795a1ab47232f8b6e2e0dde4"
-
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -2187,42 +2135,6 @@ find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
-findup-sync@^0.4.0, findup-sync@^0.4.2:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.4.3.tgz#40043929e7bc60adf0b7f4827c4c6e75a0deca12"
-  dependencies:
-    detect-file "^0.1.0"
-    is-glob "^2.0.1"
-    micromatch "^2.3.7"
-    resolve-dir "^0.1.0"
-
-findup-sync@~0.1.0, findup-sync@~0.1.2:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.1.3.tgz#7f3e7a97b82392c653bf06589bd85190e93c3683"
-  dependencies:
-    glob "~3.2.9"
-    lodash "~2.4.1"
-
-fined@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/fined/-/fined-1.0.2.tgz#5b28424b760d7598960b7ef8480dff8ad3660e97"
-  dependencies:
-    expand-tilde "^1.2.1"
-    lodash.assignwith "^4.0.7"
-    lodash.isempty "^4.2.1"
-    lodash.isplainobject "^4.0.4"
-    lodash.isstring "^4.0.1"
-    lodash.pick "^4.2.1"
-    parse-filepath "^1.0.1"
-
-first-chunk-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
-
-flagged-respawn@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5"
-
 flat-cache@^1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.2.2.tgz#fa86714e72c21db88601761ecf2f555d1abc6b96"
@@ -2244,15 +2156,15 @@ flow-parser@0.40.0:
     colors ">=0.6.2"
     minimist ">=0.2.0"
 
-for-in@^0.1.5:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.6.tgz#c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8"
+for-in@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
 
 for-own@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.4.tgz#0149b41a39088c7515f51ebe1c1386d45f935072"
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
   dependencies:
-    for-in "^0.1.5"
+    for-in "^1.0.1"
 
 foreach@^2.0.5:
   version "2.0.5"
@@ -2270,10 +2182,6 @@ form-data@~2.1.1:
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
-fs-exists-sync@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add"
-
 fs-readdir-recursive@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz#315b4fb8c1ca5b8c47defef319d073dad3568059"
@@ -2287,13 +2195,13 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
 fsevents@^1.0.0:
-  version "1.0.17"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.0.17.tgz#8537f3f12272678765b4fd6528c0f1f66f8f4558"
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.1.tgz#f19fd28f43eeaf761680e519a203c4d0b3d31aff"
   dependencies:
     nan "^2.3.0"
     node-pre-gyp "^0.6.29"
 
-fstream-ignore@~1.0.5:
+fstream-ignore@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
   dependencies:
@@ -2301,9 +2209,9 @@ fstream-ignore@~1.0.5:
     inherits "2"
     minimatch "^3.0.0"
 
-fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.10.tgz#604e8a92fe26ffd9f6fae30399d4984e1ab22822"
+fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
   dependencies:
     graceful-fs "^4.1.2"
     inherits "~2.0.0"
@@ -2327,12 +2235,6 @@ gauge@~2.7.1:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-gaze@^0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/gaze/-/gaze-0.5.2.tgz#40b709537d24d1d45767db5a908689dfe69ac44f"
-  dependencies:
-    globule "~0.1.0"
-
 generate-function@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
@@ -2355,16 +2257,16 @@ get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
 
-getobject@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/getobject/-/getobject-0.1.0.tgz#047a449789fa160d018f5486ed91320b6ec7885c"
-
 getpass@^0.1.1:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.6.tgz#283ffd9fc1256840875311c1b60e8c40187110e6"
   dependencies:
     assert-plus "^1.0.0"
 
+git-branch@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/git-branch/-/git-branch-0.3.0.tgz#cae53f599054d2bd4773e164550f54cc5fe53d2c"
+
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@@ -2385,17 +2287,6 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-stream@^3.1.5:
-  version "3.1.18"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-3.1.18.tgz#9170a5f12b790306fdfe598f313f8f7954fd143b"
-  dependencies:
-    glob "^4.3.1"
-    glob2base "^0.0.12"
-    minimatch "^2.0.1"
-    ordered-read-streams "^0.1.0"
-    through2 "^0.6.1"
-    unique-stream "^1.0.0"
-
 glob-stream@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4"
@@ -2411,18 +2302,6 @@ glob-stream@^6.1.0:
     to-absolute-glob "^2.0.0"
     unique-stream "^2.0.2"
 
-glob-watcher@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-0.0.6.tgz#b95b4a8df74b39c83298b0c05c978b4d9a3b710b"
-  dependencies:
-    gaze "^0.5.1"
-
-glob2base@^0.0.12:
-  version "0.0.12"
-  resolved "https://registry.yarnpkg.com/glob2base/-/glob2base-0.0.12.tgz#9d419b3e28f12e83a362164a277055922c9c0d56"
-  dependencies:
-    find-index "^0.1.1"
-
 glob@7.1.1, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8"
@@ -2434,15 +2313,6 @@ glob@7.1.1, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.0, glob@^7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^4.3.1:
-  version "4.5.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-4.5.3.tgz#c6cb73d3226c1efef04de3c56d012f03377ee15f"
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^2.0.1"
-    once "^1.3.0"
-
 glob@^5.0.15, glob@^5.0.5:
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
@@ -2453,7 +2323,7 @@ glob@^5.0.15, glob@^5.0.5:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^6.0.1:
+glob@^6.0.4:
   version "6.0.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"
   dependencies:
@@ -2463,44 +2333,13 @@ glob@^6.0.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@~3.1.21:
-  version "3.1.21"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd"
-  dependencies:
-    graceful-fs "~1.2.0"
-    inherits "1"
-    minimatch "~0.2.11"
-
-glob@~3.2.9:
-  version "3.2.11"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d"
-  dependencies:
-    inherits "2"
-    minimatch "0.3"
-
-global-modules@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-0.2.3.tgz#ea5a3bed42c6d6ce995a4f8a1269b5dae223828d"
-  dependencies:
-    global-prefix "^0.1.4"
-    is-windows "^0.2.0"
-
-global-prefix@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f"
-  dependencies:
-    homedir-polyfill "^1.0.0"
-    ini "^1.3.4"
-    is-windows "^0.2.0"
-    which "^1.2.12"
-
 globals@^6.4.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/globals/-/globals-6.4.1.tgz#8498032b3b6d1cc81eebc5f79690d8fe29fabf4f"
 
 globals@^9.0.0, globals@^9.14.0:
-  version "9.14.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.14.0.tgz#8859936af0038741263053b39d0e76ca241e4034"
+  version "9.17.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.17.0.tgz#0c0ca696d9b9bb694d2e5470bd37777caad50286"
 
 globby@^5.0.0:
   version "5.0.0"
@@ -2513,34 +2352,16 @@ globby@^5.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-globule@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/globule/-/globule-0.1.0.tgz#d9c8edde1da79d125a151b79533b978676346ae5"
-  dependencies:
-    glob "~3.1.21"
-    lodash "~1.0.1"
-    minimatch "~0.2.11"
-
 glogg@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.0.tgz#7fe0f199f57ac906cf512feead8f90ee4a284fc5"
   dependencies:
     sparkles "^1.0.0"
 
-graceful-fs@^3.0.0:
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-3.0.11.tgz#7613c778a1afea62f25c630a086d7f3acbbdd818"
-  dependencies:
-    natives "^1.1.0"
-
 graceful-fs@^4.1.2, graceful-fs@^4.1.4, graceful-fs@^4.1.6:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
-graceful-fs@~1.2.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-1.2.3.tgz#15a4806a57547cb2d2dbf27f42e89a8c3451b364"
-
 "graceful-readlink@>= 1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/graceful-readlink/-/graceful-readlink-1.0.1.tgz#4cafad76bc62f02fa039b2f94e9a3dd3a391a725"
@@ -2549,112 +2370,7 @@ growly@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
 
-grunt-cli@^0.1.13:
-  version "0.1.13"
-  resolved "https://registry.yarnpkg.com/grunt-cli/-/grunt-cli-0.1.13.tgz#e9ebc4047631f5012d922770c39378133cad10f4"
-  dependencies:
-    findup-sync "~0.1.0"
-    nopt "~1.0.10"
-    resolve "~0.3.1"
-
-grunt-compare-size@^0.4.0:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/grunt-compare-size/-/grunt-compare-size-0.4.2.tgz#d2abf1d3cd9d39a16203e11d23b718b57579ef51"
-  dependencies:
-    lodash "^4.11.1"
-
-grunt-contrib-clean@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/grunt-contrib-clean/-/grunt-contrib-clean-0.6.0.tgz#f532dba4b8212674c7c013e146bda6638b9048f6"
-  dependencies:
-    rimraf "~2.2.1"
-
-grunt-legacy-log-utils@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/grunt-legacy-log-utils/-/grunt-legacy-log-utils-0.1.1.tgz#c0706b9dd9064e116f36f23fe4e6b048672c0f7e"
-  dependencies:
-    colors "~0.6.2"
-    lodash "~2.4.1"
-    underscore.string "~2.3.3"
-
-grunt-legacy-log@~0.1.0:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/grunt-legacy-log/-/grunt-legacy-log-0.1.3.tgz#ec29426e803021af59029f87d2f9cd7335a05531"
-  dependencies:
-    colors "~0.6.2"
-    grunt-legacy-log-utils "~0.1.1"
-    hooker "~0.2.3"
-    lodash "~2.4.1"
-    underscore.string "~2.3.3"
-
-grunt-legacy-util@~0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz#93324884dbf7e37a9ff7c026dff451d94a9e554b"
-  dependencies:
-    async "~0.1.22"
-    exit "~0.1.1"
-    getobject "~0.1.0"
-    hooker "~0.2.3"
-    lodash "~0.9.2"
-    underscore.string "~2.2.1"
-    which "~1.0.5"
-
-grunt@^0.4.5:
-  version "0.4.5"
-  resolved "https://registry.yarnpkg.com/grunt/-/grunt-0.4.5.tgz#56937cd5194324adff6d207631832a9d6ba4e7f0"
-  dependencies:
-    async "~0.1.22"
-    coffee-script "~1.3.3"
-    colors "~0.6.2"
-    dateformat "1.0.2-1.2.3"
-    eventemitter2 "~0.4.13"
-    exit "~0.1.1"
-    findup-sync "~0.1.2"
-    getobject "~0.1.0"
-    glob "~3.1.21"
-    grunt-legacy-log "~0.1.0"
-    grunt-legacy-util "~0.2.0"
-    hooker "~0.2.3"
-    iconv-lite "~0.2.11"
-    js-yaml "~2.0.5"
-    lodash "~0.9.2"
-    minimatch "~0.2.12"
-    nopt "~1.0.10"
-    rimraf "~2.2.8"
-    underscore.string "~2.2.1"
-    which "~1.0.5"
-
-gulp-babel@^6.0.0:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/gulp-babel/-/gulp-babel-6.1.2.tgz#7c0176e4ba3f244c60588a0c4b320a45d1adefce"
-  dependencies:
-    babel-core "^6.0.2"
-    gulp-util "^3.0.0"
-    object-assign "^4.0.1"
-    replace-ext "0.0.1"
-    through2 "^2.0.0"
-    vinyl-sourcemaps-apply "^0.2.0"
-
-gulp-flatten@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/gulp-flatten/-/gulp-flatten-0.2.0.tgz#892d517e38d7900fd454cf9a1e0210300e92eb06"
-  dependencies:
-    gulp-util "^3.0.1"
-    through2 "^2.0.0"
-
-gulp-load-plugins@^1.2.4:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/gulp-load-plugins/-/gulp-load-plugins-1.5.0.tgz#4c419f7e5764d9a0e33061bab9618f81b73d4171"
-  dependencies:
-    array-unique "^0.2.1"
-    fancy-log "^1.2.0"
-    findup-sync "^0.4.0"
-    gulplog "^1.0.0"
-    has-gulplog "^0.1.0"
-    micromatch "^2.3.8"
-    resolve "^1.1.7"
-
-gulp-util@*, gulp-util@^3.0.0, gulp-util@^3.0.1, gulp-util@^3.0.4, gulp-util@^3.0.7:
+gulp-util@*, gulp-util@^3.0.4:
   version "3.0.8"
   resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
   dependencies:
@@ -2677,24 +2393,6 @@ gulp-util@*, gulp-util@^3.0.0, gulp-util@^3.0.1, gulp-util@^3.0.4, gulp-util@^3.
     through2 "^2.0.0"
     vinyl "^0.5.0"
 
-gulp@^3.9.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/gulp/-/gulp-3.9.1.tgz#571ce45928dd40af6514fc4011866016c13845b4"
-  dependencies:
-    archy "^1.0.0"
-    chalk "^1.0.0"
-    deprecated "^0.0.1"
-    gulp-util "^3.0.0"
-    interpret "^1.0.0"
-    liftoff "^2.1.0"
-    minimist "^1.1.0"
-    orchestrator "^0.3.0"
-    pretty-hrtime "^1.0.0"
-    semver "^4.1.0"
-    tildify "^1.0.0"
-    v8flags "^2.0.2"
-    vinyl-fs "^0.3.0"
-
 gulplog@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
@@ -2708,6 +2406,12 @@ gzip-js@~0.3.2:
     crc32 ">= 0.2.2"
     deflate-js ">= 0.2.2"
 
+gzip-size@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-3.0.0.tgz#546188e9bdc337f673772f81660464b389dce520"
+  dependencies:
+    duplexer "^0.1.1"
+
 handlebars@^4.0.3:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.6.tgz#2ce4484850537f9c97a8026d5399b935c4ed4ed7"
@@ -2718,6 +2422,10 @@ handlebars@^4.0.3:
   optionalDependencies:
     uglify-js "^2.6"
 
+har-schema@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e"
+
 har-validator@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
@@ -2727,6 +2435,13 @@ har-validator@~2.0.6:
     is-my-json-valid "^2.12.4"
     pinkie-promise "^2.0.0"
 
+har-validator@~4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a"
+  dependencies:
+    ajv "^4.9.1"
+    har-schema "^1.0.5"
+
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
@@ -2747,13 +2462,13 @@ has-unicode@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
 
-has@^1.0.0:
+has@^1.0.0, has@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
   dependencies:
     function-bind "^1.0.2"
 
-hash.js@^1.0.0:
+hash.js@^1.0.0, hash.js@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573"
   dependencies:
@@ -2768,6 +2483,14 @@ hawk@~3.1.3:
     hoek "2.x.x"
     sntp "1.x.x"
 
+hmac-drbg@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.0.tgz#3db471f45aae4a994a0688322171f51b8b91bee5"
+  dependencies:
+    hash.js "^1.0.3"
+    minimalistic-assert "^1.0.0"
+    minimalistic-crypto-utils "^1.0.1"
+
 hoek@2.x.x:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
@@ -2786,19 +2509,9 @@ home-or-tmp@^2.0.0:
     os-homedir "^1.0.0"
     os-tmpdir "^1.0.1"
 
-homedir-polyfill@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc"
-  dependencies:
-    parse-passwd "^1.0.0"
-
-hooker@~0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/hooker/-/hooker-0.2.3.tgz#b834f723cc4a242aa65963459df6d984c5d3d959"
-
 hosted-git-info@^2.1.4:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.2.0.tgz#7a0d097863d886c0fabbdcd37bf1758d8becf8a5"
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.4.1.tgz#4b0445e41c004a8bd1337773a4ff790ca40318c8"
 
 html-encoding-sniffer@^1.0.1:
   version "1.0.1"
@@ -2830,17 +2543,13 @@ iconv-lite@^0.4.5, iconv-lite@~0.4.13:
   version "0.4.15"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
 
-iconv-lite@~0.2.11:
-  version "0.2.11"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.2.11.tgz#1ce60a3a57864a292d1321ff4609ca4bb965adc8"
-
 ieee754@^1.1.4:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
 
 ignore@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.2.tgz#1c51e1ef53bab6ddc15db4d9ac4ec139eceb3410"
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.2.6.tgz#26e8da0644be0bb4cb39516f6c79f0e0f4ffe48c"
 
 imurmurhash@^0.1.4:
   version "0.1.4"
@@ -2857,11 +2566,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
-
-inherits@2, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -2869,7 +2574,7 @@ inherits@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
 
-ini@^1.3.4, ini@~1.3.0:
+ini@~1.3.0:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.4.tgz#0537cb79daf59b59a1a517dff706c86ec039162e"
 
@@ -2917,8 +2622,8 @@ insert-module-globals@^7.0.0:
     xtend "^4.0.0"
 
 interpret@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.1.tgz#d579fb7f693b858004947af39fa0db49f795602c"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.2.tgz#f4f623f0bb7122f15f5717c8e254b8161b5c5b2d"
 
 invariant@^2.2.0:
   version "2.2.2"
@@ -2930,7 +2635,7 @@ invert-kv@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
 
-is-absolute@^0.2.3, is-absolute@^0.2.5:
+is-absolute@^0.2.5:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb"
   dependencies:
@@ -2948,8 +2653,8 @@ is-binary-path@^1.0.0:
     binary-extensions "^1.0.0"
 
 is-buffer@^1.0.2, is-buffer@^1.1.0:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.4.tgz#cfc86ccd5dc5a52fa80489111c6920c457e2d98b"
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.5.tgz#1f3b26ef613b214b88cbca23cc6c01d87961eecc"
 
 is-builtin-module@^1.0.0:
   version "1.0.0"
@@ -3028,8 +2733,8 @@ is-integer@^1.0.4:
     is-finite "^1.0.0"
 
 is-my-json-valid@^2.10.0, is-my-json-valid@^2.12.4:
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.15.0.tgz#936edda3ca3c211fd98f3b2d3e08da43f7b2915b"
+  version "2.16.0"
+  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz#f079dd9bfdae65ee2038aae8acbc86ab109e3693"
   dependencies:
     generate-function "^2.0.0"
     generate-object-property "^1.1.0"
@@ -3075,8 +2780,10 @@ is-property@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
 
 is-regex@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.3.tgz#0d55182bddf9f2fde278220aec3a75642c908637"
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  dependencies:
+    has "^1.0.1"
 
 is-relative@^0.2.1:
   version "0.2.1"
@@ -3124,9 +2831,9 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
 
-isexe@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-1.1.2.tgz#36f3e22e60750920f5e7241a476a8c6a42275ad0"
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
 
 isobject@^2.0.0:
   version "2.1.0"
@@ -3146,76 +2853,74 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
 
 istanbul-api@^1.1.0-alpha.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.1.tgz#d36e2f1560d1a43ce304c4ff7338182de61c8f73"
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.1.7.tgz#f6f37f09f8002b130f891c646b70ee4a8e7345ae"
   dependencies:
     async "^2.1.4"
     fileset "^2.0.2"
-    istanbul-lib-coverage "^1.0.0"
-    istanbul-lib-hook "^1.0.0"
-    istanbul-lib-instrument "^1.3.0"
-    istanbul-lib-report "^1.0.0-alpha.3"
-    istanbul-lib-source-maps "^1.1.0"
-    istanbul-reports "^1.0.0"
+    istanbul-lib-coverage "^1.0.2"
+    istanbul-lib-hook "^1.0.5"
+    istanbul-lib-instrument "^1.7.0"
+    istanbul-lib-report "^1.0.0"
+    istanbul-lib-source-maps "^1.1.1"
+    istanbul-reports "^1.0.2"
     js-yaml "^3.7.0"
     mkdirp "^0.5.1"
     once "^1.4.0"
 
-istanbul-lib-coverage@^1.0.0, istanbul-lib-coverage@^1.0.0-alpha, istanbul-lib-coverage@^1.0.0-alpha.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.1.tgz#f263efb519c051c5f1f3343034fc40e7b43ff212"
+istanbul-lib-coverage@^1.0.0, istanbul-lib-coverage@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.2.tgz#87a0c015b6910651cb3b184814dfb339337e25e1"
 
-istanbul-lib-hook@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.0.tgz#fc5367ee27f59268e8f060b0c7aaf051d9c425c5"
+istanbul-lib-hook@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.5.tgz#6ca3d16d60c5f4082da39f7c5cd38ea8a772b88e"
   dependencies:
     append-transform "^0.4.0"
 
-istanbul-lib-instrument@^1.1.1, istanbul-lib-instrument@^1.3.0, istanbul-lib-instrument@^1.4.2:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.4.2.tgz#0e2fdfac93c1dabf2e31578637dc78a19089f43e"
+istanbul-lib-instrument@^1.1.1, istanbul-lib-instrument@^1.6.2, istanbul-lib-instrument@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.0.tgz#b8e0dc25709bb44e17336ab47b7bb5c97c23f659"
   dependencies:
     babel-generator "^6.18.0"
     babel-template "^6.16.0"
     babel-traverse "^6.18.0"
     babel-types "^6.18.0"
     babylon "^6.13.0"
-    istanbul-lib-coverage "^1.0.0"
+    istanbul-lib-coverage "^1.0.2"
     semver "^5.3.0"
 
-istanbul-lib-report@^1.0.0-alpha.3:
-  version "1.0.0-alpha.3"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.0.0-alpha.3.tgz#32d5f6ec7f33ca3a602209e278b2e6ff143498af"
+istanbul-lib-report@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.0.0.tgz#d83dac7f26566b521585569367fe84ccfc7aaecb"
   dependencies:
-    async "^1.4.2"
-    istanbul-lib-coverage "^1.0.0-alpha"
+    istanbul-lib-coverage "^1.0.2"
     mkdirp "^0.5.1"
     path-parse "^1.0.5"
-    rimraf "^2.4.3"
     supports-color "^3.1.2"
 
-istanbul-lib-source-maps@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.1.0.tgz#9d429218f35b823560ea300a96ff0c3bbdab785f"
+istanbul-lib-source-maps@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.1.1.tgz#f8c8c2e8f2160d1d91526d97e5bd63b2079af71c"
   dependencies:
-    istanbul-lib-coverage "^1.0.0-alpha.0"
+    istanbul-lib-coverage "^1.0.2"
     mkdirp "^0.5.1"
     rimraf "^2.4.4"
     source-map "^0.5.3"
 
-istanbul-reports@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.0.1.tgz#9a17176bc4a6cbebdae52b2f15961d52fa623fbc"
+istanbul-reports@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.0.2.tgz#4e8366abe6fa746cc1cd6633f108de12cc6ac6fa"
   dependencies:
     handlebars "^4.0.3"
 
-jest-changed-files@^19.0.0:
-  version "19.0.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-19.0.0.tgz#8c1a43a4ffccbcb8ae12e819104585adf2ed93a6"
+jest-changed-files@^19.0.2:
+  version "19.0.2"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-19.0.2.tgz#16c54c84c3270be408e06d2e8af3f3e37a885824"
 
-jest-cli@^19.0.1:
-  version "19.0.1"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-19.0.1.tgz#79630200c3a33a0b15e81b369cf60c35552722c8"
+jest-cli@^19.0.2:
+  version "19.0.2"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-19.0.2.tgz#cc3620b62acac5f2d93a548cb6ef697d4ec85443"
   dependencies:
     ansi-escapes "^1.4.0"
     callsites "^2.0.0"
@@ -3225,17 +2930,17 @@ jest-cli@^19.0.1:
     istanbul-api "^1.1.0-alpha.1"
     istanbul-lib-coverage "^1.0.0"
     istanbul-lib-instrument "^1.1.1"
-    jest-changed-files "^19.0.0"
-    jest-config "^19.0.1"
-    jest-environment-jsdom "^19.0.1"
+    jest-changed-files "^19.0.2"
+    jest-config "^19.0.2"
+    jest-environment-jsdom "^19.0.2"
     jest-haste-map "^19.0.0"
-    jest-jasmine2 "^19.0.1"
+    jest-jasmine2 "^19.0.2"
     jest-message-util "^19.0.0"
     jest-regex-util "^19.0.0"
     jest-resolve-dependencies "^19.0.0"
-    jest-runtime "^19.0.1"
-    jest-snapshot "^19.0.1"
-    jest-util "^19.0.1"
+    jest-runtime "^19.0.2"
+    jest-snapshot "^19.0.2"
+    jest-util "^19.0.2"
     micromatch "^2.3.11"
     node-notifier "^5.0.1"
     slash "^1.0.0"
@@ -3245,17 +2950,17 @@ jest-cli@^19.0.1:
     worker-farm "^1.3.1"
     yargs "^6.3.0"
 
-jest-config@^19.0.1:
-  version "19.0.1"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-19.0.1.tgz#a50698aca3b70949ff4e3898d339a13e166d8fb8"
+jest-config@^19.0.1, jest-config@^19.0.2:
+  version "19.0.2"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-19.0.2.tgz#1b9bd2db0ddd16df61c2b10a54009e1768da6411"
   dependencies:
     chalk "^1.1.1"
-    jest-environment-jsdom "^19.0.1"
-    jest-environment-node "^19.0.1"
-    jest-jasmine2 "^19.0.1"
+    jest-environment-jsdom "^19.0.2"
+    jest-environment-node "^19.0.2"
+    jest-jasmine2 "^19.0.2"
     jest-regex-util "^19.0.0"
-    jest-resolve "^19.0.0"
-    jest-validate "^19.0.0"
+    jest-resolve "^19.0.2"
+    jest-validate "^19.0.2"
     pretty-format "^19.0.0"
 
 jest-diff@^19.0.0:
@@ -3267,20 +2972,20 @@ jest-diff@^19.0.0:
     jest-matcher-utils "^19.0.0"
     pretty-format "^19.0.0"
 
-jest-environment-jsdom@^19.0.1:
-  version "19.0.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-19.0.1.tgz#baf16bb10cbd54f3b9a3edb8fd88d11282b11f99"
+jest-environment-jsdom@^19.0.2:
+  version "19.0.2"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-19.0.2.tgz#ceda859c4a4b94ab35e4de7dab54b926f293e4a3"
   dependencies:
     jest-mock "^19.0.0"
-    jest-util "^19.0.1"
+    jest-util "^19.0.2"
     jsdom "^9.11.0"
 
-jest-environment-node@^19.0.1:
-  version "19.0.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-19.0.1.tgz#5a9170437bb8b99da139d79f01de20e8e37a3e34"
+jest-environment-node@^19.0.2:
+  version "19.0.2"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-19.0.2.tgz#6e84079db87ed21d0c05e1f9669f207b116fe99b"
   dependencies:
     jest-mock "^19.0.0"
-    jest-util "^19.0.1"
+    jest-util "^19.0.2"
 
 jest-file-exists@^19.0.0:
   version "19.0.0"
@@ -3296,15 +3001,15 @@ jest-haste-map@^19.0.0:
     sane "~1.5.0"
     worker-farm "^1.3.1"
 
-jest-jasmine2@^19.0.1:
-  version "19.0.1"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-19.0.1.tgz#9a9ee34573fc15c4856ec32e65a0865ee878756e"
+jest-jasmine2@^19.0.1, jest-jasmine2@^19.0.2:
+  version "19.0.2"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-19.0.2.tgz#167991ac825981fb1a800af126e83afcca832c73"
   dependencies:
     graceful-fs "^4.1.6"
     jest-matcher-utils "^19.0.0"
     jest-matchers "^19.0.0"
     jest-message-util "^19.0.0"
-    jest-snapshot "^19.0.1"
+    jest-snapshot "^19.0.2"
 
 jest-matcher-utils@^19.0.0:
   version "19.0.0"
@@ -3343,62 +3048,71 @@ jest-resolve-dependencies@^19.0.0:
   dependencies:
     jest-file-exists "^19.0.0"
 
-jest-resolve@^19.0.0:
-  version "19.0.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-19.0.0.tgz#83e6166d58ad9e31c8503e54b215e30ca56cb5ae"
+jest-resolve@^19.0.2:
+  version "19.0.2"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-19.0.2.tgz#5793575de4f07aec32f7d7ff0c6c181963eefb3c"
   dependencies:
     browser-resolve "^1.11.2"
     jest-haste-map "^19.0.0"
     resolve "^1.2.0"
 
-jest-runtime@^19.0.1:
-  version "19.0.1"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-19.0.1.tgz#7b584cbc690a500d9da148aba6a109bc9266a6b1"
+jest-runtime@^19.0.1, jest-runtime@^19.0.2:
+  version "19.0.2"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-19.0.2.tgz#d9a43e72de416d27d196fd9c7940d98fe6685407"
   dependencies:
     babel-core "^6.0.0"
     babel-jest "^19.0.0"
     babel-plugin-istanbul "^4.0.0"
     chalk "^1.1.3"
     graceful-fs "^4.1.6"
-    jest-config "^19.0.1"
+    jest-config "^19.0.2"
     jest-file-exists "^19.0.0"
     jest-haste-map "^19.0.0"
     jest-regex-util "^19.0.0"
-    jest-resolve "^19.0.0"
-    jest-util "^19.0.1"
+    jest-resolve "^19.0.2"
+    jest-util "^19.0.2"
     json-stable-stringify "^1.0.1"
     micromatch "^2.3.11"
     strip-bom "3.0.0"
     yargs "^6.3.0"
 
-jest-snapshot@^19.0.1:
-  version "19.0.1"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-19.0.1.tgz#5b8161f737b63b6973f7e6e222b473970b5a69d1"
+jest-snapshot@^19.0.2:
+  version "19.0.2"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-19.0.2.tgz#9c1b216214f7187c38bfd5c70b1efab16b0ff50b"
   dependencies:
     chalk "^1.1.3"
     jest-diff "^19.0.0"
     jest-file-exists "^19.0.0"
     jest-matcher-utils "^19.0.0"
-    jest-util "^19.0.1"
+    jest-util "^19.0.2"
     natural-compare "^1.4.0"
     pretty-format "^19.0.0"
 
-jest-util@^19.0.1:
-  version "19.0.1"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-19.0.1.tgz#27235211a21280b42bc7c84d8f69e4e07c72cf9f"
+jest-util@^19.0.2:
+  version "19.0.2"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-19.0.2.tgz#e0a0232a2ab9e6b2b53668bdb3534c2b5977ed41"
   dependencies:
     chalk "^1.1.1"
     graceful-fs "^4.1.6"
     jest-file-exists "^19.0.0"
     jest-message-util "^19.0.0"
     jest-mock "^19.0.0"
-    jest-validate "^19.0.0"
+    jest-validate "^19.0.2"
     leven "^2.0.0"
     mkdirp "^0.5.1"
 
-jest-validate@19.0.0, jest-validate@^19.0.0:
-  version "19.0.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-19.0.0.tgz#8c6318a20ecfeaba0ba5378bfbb8277abded4173"
+jest-validate@19.0.0:
+  version "19.0.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-19.0.0.tgz#8c6318a20ecfeaba0ba5378bfbb8277abded4173"
+  dependencies:
+    chalk "^1.1.1"
+    jest-matcher-utils "^19.0.0"
+    leven "^2.0.0"
+    pretty-format "^19.0.0"
+
+jest-validate@^19.0.2:
+  version "19.0.2"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-19.0.2.tgz#dc534df5f1278d5b63df32b14241d4dbf7244c0c"
   dependencies:
     chalk "^1.1.1"
     jest-matcher-utils "^19.0.0"
@@ -3406,10 +3120,10 @@ jest-validate@19.0.0, jest-validate@^19.0.0:
     pretty-format "^19.0.0"
 
 jest@^19.0.1:
-  version "19.0.1"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-19.0.1.tgz#f373b3f4688147d4fc18ccd54497acebca72b8c4"
+  version "19.0.2"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-19.0.2.tgz#b794faaf8ff461e7388f28beef559a54f20b2c10"
   dependencies:
-    jest-cli "^19.0.1"
+    jest-cli "^19.0.2"
 
 jodid25519@^1.0.0:
   version "1.0.2"
@@ -3433,26 +3147,19 @@ js-yaml@3.6.1, js-yaml@^3.5.1:
     esprima "^2.6.0"
 
 js-yaml@^3.7.0:
-  version "3.8.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.1.tgz#782ba50200be7b9e5a8537001b7804db3ad02628"
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.3.tgz#33a05ec481c850c8875929166fe1beb61c728766"
   dependencies:
     argparse "^1.0.7"
     esprima "^3.1.1"
 
-js-yaml@~2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-2.0.5.tgz#a25ae6509999e97df278c6719da11bd0687743a8"
-  dependencies:
-    argparse "~ 0.1.11"
-    esprima "~ 1.0.2"
-
 jsbn@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.0.tgz#650987da0dd74f4ebf5a11377a2aa2d273e97dfd"
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
 jsdom@^9.11.0:
-  version "9.11.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.11.0.tgz#a95b0304e521a2ca5a63c6ea47bf7708a7a84591"
+  version "9.12.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-9.12.0.tgz#e8c546fffcb06c00d4833ca84410fed7f8a097d4"
   dependencies:
     abab "^1.0.3"
     acorn "^4.0.4"
@@ -3523,9 +3230,10 @@ jsonpointer@^4.0.0:
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
 
 jsprim@^1.2.2:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.3.1.tgz#2a7256f70412a29ee3670aaca625994c4dcff252"
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.0.tgz#a3b87e40298d8c380552d8cc7628a0bb95a22918"
   dependencies:
+    assert-plus "1.0.0"
     extsprintf "1.0.2"
     json-schema "0.2.3"
     verror "1.3.6"
@@ -3585,20 +3293,6 @@ lexical-scope@^1.2.0:
   dependencies:
     astw "^2.0.0"
 
-liftoff@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.3.0.tgz#a98f2ff67183d8ba7cfaca10548bd7ff0550b385"
-  dependencies:
-    extend "^3.0.0"
-    findup-sync "^0.4.2"
-    fined "^1.0.1"
-    flagged-respawn "^0.3.2"
-    lodash.isplainobject "^4.0.4"
-    lodash.isstring "^4.0.1"
-    lodash.mapvalues "^4.4.0"
-    rechoir "^0.6.2"
-    resolve "^1.1.7"
-
 load-json-file@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
@@ -3652,10 +3346,6 @@ lodash._root@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
 
-lodash.assignwith@^4.0.7:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz#127a97f02adc41751a954d24b0de17e100e038eb"
-
 lodash.escape@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
@@ -3670,18 +3360,6 @@ lodash.isarray@^3.0.0:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
 
-lodash.isempty@^4.2.1:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e"
-
-lodash.isplainobject@^4.0.4:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb"
-
-lodash.isstring@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
-
 lodash.keys@^3.0.0:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
@@ -3690,22 +3368,10 @@ lodash.keys@^3.0.0:
     lodash.isarguments "^3.0.0"
     lodash.isarray "^3.0.0"
 
-lodash.mapvalues@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz#1bafa5005de9dd6f4f26668c30ca37230cc9689c"
-
 lodash.memoize@~3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
 
-lodash.pick@^4.2.1:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
-
-lodash.pickby@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.pickby/-/lodash.pickby-4.6.0.tgz#7dea21d8c18d7703a27c704c15d3b84a67e33aff"
-
 lodash.restparam@^3.0.0:
   version "3.6.1"
   resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
@@ -3735,22 +3401,10 @@ lodash@^3.10.0, lodash@^3.2.0, lodash@^3.9.3:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
 
-lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.2.0, lodash@^4.3.0:
+lodash@^4.0.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.2.0, lodash@^4.3.0:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
-lodash@~0.9.2:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-0.9.2.tgz#8f3499c5245d346d682e5b0d3b40767e09f1a92c"
-
-lodash@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
-
-lodash@~2.4.1:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-2.4.2.tgz#fadd834b9683073da179b3eae6d9c0d15053f73e"
-
 log-driver@1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.5.tgz#7ae4ec257302fd790d557cb10c97100d857b0056"
@@ -3765,10 +3419,6 @@ loose-envify@^1.0.0, loose-envify@^1.1.0:
   dependencies:
     js-tokens "^3.0.0"
 
-lru-cache@2:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952"
-
 lru-cache@^4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.0.2.tgz#1d17679c069cda5d040991a09dbc2c0db377e55e"
@@ -3776,16 +3426,30 @@ lru-cache@^4.0.0:
     pseudomap "^1.0.1"
     yallist "^2.0.0"
 
+magic-string@^0.15.2:
+  version "0.15.2"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.15.2.tgz#0681d7388741bbc3addaa65060992624c6c09e9c"
+  dependencies:
+    vlq "^0.2.1"
+
+magic-string@^0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.16.0.tgz#970ebb0da7193301285fb1aa650f39bdd81eb45a"
+  dependencies:
+    vlq "^0.2.1"
+
+magic-string@^0.19.0:
+  version "0.19.0"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.19.0.tgz#198948217254e3e0b93080e01146b7c73b2a06b2"
+  dependencies:
+    vlq "^0.2.1"
+
 makeerror@1.0.x:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
   dependencies:
     tmpl "1.0.x"
 
-map-cache@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-
 merge-stream@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
@@ -3796,7 +3460,7 @@ merge@^1.1.3:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
 
-micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7, micromatch@^2.3.8:
+micromatch@^2.1.5, micromatch@^2.3.11:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
   dependencies:
@@ -3821,26 +3485,23 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@~1.26.0:
-  version "1.26.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.26.0.tgz#eaffcd0e4fc6935cf8134da246e2e6c35305adff"
+mime-db@~1.27.0:
+  version "1.27.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.27.0.tgz#820f572296bbd20ec25ed55e5b5de869e5436eb1"
 
 mime-types@^2.1.12, mime-types@~2.1.7:
-  version "2.1.14"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.14.tgz#f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee"
+  version "2.1.15"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.15.tgz#a4ebf5064094569237b8cf70046776d09fc92aed"
   dependencies:
-    mime-db "~1.26.0"
+    mime-db "~1.27.0"
 
 minimalistic-assert@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
 
-minimatch@0.3:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.3.0.tgz#275d8edaac4f1bb3326472089e7949c8394699dd"
-  dependencies:
-    lru-cache "2"
-    sigmund "~1.0.0"
+minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
 
 "minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3:
   version "3.0.3"
@@ -3848,19 +3509,12 @@ minimatch@0.3:
   dependencies:
     brace-expansion "^1.0.0"
 
-minimatch@^2.0.1, minimatch@^2.0.3:
+minimatch@^2.0.3:
   version "2.0.10"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"
   dependencies:
     brace-expansion "^1.0.0"
 
-minimatch@~0.2.11, minimatch@~0.2.12:
-  version "0.2.14"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-0.2.14.tgz#c74e780574f63c6f9a090e90efbe6ef53a6a756a"
-  dependencies:
-    lru-cache "2"
-    sigmund "~1.0.0"
-
 minimist@0.0.8, minimist@~0.0.1:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
@@ -3869,15 +3523,15 @@ minimist@1.2.0, minimist@>=0.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
+"mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   dependencies:
     minimist "0.0.8"
 
 module-deps@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-4.0.8.tgz#55fd70623399706c3288bef7a609ff1e8c0ed2bb"
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-4.1.1.tgz#23215833f1da13fd606ccb8087b44852dcb821fd"
   dependencies:
     JSONStream "^1.0.3"
     browser-resolve "^1.7.0"
@@ -3895,10 +3549,6 @@ module-deps@^4.0.8:
     through2 "^2.0.0"
     xtend "^4.0.0"
 
-ms@0.7.1:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098"
-
 ms@0.7.2:
   version "0.7.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.2.tgz#ae25cf2512b3885a1d95d7f037868d8431124765"
@@ -3917,14 +3567,14 @@ nan@^2.3.0:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.1.tgz#d5b01691253326a97a2bbee9e61c55d8d60351e2"
 
-natives@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31"
-
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
 
+ncp@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
+
 node-fetch@^1.0.1:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
@@ -3937,8 +3587,8 @@ node-int64@^0.4.0:
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
 
 node-notifier@^5.0.1:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.0.2.tgz#4438449fe69e321f941cef943986b0797032701b"
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-5.1.2.tgz#2fa9e12605fa10009d44549d6fcd8a63dde0e4ff"
   dependencies:
     growly "^1.3.0"
     semver "^5.3.0"
@@ -3946,34 +3596,29 @@ node-notifier@^5.0.1:
     which "^1.2.12"
 
 node-pre-gyp@^0.6.29:
-  version "0.6.33"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.33.tgz#640ac55198f6a925972e0c16c4ac26a034d5ecc9"
-  dependencies:
-    mkdirp "~0.5.1"
-    nopt "~3.0.6"
-    npmlog "^4.0.1"
-    rc "~1.1.6"
-    request "^2.79.0"
-    rimraf "~2.5.4"
-    semver "~5.3.0"
-    tar "~2.2.1"
-    tar-pack "~3.3.0"
-
-nopt@~1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
+  version "0.6.34"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.34.tgz#94ad1c798a11d7fc67381b50d47f8cc18d9799f7"
   dependencies:
-    abbrev "1"
+    mkdirp "^0.5.1"
+    nopt "^4.0.1"
+    npmlog "^4.0.2"
+    rc "^1.1.7"
+    request "^2.81.0"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^2.2.1"
+    tar-pack "^3.4.0"
 
-nopt@~3.0.6:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
+nopt@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
   dependencies:
     abbrev "1"
+    osenv "^0.1.4"
 
 normalize-package-data@^2.3.2:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.5.tgz#8d924f142960e1777e7ffe170543631cc7cb02df"
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.6.tgz#498fa420c96401f787402ba21e600def9f981fff"
   dependencies:
     hosted-git-info "^2.1.4"
     is-builtin-module "^1.0.0"
@@ -3981,10 +3626,12 @@ normalize-package-data@^2.3.2:
     validate-npm-package-license "^3.0.1"
 
 normalize-path@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a"
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  dependencies:
+    remove-trailing-separator "^1.0.1"
 
-npmlog@^4.0.1:
+npmlog@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.0.2.tgz#d03950e0e78ce1527ba26d2a7592e9348ac3e75f"
   dependencies:
@@ -4013,10 +3660,18 @@ object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
 
-object-keys@^1.0.6, object-keys@^1.0.8:
+object-keys@^1.0.10, object-keys@^1.0.6, object-keys@^1.0.8:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
 
+object.assign@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.0.4.tgz#b1c9cc044ef1b9fe63606fc141abbb32e14730cc"
+  dependencies:
+    define-properties "^1.1.2"
+    function-bind "^1.1.0"
+    object-keys "^1.0.10"
+
 object.omit@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
@@ -4024,13 +3679,13 @@ object.omit@^2.0.0:
     for-own "^0.1.4"
     is-extendable "^0.1.1"
 
-once@^1.3.0, once@^1.3.1, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   dependencies:
     wrappy "1"
 
-once@~1.3.0, once@~1.3.3:
+once@~1.3.0:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
   dependencies:
@@ -4058,18 +3713,6 @@ optionator@^0.8.1, optionator@^0.8.2:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
-orchestrator@^0.3.0:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/orchestrator/-/orchestrator-0.3.8.tgz#14e7e9e2764f7315fbac184e506c7aa6df94ad7e"
-  dependencies:
-    end-of-stream "~0.1.5"
-    sequencify "~0.0.7"
-    stream-consume "~0.1.0"
-
-ordered-read-streams@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz#fd565a9af8eb4473ba69b6ed8a34352cb552f126"
-
 ordered-read-streams@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.0.tgz#d674a86ffcedf83d0ae06afa2918855e96d4033a"
@@ -4081,7 +3724,7 @@ os-browserify@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.1.2.tgz#49ca0293e0b19590a5f5de10c7f265a617d8fe54"
 
-os-homedir@^1.0.0, os-homedir@^1.0.1:
+os-homedir@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
 
@@ -4095,10 +3738,17 @@ os-shim@^0.1.2:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/os-shim/-/os-shim-0.1.3.tgz#6b62c3791cf7909ea35ed46e17658bb417cb3917"
 
-os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
+os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
+osenv@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
+  dependencies:
+    os-homedir "^1.0.0"
+    os-tmpdir "^1.0.0"
+
 output-file-sync@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/output-file-sync/-/output-file-sync-1.1.2.tgz#d0a33eefe61a205facb90092e826598d5245ce76"
@@ -4128,8 +3778,8 @@ parents@^1.0.0, parents@^1.0.1:
     path-platform "~0.11.15"
 
 parse-asn1@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.0.0.tgz#35060f6d5015d37628c770f4e091a0b5a278bc23"
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
@@ -4137,14 +3787,6 @@ parse-asn1@^5.0.0:
     evp_bytestokey "^1.0.0"
     pbkdf2 "^3.0.3"
 
-parse-filepath@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.1.tgz#159d6155d43904d16c10ef698911da1e91969b73"
-  dependencies:
-    is-absolute "^0.2.3"
-    map-cache "^0.2.0"
-    path-root "^0.1.1"
-
 parse-glob@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
@@ -4160,10 +3802,6 @@ parse-json@^2.2.0:
   dependencies:
     error-ex "^1.2.0"
 
-parse-passwd@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
-
 parse5@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-1.5.1.tgz#9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"
@@ -4206,16 +3844,6 @@ path-platform@~0.11.15:
   version "0.11.15"
   resolved "https://registry.yarnpkg.com/path-platform/-/path-platform-0.11.15.tgz#e864217f74c36850f0852b78dc7bf7d4a5721bf2"
 
-path-root-regex@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
-
-path-root@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
-  dependencies:
-    path-root-regex "^0.1.0"
-
 path-type@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
@@ -4230,6 +3858,10 @@ pbkdf2@^3.0.3:
   dependencies:
     create-hmac "^1.1.2"
 
+performance-now@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"
+
 pify@^2.0.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
@@ -4245,8 +3877,8 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
 
 platform@^1.1.0:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.3.tgz#646c77011899870b6a0903e75e997e8e51da7461"
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/platform/-/platform-1.3.4.tgz#6f0fb17edaaa48f21442b3a975c063130f1c3ebd"
 
 pluralize@^1.2.1:
   version "1.2.1"
@@ -4281,10 +3913,6 @@ pretty-format@^19.0.0:
   dependencies:
     ansi-styles "^3.0.0"
 
-pretty-hrtime@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
-
 private@^0.1.6, private@~0.1.5:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.7.tgz#68ce5e8a1ef0a23bb570cc28537b5332aba63ef1"
@@ -4349,12 +3977,16 @@ punycode@^1.3.2, punycode@^1.4.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
 
 q@^1.1.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/q/-/q-1.5.0.tgz#dd01bac9d06d30e6f219aecb8253ee9ebdc308f1"
 
 qs@~6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"
+  version "6.3.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
+
+qs@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233"
 
 querystring-es3@~0.2.0:
   version "0.2.1"
@@ -4375,14 +4007,14 @@ randombytes@^2.0.0, randombytes@^2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.3.tgz#674c99760901c3c4112771a31e521dc349cc09ec"
 
-rc@~1.1.6:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.1.6.tgz#43651b76b6ae53b5c802f1151fa3fc3b059969c9"
+rc@^1.1.7:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"
   dependencies:
     deep-extend "~0.4.0"
     ini "~1.3.0"
     minimist "^1.2.0"
-    strip-json-comments "~1.0.4"
+    strip-json-comments "~2.0.1"
 
 read-only-stream@^2.0.0:
   version "2.0.0"
@@ -4405,15 +4037,6 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
-"readable-stream@>=1.0.33-1 <1.1.0-0":
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 "readable-stream@>=1.1.13-1 <1.2.0-0", readable-stream@~1.1.9:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
@@ -4423,9 +4046,9 @@ read-pkg@^1.0.0:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.0, readable-stream@^2.1.5:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
+readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6:
+  version "2.2.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.6.tgz#8b43aed76e71483938d12a8d46c6cf1a00b1f816"
   dependencies:
     buffer-shims "^1.0.0"
     core-util-is "~1.0.0"
@@ -4446,18 +4069,6 @@ readable-stream@~2.0.0:
     string_decoder "~0.10.x"
     util-deprecate "~1.0.1"
 
-readable-stream@~2.1.4:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0"
-  dependencies:
-    buffer-shims "^1.0.0"
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~0.10.x"
-    util-deprecate "~1.0.1"
-
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
@@ -4475,7 +4086,7 @@ readline2@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     mute-stream "0.0.5"
 
-recast@0.10.33, recast@^0.10.10:
+recast@0.10.33:
   version "0.10.33"
   resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.33.tgz#942808f7aa016f1fa7142c461d7e5704aaa8d697"
   dependencies:
@@ -4484,11 +4095,20 @@ recast@0.10.33, recast@^0.10.10:
     private "~0.1.5"
     source-map "~0.5.0"
 
+recast@^0.10.10:
+  version "0.10.43"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.43.tgz#b95d50f6d60761a5f6252e15d80678168491ce7f"
+  dependencies:
+    ast-types "0.8.15"
+    esprima-fb "~15001.1001.0-dev-harmony-fb"
+    private "~0.1.5"
+    source-map "~0.5.0"
+
 recast@^0.11.17:
-  version "0.11.21"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.21.tgz#4e83081c6359ecb2e526d14f4138879333f20ac9"
+  version "0.11.23"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3"
   dependencies:
-    ast-types "0.9.5"
+    ast-types "0.9.6"
     esprima "~3.1.0"
     private "~0.1.5"
     source-map "~0.5.0"
@@ -4504,8 +4124,8 @@ regenerate@^1.2.1:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.2.tgz#d1941c67bad437e1be76433add5b385f95b19260"
 
 regenerator-runtime@^0.10.0:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.1.tgz#257f41961ce44558b18f7814af48c17559f9faeb"
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.3.tgz#8c4367a904b51ea62a908ac310bf99ff90a82a3e"
 
 regenerator@0.8.40:
   version "0.8.40"
@@ -4598,6 +4218,33 @@ request@2.79.0, request@^2.79.0:
     tunnel-agent "~0.4.1"
     uuid "^3.0.0"
 
+request@^2.81.0:
+  version "2.81.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
+  dependencies:
+    aws-sign2 "~0.6.0"
+    aws4 "^1.2.1"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.0"
+    forever-agent "~0.6.1"
+    form-data "~2.1.1"
+    har-validator "~4.2.1"
+    hawk "~3.1.3"
+    http-signature "~1.1.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.7"
+    oauth-sign "~0.8.1"
+    performance-now "^0.2.0"
+    qs "~6.4.0"
+    safe-buffer "^5.0.1"
+    stringstream "~0.0.4"
+    tough-cookie "~2.3.0"
+    tunnel-agent "^0.6.0"
+    uuid "^3.0.0"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -4613,13 +4260,6 @@ require-uncached@^1.0.2:
     caller-path "^0.1.0"
     resolve-from "^1.0.0"
 
-resolve-dir@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-0.1.1.tgz#b219259a5602fac5c5c496ad894a6e8cc430261e"
-  dependencies:
-    expand-tilde "^1.2.2"
-    global-modules "^0.2.3"
-
 resolve-from@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
@@ -4629,12 +4269,10 @@ resolve@1.1.7:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
 resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.2.0.tgz#9589c3f2f6149d1417a40becc1663db6ec6bc26c"
-
-resolve@~0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-0.3.1.tgz#34c63447c664c70598d1c9b126fc43b2a24310a4"
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.3.2.tgz#1f0442c9e0cbb8136e87b9305f932f46c7f28235"
+  dependencies:
+    path-parse "^1.0.5"
 
 restore-cursor@^1.0.1:
   version "1.0.1"
@@ -4649,20 +4287,90 @@ right-align@^0.1.1:
   dependencies:
     align-text "^0.1.1"
 
-rimraf@2, rimraf@^2.2.8, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@~2.5.1, rimraf@~2.5.4:
-  version "2.5.4"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.5.4.tgz#96800093cbf1a0c86bd95b4625467535c29dfa04"
+rimraf@2, rimraf@^2.2.8, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
   dependencies:
     glob "^7.0.5"
 
-rimraf@~2.2.1, rimraf@~2.2.8:
-  version "2.2.8"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
-
 ripemd160@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-1.0.1.tgz#93a4bbd4942bc574b69a8fa57c71de10ecca7d6e"
 
+rollup-plugin-alias@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-alias/-/rollup-plugin-alias-1.2.1.tgz#1e895581cc18fdbf1acd7ada219571bfca9d6593"
+
+rollup-plugin-babel@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-2.7.1.tgz#16528197b0f938a1536f44683c7a93d573182f57"
+  dependencies:
+    babel-core "6"
+    babel-plugin-transform-es2015-classes "^6.9.0"
+    object-assign "^4.1.0"
+    rollup-pluginutils "^1.5.0"
+
+rollup-plugin-commonjs@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-8.0.2.tgz#98b1589bfe32a6c0f67790b60c0b499972afed89"
+  dependencies:
+    acorn "^4.0.1"
+    estree-walker "^0.3.0"
+    magic-string "^0.19.0"
+    resolve "^1.1.7"
+    rollup-pluginutils "^2.0.1"
+
+rollup-plugin-inject@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-inject/-/rollup-plugin-inject-2.0.0.tgz#8934d98a5b0db2d05efcee2ac06a170a4c70b044"
+  dependencies:
+    acorn "^4.0.3"
+    estree-walker "^0.2.0"
+    magic-string "^0.16.0"
+    rollup-pluginutils "^1.2.0"
+
+rollup-plugin-node-resolve@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-2.1.1.tgz#cbb783b0d15b02794d58915350b2f0d902b8ddc8"
+  dependencies:
+    browser-resolve "^1.11.0"
+    builtin-modules "^1.1.0"
+    resolve "^1.1.6"
+
+rollup-plugin-replace@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-replace/-/rollup-plugin-replace-1.1.1.tgz#396315ded050a6ce43b9518a886a3f60efb1ea33"
+  dependencies:
+    magic-string "^0.15.2"
+    minimatch "^3.0.2"
+    rollup-pluginutils "^1.5.0"
+
+rollup-plugin-uglify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-uglify/-/rollup-plugin-uglify-1.0.1.tgz#11d0b0c8bcd2d07e6908f74fd16b0152390b922a"
+  dependencies:
+    uglify-js "^2.6.1"
+
+rollup-pluginutils@^1.2.0, rollup-pluginutils@^1.5.0:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408"
+  dependencies:
+    estree-walker "^0.2.1"
+    minimatch "^3.0.2"
+
+rollup-pluginutils@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz#7ec95b3573f6543a46a6461bd9a7c544525d0fc0"
+  dependencies:
+    estree-walker "^0.3.0"
+    micromatch "^2.3.11"
+
+rollup@^0.41.6:
+  version "0.41.6"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.41.6.tgz#e0d05497877a398c104d816d2733a718a7a94e2a"
+  dependencies:
+    source-map-support "^0.4.0"
+
 run-async@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
@@ -4680,6 +4388,10 @@ rx-lite@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
 
+safe-buffer@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
+
 sane@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/sane/-/sane-1.5.0.tgz#a4adeae764d048621ecb27d5f9ecf513101939f3"
@@ -4696,18 +4408,10 @@ sax@^1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.2.tgz#fd8631a23bc7826bef5d871bdb87378c95647828"
 
-"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0, semver@~5.3.0:
+"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
 
-semver@^4.1.0:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
-
-sequencify@~0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/sequencify/-/sequencify-0.0.7.tgz#90cff19d02e07027fd767f5ead3e7b95d1e7380c"
-
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -4747,8 +4451,8 @@ shell-quote@^1.6.1:
     jsonify "~0.0.0"
 
 shelljs@^0.7.5:
-  version "0.7.6"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.6.tgz#379cccfb56b91c8601e4793356eb5382924de9ad"
+  version "0.7.7"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1"
   dependencies:
     glob "^7.0.0"
     interpret "^1.0.0"
@@ -4758,10 +4462,6 @@ shellwords@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.0.tgz#66afd47b6a12932d9071cbfd98a52e785cd0ba14"
 
-sigmund@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
-
 signal-exit@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -4794,11 +4494,11 @@ source-map-support@^0.2.10:
   dependencies:
     source-map "0.1.32"
 
-source-map-support@^0.4.2:
-  version "0.4.11"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.11.tgz#647f939978b38535909530885303daf23279f322"
+source-map-support@^0.4.0, source-map-support@^0.4.2:
+  version "0.4.14"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.14.tgz#9d4463772598b86271b4f523f6c1f4e02a7d6aef"
   dependencies:
-    source-map "^0.5.3"
+    source-map "^0.5.6"
 
 source-map@0.1.32:
   version "0.1.32"
@@ -4812,7 +4512,7 @@ source-map@^0.4.4, source-map@~0.4.0, source-map@~0.4.2:
   dependencies:
     amdefine ">=0.0.4"
 
-source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.3, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3:
+source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.0, source-map@~0.5.1, source-map@~0.5.3:
   version "0.5.6"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
 
@@ -4852,8 +4552,8 @@ sprintf-js@~1.0.2:
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
 sshpk@^1.7.0:
-  version "1.10.2"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.10.2.tgz#d5a804ce22695515638e798dbe23273de070a5fa"
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.11.0.tgz#2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -4867,8 +4567,8 @@ sshpk@^1.7.0:
     tweetnacl "~0.14.0"
 
 stable@~0.1.3:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.5.tgz#08232f60c732e9890784b5bed0734f8b32a887b9"
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.6.tgz#910f5d2aed7b520c6e777499c1f32e139fdecb10"
 
 stream-browserify@^2.0.0:
   version "2.0.1"
@@ -4884,17 +4584,13 @@ stream-combiner2@^1.1.1:
     duplexer2 "~0.1.0"
     readable-stream "^2.0.2"
 
-stream-consume@~0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/stream-consume/-/stream-consume-0.1.0.tgz#a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f"
-
 stream-http@^2.0.0:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.6.3.tgz#4c3ddbf9635968ea2cfd4e48d43de5def2625ac3"
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.0.tgz#cec1f4e3b494bc4a81b451808970f8b20b4ed5f6"
   dependencies:
     builtin-status-codes "^3.0.0"
     inherits "^2.0.1"
-    readable-stream "^2.1.0"
+    readable-stream "^2.2.6"
     to-arraybuffer "^1.0.0"
     xtend "^4.0.0"
 
@@ -4956,23 +4652,12 @@ strip-bom@3.0.0, strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
 
-strip-bom@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-1.0.0.tgz#85b8862f3844b5a6d5ec8467a93598173a36f794"
-  dependencies:
-    first-chunk-stream "^1.0.0"
-    is-utf8 "^0.2.0"
-
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
   dependencies:
     is-utf8 "^0.2.0"
 
-strip-json-comments@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-1.0.4.tgz#1e15fbcac97d3ee99bf2d73b4c656b082bbafb91"
-
 strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
@@ -4994,14 +4679,14 @@ supports-color@^3.1.2:
     has-flag "^1.0.0"
 
 symbol-tree@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.1.tgz#8549dd1d01fa9f893c18cc9ab0b106b4d9b168cb"
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
 syntax-error@^1.1.1:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.1.6.tgz#b4549706d386cc1c1dc7c2423f18579b6cade710"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/syntax-error/-/syntax-error-1.3.0.tgz#1ed9266c4d40be75dc55bf9bb1cb77062bb96ca1"
   dependencies:
-    acorn "^2.7.0"
+    acorn "^4.0.3"
 
 table@^3.7.8:
   version "3.8.3"
@@ -5014,20 +4699,20 @@ table@^3.7.8:
     slice-ansi "0.0.4"
     string-width "^2.0.0"
 
-tar-pack@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.3.0.tgz#30931816418f55afc4d21775afdd6720cee45dae"
-  dependencies:
-    debug "~2.2.0"
-    fstream "~1.0.10"
-    fstream-ignore "~1.0.5"
-    once "~1.3.3"
-    readable-stream "~2.1.4"
-    rimraf "~2.5.1"
-    tar "~2.2.1"
-    uid-number "~0.0.6"
-
-tar@~2.2.1:
+tar-pack@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
+  dependencies:
+    debug "^2.2.0"
+    fstream "^1.0.10"
+    fstream-ignore "^1.0.5"
+    once "^1.3.3"
+    readable-stream "^2.1.4"
+    rimraf "^2.5.1"
+    tar "^2.2.1"
+    uid-number "^0.0.6"
+
+tar@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
   dependencies:
@@ -5035,9 +4720,9 @@ tar@~2.2.1:
     fstream "^1.0.2"
     inherits "2"
 
-test-exclude@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.0.0.tgz#0ddc0100b8ae7e88b34eb4fd98a907e961991900"
+test-exclude@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.0.3.tgz#86a13ce3effcc60e6c90403cf31a27a60ac6c4e7"
   dependencies:
     arrify "^1.0.1"
     micromatch "^2.3.11"
@@ -5060,13 +4745,6 @@ through2-filter@^2.0.0:
     through2 "~2.0.0"
     xtend "~4.0.0"
 
-through2@^0.6.1:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
-  dependencies:
-    readable-stream ">=1.0.33-1 <1.1.0-0"
-    xtend ">=4.0.0 <4.1.0-0"
-
 through2@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/through2/-/through2-1.1.1.tgz#0847cbc4449f3405574dbdccd9bb841b83ac3545"
@@ -5085,12 +4763,6 @@ through2@^2.0.0, through2@~2.0.0:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
-tildify@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/tildify/-/tildify-1.2.0.tgz#dcec03f55dca9b7aa3e5b04f21817eb56e63588a"
-  dependencies:
-    os-homedir "^1.0.0"
-
 time-stamp@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.0.1.tgz#9f4bd23559c9365966f3302dbba2b07c6b99b151"
@@ -5137,7 +4809,7 @@ tr46@~0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
 
-trim-right@^1.0.0:
+trim-right@^1.0.0, trim-right@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
 
@@ -5157,6 +4829,12 @@ tty-browserify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
 
+tunnel-agent@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
+  dependencies:
+    safe-buffer "^5.0.1"
+
 tunnel-agent@~0.4.1:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
@@ -5171,7 +4849,7 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-typedarray@~0.0.5:
+typedarray@^0.0.6, typedarray@~0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
@@ -5183,14 +4861,14 @@ ua-parser-js@^0.7.9:
   version "0.7.12"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"
 
-uglify-js@2.x.x, uglify-js@^2.5.0, uglify-js@^2.6:
-  version "2.7.5"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8"
+uglify-js@2.x.x, uglify-js@^2.5.0, uglify-js@^2.6, uglify-js@^2.6.1:
+  version "2.8.21"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.21.tgz#1733f669ae6f82fc90c7b25ec0f5c783ee375314"
   dependencies:
-    async "~0.2.6"
     source-map "~0.5.1"
-    uglify-to-browserify "~1.0.0"
     yargs "~3.10.0"
+  optionalDependencies:
+    uglify-to-browserify "~1.0.0"
 
 uglify-to-browserify@~1.0.0:
   version "1.0.2"
@@ -5206,7 +4884,7 @@ uglifyify@^3.0.1:
     through "~2.3.4"
     uglify-js "2.x.x"
 
-uid-number@~0.0.6:
+uid-number@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
 
@@ -5218,26 +4896,6 @@ unc-path-regex@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
 
-underscore.string@~2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-2.2.1.tgz#d7c0fa2af5d5a1a67f4253daee98132e733f0f19"
-
-underscore.string@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-2.3.3.tgz#71c08bf6b428b1133f37e78fa3a21c82f7329b0d"
-
-underscore.string@~2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-2.4.0.tgz#8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"
-
-underscore@~1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.7.0.tgz#6bbaf0877500d36be34ecaa584e0db9fef035209"
-
-unique-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-1.0.0.tgz#d59a4a75427447d9aa6c91e70263f8d26a4b104b"
-
 unique-stream@^2.0.2:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.2.1.tgz#5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"
@@ -5276,9 +4934,9 @@ uuid@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"
 
-v8flags@^2.0.10, v8flags@^2.0.2:
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.0.11.tgz#bca8f30f0d6d60612cc2c00641e6962d42ae6881"
+v8flags@^2.0.10:
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-2.0.12.tgz#73235d9f7176f8e8833fb286795445f7938d84e5"
   dependencies:
     user-home "^1.1.1"
 
@@ -5295,32 +4953,6 @@ verror@1.3.6:
   dependencies:
     extsprintf "1.0.2"
 
-vinyl-fs@^0.3.0:
-  version "0.3.14"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-0.3.14.tgz#9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"
-  dependencies:
-    defaults "^1.0.0"
-    glob-stream "^3.1.5"
-    glob-watcher "^0.0.6"
-    graceful-fs "^3.0.0"
-    mkdirp "^0.5.0"
-    strip-bom "^1.0.0"
-    through2 "^0.6.1"
-    vinyl "^0.4.0"
-
-vinyl-sourcemaps-apply@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705"
-  dependencies:
-    source-map "^0.5.1"
-
-vinyl@^0.4.0:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
-  dependencies:
-    clone "^0.2.0"
-    clone-stats "^0.0.1"
-
 vinyl@^0.5.0:
   version "0.5.3"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
@@ -5329,6 +4961,10 @@ vinyl@^0.5.0:
     clone-stats "^0.0.1"
     replace-ext "0.0.1"
 
+vlq@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.1.tgz#14439d711891e682535467f8587c5630e4222a6c"
+
 vm-browserify@~0.0.1:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
@@ -5360,12 +4996,12 @@ whatwg-encoding@^1.0.1:
     iconv-lite "0.4.13"
 
 whatwg-fetch@>=0.10.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.2.tgz#fe294d1d89e36c5be8b3195057f2e4bc74fc980e"
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
 
 whatwg-url@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.3.0.tgz#92aaee21f4f2a642074357d70ef8500a7cbb171a"
+  version "4.7.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.7.0.tgz#202035ac1955b087cdd20fa8b58ded3ab1cd2af5"
   dependencies:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
@@ -5375,14 +5011,10 @@ which-module@^1.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
 
 which@^1.1.1, which@^1.2.12, which@^1.2.8:
-  version "1.2.12"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.2.12.tgz#de67b5e450269f194909ef23ece4ebe416fa1192"
+  version "1.2.14"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
   dependencies:
-    isexe "^1.1.1"
-
-which@~1.0.5:
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.0.9.tgz#460c1da0f810103d0321a9b633af9e575e64486f"
+    isexe "^2.0.0"
 
 wide-align@^1.1.0:
   version "1.1.0"
@@ -5443,8 +5075,8 @@ y18n@^3.2.0, y18n@^3.2.1:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
 
 yallist@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.0.0.tgz#306c543835f09ee1a4cb23b7bce9ab341c91cdd4"
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
 
 yargs-parser@^4.2.0:
   version "4.2.1"

From 665f80483ee27c6460784733c114f724dacdc675 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 5 Apr 2017 16:53:25 +0100
Subject: [PATCH 048/153] Update build paths in docs (#9340)

---
 docs/contributing/how-to-contribute.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contributing/how-to-contribute.md b/docs/contributing/how-to-contribute.md
index ff2180e0dbb07..5b2c6c5031171 100644
--- a/docs/contributing/how-to-contribute.md
+++ b/docs/contributing/how-to-contribute.md
@@ -115,9 +115,9 @@ We recommend running `npm test` (or its variations above) to make sure you don't
 
 First, run `npm run build`. This will produce pre-built bundles in `build` folder, as well as prepare npm packages inside `build/packages`.
 
-The easiest way to try your changes is to run `npm run build` and then open `fixtures/packaging/globals.html`. This file already uses `react.js` from the `build` folder so it will pick up your changes.
+The easiest way to try your changes is to run `npm run build` and then open `fixtures/packaging/babel-standalone/dev.html`. This file already uses `react.js` from the `build` folder so it will pick up your changes.
 
-If you want to try your changes in your existing React project, you may copy `build/react.js`, `build/react-dom.js`, or any other build products into your app and use them instead of the stable version. If your project uses React from npm, you may delete `react` and `react-dom` in its dependencies and use `npm link` to point them to your local `build` folder:
+If you want to try your changes in your existing React project, you may copy `build/dist/react.development.js`, `build/dist/react-dom.development.js`, or any other build products into your app and use them instead of the stable version. If your project uses React from npm, you may delete `react` and `react-dom` in its dependencies and use `npm link` to point them to your local `build` folder:
 
 ```sh
 cd your_project

From 4fa8122d5d7b0eb60d9bf2aa5e09e4cf4a6a20bf Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 5 Apr 2017 17:16:36 +0100
Subject: [PATCH 049/153] Update release manager with latest change

---
 scripts/release-manager/Readme.md | 37 ++++++++++++++++---------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/scripts/release-manager/Readme.md b/scripts/release-manager/Readme.md
index 54453fe3acc27..34b313b1613e2 100644
--- a/scripts/release-manager/Readme.md
+++ b/scripts/release-manager/Readme.md
@@ -250,36 +250,37 @@ git clone https://github.com/reactjs/react-bower.git ../react-bower
 
 ### Build It!
 
-The next step depends on the type of release you want to cut.
 
-For a **stable** release, run in the working copy:
-
-```
-./node_modules/.bin/grunt release
-```
-
-This will create the build products in the working copy. You won’t see changes in git because the `build` folder is ignored. It will also create a commit and a tag in the `../react-bower` folder. I recommend checking `git log` and running `git show <put last commit hash here>` to verify the changes roughly correspond to what you expect.
-
-For a **pre-release**, run this instead:
+Run in the working copy:
 
 ```
 npm run build
 ```
 
+This will create the build products in the working copy. You won’t see changes in git because the `build` folder is ignored.
+
 ### Verify the Build Works
 
-At the very least, open `fixtures/packaging/index.html` in the browser. You should see a “Hello, World!” fading in on each iframe, and the console should have no errors.
+At the very least, open `fixtures/packaging/babel-standalone/dev.html` in the browser. You should see a “Hello, World!” there, and the console should have no errors.
 
-If you changed anything related to how packages are created, I recommend following the instructions in `fixtures/packaging/README.md` and verifying that each of those manual tests works. You can skip the “build React” step in it but still need to build the fixtures.
+If you changed anything related to how packages are created, I recommend following the instructions in `fixtures/packaging/README.md` to verify all fixtures still work. You can skip the “build React” step in it but still need to build the fixtures. In short, run `node build-all.js` in `fixtures` folder and follow the instructions it prints.
 
 They are manual tests, so the CI wouldn’t have caught errors in them.
 
-### Update the Docs
+### Update Bower and Docs
 
 **This step is only necessary for a stable release.**  
 If you’re just cutting an alpha, you should skip it.
 
-You will see that `docs/js/react-dom.js` and `docs/js/react.js` have changed. This is because the docs are now using a newer version of React. In addition to those changes, bump the version inside `docs/_config.yml`:
+**TODO: We used to have a `grunt release` command that does a few extra things but it was deleted when we moved build process to Rollup. We need to decide if we care about Bower or not, and if we do, either add a similar script back, or write up commands to do it by hand.**
+
+[Here's what the script used to do:](https://github.com/facebook/react/blob/50b3cab3ec7565085da21106791dbaa6fe22d862/grunt/tasks/release.js)
+
+* Copy UMD bundles to `../react-bower`.
+* Commit and tag them in `react-bower` (but not push yet).
+* Copy them to `docs/js/` (note: we changed their filenames so might need to change docs too).
+
+In addition to those changes, bump the version inside `docs/_config.yml`:
 
 ```diff
 - react_version: 15.4.0
@@ -386,10 +387,10 @@ Copy your new release notes from `CHANGELOG.md` and [create a new Release](https
 
 Finally, attach these files to the release:
 
-* `build/dist/react.dev.js`
-* `build/dist/react.min.prod.js`
-* `build/dist/react-dom.dev.js`
-* `build/dist/react-dom.prod.min.js`
+* `build/dist/react.development.js`
+* `build/dist/react.production.min.js`
+* `build/dist/react-dom.development.js`
+* `build/dist/react-dom.production.min.js`
 
 ### Force-Updating the Website
 

From 24dc43c49fd8b1b84ebdbf6e1b83366cd9f3e1b0 Mon Sep 17 00:00:00 2001
From: Dominic Gannaway <trueadm@users.noreply.github.com>
Date: Wed, 5 Apr 2017 17:25:09 +0100
Subject: [PATCH 050/153] fixes circleci/upload_build.sh paths for dist files
 (#9341)

* fixes circleci/upload_build.sh paths for dist files

* updated the react filenames to include development or production
---
 scripts/circleci/upload_build.sh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/scripts/circleci/upload_build.sh b/scripts/circleci/upload_build.sh
index 6b57fceac206c..a17159192eb14 100755
--- a/scripts/circleci/upload_build.sh
+++ b/scripts/circleci/upload_build.sh
@@ -4,14 +4,12 @@ set -e
 
 if [ -z $CI_PULL_REQUEST ] && [ -n "$BUILD_SERVER_ENDPOINT" ]; then
   curl \
-    -F "react=@build/react.js" \
-    -F "react.min=@build/react.min.js" \
-    -F "react-dom=@build/react-dom.js" \
-    -F "react-dom.min=@build/react-dom.min.js" \
-    -F "react-dom-server=@build/react-dom-server.js" \
-    -F "react-dom-server.min=@build/react-dom-server.min.js" \
-    -F "npm-react=@build/packages/react.tgz" \
-    -F "npm-react-dom=@build/packages/react-dom.tgz" \
+    -F "react.development=@build/dist/react.development.js" \
+    -F "react.production.min=@build/dist/react.production.min.js" \
+    -F "react-dom.development=@build/dist/react-dom.development.js" \
+    -F "react-dom.production.min=@build/dist/react-dom.production.min.js" \
+    -F "react-dom-server.development=@build/dist/react-dom-server.development.js" \
+    -F "react-dom-server.production.min=@build/dist/react-dom-server.production.min.js" \
     -F "commit=$CIRCLE_SHA1" \
     -F "date=`git log --format='%ct' -1`" \
     -F "pull_request=false" \

From 6b68410808b341ce20b5538f0c4bd3c20a4c2ac3 Mon Sep 17 00:00:00 2001
From: Dominic Gannaway <trueadm@users.noreply.github.com>
Date: Wed, 5 Apr 2017 18:30:12 +0100
Subject: [PATCH 051/153] Adds support for labels on building bundles (#9342)

* adds support for labels on bundles

* -fiber

* reverts results
---
 scripts/rollup/build.js   |  4 +++-
 scripts/rollup/bundles.js | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js
index fcc139b04b983..30d8d29e9a874 100644
--- a/scripts/rollup/build.js
+++ b/scripts/rollup/build.js
@@ -32,6 +32,7 @@ const RN_PROD = Bundles.bundleTypes.RN_PROD;
 
 const reactVersion = require('../../package.json').version;
 const inputBundleType = argv.type;
+const inputBundleName = argv._ && argv._[0];
 
 // used for when we property mangle with uglify/gcc
 const mangleRegex = new RegExp(
@@ -295,7 +296,8 @@ function getPlugins(
 function createBundle(bundle, bundleType) {
   if (
     (inputBundleType && bundleType.indexOf(inputBundleType) === -1) ||
-    bundle.bundleTypes.indexOf(bundleType) === -1
+    bundle.bundleTypes.indexOf(bundleType) === -1 ||
+    (inputBundleName && bundle.label.indexOf(inputBundleName) === -1)
   ) {
     // Skip this bundle because its config doesn't specify this target.
     return Promise.resolve();
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index 012f8c08b2e20..6a68b36c3d013 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -49,6 +49,7 @@ const bundles = [
     fbEntry: 'src/fb/ReactFBEntry.js',
     hasteName: 'React',
     isRenderer: false,
+    label: 'core',
     manglePropertiesOnProd: false,
     name: 'react',
     paths: [
@@ -81,6 +82,7 @@ const bundles = [
     fbEntry: 'src/fb/ReactDOMFBEntry.js',
     hasteName: 'ReactDOMStack',
     isRenderer: true,
+    label: 'dom-stack',
     manglePropertiesOnProd: false,
     name: 'react-dom-stack',
     paths: [
@@ -110,6 +112,7 @@ const bundles = [
     fbEntry: 'src/fb/ReactDOMFiberFBEntry.js',
     hasteName: 'ReactDOMFiber',
     isRenderer: true,
+    label: 'dom-fiber',
     manglePropertiesOnProd: false,
     name: 'react-dom',
     paths: [
@@ -142,6 +145,7 @@ const bundles = [
     fbEntry: 'src/umd/ReactDOMServerUMDEntry.js',
     hasteName: 'ReactDOMServerStack',
     isRenderer: true,
+    label: 'dom-server',
     manglePropertiesOnProd: false,
     name: 'react-dom/server',
     paths: [
@@ -179,6 +183,7 @@ const bundles = [
     fbEntry: 'src/renderers/art/ReactARTStack.js',
     hasteName: 'ReactARTStack',
     isRenderer: true,
+    label: 'art-stack',
     manglePropertiesOnProd: false,
     name: 'react-art',
     paths: [
@@ -213,6 +218,7 @@ const bundles = [
     fbEntry: 'src/renderers/art/ReactARTFiber.js',
     hasteName: 'ReactARTFiber',
     isRenderer: true,
+    label: 'art-fiber',
     manglePropertiesOnProd: false,
     name: 'react-art',
     paths: [
@@ -252,6 +258,7 @@ const bundles = [
     ],
     hasteName: 'ReactNativeStack',
     isRenderer: true,
+    label: 'native-stack',
     manglePropertiesOnProd: false,
     name: 'react-native-renderer',
     paths: [
@@ -287,6 +294,7 @@ const bundles = [
     ],
     hasteName: 'ReactNativeFiber',
     isRenderer: true,
+    label: 'native-fiber',
     manglePropertiesOnProd: false,
     name: 'react-native-renderer',
     paths: [
@@ -312,6 +320,7 @@ const bundles = [
     fbEntry: 'src/renderers/testing/ReactTestRendererFiber',
     hasteName: 'ReactTestRendererFiber',
     isRenderer: true,
+    label: 'test-fiber',
     manglePropertiesOnProd: false,
     name: 'react-test-renderer',
     paths: [
@@ -337,6 +346,7 @@ const bundles = [
     fbEntry: 'src/renderers/testing/stack/ReactTestRendererStack',
     hasteName: 'ReactTestRendererStack',
     isRenderer: true,
+    label: 'test-stack',
     manglePropertiesOnProd: false,
     name: 'react-test-renderer-stack',
     paths: [
@@ -364,6 +374,7 @@ const bundles = [
     entry: 'src/renderers/noop/ReactNoop.js',
     externals: [],
     isRenderer: true,
+    label: 'noop-fiber',
     manglePropertiesOnProd: false,
     name: 'react-noop-renderer',
     paths: [

From 398d449c4803cf126c616a4c99a8caad75314508 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 5 Apr 2017 18:54:48 +0100
Subject: [PATCH 052/153] Fix the print warnings script (#9344)

---
 package.json                                   |  5 +++--
 scripts/circleci/test_entry_point.sh           |  1 +
 scripts/circleci/test_print_warnings.sh        |  7 +++++++
 .../error-codes/dev-expression-with-codes.js   |  2 +-
 scripts/error-codes/extract-errors.js          |  2 +-
 scripts/fiber/tests-passing.txt                | 10 +++++-----
 scripts/print-warnings/README.md               |  1 +
 .../print-warnings.js                          | 18 +++++++++---------
 scripts/rollup/bundles.js                      |  1 -
 .../__tests__/evalToString-test.js             |  0
 .../{error-codes => shared}/evalToString.js    |  0
 11 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 scripts/circleci/test_print_warnings.sh
 create mode 100644 scripts/print-warnings/README.md
 rename scripts/{error-codes => print-warnings}/print-warnings.js (83%)
 rename scripts/{error-codes => shared}/__tests__/evalToString-test.js (100%)
 rename scripts/{error-codes => shared}/evalToString.js (100%)

diff --git a/package.json b/package.json
index d62a325c602fa..c8ee3166d9f7d 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,8 @@
   "jest": {
     "modulePathIgnorePatterns": [
       "/.module-cache/",
-      "/react/build/"
+      "/react/build/",
+      "/react/scripts/rollup/shims/"
     ],
     "rootDir": "",
     "transform": {
@@ -130,7 +131,7 @@
     "roots": [
       "<rootDir>/eslint-rules",
       "<rootDir>/mocks",
-      "<rootDir>/scripts/error-codes",
+      "<rootDir>/scripts",
       "<rootDir>/src",
       "node_modules/fbjs"
     ],
diff --git a/scripts/circleci/test_entry_point.sh b/scripts/circleci/test_entry_point.sh
index 2a4cbdf665117..85a26c37612d6 100755
--- a/scripts/circleci/test_entry_point.sh
+++ b/scripts/circleci/test_entry_point.sh
@@ -31,6 +31,7 @@ if [ $((0 % CIRCLE_NODE_TOTAL)) -eq "$CIRCLE_NODE_INDEX" ]; then
   COMMANDS_TO_RUN+=('node ./scripts/tasks/flow')
   COMMANDS_TO_RUN+=('node ./scripts/tasks/jest')
   COMMANDS_TO_RUN+=('./scripts/circleci/build.sh')
+  COMMANDS_TO_RUN+=('./scripts/circleci/test_print_warnings.sh')
   COMMANDS_TO_RUN+=('./scripts/circleci/track_stats.sh')
 fi
 
diff --git a/scripts/circleci/test_print_warnings.sh b/scripts/circleci/test_print_warnings.sh
new file mode 100644
index 0000000000000..27be0ace0a2f5
--- /dev/null
+++ b/scripts/circleci/test_print_warnings.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -e
+
+WARNINGS=$(node scripts/print-warnings/print-warnings.js)
+echo "$WARNINGS"
+test ! -z "$WARNINGS"
diff --git a/scripts/error-codes/dev-expression-with-codes.js b/scripts/error-codes/dev-expression-with-codes.js
index 560264878dd3a..f5e359eded929 100644
--- a/scripts/error-codes/dev-expression-with-codes.js
+++ b/scripts/error-codes/dev-expression-with-codes.js
@@ -8,7 +8,7 @@
  */
 'use strict';
 
-var evalToString = require('./evalToString');
+var evalToString = require('../shared/evalToString');
 var existingErrorMap = require('./codes.json');
 var invertObject = require('./invertObject');
 
diff --git a/scripts/error-codes/extract-errors.js b/scripts/error-codes/extract-errors.js
index 89f7743e0767c..b437a9cbde3d2 100644
--- a/scripts/error-codes/extract-errors.js
+++ b/scripts/error-codes/extract-errors.js
@@ -12,7 +12,7 @@ const babylon = require('babylon');
 const fs = require('fs');
 const path = require('path');
 const traverse = require('babel-traverse').default;
-const evalToString = require('./evalToString');
+const evalToString = require('../shared/evalToString');
 const invertObject = require('./invertObject');
 
 const babylonOptions = {
diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index a8e34c1158fe8..0c658781d6468 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -31,17 +31,17 @@ scripts/error-codes/__tests__/dev-expression-with-codes-test.js
 * should warn in non-test envs if the error message cannot be found
 * should not warn in test env if the error message cannot be found
 
-scripts/error-codes/__tests__/evalToString-test.js
-* should support StringLiteral
-* should support string concat (`+`)
-* should throw when it finds other types
-
 scripts/error-codes/__tests__/invertObject-test.js
 * should return an empty object for an empty input
 * should invert key-values
 * should take the last value when there're duplications in vals
 * should preserve the original order
 
+scripts/shared/__tests__/evalToString-test.js
+* should support StringLiteral
+* should support string concat (`+`)
+* should throw when it finds other types
+
 src/isomorphic/__tests__/React-test.js
 * should log a deprecation warning once when using React.createMixin
 
diff --git a/scripts/print-warnings/README.md b/scripts/print-warnings/README.md
new file mode 100644
index 0000000000000..87cacefec4a43
--- /dev/null
+++ b/scripts/print-warnings/README.md
@@ -0,0 +1 @@
+We use this script to extract all messages from `warning()` calls. They don't get substituted with anything in the source or the build. We only do this so we can have a copy of these messages in our internal repository and can spot accidental changes to them.
diff --git a/scripts/error-codes/print-warnings.js b/scripts/print-warnings/print-warnings.js
similarity index 83%
rename from scripts/error-codes/print-warnings.js
rename to scripts/print-warnings/print-warnings.js
index 73ac5e2c1aaac..b861021450368 100644
--- a/scripts/error-codes/print-warnings.js
+++ b/scripts/print-warnings/print-warnings.js
@@ -13,10 +13,9 @@ const fs = require('fs');
 const through = require('through2');
 const traverse = require('babel-traverse').default;
 const gs = require('glob-stream');
+const Bundles = require('../rollup/bundles');
 
-const evalToString = require('./evalToString');
-
-const paths = require('../../gulpfile').paths;
+const evalToString = require('../shared/evalToString');
 
 const babylonOptions = {
   sourceType: 'module',
@@ -62,12 +61,13 @@ function transform(file, enc, cb) {
   });
 }
 
-const sourcePaths = [].concat(
-  paths.react.src,
-  paths.reactDOM.src,
-  paths.reactNative.src,
-  paths.reactTestRenderer.src
-);
+const sourcePaths = Bundles.bundles
+  .filter(
+    bundle =>
+      bundle.bundleTypes.indexOf(Bundles.bundleTypes.FB_DEV) !== -1 ||
+      bundle.bundleTypes.indexOf(Bundles.bundleTypes.FB_PROD) !== -1
+  )
+  .reduce((allPaths, bundle) => [...allPaths, ...bundle.paths], []);
 
 gs(sourcePaths).pipe(
   through.obj(transform, cb => {
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index 6a68b36c3d013..a9010f0d0db35 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -54,7 +54,6 @@ const bundles = [
     name: 'react',
     paths: [
       'src/umd/ReactUMDEntry.js',
-      'src/umd/ReactWithAddonsUMDEntry.js',
       'src/umd/shims/**/*.js',
 
       'src/isomorphic/**/*.js',
diff --git a/scripts/error-codes/__tests__/evalToString-test.js b/scripts/shared/__tests__/evalToString-test.js
similarity index 100%
rename from scripts/error-codes/__tests__/evalToString-test.js
rename to scripts/shared/__tests__/evalToString-test.js
diff --git a/scripts/error-codes/evalToString.js b/scripts/shared/evalToString.js
similarity index 100%
rename from scripts/error-codes/evalToString.js
rename to scripts/shared/evalToString.js

From fc1f324cc4c83e38b618a1cb076cd704bf8867ea Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 5 Apr 2017 19:01:09 +0100
Subject: [PATCH 053/153] Fix warnings script to work on Node 4

---
 scripts/print-warnings/print-warnings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/print-warnings/print-warnings.js b/scripts/print-warnings/print-warnings.js
index b861021450368..e2f0058aa264d 100644
--- a/scripts/print-warnings/print-warnings.js
+++ b/scripts/print-warnings/print-warnings.js
@@ -67,7 +67,7 @@ const sourcePaths = Bundles.bundles
       bundle.bundleTypes.indexOf(Bundles.bundleTypes.FB_DEV) !== -1 ||
       bundle.bundleTypes.indexOf(Bundles.bundleTypes.FB_PROD) !== -1
   )
-  .reduce((allPaths, bundle) => [...allPaths, ...bundle.paths], []);
+  .reduce((allPaths, bundle) => allPaths.concat(bundle.paths), []);
 
 gs(sourcePaths).pipe(
   through.obj(transform, cb => {

From c80570b0167711377b8e836eebd3c0a21dbb14f7 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Wed, 5 Apr 2017 11:29:45 -0700
Subject: [PATCH 054/153] Synced ReactNativeFiber bugfix for leaf-node children
 (#9330)

---
 src/renderers/native/ReactNativeFiber.js | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/renderers/native/ReactNativeFiber.js b/src/renderers/native/ReactNativeFiber.js
index 4b0e71d613df8..ad2bae1a7a05f 100644
--- a/src/renderers/native/ReactNativeFiber.js
+++ b/src/renderers/native/ReactNativeFiber.js
@@ -72,11 +72,16 @@ const NativeRenderer = ReactFiberReconciler({
     parentInstance: Instance | Container,
     child: Instance | TextInstance,
   ): void {
+
+    const childTag = typeof child === 'number'
+      ? child
+      : child._nativeTag;
+
     if (typeof parentInstance === 'number') {
       // Root container
       UIManager.setChildren(
         parentInstance, // containerTag
-        [(child: any)._nativeTag], // reactTags
+        [childTag], // reactTags
       );
     } else {
       const children = parentInstance._children;
@@ -87,7 +92,7 @@ const NativeRenderer = ReactFiberReconciler({
         parentInstance._nativeTag, // containerTag
         [], // moveFromIndices
         [], // moveToIndices
-        [(child: any)._nativeTag], // addChildReactTags
+        [childTag], // addChildReactTags
         [children.length - 1], // addAtIndices
         [], // removeAtIndices
       );
@@ -141,7 +146,7 @@ const NativeRenderer = ReactFiberReconciler({
     );
 
     UIManager.updateView(
-      (instance: any)._nativeTag, // reactTag
+      instance._nativeTag, // reactTag
       viewConfig.uiViewClassName, // viewName
       updatePayload, // props
     );
@@ -282,11 +287,15 @@ const NativeRenderer = ReactFiberReconciler({
     } else {
       children.splice(beforeChildIndex, 0, child);
 
+      const childTag = typeof child === 'number'
+        ? child
+        : child._nativeTag;
+
       UIManager.manageChildren(
         (parentInstance: any)._nativeTag, // containerID
         [], // moveFromIndices
         [], // moveToIndices
-        [(child: any)._nativeTag], // addChildReactTags
+        [childTag], // addChildReactTags
         [beforeChildIndex], // addAtIndices
         [], // removeAtIndices
       );

From 6a48f32f2194423d905bd2e475e093638e12e299 Mon Sep 17 00:00:00 2001
From: Dan Abramov <gaearon@fb.com>
Date: Wed, 5 Apr 2017 19:51:19 +0100
Subject: [PATCH 055/153] Exclude tests from warning print script

---
 scripts/print-warnings/print-warnings.js | 4 +++-
 scripts/rollup/modules.js                | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/scripts/print-warnings/print-warnings.js b/scripts/print-warnings/print-warnings.js
index e2f0058aa264d..dfa9b7c0afe80 100644
--- a/scripts/print-warnings/print-warnings.js
+++ b/scripts/print-warnings/print-warnings.js
@@ -14,6 +14,7 @@ const through = require('through2');
 const traverse = require('babel-traverse').default;
 const gs = require('glob-stream');
 const Bundles = require('../rollup/bundles');
+const Modules = require('../rollup/modules');
 
 const evalToString = require('../shared/evalToString');
 
@@ -67,7 +68,8 @@ const sourcePaths = Bundles.bundles
       bundle.bundleTypes.indexOf(Bundles.bundleTypes.FB_DEV) !== -1 ||
       bundle.bundleTypes.indexOf(Bundles.bundleTypes.FB_PROD) !== -1
   )
-  .reduce((allPaths, bundle) => allPaths.concat(bundle.paths), []);
+  .reduce((allPaths, bundle) => allPaths.concat(bundle.paths), [])
+  .concat(Modules.getExcludedHasteGlobs().map(glob => `!${glob}`));
 
 gs(sourcePaths).pipe(
   through.obj(transform, cb => {
diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js
index 48abc1b6fbfb0..3a3e3a27ace75 100644
--- a/scripts/rollup/modules.js
+++ b/scripts/rollup/modules.js
@@ -347,7 +347,12 @@ function getDefaultReplaceModules(bundleType) {
   );
 }
 
+function getExcludedHasteGlobs() {
+  return exclude;
+}
+
 module.exports = {
+  getExcludedHasteGlobs,
   getDefaultReplaceModules,
   getAliases,
   createModuleMap,

From a85d7eed9a9a15c699341a93ee7dccd23690e0cc Mon Sep 17 00:00:00 2001
From: Dan Abramov <gaearon@fb.com>
Date: Wed, 5 Apr 2017 19:51:23 +0100
Subject: [PATCH 056/153] Run prettier

---
 src/renderers/native/ReactNativeFiber.js | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/renderers/native/ReactNativeFiber.js b/src/renderers/native/ReactNativeFiber.js
index ad2bae1a7a05f..7027f47213756 100644
--- a/src/renderers/native/ReactNativeFiber.js
+++ b/src/renderers/native/ReactNativeFiber.js
@@ -72,10 +72,7 @@ const NativeRenderer = ReactFiberReconciler({
     parentInstance: Instance | Container,
     child: Instance | TextInstance,
   ): void {
-
-    const childTag = typeof child === 'number'
-      ? child
-      : child._nativeTag;
+    const childTag = typeof child === 'number' ? child : child._nativeTag;
 
     if (typeof parentInstance === 'number') {
       // Root container
@@ -287,9 +284,7 @@ const NativeRenderer = ReactFiberReconciler({
     } else {
       children.splice(beforeChildIndex, 0, child);
 
-      const childTag = typeof child === 'number'
-        ? child
-        : child._nativeTag;
+      const childTag = typeof child === 'number' ? child : child._nativeTag;
 
       UIManager.manageChildren(
         (parentInstance: any)._nativeTag, // containerID

From 3a416762e7244b629efed3260396fcbda1caffec Mon Sep 17 00:00:00 2001
From: Dan Abramov <gaearon@fb.com>
Date: Wed, 5 Apr 2017 20:24:30 +0100
Subject: [PATCH 057/153] Fix glob ignore for build script

---
 scripts/rollup/modules.js   |  2 +-
 scripts/rollup/results.json | 94 ++++++++++++++++++-------------------
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js
index 3a3e3a27ace75..9c6bbee5c7ad3 100644
--- a/scripts/rollup/modules.js
+++ b/scripts/rollup/modules.js
@@ -60,7 +60,7 @@ function createModuleMap(paths, extractErrors, bundleType) {
   const moduleMap = {};
 
   paths.forEach(path => {
-    const files = sync(path, exclude);
+    const files = sync(path, {ignore: exclude});
 
     files.forEach(file => {
       if (extractErrors) {
diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
index 48bef38a8b160..4c9f612b05077 100644
--- a/scripts/rollup/results.json
+++ b/scripts/rollup/results.json
@@ -1,5 +1,5 @@
 {
-  "branch": "rollup",
+  "branch": "master",
   "bundleSizes": {
     "react.development.js (UMD_DEV)": {
       "size": 116402,
@@ -10,24 +10,24 @@
       "gzip": 5080
     },
     "react-dom.development.js (UMD_DEV)": {
-      "size": 565236,
-      "gzip": 130605
+      "size": 564925,
+      "gzip": 130471
     },
     "react-dom.production.min.js (UMD_PROD)": {
-      "size": 120184,
-      "gzip": 37868
+      "size": 120123,
+      "gzip": 37844
     },
     "react-dom-server.development.js (UMD_DEV)": {
-      "size": 477786,
-      "gzip": 115723
+      "size": 477463,
+      "gzip": 115586
     },
     "react-dom-server.production.min.js (UMD_PROD)": {
-      "size": 106410,
-      "gzip": 33019
+      "size": 106349,
+      "gzip": 32997
     },
     "react-art.development.js (UMD_DEV)": {
-      "size": 341133,
-      "gzip": 76276
+      "size": 341151,
+      "gzip": 76261
     },
     "react-art.production.min.js (UMD_PROD)": {
       "size": 94939,
@@ -50,64 +50,64 @@
       "gzip": 14328
     },
     "ReactDOMStack-dev.js (FB_DEV)": {
-      "size": 523977,
-      "gzip": 125062
+      "size": 523654,
+      "gzip": 124928
     },
     "ReactDOMStack-prod.js (FB_PROD)": {
-      "size": 351653,
-      "gzip": 84412
+      "size": 351793,
+      "gzip": 84394
     },
     "react-dom.development.js (NODE_DEV)": {
-      "size": 543610,
-      "gzip": 125563
+      "size": 543299,
+      "gzip": 125435
     },
     "react-dom.production.min.js (NODE_PROD)": {
-      "size": 116863,
-      "gzip": 36727
+      "size": 116802,
+      "gzip": 36707
     },
     "ReactDOMFiber-dev.js (FB_DEV)": {
-      "size": 798188,
-      "gzip": 184347
+      "size": 797865,
+      "gzip": 184217
     },
     "ReactDOMFiber-prod.js (FB_PROD)": {
-      "size": 407208,
-      "gzip": 93465
+      "size": 407360,
+      "gzip": 93460
     },
     "react-dom-server.development.js (NODE_DEV)": {
-      "size": 447187,
-      "gzip": 108026
+      "size": 446864,
+      "gzip": 107887
     },
     "react-dom-server.production.min.js (NODE_PROD)": {
-      "size": 101265,
-      "gzip": 31247
+      "size": 101204,
+      "gzip": 31227
     },
     "ReactDOMServerStack-dev.js (FB_DEV)": {
-      "size": 445938,
-      "gzip": 107881
+      "size": 445615,
+      "gzip": 107744
     },
     "ReactDOMServerStack-prod.js (FB_PROD)": {
-      "size": 332920,
-      "gzip": 80268
+      "size": 333060,
+      "gzip": 80242
     },
     "ReactARTStack-dev.js (FB_DEV)": {
-      "size": 494749,
-      "gzip": 118999
+      "size": 494426,
+      "gzip": 118867
     },
     "ReactARTStack-prod.js (FB_PROD)": {
-      "size": 365061,
-      "gzip": 87642
+      "size": 365201,
+      "gzip": 87622
     },
     "react-art.development.js (NODE_DEV)": {
-      "size": 266368,
-      "gzip": 57200
+      "size": 266386,
+      "gzip": 57183
     },
     "react-art.production.min.js (NODE_PROD)": {
       "size": 56517,
       "gzip": 17109
     },
     "ReactARTFiber-dev.js (FB_DEV)": {
-      "size": 265543,
-      "gzip": 57024
+      "size": 265561,
+      "gzip": 57011
     },
     "ReactARTFiber-prod.js (FB_PROD)": {
       "size": 205194,
@@ -122,20 +122,20 @@
       "gzip": 84001
     },
     "ReactTestRendererFiber-dev.js (FB_DEV)": {
-      "size": 263434,
-      "gzip": 55987
+      "size": 263452,
+      "gzip": 55974
     },
     "ReactTestRendererStack-dev.js (FB_DEV)": {
-      "size": 155204,
-      "gzip": 35682
+      "size": 155222,
+      "gzip": 35662
     },
     "react-noop-renderer.development.js (NODE_DEV)": {
-      "size": 255429,
-      "gzip": 53949
+      "size": 255447,
+      "gzip": 53933
     },
     "react-test-renderer.development.js (NODE_DEV)": {
-      "size": 264268,
-      "gzip": 56169
+      "size": 264286,
+      "gzip": 56152
     }
   }
 }
\ No newline at end of file

From 2429fd2cee8ac24f1bd41a425b1e27384dd451f6 Mon Sep 17 00:00:00 2001
From: Dan Abramov <gaearon@fb.com>
Date: Wed, 5 Apr 2017 21:05:23 +0100
Subject: [PATCH 058/153] Fix art fixture

---
 fixtures/art/package.json |  2 +-
 fixtures/art/yarn.lock    | 88 +++------------------------------------
 2 files changed, 6 insertions(+), 84 deletions(-)

diff --git a/fixtures/art/package.json b/fixtures/art/package.json
index f2870feddf706..5b4f61d21393e 100644
--- a/fixtures/art/package.json
+++ b/fixtures/art/package.json
@@ -7,6 +7,6 @@
     "webpack": "^1.14.0"
   },
   "scripts": {
-    "build": "ln -fs ../../build/packages/react node_modules/react && ln -fs ../../build/packages/react-dom node_modules/react-dom && ln -fs ../../build/packages/react-art node_modules/react-art && webpack app.js bundle.js"
+    "build": "ln -fs ../../../build/packages/react node_modules/react && ln -fs ../../../build/packages/react-dom node_modules/react-dom && ln -fs ../../../build/packages/react-art node_modules/react-art && webpack app.js bundle.js"
   }
 }
diff --git a/fixtures/art/yarn.lock b/fixtures/art/yarn.lock
index e4f676b6034b4..03c960d66a3b5 100644
--- a/fixtures/art/yarn.lock
+++ b/fixtures/art/yarn.lock
@@ -73,10 +73,6 @@ arrify@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
 
-asap@~2.0.3:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.5.tgz#522765b50c3510490e52d7dcfe085ef9ba96958f"
-
 asn1@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
@@ -131,7 +127,7 @@ babel-code-frame@^6.22.0:
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-babel-core@^6.24.0, babel-core@^6.7.7:
+babel-core@^6.24.0:
   version "6.24.0"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.24.0.tgz#8f36a0a77f5c155aed6f920b844d23ba56742a02"
   dependencies:
@@ -252,7 +248,7 @@ babel-helpers@^6.23.0:
     babel-runtime "^6.22.0"
     babel-template "^6.23.0"
 
-babel-loader@^6.2.4:
+babel-loader@^6.4.1:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-6.4.1.tgz#0b34112d5b0748a8dcdbf51acf6f9bd42d50b8ca"
   dependencies:
@@ -768,10 +764,6 @@ convert-source-map@^1.1.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
 
-core-js@^1.0.0:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
-
 core-js@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
@@ -847,12 +839,6 @@ emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
 
-encoding@^0.1.11:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-  dependencies:
-    iconv-lite "~0.4.13"
-
 enhanced-resolve@~0.9.0:
   version "0.9.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz#4d6e689b3725f86090927ccc86cd9f1635b89e2e"
@@ -905,18 +891,6 @@ extsprintf@1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.0.2.tgz#e1080e0658e300b06294990cc70e1502235fd550"
 
-fbjs@^0.8.1, fbjs@^0.8.4:
-  version "0.8.12"
-  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.12.tgz#10b5d92f76d45575fd63a217d4ea02bea2f8ed04"
-  dependencies:
-    core-js "^1.0.0"
-    isomorphic-fetch "^2.1.1"
-    loose-envify "^1.0.0"
-    object-assign "^4.1.0"
-    promise "^7.1.1"
-    setimmediate "^1.0.5"
-    ua-parser-js "^0.7.9"
-
 filename-regex@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775"
@@ -1104,10 +1078,6 @@ https-browserify@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82"
 
-iconv-lite@~0.4.13:
-  version "0.4.15"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
-
 ieee754@^1.1.4:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
@@ -1205,10 +1175,6 @@ is-primitive@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
 
-is-stream@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
-
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -1223,13 +1189,6 @@ isobject@^2.0.0:
   dependencies:
     isarray "1.0.0"
 
-isomorphic-fetch@^2.1.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9"
-  dependencies:
-    node-fetch "^1.0.1"
-    whatwg-fetch ">=0.10.0"
-
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -1314,7 +1273,7 @@ longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
 
-loose-envify@^1.0.0, loose-envify@^1.1.0:
+loose-envify@^1.0.0:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
   dependencies:
@@ -1387,13 +1346,6 @@ nan@^2.3.0:
   version "2.5.1"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.1.tgz#d5b01691253326a97a2bbee9e61c55d8d60351e2"
 
-node-fetch@^1.0.1:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
-  dependencies:
-    encoding "^0.1.11"
-    is-stream "^1.0.1"
-
 node-libs-browser@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-0.7.0.tgz#3e272c0819e308935e26674408d7af0e1491b83b"
@@ -1576,12 +1528,6 @@ process@^0.11.0:
   version "0.11.9"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.9.tgz#7bd5ad21aa6253e7da8682264f1e11d11c0318c1"
 
-promise@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/promise/-/promise-7.1.1.tgz#489654c692616b8aa55b0724fa809bb7db49c5bf"
-  dependencies:
-    asap "~2.0.3"
-
 prr@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
@@ -1622,22 +1568,6 @@ rc@^1.1.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-dom@^15.0.2:
-  version "15.4.2"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.4.2.tgz#015363f05b0a1fd52ae9efdd3a0060d90695208f"
-  dependencies:
-    fbjs "^0.8.1"
-    loose-envify "^1.1.0"
-    object-assign "^4.1.0"
-
-react@^15.0.2:
-  version "15.4.2"
-  resolved "https://registry.yarnpkg.com/react/-/react-15.4.2.tgz#41f7991b26185392ba9bae96c8889e7e018397ef"
-  dependencies:
-    fbjs "^0.8.4"
-    loose-envify "^1.1.0"
-    object-assign "^4.1.0"
-
 "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.4, readable-stream@^2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.6.tgz#8b43aed76e71483938d12a8d46c6cf1a00b1f816"
@@ -1777,7 +1707,7 @@ set-immediate-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
 
-setimmediate@^1.0.4, setimmediate@^1.0.5:
+setimmediate@^1.0.4:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
 
@@ -1950,10 +1880,6 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
 
-ua-parser-js@^0.7.9:
-  version "0.7.12"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.12.tgz#04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"
-
 uglify-js@~2.7.3:
   version "2.7.5"
   resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.7.5.tgz#4612c0c7baaee2ba7c487de4904ae122079f2ca8"
@@ -2019,7 +1945,7 @@ webpack-core@~0.6.9:
     source-list-map "~0.1.7"
     source-map "~0.4.1"
 
-webpack@^1.13.0:
+webpack@^1.14.0:
   version "1.14.0"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-1.14.0.tgz#54f1ffb92051a328a5b2057d6ae33c289462c823"
   dependencies:
@@ -2039,10 +1965,6 @@ webpack@^1.13.0:
     watchpack "^0.2.1"
     webpack-core "~0.6.9"
 
-whatwg-fetch@>=0.10.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
-
 wide-align@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.0.tgz#40edde802a71fea1f070da3e62dcda2e7add96ad"

From 84b5b49aec78c927dfa59032fa8c8e7e40784dd5 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Wed, 5 Apr 2017 21:17:10 +0100
Subject: [PATCH 059/153] Delete extra babel-standalone.html: it already exists
 in a folder

---
 fixtures/packaging/babel-standalone.html | 14 --------------
 1 file changed, 14 deletions(-)
 delete mode 100644 fixtures/packaging/babel-standalone.html

diff --git a/fixtures/packaging/babel-standalone.html b/fixtures/packaging/babel-standalone.html
deleted file mode 100644
index ea37f34df0974..0000000000000
--- a/fixtures/packaging/babel-standalone.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<html>
-  <body>
-    <script src="../../build/react.js"></script>
-    <script src="../../build/react-dom.js"></script>
-    <script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
-    <div id="container"></div>
-    <script type="text/babel">
-      ReactDOM.render(
-        <h1>Hello World!</h1>,
-        document.getElementById('container')
-      );
-    </script>
-  </body>
-</html>
\ No newline at end of file

From 3ebdd0911e069260590e301aa80823f3d9f1a85b Mon Sep 17 00:00:00 2001
From: Dominic Gannaway <trueadm@users.noreply.github.com>
Date: Wed, 5 Apr 2017 22:42:12 +0100
Subject: [PATCH 060/153] Fixes the eager react-dom replacement on the rollup
 plugin (#9346)

* Fixes the eager react-dom replacement on the rollup plugin

* added the other replaceInternalModules
---
 scripts/rollup/modules.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js
index 9c6bbee5c7ad3..2be3391469332 100644
--- a/scripts/rollup/modules.js
+++ b/scripts/rollup/modules.js
@@ -178,12 +178,10 @@ function getInternalModules() {
 function replaceInternalModules() {
   // we inline these modules in the bundles rather than leave them as external
   return {
-    'react-dom/lib/ReactPerf': resolve('./src/renderers/shared/ReactPerf.js'),
-    'react-dom/lib/ReactTestUtils': resolve('./src/test/ReactTestUtils.js'),
-    'react-dom/lib/ReactInstanceMap': resolve(
-      './src/renderers/shared/shared/ReactInstanceMap.js'
-    ),
-    'react-dom': resolve('./src/renderers/dom/ReactDOM.js'),
+    "'react-dom/lib/ReactPerf'": `'${resolve('./src/renderers/shared/ReactPerf.js')}'`,
+    "'react-dom/lib/ReactTestUtils'": `'${resolve('./src/test/ReactTestUtils.js')}'`,
+    "'react-dom/lib/ReactInstanceMap'": `'${resolve('./src/renderers/shared/shared/ReactInstanceMap.js')}'`,
+    "'react-dom'": `'${resolve('./src/renderers/dom/ReactDOM.js')}'`,
   };
 }
 

From 832488ab094fe50740faa189c2fc44657a1e6de6 Mon Sep 17 00:00:00 2001
From: Dominic Gannaway <trueadm@users.noreply.github.com>
Date: Wed, 5 Apr 2017 23:18:39 +0100
Subject: [PATCH 061/153] change permissions of test_print_warnings (#9347)

---
 scripts/circleci/test_print_warnings.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 scripts/circleci/test_print_warnings.sh

diff --git a/scripts/circleci/test_print_warnings.sh b/scripts/circleci/test_print_warnings.sh
old mode 100644
new mode 100755

From 6ba42514eaf6458db4be24a4fb507ad2a9e9d7f6 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Thu, 6 Apr 2017 10:39:18 -0700
Subject: [PATCH 062/153] Remove 'takeSnapshot' from ReactNative
 renderer\nUpstream sync from react-native repo (#9356)

---
 src/renderers/native/ReactNativeFiber.js | 3 ---
 src/renderers/native/ReactNativeStack.js | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/src/renderers/native/ReactNativeFiber.js b/src/renderers/native/ReactNativeFiber.js
index 7027f47213756..dd4b7a215d4a7 100644
--- a/src/renderers/native/ReactNativeFiber.js
+++ b/src/renderers/native/ReactNativeFiber.js
@@ -29,7 +29,6 @@ const deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationI
 const emptyObject = require('fbjs/lib/emptyObject');
 const findNodeHandle = require('findNodeHandle');
 const invariant = require('fbjs/lib/invariant');
-const takeSnapshot = require('takeSnapshot');
 
 const {injectInternals} = require('ReactFiberDevToolsHook');
 
@@ -415,8 +414,6 @@ const ReactNative = {
     return NativeRenderer.getPublicRootInstance(root);
   },
 
-  takeSnapshot,
-
   unmountComponentAtNode(containerTag: number) {
     const root = roots.get(containerTag);
     if (root) {
diff --git a/src/renderers/native/ReactNativeStack.js b/src/renderers/native/ReactNativeStack.js
index 0d1f323f0237e..a9fa118cf27b6 100644
--- a/src/renderers/native/ReactNativeStack.js
+++ b/src/renderers/native/ReactNativeStack.js
@@ -18,7 +18,6 @@ var ReactNativeStackInjection = require('ReactNativeStackInjection');
 var ReactUpdates = require('ReactUpdates');
 
 var findNodeHandle = require('findNodeHandle');
-var takeSnapshot = require('takeSnapshot');
 
 ReactNativeInjection.inject();
 ReactNativeStackInjection.inject();
@@ -47,8 +46,6 @@ var ReactNative = {
 
   render: render,
 
-  takeSnapshot,
-
   unmountComponentAtNode: ReactNativeMount.unmountComponentAtNode,
 
   /* eslint-disable camelcase */

From 21bb8c00d4a391aa2de53b63a4faa2685f17543e Mon Sep 17 00:00:00 2001
From: Dan Abramov <gaearon@fb.com>
Date: Thu, 6 Apr 2017 19:48:11 +0100
Subject: [PATCH 063/153] 16.0.0-alpha.7

---
 package.json                              |  2 +-
 packages/react-art/package.json           |  4 +--
 packages/react-dom/package.json           |  4 +--
 packages/react-noop-renderer/package.json |  2 +-
 packages/react-test-renderer/package.json |  4 +--
 packages/react/package.json               |  2 +-
 scripts/rollup/results.json               | 42 +++++++++++------------
 src/ReactVersion.js                       |  2 +-
 yarn.lock                                 | 35 ++++---------------
 9 files changed, 38 insertions(+), 59 deletions(-)

diff --git a/package.json b/package.json
index c8ee3166d9f7d..9cc3af3f92680 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-build",
   "private": true,
-  "version": "16.0.0-alpha.6",
+  "version": "16.0.0-alpha.7",
   "devDependencies": {
     "aliasify": "^2.0.0",
     "art": "^0.10.1",
diff --git a/packages/react-art/package.json b/packages/react-art/package.json
index d105d3c6e6b34..b550b1e0fba68 100644
--- a/packages/react-art/package.json
+++ b/packages/react-art/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-art",
-  "version": "16.0.0-alpha.6",
+  "version": "16.0.0-alpha.7",
   "description": "React ART is a JavaScript library for drawing vector graphics using React. It provides declarative and reactive bindings to the ART library. Using the same declarative API you can render the output to either Canvas, SVG or VML (IE8).",
   "main": "index.js",
   "repository": "facebook/react",
@@ -23,7 +23,7 @@
     "object-assign": "^4.1.0"
   },
   "peerDependencies": {
-    "react": "^16.0.0-alpha.6"
+    "react": "^16.0.0-alpha.7"
   },
   "files": [
     "LICENSE",
diff --git a/packages/react-dom/package.json b/packages/react-dom/package.json
index efd91381e416b..831a2bed68e5e 100644
--- a/packages/react-dom/package.json
+++ b/packages/react-dom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-dom",
-  "version": "16.0.0-alpha.6",
+  "version": "16.0.0-alpha.7",
   "description": "React package for working with the DOM.",
   "main": "index.js",
   "repository": "facebook/react",
@@ -18,7 +18,7 @@
     "object-assign": "^4.1.0"
   },
   "peerDependencies": {
-    "react": "^16.0.0-alpha.6"
+    "react": "^16.0.0-alpha.7"
   },
   "files": [
     "LICENSE",
diff --git a/packages/react-noop-renderer/package.json b/packages/react-noop-renderer/package.json
index c7358af39faae..0402ad8d006dd 100644
--- a/packages/react-noop-renderer/package.json
+++ b/packages/react-noop-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-noop-renderer",
-  "version": "16.0.0-alpha.6",
+  "version": "16.0.0-alpha.7",
   "private": true,
   "description": "React package for testing the Fiber reconciler.",
   "main": "index.js",
diff --git a/packages/react-test-renderer/package.json b/packages/react-test-renderer/package.json
index 4c5389360ee2d..eb2b8732f3e4c 100644
--- a/packages/react-test-renderer/package.json
+++ b/packages/react-test-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-test-renderer",
-  "version": "16.0.0-alpha.6",
+  "version": "16.0.0-alpha.7",
   "description": "React package for snapshot testing.",
   "main": "index.js",
   "repository": "facebook/react",
@@ -19,7 +19,7 @@
     "object-assign": "^4.1.0"
   },
   "peerDependencies": {
-    "react": "^16.0.0-alpha.6"
+    "react": "^16.0.0-alpha.7"
   },
   "files": [
     "LICENSE",
diff --git a/packages/react/package.json b/packages/react/package.json
index fe1076beacfb4..4ce3cc5b9ade9 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react",
   "description": "React is a JavaScript library for building user interfaces.",
-  "version": "16.0.0-alpha.6",
+  "version": "16.0.0-alpha.7",
   "keywords": [
     "react"
   ],
diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
index 4c9f612b05077..f2b0466682d6b 100644
--- a/scripts/rollup/results.json
+++ b/scripts/rollup/results.json
@@ -18,12 +18,12 @@
       "gzip": 37844
     },
     "react-dom-server.development.js (UMD_DEV)": {
-      "size": 477463,
-      "gzip": 115586
+      "size": 477377,
+      "gzip": 115561
     },
     "react-dom-server.production.min.js (UMD_PROD)": {
       "size": 106349,
-      "gzip": 32997
+      "gzip": 32998
     },
     "react-art.development.js (UMD_DEV)": {
       "size": 341151,
@@ -31,7 +31,7 @@
     },
     "react-art.production.min.js (UMD_PROD)": {
       "size": 94939,
-      "gzip": 28977
+      "gzip": 28976
     },
     "react.development.js (NODE_DEV)": {
       "size": 109416,
@@ -47,15 +47,15 @@
     },
     "React-prod.js (FB_PROD)": {
       "size": 56205,
-      "gzip": 14328
+      "gzip": 14329
     },
     "ReactDOMStack-dev.js (FB_DEV)": {
-      "size": 523654,
-      "gzip": 124928
+      "size": 523568,
+      "gzip": 124900
     },
     "ReactDOMStack-prod.js (FB_PROD)": {
-      "size": 351793,
-      "gzip": 84394
+      "size": 351707,
+      "gzip": 84367
     },
     "react-dom.development.js (NODE_DEV)": {
       "size": 543299,
@@ -66,36 +66,36 @@
       "gzip": 36707
     },
     "ReactDOMFiber-dev.js (FB_DEV)": {
-      "size": 797865,
-      "gzip": 184217
+      "size": 797779,
+      "gzip": 184190
     },
     "ReactDOMFiber-prod.js (FB_PROD)": {
       "size": 407360,
       "gzip": 93460
     },
     "react-dom-server.development.js (NODE_DEV)": {
-      "size": 446864,
-      "gzip": 107887
+      "size": 446778,
+      "gzip": 107862
     },
     "react-dom-server.production.min.js (NODE_PROD)": {
       "size": 101204,
       "gzip": 31227
     },
     "ReactDOMServerStack-dev.js (FB_DEV)": {
-      "size": 445615,
-      "gzip": 107744
+      "size": 445529,
+      "gzip": 107719
     },
     "ReactDOMServerStack-prod.js (FB_PROD)": {
-      "size": 333060,
-      "gzip": 80242
+      "size": 332974,
+      "gzip": 80219
     },
     "ReactARTStack-dev.js (FB_DEV)": {
-      "size": 494426,
-      "gzip": 118867
+      "size": 494340,
+      "gzip": 118840
     },
     "ReactARTStack-prod.js (FB_PROD)": {
-      "size": 365201,
-      "gzip": 87622
+      "size": 365115,
+      "gzip": 87595
     },
     "react-art.development.js (NODE_DEV)": {
       "size": 266386,
diff --git a/src/ReactVersion.js b/src/ReactVersion.js
index 6bf2d3b1bba84..9df23ee824959 100644
--- a/src/ReactVersion.js
+++ b/src/ReactVersion.js
@@ -11,4 +11,4 @@
 
 'use strict';
 
-module.exports = '16.0.0-alpha.6';
+module.exports = '16.0.0-alpha.7';
diff --git a/yarn.lock b/yarn.lock
index a2185e1948fbb..0314dfbc94221 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -225,10 +225,6 @@ ast-types@0.8.12:
   version "0.8.12"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.12.tgz#a0d90e4351bb887716c83fd637ebf818af4adfcc"
 
-ast-types@0.8.15:
-  version "0.8.15"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.15.tgz#8eef0827f04dff0ec8857ba925abe3fea6194e52"
-
 ast-types@0.8.18:
   version "0.8.18"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.18.tgz#c8b98574898e8914e9d8de74b947564a9fe929af"
@@ -896,7 +892,7 @@ babel@^5.4.7:
     slash "^1.0.0"
     source-map "^0.5.0"
 
-babylon@6.15.0:
+babylon@6.15.0, babylon@^6.11.0:
   version "6.15.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e"
 
@@ -904,7 +900,7 @@ babylon@^5.8.38:
   version "5.8.38"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-5.8.38.tgz#ec9b120b11bf6ccd4173a18bf217e60b79859ffd"
 
-babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0, babylon@^6.16.1:
+babylon@^6.13.0, babylon@^6.15.0, babylon@^6.16.1:
   version "6.16.1"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.16.1.tgz#30c5a22f481978a9e7f8cdfdf496b11d94b404d3"
 
@@ -1359,15 +1355,7 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.0, concat-stream@^1.5.2:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-concat-stream@~1.5.0, concat-stream@~1.5.1:
+concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@~1.5.0, concat-stream@~1.5.1:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266"
   dependencies:
@@ -2566,7 +2554,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1:
+inherits@2, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
@@ -4046,7 +4034,7 @@ read-pkg@^1.0.0:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.6:
+readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.6:
   version "2.2.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.6.tgz#8b43aed76e71483938d12a8d46c6cf1a00b1f816"
   dependencies:
@@ -4086,7 +4074,7 @@ readline2@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     mute-stream "0.0.5"
 
-recast@0.10.33:
+recast@0.10.33, recast@^0.10.10:
   version "0.10.33"
   resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.33.tgz#942808f7aa016f1fa7142c461d7e5704aaa8d697"
   dependencies:
@@ -4095,15 +4083,6 @@ recast@0.10.33:
     private "~0.1.5"
     source-map "~0.5.0"
 
-recast@^0.10.10:
-  version "0.10.43"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.43.tgz#b95d50f6d60761a5f6252e15d80678168491ce7f"
-  dependencies:
-    ast-types "0.8.15"
-    esprima-fb "~15001.1001.0-dev-harmony-fb"
-    private "~0.1.5"
-    source-map "~0.5.0"
-
 recast@^0.11.17:
   version "0.11.23"
   resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.23.tgz#451fd3004ab1e4df9b4e4b66376b2a21912462d3"
@@ -4849,7 +4828,7 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-typedarray@^0.0.6, typedarray@~0.0.5:
+typedarray@~0.0.5:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 

From 8f7281199dfdcf154ffc0a6fe8034fe623d60c38 Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Thu, 6 Apr 2017 17:20:54 -0700
Subject: [PATCH 064/153] All doc updates forv15.5 (#9359)

* `react-addons-test-utils` -> `react-dom/test-utils`

Updating all references and docs on the `React.addons.TestUtils` and the
shallow renderer to refer to the correct targets.

Instead of:
```
const React = require('react');

// ...
React.addons.Testutils
// or

const ReactTestUtils = require('react-addons-test-utils');
```
we now show:
```
const ReactTestUtils = require('react-dom/test-utils');
```

And for shallow renderer, instead of:
```
const shallowRenderer = TestUtils.createRenderer();
```

we now show:
```
const shallowRenderer = require('react-test-renderer/shallow');
```

* Update the 'prev' and 'next' attributes of 'add-ons' docs

These flags are used to set arrow links to easily navigate through the
documents. They were wrong or missing in some of the 'add-ons' pages and
this bothered me when manually testing the updates from the previous
commit.

* Update syntax for instantiating shallow renderer

Missed this when updating the docs for the changes to shallow-renderer
in React 15.5.

* Fix pointers in addons docs

Thanks @bvaughn for catching this

* Make example of shallow renderer more consistent

We should show using the same variable names between code samples.

* Make names in example even more consistent

We should use the same variable name for the same thing across examples.
`renderer` -> `shallowRenderer`.

* Update docs to deprecate React<CSS>TransitionGroup

 - removes link to the docs about `ReactCSSTransitionGroup` and
   `ReactTransitionGroup` from the main navigation
 - updates 'prev' and 'next' pointers to skip this page
 - adds deprecation warning to the top of the page
 - remove references to these modules from the packages README
 - updates 'add-ons' main page to list this as a deprecated add-on

* Update `React.createClass` to `createReactClass` in the docs

The `React.createClass` method is being deprecated in favor of
`createReactClass`.

* Remove 'React.createClass' from top level API docs

It no longer makes sense to have a section for the 'createClass' method
in this page, since it won't be available as a top level method on
'React'.

I initially was going to pull the section about 'createClass' into a
separate page to add under 'addons' but it was short and duplicative of
the 'react-without-es6' docs. So I just linked to those.

* Remove *most* `React.PropTypes` from the docs

I am doing the docs for `context` in a separate commit because that case
was a bit less clear-cut.

We will no longer support `React.PropTypes` as a built-in feature of
React, and instead should direct folks to use the `PropTypes` project
that stands alone.

Rather than retaining the `React.PropTypes` examples and just revamping
them to show the use of the stand-alone `PropTypes` library with React,
it makes more sense to direct people to that project and reduce the
perceived API area and complexity of React core. The proper place to
document `PropTypes` is in the README or docs of that project, not in
React docs.

* Update `context` docs to not use `React.PropTypes`

We use `React.PropTypes` to define the `contextType` for the `context`
feature of React. It's unclear how this will work once `React.PropTypes`
is replaced by the external `PropTypes` library. Some options;

a) Deprecate `context`, either in v16 or shortly after. Seems reasonable
based on the intense warnings against using context that we have in the
docs -
https://facebook.github.io/react/docs/context.html#why-not-to-use-context
**Except** that probably some widely used libraries depend on it, like
`React-Router`.

b) Expect users will use external `PropTypes` library when defining
`contextTypes` and just don't do our `checkReactTypeSpec` against them
any more in v16.

c) Stop masking context and pass the whole context
unmasked everywhere. Worst option, do not recommend.

I went with `b` and assume that, for now, we will get users to use the
external `PropTypes` when defining context. I will update this PR if we
want a different approach.

* Remove 'addons' items from left nav, and deprecate 'addons' doc page

The plan:
[X] Remove links to 'addons' items from main navigation
[X] Add deprecation notices where appropriate, and update syntax to show
using the separate modules.
[ ] Update other references to 'React.addons' in docs. Coming in next
commit.
--- blocked but coming in future PRs
[ ] Link to a blog post describing the new locations of add-ons in the
deprecation notice on the '/docs/addons.html' page. Blocked until we
actually publish that blog post.
[ ] Move the docs for each add-on to the actual github repo where it now
lives.
[ ] Redirect the old add-ons doc permalinks to the docs in the separate
github repos for those modules.
[ ] Remove the old add-ons doc markdown files from React core docs.

* Remove references to `React.addons` from docs

Just misc. places where we referenced the 'addons' feature. All gone!
---
 docs/_data/nav_docs.yml                     |  21 --
 docs/contributing/codebase-overview.md      |   6 -
 docs/docs/addons-animation.md               |   7 +-
 docs/docs/addons-create-fragment.md         |   3 -
 docs/docs/addons-perf.md                    |   3 -
 docs/docs/addons-pure-render-mixin.md       |   5 +-
 docs/docs/addons-shallow-compare.md         |   1 -
 docs/docs/addons-shallow-renderer.md        |  60 +++++
 docs/docs/addons-test-utils.md              |  53 +---
 docs/docs/addons-two-way-binding-helpers.md |  20 +-
 docs/docs/addons-update.md                  |   1 -
 docs/docs/addons.md                         |   9 +-
 docs/docs/components-and-props.md           |   2 -
 docs/docs/composition-vs-inheritance.md     |   2 -
 docs/docs/conditional-rendering.md          |   2 -
 docs/docs/context.md                        |  20 +-
 docs/docs/react-without-es6.md              |  41 ++--
 docs/docs/reference-pure-render-mixin.md    |   3 +-
 docs/docs/reference-react-component.md      |  25 +-
 docs/docs/reference-react.md                | 259 +-------------------
 docs/docs/typechecking-with-proptypes.md    |   5 +
 docs/warnings/dont-call-proptypes.md        |   3 +
 packages/react/README.md                    |   7 -
 23 files changed, 132 insertions(+), 426 deletions(-)
 create mode 100644 docs/docs/addons-shallow-renderer.md

diff --git a/docs/_data/nav_docs.yml b/docs/_data/nav_docs.yml
index 1e66741d1fb24..58e1c03dca649 100644
--- a/docs/_data/nav_docs.yml
+++ b/docs/_data/nav_docs.yml
@@ -30,8 +30,6 @@
   items:
     - id: jsx-in-depth
       title: JSX In Depth
-    - id: typechecking-with-proptypes
-      title: Typechecking With PropTypes
     - id: refs-and-the-dom
       title: Refs and the DOM
     - id: uncontrolled-components
@@ -65,22 +63,3 @@
       title: DOM Elements
     - id: events
       title: SyntheticEvent
-    - id: addons
-      title: Add-Ons
-      subitems:
-        - id: perf
-          title: Performance Tools
-        - id: test-utils
-          title: Test Utilities
-        - id: animation
-          title: Animation
-        - id: create-fragment
-          title: Keyed Fragments
-        - id: update
-          title: Immutability Helpers
-        - id: pure-render-mixin
-          title: PureRenderMixin
-        - id: shallow-compare
-          title: Shallow Compare
-        - id: two-way-binding-helpers
-          title: Two-way Binding Helpers
diff --git a/docs/contributing/codebase-overview.md b/docs/contributing/codebase-overview.md
index d0062cf331b78..045f2c9030231 100644
--- a/docs/contributing/codebase-overview.md
+++ b/docs/contributing/codebase-overview.md
@@ -401,12 +401,6 @@ React implements a synthetic event system which is agnostic of the renderers and
 
 There is a [video with a deep code dive into it](https://www.youtube.com/watch?v=dRo_egw7tBc) (66 mins).
 
-### Add-ons
-
-Each of the [React add-ons](/react/docs/addons.html) ships as a separate package on npm with a `react-addons-` prefix. Their source is located in [`src/addons`](https://github.com/facebook/react/tree/master/src/addons) with the exception of [`ReactPerf`](https://github.com/facebook/react/blob/master/src/renderers/shared/ReactPerf.js) and [`ReactTestUtils`](https://github.com/facebook/react/blob/master/src/test/ReactTestUtils.js).
-
-Additionally, we provide a standalone build called `react-with-addons.js` which includes React core *and* all add-ons exposed on the `addons` field of the `React` global object.
-
 ### What Next?
 
 Read the [next section](/react/contributing/implementation-notes.html) to learn about the current implementation of reconciler in more detail.
diff --git a/docs/docs/addons-animation.md b/docs/docs/addons-animation.md
index 0f684402730b1..2dd2884ce66d2 100644
--- a/docs/docs/addons-animation.md
+++ b/docs/docs/addons-animation.md
@@ -4,14 +4,15 @@ title: Animation Add-Ons
 permalink: docs/animation.html
 layout: docs
 category: Add-Ons
-prev: addons.html
-next: create-fragment.html
 redirect_from:
   - "docs/animation-ja-JP.html"
   - "docs/animation-ko-KR.html"
   - "docs/animation-zh-CN.html"
 ---
 
+>Note:
+> `ReactTransitionGroup` and `ReactCSSTransitionGroup` are both deprecated as of React v15.5.0. The recommendation is to use `TransitionGroup` and `CSSTransitionGroup` from ['react-transition-group'](https://github.com/reactjs/react-transition-group) instead.
+
 The [`ReactTransitionGroup`](#low-level-api-reacttransitiongroup) add-on component is a low-level API for animation, and [`ReactCSSTransitionGroup`](#high-level-api-reactcsstransitiongroup) is an add-on component for easily implementing basic CSS animations and transitions.
 
 ## High-level API: ReactCSSTransitionGroup
@@ -23,7 +24,6 @@ The [`ReactTransitionGroup`](#low-level-api-reacttransitiongroup) add-on compone
 ```javascript
 import ReactCSSTransitionGroup from 'react-addons-css-transition-group'; // ES6
 var ReactCSSTransitionGroup = require('react-addons-css-transition-group'); // ES5 with npm
-var ReactCSSTransitionGroup = React.addons.CSSTransitionGroup; // ES5 with react-with-addons.js
 ```
 
 ```javascript{31-36}
@@ -231,7 +231,6 @@ You can disable animating `enter` or `leave` animations if you want. For example
 ```javascript
 import ReactTransitionGroup from 'react-addons-transition-group' // ES6
 var ReactTransitionGroup = require('react-addons-transition-group') // ES5 with npm
-var ReactTransitionGroup = React.addons.TransitionGroup; // ES5 with react-with-addons.js
 ```
 
 `ReactTransitionGroup` is the basis for animations. When children are declaratively added or removed from it (as in the [example above](#getting-started)), special lifecycle hooks are called on them.
diff --git a/docs/docs/addons-create-fragment.md b/docs/docs/addons-create-fragment.md
index 527525def5e5a..806aa826f825d 100644
--- a/docs/docs/addons-create-fragment.md
+++ b/docs/docs/addons-create-fragment.md
@@ -4,8 +4,6 @@ title: Keyed Fragments
 permalink: docs/create-fragment.html
 layout: docs
 category: Add-Ons
-prev: animation.html
-next: perf.html
 ---
 
 **Importing**
@@ -13,7 +11,6 @@ next: perf.html
 ```javascript
 import createFragment from 'react-addons-create-fragment'; // ES6
 var createFragment = require('react-addons-create-fragment'); // ES5 with npm
-var createFragment = React.addons.createFragment; // ES5 with react-with-addons.js
 ```
 
 ## Overview
diff --git a/docs/docs/addons-perf.md b/docs/docs/addons-perf.md
index 26f3f24b8fad6..762c75a3e4e75 100644
--- a/docs/docs/addons-perf.md
+++ b/docs/docs/addons-perf.md
@@ -4,8 +4,6 @@ title: Performance Tools
 permalink: docs/perf.html
 layout: docs
 category: Add-Ons
-prev: create-fragment.html
-next: test-utils.html
 ---
 
 **Importing**
@@ -13,7 +11,6 @@ next: test-utils.html
 ```javascript
 import Perf from 'react-addons-perf'; // ES6
 var Perf = require('react-addons-perf'); // ES5 with npm
-var Perf = React.addons.Perf; // ES5 with react-with-addons.js
 ```
 
 
diff --git a/docs/docs/addons-pure-render-mixin.md b/docs/docs/addons-pure-render-mixin.md
index 86193c0371949..02b213bdcc318 100644
--- a/docs/docs/addons-pure-render-mixin.md
+++ b/docs/docs/addons-pure-render-mixin.md
@@ -14,7 +14,6 @@ category: Add-Ons
 ```javascript
 import PureRenderMixin from 'react-addons-pure-render-mixin'; // ES6
 var PureRenderMixin = require('react-addons-pure-render-mixin'); // ES5 with npm
-var PureRenderMixin = React.addons.PureRenderMixin; // ES5 with react-with-addons.js
 ```
 
 ## Overview
@@ -24,7 +23,9 @@ If your React component's render function renders the same result given the same
 Example:
 
 ```js
-React.createClass({
+const createReactClass = require('create-react-class');
+
+createReactClass({
   mixins: [PureRenderMixin],
 
   render: function() {
diff --git a/docs/docs/addons-shallow-compare.md b/docs/docs/addons-shallow-compare.md
index 453c8581c4cbc..55e7f45d309cb 100644
--- a/docs/docs/addons-shallow-compare.md
+++ b/docs/docs/addons-shallow-compare.md
@@ -14,7 +14,6 @@ category: Reference
 ```javascript
 import shallowCompare from 'react-addons-shallow-compare'; // ES6
 var shallowCompare = require('react-addons-shallow-compare'); // ES5 with npm
-var shallowCompare = React.addons.shallowCompare; // ES5 with react-with-addons.js
 ```
 
 ## Overview
diff --git a/docs/docs/addons-shallow-renderer.md b/docs/docs/addons-shallow-renderer.md
new file mode 100644
index 0000000000000..b0f3bd6b05325
--- /dev/null
+++ b/docs/docs/addons-shallow-renderer.md
@@ -0,0 +1,60 @@
+---
+id: shallow-renderer
+title: Shallow Renderer
+permalink: docs/shallow-renderer.html
+layout: docs
+category: Reference
+---
+
+**Importing**
+
+```javascript
+import ReactShallowRenderer from 'react-test-renderer/shallow'; // ES6
+var ReactShallowRenderer = require('react-test-renderer/shallow'); // ES5 with npm
+```
+### Shallow Rendering
+
+Shallow rendering lets you render a component "one level deep" and assert facts about what its render method returns, without worrying about the behavior of child components, which are not instantiated or rendered. This does not require a DOM.
+
+ - [`shallowRenderer.render()`](#shallowrenderer.render)
+ - [`shallowRenderer.getRenderOutput()`](#shallowrenderer.getrenderoutput)
+
+You can think of the shallowRenderer as a "place" to render the component you're testing, and from which you can extract the component's output.
+
+[`shallowRenderer.render()`](#shallowrenderer.render) is similar to [`ReactDOM.render()`](/react/docs/react-dom.html#render) but it doesn't require DOM and only renders a single level deep. This means you can test components isolated from how their children are implemented.
+
+After `shallowRenderer.render()` has been called, you can use [`shallowRenderer.getRenderOutput()`](#shallowrenderer.getrenderoutput) to get the shallowly rendered output.
+
+You can then begin to assert facts about the output. For example, if you have the following component:
+
+```javascript
+function MyComponent() {
+  return (
+    <div>
+      <span className="heading">Title</span>
+      <Subcomponent foo="bar" />
+    </div>
+  );
+}
+```
+
+Then you can assert:
+
+```javascript
+const ReactShallowRenderer = require('react-test-renderer/shallow');
+const shallowRenderer = new ReactShallowRenderer();
+shallowRenderer.render(<MyComponent />);
+const result = shallowRenderer.getRenderOutput();
+
+expect(result.type).toBe('div');
+expect(result.props.children).toEqual([
+  <span className="heading">Title</span>,
+  <Subcomponent foo="bar" />
+]);
+```
+
+Shallow testing currently has some limitations, namely not supporting refs.
+
+We also recommend checking out Enzyme's [Shallow Rendering API](http://airbnb.io/enzyme/docs/api/shallow.html). It provides a nicer higher-level API over the same functionality.
+
+* * *
diff --git a/docs/docs/addons-test-utils.md b/docs/docs/addons-test-utils.md
index 2dd8058d7b157..cda0cb2ac74c1 100644
--- a/docs/docs/addons-test-utils.md
+++ b/docs/docs/addons-test-utils.md
@@ -4,15 +4,13 @@ title: Test Utilities
 permalink: docs/test-utils.html
 layout: docs
 category: Reference
-prev: perf.html
 ---
 
 **Importing**
 
 ```javascript
-import ReactTestUtils from 'react-addons-test-utils'; // ES6
-var ReactTestUtils = require('react-addons-test-utils'); // ES5 with npm
-var ReactTestUtils = React.addons.TestUtils; // ES5 with react-with-addons.js
+import ReactTestUtils from 'react-dom/test-utils'; // ES6
+var ReactTestUtils = require('react-dom/test-utils'); // ES5 with npm
 ```
 
 ## Overview
@@ -39,53 +37,6 @@ var ReactTestUtils = React.addons.TestUtils; // ES5 with react-with-addons.js
  - [`scryRenderedComponentsWithType()`](#scryrenderedcomponentswithtype)
  - [`findRenderedComponentWithType()`](#findrenderedcomponentwithtype)
 
-### Shallow Rendering
-
-Shallow rendering lets you render a component "one level deep" and assert facts about what its render method returns, without worrying about the behavior of child components, which are not instantiated or rendered. This does not require a DOM.
-
- - [`createRenderer()`](#createrenderer)
- - [`shallowRenderer.render()`](#shallowrenderer.render)
- - [`shallowRenderer.getRenderOutput()`](#shallowrenderer.getrenderoutput)
-
-Call [`createRenderer()`](#createrenderer) in your tests to create a shallow renderer. You can think of this as a "place" to render the component you're testing, and from which you can extract the component's output.
-
-[`shallowRenderer.render()`](#shallowrenderer.render) is similar to [`ReactDOM.render()`](/react/docs/react-dom.html#render) but it doesn't require DOM and only renders a single level deep. This means you can test components isolated from how their children are implemented.
-
-After `shallowRenderer.render()` has been called, you can use [`shallowRenderer.getRenderOutput()`](#shallowrenderer.getrenderoutput) to get the shallowly rendered output.
-
-You can then begin to assert facts about the output. For example, if you have the following component:
-
-```javascript
-function MyComponent() {
-  return (
-    <div>
-      <span className="heading">Title</span>
-      <Subcomponent foo="bar" />
-    </div>
-  );
-}
-```
-
-Then you can assert:
-
-```javascript
-const renderer = ReactTestUtils.createRenderer();
-renderer.render(<MyComponent />);
-const result = renderer.getRenderOutput();
-
-expect(result.type).toBe('div');
-expect(result.props.children).toEqual([
-  <span className="heading">Title</span>,
-  <Subcomponent foo="bar" />
-]);
-```
-
-Shallow testing currently has some limitations, namely not supporting refs.
-
-We also recommend checking out Enzyme's [Shallow Rendering API](http://airbnb.io/enzyme/docs/api/shallow.html). It provides a nicer higher-level API over the same functionality.
-
-* * *
-
 ## Reference
 
 ### `Simulate`
diff --git a/docs/docs/addons-two-way-binding-helpers.md b/docs/docs/addons-two-way-binding-helpers.md
index 29e9662e93b6b..1d08193c0bcee 100644
--- a/docs/docs/addons-two-way-binding-helpers.md
+++ b/docs/docs/addons-two-way-binding-helpers.md
@@ -4,8 +4,6 @@ title: Two-way Binding Helpers
 permalink: docs/two-way-binding-helpers.html
 layout: docs
 category: Add-Ons
-prev: pure-render-mixin.html
-next: update.html
 ---
 
 > Note:
@@ -16,7 +14,6 @@ next: update.html
 ```javascript
 import LinkedStateMixin from 'react-addons-linked-state-mixin'; // ES6
 var LinkedStateMixin = require('react-addons-linked-state-mixin'); // ES5 with npm
-var LinkedStateMixin = React.addons.LinkedStateMixin; // ES5 with react-with-addons.js
 ```
 
 ## Overview
@@ -40,7 +37,9 @@ Two-way binding -- implicitly enforcing that some value in the DOM is always con
 Here's a simple form example without using `LinkedStateMixin`:
 
 ```javascript
-var NoLink = React.createClass({
+var createReactClass = require('create-react-class');
+
+var NoLink = createReactClass({
   getInitialState: function() {
     return {message: 'Hello!'};
   },
@@ -57,7 +56,9 @@ var NoLink = React.createClass({
 This works really well and it's very clear how data is flowing, however, with a lot of form fields it could get a bit verbose. Let's use `LinkedStateMixin` to save us some typing:
 
 ```javascript{4,9}
-var WithLink = React.createClass({
+var createReactClass = require('create-react-class');
+
+var WithLink = createReactClass({
   mixins: [LinkedStateMixin],
   getInitialState: function() {
     return {message: 'Hello!'};
@@ -83,8 +84,10 @@ There are two sides to `LinkedStateMixin`: the place where you create the `value
 
 ### valueLink Without LinkedStateMixin
 
-```javascript{5-7,9-12}
-var WithoutMixin = React.createClass({
+```javascript{7-9,11-14}
+var createReactClass = require('create-react-class');
+
+var WithoutMixin = createReactClass({
   getInitialState: function() {
     return {message: 'Hello!'};
   },
@@ -107,8 +110,9 @@ As you can see, `valueLink` objects are very simple objects that just have a `va
 
 ```javascript
 var LinkedStateMixin = require('react-addons-linked-state-mixin');
+var createReactClass = require('create-react-class');
 
-var WithoutLink = React.createClass({
+var WithoutLink = createReactClass({
   mixins: [LinkedStateMixin],
   getInitialState: function() {
     return {message: 'Hello!'};
diff --git a/docs/docs/addons-update.md b/docs/docs/addons-update.md
index ecebc205401d4..b85ea808663bb 100644
--- a/docs/docs/addons-update.md
+++ b/docs/docs/addons-update.md
@@ -14,7 +14,6 @@ category: Add-Ons
 ```javascript
 import update from 'react-addons-update'; // ES6
 var update = require('react-addons-update'); // ES5 with npm
-var update = React.addons.update; // ES5 with react-with-addons.js
 ```
 
 ## Overview
diff --git a/docs/docs/addons.md b/docs/docs/addons.md
index a927a4266ac47..982f5e481fc59 100644
--- a/docs/docs/addons.md
+++ b/docs/docs/addons.md
@@ -4,9 +4,11 @@ title: Add-Ons
 permalink: docs/addons.html
 ---
 
+>Note:
+> `React.addons` is deprecated as of React v15.5. The add-ons have now all either been deprecated or moved to separate modules.
+
 The React add-ons are a collection of useful utility modules for building React apps. **These should be considered experimental** and tend to change more often than the core.
 
-- [`TransitionGroup` and `CSSTransitionGroup`](animation.html), for dealing with animations and transitions that are usually not simple to implement, such as before a component's removal.
 - [`createFragment`](create-fragment.html), to create a set of externally-keyed children.
 
 The add-ons below are in the development (unminified) version of React only:
@@ -24,11 +26,12 @@ The add-ons below are considered legacy and their use is discouraged.
 
 ### Deprecated Add-ons
 
-[`LinkedStateMixin`](two-way-binding-helpers.html) has been deprecated.
+- [`LinkedStateMixin`](two-way-binding-helpers.html) has been deprecated.
+- [`TransitionGroup` and `CSSTransitionGroup`](animation.html) have been deprecated.
 
 ## Using React with Add-ons
 
-If using npm, you can install the add-ons individually from npm (e.g. `npm install react-addons-test-utils`) and import them:
+You can install the add-ons individually from npm (e.g. `npm install react-addons-create-fragment`) and import them:
 
 ```javascript
 import Perf from 'react-addons-perf'; // ES6
diff --git a/docs/docs/components-and-props.md b/docs/docs/components-and-props.md
index 150138fb91b60..d1bf5ca9d3664 100644
--- a/docs/docs/components-and-props.md
+++ b/docs/docs/components-and-props.md
@@ -12,8 +12,6 @@ redirect_from:
   - "docs/transferring-props-zh-CN.html"
   - "tips/props-in-getInitialState-as-anti-pattern.html"
   - "tips/communicate-between-components.html"
-prev: rendering-elements.html
-next: state-and-lifecycle.html
 ---
 
 Components let you split the UI into independent, reusable pieces, and think about each piece in isolation.
diff --git a/docs/docs/composition-vs-inheritance.md b/docs/docs/composition-vs-inheritance.md
index 0ac5cd45b21cc..2817811a669c4 100644
--- a/docs/docs/composition-vs-inheritance.md
+++ b/docs/docs/composition-vs-inheritance.md
@@ -3,8 +3,6 @@ id: composition-vs-inheritance
 title: Composition vs Inheritance
 permalink: docs/composition-vs-inheritance.html
 redirect_from: "docs/multiple-components.html"
-prev: lifting-state-up.html
-next: thinking-in-react.html
 ---
 
 React has a powerful composition model, and we recommend using composition instead of inheritance to reuse code between components.
diff --git a/docs/docs/conditional-rendering.md b/docs/docs/conditional-rendering.md
index ea1be02a4c850..7cfc60a8f9531 100644
--- a/docs/docs/conditional-rendering.md
+++ b/docs/docs/conditional-rendering.md
@@ -2,8 +2,6 @@
 id: conditional-rendering
 title: Conditional Rendering
 permalink: docs/conditional-rendering.html
-prev: handling-events.html
-next: lists-and-keys.html
 redirect_from: "tips/false-in-jsx.html"
 ---
 
diff --git a/docs/docs/context.md b/docs/docs/context.md
index cfe86556f599d..e3efaf5d5b308 100644
--- a/docs/docs/context.md
+++ b/docs/docs/context.md
@@ -4,11 +4,15 @@ title: Context
 permalink: docs/context.html
 ---
 
+>Note:
+> As of React v15.5 the `React.PropTypes` helper is deprecated, and we recommend using the [`prop-types` library](https://github.com/aackerman/PropTypes) to define `contextTypes`.
+
 With React, it's easy to track the flow of data through your React components. When you look at a component, you can see which props are being passed, which makes your apps easy to reason about.
 
 In some cases, you want to pass data through the component tree without having to pass the props down manually at every level.
 You can do this directly in React with the powerful "context" API.
 
+
 ## Why Not To Use Context
 
 The vast majority of applications do not need to use context.
@@ -59,7 +63,9 @@ class MessageList extends React.Component {
 
 In this example, we manually thread through a `color` prop in order to style the `Button` and `Message` components appropriately. Using context, we can pass this through the tree automatically:
 
-```javascript{4,11-13,19,26-28,38-40}
+```javascript{6,13-15,21,28-30,40-42}
+const PropTypes = require('prop-types');
+
 class Button extends React.Component {
   render() {
     return (
@@ -71,7 +77,7 @@ class Button extends React.Component {
 }
 
 Button.contextTypes = {
-  color: React.PropTypes.string
+  color: PropTypes.string
 };
 
 class Message extends React.Component {
@@ -98,7 +104,7 @@ class MessageList extends React.Component {
 }
 
 MessageList.childContextTypes = {
-  color: React.PropTypes.string
+  color: PropTypes.string
 };
 ```
 
@@ -151,12 +157,14 @@ If `contextTypes` is defined within a component, the following [lifecycle method
 Stateless functional components are also able to reference `context` if `contextTypes` is defined as a property of the function. The following code shows a `Button` component written as a stateless functional component.
 
 ```javascript
+const PropTypes = require('prop-types');
+
 const Button = ({children}, context) =>
   <button style={{'{{'}}background: context.color}}>
     {children}
   </button>;
 
-Button.contextTypes = {color: React.PropTypes.string};
+Button.contextTypes = {color: PropTypes.string};
 ```
 
 ## Updating Context
@@ -168,6 +176,8 @@ React has an API to update context, but it is fundamentally broken and you shoul
 The `getChildContext` function will be called when the state or props changes. In order to update data in the context, trigger a local state update with `this.setState`. This will trigger a new context and changes will be received by the children.
 
 ```javascript
+const PropTypes = require('prop-types');
+
 class MediaQuery extends React.Component {
   constructor(props) {
     super(props);
@@ -196,7 +206,7 @@ class MediaQuery extends React.Component {
 }
 
 MediaQuery.childContextTypes = {
-  type: React.PropTypes.string
+  type: PropTypes.string
 };
 ```
 
diff --git a/docs/docs/react-without-es6.md b/docs/docs/react-without-es6.md
index 84fa1fefe7f06..e49a5e0757088 100644
--- a/docs/docs/react-without-es6.md
+++ b/docs/docs/react-without-es6.md
@@ -14,45 +14,38 @@ class Greeting extends React.Component {
 }
 ```
 
-If you don't use ES6 yet, you may use the `React.createClass` helper instead:
+If you don't use ES6 yet, you may use the `create-react-class` module instead:
 
 
 ```javascript
-var Greeting = React.createClass({
+var createReactClass = require('create-react-class');
+var Greeting = createReactClass({
   render: function() {
     return <h1>Hello, {this.props.name}</h1>;
   }
 });
 ```
 
-The API of ES6 classes is similar to `React.createClass` with a few exceptions.
+The API of ES6 classes is similar to `createReactClass()` with a few exceptions.
 
-## Declaring Prop Types and Default Props
+## Declaring Default Props
 
-With functions and ES6 classes, `propTypes` and `defaultProps` are defined as properties on the components themselves:
+With functions and ES6 classes `defaultProps` is defined as a property on the component itself:
 
 ```javascript
 class Greeting extends React.Component {
   // ...
 }
 
-Greeting.propTypes = {
-  name: React.PropTypes.string
-};
-
 Greeting.defaultProps = {
   name: 'Mary'
 };
 ```
 
-With `React.createClass()`, you need to define `propTypes` as a property on the passed object, and `getDefaultProps()` as a function on it:
+With `createReactClass()`, you need to define `getDefaultProps()` as a function on the passed object:
 
 ```javascript
-var Greeting = React.createClass({
-  propTypes: {
-    name: React.PropTypes.string
-  },
-
+var Greeting = createReactClass({
   getDefaultProps: function() {
     return {
       name: 'Mary'
@@ -78,10 +71,10 @@ class Counter extends React.Component {
 }
 ```
 
-With `React.createClass()`, you have to provide a separate `getInitialState` method that returns the initial state:
+With `createReactClass()`, you have to provide a separate `getInitialState` method that returns the initial state:
 
 ```javascript
-var Counter = React.createClass({
+var Counter = createReactClass({
   getInitialState: function() {
     return {count: this.props.initialCount};
   },
@@ -117,14 +110,14 @@ class SayHello extends React.Component {
 }
 ```
 
-With `React.createClass()`, this is not necessary because it binds all methods:
+With `createReactClass()`, this is not necessary because it binds all methods:
 
 ```javascript
-var SayHello = React.createClass({
+var SayHello = createReactClass({
   getInitialState: function() {
     return {message: 'Hello!'};
   },
-  
+
   handleClick: function() {
     alert(this.state.message);
   },
@@ -172,7 +165,7 @@ If you'd rather play it safe, you have a few options:
 
 * Bind methods in the constructor.
 * Use arrow functions, e.g. `onClick={(e) => this.handleClick(e)}`.
-* Keep using `React.createClass()`.
+* Keep using `createReactClass`.
 
 ## Mixins
 
@@ -184,7 +177,7 @@ If you'd rather play it safe, you have a few options:
 >
 >This section exists only for the reference.
 
-Sometimes very different components may share some common functionality. These are sometimes called [cross-cutting concerns](https://en.wikipedia.org/wiki/Cross-cutting_concern). [`React.createClass`](/react/docs/top-level-api.html#react.createclass) lets you use a legacy `mixins` system for that.
+Sometimes very different components may share some common functionality. These are sometimes called [cross-cutting concerns](https://en.wikipedia.org/wiki/Cross-cutting_concern). [`createReactClass`](/react/docs/top-level-api.html#react.createclass) lets you use a legacy `mixins` system for that.
 
 One common use case is a component wanting to update itself on a time interval. It's easy to use `setInterval()`, but it's important to cancel your interval when you don't need it anymore to save memory. React provides [lifecycle methods](/react/docs/working-with-the-browser.html#component-lifecycle) that let you know when a component is about to be created or destroyed. Let's create a simple mixin that uses these methods to provide an easy `setInterval()` function that will automatically get cleaned up when your component is destroyed.
 
@@ -201,7 +194,9 @@ var SetIntervalMixin = {
   }
 };
 
-var TickTock = React.createClass({
+var createReactClass = require('create-react-class');
+
+var TickTock = createReactClass({
   mixins: [SetIntervalMixin], // Use the mixin
   getInitialState: function() {
     return {seconds: 0};
diff --git a/docs/docs/reference-pure-render-mixin.md b/docs/docs/reference-pure-render-mixin.md
index 4b2e5a439dbfd..cee8bcaa948bd 100644
--- a/docs/docs/reference-pure-render-mixin.md
+++ b/docs/docs/reference-pure-render-mixin.md
@@ -16,7 +16,8 @@ Example:
 
 ```js
 var PureRenderMixin = require('react-addons-pure-render-mixin');
-React.createClass({
+var createReactClass = require('create-react-class');
+createReactClass({
   mixins: [PureRenderMixin],
 
   render: function() {
diff --git a/docs/docs/reference-react-component.md b/docs/docs/reference-react-component.md
index b274da6edf332..d8c2be7302fec 100644
--- a/docs/docs/reference-react-component.md
+++ b/docs/docs/reference-react-component.md
@@ -31,7 +31,7 @@ class Greeting extends React.Component {
 }
 ```
 
-If you don't use ES6 yet, you may use the [`React.createClass`](/react/docs/react-api.html#createclass) helper instead. Take a look at [Using React without ES6](/react/docs/react-without-es6.html) to learn more.
+If you don't use ES6 yet, you may use the [`create-react-class`](/react/docs/react-api.html#createclass) module instead. Take a look at [Using React without ES6](/react/docs/react-without-es6.html) to learn more.
 
 ### The Component Lifecycle
 
@@ -73,7 +73,6 @@ Each component also provides some other APIs:
 
   - [`defaultProps`](#defaultprops)
   - [`displayName`](#displayname)
-  - [`propTypes`](#proptypes)
 
 ### Instance Properties
 
@@ -122,7 +121,7 @@ constructor(props) {
   this.state = {
     color: props.initialColor
   };
-}  
+}
 ```
 
 Beware of this pattern, as it effectively "forks" the props and can lead to bugs. Instead of syncing props to state, you often want to [lift the state up](/react/docs/lifting-state-up.html).
@@ -315,26 +314,6 @@ The `displayName` string is used in debugging messages. JSX sets this value auto
 
 * * *
 
-### `propTypes`
-
-`propTypes` can be defined as a property on the component class itself, to define what types the props should be. It should be a map from prop names to types as defined in [`React.PropTypes`](/react/docs/react-api.html#react.proptypes). In development mode, when an invalid value is provided for a prop, a warning will be shown in the JavaScript console. In production mode, `propTypes` checks are skipped for efficiency.
-
-For example, this code ensures that the `color` prop is a string:
-
-```js
-class CustomButton extends React.Component {
-  // ...
-}
-
-CustomButton.propTypes = {
-  color: React.PropTypes.string
-};
-```
-
-We recommend using [Flow](https://flowtype.org/) when possible, to get compile-time typechecking instead of runtime typechecking. [Flow has built-in support for React](https://flowtype.org/docs/react.html) so it's easy to run static analysis on a React app.
-
-* * *
-
 ## Instance Properties
 
 ### `props`
diff --git a/docs/docs/reference-react.md b/docs/docs/reference-react.md
index a00770a2fb5f9..abcdfd91b05a1 100644
--- a/docs/docs/reference-react.md
+++ b/docs/docs/reference-react.md
@@ -25,9 +25,7 @@ React components let you split the UI into independent, reusable pieces, and thi
  - [`React.Component`](#react.component)
  - [`React.PureComponent`](#react.purecomponent)
 
-If you don't use ES6 classes, you may use this helper instead.
-
- - [`createClass()`](#createclass)
+If you don't use ES6 classes, you may use the `create-react-class` module instead. See [Using React without ES6](/react/docs/react-without-es6.html) for more information.
 
 ### Creating React Elements
 
@@ -46,38 +44,6 @@ See [Using React without JSX](/react/docs/react-without-jsx.html) for more infor
 - [`isValidElement()`](#isvalidelement)
 - [`React.Children`](#react.children)
 
-### Typechecking with PropTypes
-
-You can use `React.PropTypes` to run typechecking on the props for a component.
-
- - [`React.PropTypes`](#react.proptypes)
- - [`React.PropTypes.array`](#react.proptypes.array)
- - [`React.PropTypes.bool`](#react.proptypes.bool)
- - [`React.PropTypes.func`](#react.proptypes.func)
- - [`React.PropTypes.number`](#react.proptypes.number)
- - [`React.PropTypes.object`](#react.proptypes.object)
- - [`React.PropTypes.string`](#react.proptypes.string)
- - [`React.PropTypes.symbol`](#react.proptypes.symbol)
- - [`React.PropTypes.node`](#react.proptypes.node)
- - [`React.PropTypes.element`](#react.proptypes.element)
- - [`React.PropTypes.instanceOf()`](#react.proptypes.instanceof)
- - [`React.PropTypes.oneOf()`](#react.proptypes.oneof)
- - [`React.PropTypes.oneOfType()`](#react.proptypes.oneoftype)
- - [`React.PropTypes.arrayOf()`](#react.proptypes.arrayof)
- - [`React.PropTypes.objectOf()`](#react.proptypes.objectof)
- - [`React.PropTypes.shape()`](#react.proptypes.shape)
- - [`React.PropTypes.any`](#react.proptypes.any)
-
-Validators treat props as optional by default. You can use `isRequired` to make sure a warning is shown if the prop is not provided.
-
- - [`isRequired`](#isrequired)
-
-### Add-Ons
-
-If you're using [`react-with-addons.js`](/react/docs/addons.html), the React Add-Ons will be available via `React.addons`.
-
- - [`React.addons`](#react.addons)
-
 * * *
 
 ## Reference
@@ -112,26 +78,6 @@ If your React component's `render()` function renders the same result given the
 
 * * *
 
-### `createClass()`
-
-```javascript
-React.createClass(specification)
-```
-
-If you don't use ES6 yet, you may use the `React.createClass()` helper instead to create a component class.
-
-```javascript
-var Greeting = React.createClass({
-  render: function() {
-    return <h1>Hello, {this.props.name}</h1>;
-  }
-});
-```
-
-See [Using React without ES6](/react/docs/react-without-es6.html) for more information.
-
-* * *
-
 ### `createElement()`
 
 ```javascript
@@ -245,206 +191,3 @@ Returns the `children` opaque data structure as a flat array with keys assigned
 > Note:
 >
 > `React.Children.toArray()` changes keys to preserve the semantics of nested arrays when flattening lists of children. That is, `toArray` prefixes each key in the returned array so that each element's key is scoped to the input array containing it.
-
-* * *
-
-### `React.PropTypes`
-
-`React.PropTypes` exports a range of validators that can be used with a component's `propTypes` object to validate props being passed to your components.
-
-For more information about `PropTypes`, see [Typechecking with PropTypes](/react/docs/typechecking-with-proptypes.html).
-
-#### `React.PropTypes.array`
-
-```javascript
-React.PropTypes.array
-```
-
-Validates that a prop is a JavaScript array primitive.
-
-#### `React.PropTypes.bool`
-
-```javascript
-React.PropTypes.bool
-```
-
-Validates that a prop is a JavaScript bool primitive.
-
-#### `React.PropTypes.func`
-
-```javascript
-React.PropTypes.func
-```
-
-Validates that a prop is a JavaScript function.
-
-#### `React.PropTypes.number`
-
-```javascript
-React.PropTypes.number
-```
-
-Validates that a prop is a JavaScript number primitive.
-
-#### `React.PropTypes.object`
-
-```javascript
-React.PropTypes.object
-```
-
-Validates that a prop is a JavaScript object.
-
-#### `React.PropTypes.string`
-
-```javascript
-React.PropTypes.string
-```
-
-Validates that a prop is a JavaScript string primitive.
-
-#### `React.PropTypes.symbol`
-
-```javascript
-React.PropTypes.symbol
-```
-
-Validates that a prop is a JavaScript symbol.
-
-#### `React.PropTypes.node`
-
-```javascript
-React.PropTypes.node
-```
-
-Validates that a prop is anything that can be rendered: numbers, strings, elements or an array (or fragment) containing these types.
-
-#### `React.PropTypes.element`
-
-```javascript
-React.PropTypes.element
-```
-
-Validates that a prop is a React element.
-
-#### `React.PropTypes.instanceOf()`
-
-```javascript
-React.PropTypes.instanceOf(class)
-```
-
-Validates that a prop is an instance of a class. This uses JavaScript's `instanceof` operator.
-
-#### `React.PropTypes.oneOf()`
-
-```javascript
-React.PropTypes.oneOf(arrayOfValues)
-```
-
-Validates that a prop is limited to specific values by treating it as an enum.
-
-```javascript
-MyComponent.propTypes = {
-  optionalEnum: React.PropTypes.oneOf(['News', 'Photos']),
-}
-```
-
-#### `React.PropTypes.oneOfType()`
-
-```javascript
-React.PropTypes.oneOfType(arrayOfPropTypes)
-```
-
-Validates that a prop is an object that could be one of many types.
-
-```javascript
-MyComponent.propTypes = {
-  optionalUnion: React.PropTypes.oneOfType([
-    React.PropTypes.string,
-    React.PropTypes.number,
-    React.PropTypes.instanceOf(Message)
-  ]),
-}
-```
-
-#### `React.PropTypes.arrayOf()`
-
-```javascript
-React.PropTypes.arrayOf(propType)
-```
-
-Validates that a prop is an array of a certain type.
-
-```javascript
-MyComponent.propTypes = {
-  optionalArrayOf: React.PropTypes.arrayOf(React.PropTypes.number),
-}
-```
-
-#### `React.PropTypes.objectOf()`
-
-```javascript
-React.PropTypes.objectOf(propType)
-```
-
-Validates that a prop is an object with property values of a certain type.
-
-```javascript
-MyComponent.propTypes = {
-  optionalObjectOf: React.PropTypes.objectOf(React.PropTypes.number),
-}
-```
-
-#### `React.PropTypes.shape()`
-
-```javascript
-React.PropTypes.shape(object)
-```
-
-Validates that a prop is an object taking on a particular shape.
-
-```javascript
-MyComponent.propTypes = {
-  optionalObjectWithShape: React.PropTypes.shape({
-    color: React.PropTypes.string,
-    fontSize: React.PropTypes.number
-  }),
-}
-```
-
-#### `React.PropTypes.any`
-
-```javascript
-React.PropTypes.any
-```
-
-Validates that a prop has a value of any data type. Usually followed by `isRequired`.
-
-```javascript
-MyComponent.propTypes = {
-  requiredAny: React.PropTypes.any.isRequired,
-}
-```
-
-### `isRequired`
-
-```javascript
-propType.isRequired
-```
-
-You can chain any of the above validators with `isRequired` to make sure a warning is shown if the prop is not provided.
-
-```javascript
-MyComponent.propTypes = {
-  requiredFunc: React.PropTypes.func.isRequired,
-}
-```
-
-* * *
-
-### `React.addons`
-
-```javascript
-React.addons
-```
-
-`React.addons` exports a range of add-ons when using [`react-with-addons.js`](/react/docs/addons.html).
diff --git a/docs/docs/typechecking-with-proptypes.md b/docs/docs/typechecking-with-proptypes.md
index e3c4abd200cb1..63c3241c2e1ce 100644
--- a/docs/docs/typechecking-with-proptypes.md
+++ b/docs/docs/typechecking-with-proptypes.md
@@ -2,8 +2,13 @@
 id: typechecking-with-proptypes
 title: Typechecking With PropTypes
 permalink: docs/typechecking-with-proptypes.html
+redirect_from:
+  - "docs/react-api.html#typechecking-with-proptypes"
 ---
 
+> Note:
+> `React.PropTypes` is deprecated as of React v15.5. Please use [the `prop-types` library instead](https://github.com/aackerman/PropTypes).
+
 As your app grows, you can catch a lot of bugs with typechecking. For some applications, you can use JavaScript extensions like [Flow](https://flowtype.org/) or [TypeScript](https://www.typescriptlang.org/) to typecheck your whole application. But even if you don't use those, React has some built-in typechecking abilities. To run typechecking on the props for a component, you can assign the special `propTypes` property:
 
 ```javascript
diff --git a/docs/warnings/dont-call-proptypes.md b/docs/warnings/dont-call-proptypes.md
index cb5181c931d26..bc468689af3ba 100644
--- a/docs/warnings/dont-call-proptypes.md
+++ b/docs/warnings/dont-call-proptypes.md
@@ -4,6 +4,9 @@ layout: single
 permalink: warnings/dont-call-proptypes.html
 ---
 
+> Note:
+> `React.PropTypes` is deprecated as of React v15.5. Please use [the `prop-types` library instead](https://github.com/aackerman/PropTypes).
+
 In a future major release of React, the code that implements PropType validation functions will be stripped in production. Once this happens, any code that calls these functions manually (that isn't stripped in production) will throw an error.
 
 ### Declaring PropTypes is still fine
diff --git a/packages/react/README.md b/packages/react/README.md
index 98754e724b6f7..740a4f2c064d2 100644
--- a/packages/react/README.md
+++ b/packages/react/README.md
@@ -13,11 +13,4 @@ To use React in production mode, set the environment variable `NODE_ENV` to `pro
 
 ```js
 var React = require('react');
-
-// Addons are in separate packages:
-var createFragment = require('react-addons-create-fragment');
-var immutabilityHelpers = require('react-addons-update');
-var CSSTransitionGroup = require('react-addons-css-transition-group');
 ```
-
-For a complete list of addons visit the [addons documentation page](https://facebook.github.io/react/docs/addons.html).

From a8d37a7aa0033d1af9eb886509a96f778881fe12 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Fri, 7 Apr 2017 15:23:28 +0100
Subject: [PATCH 065/153] Remove indirection in checking propTypes (#9358)

* Remove indirection in checking propTypes

* Silence flow errors
---
 .../classic/element/ReactElementValidator.js  | 11 +++++---
 .../types/__tests__/ReactPropTypes-test.js    |  4 +--
 .../shared/fiber/ReactFiberContext.js         | 20 +++++++++++---
 .../reconciler/ReactCompositeComponent.js     |  9 +++++--
 src/shared/types/checkReactTypeSpec.js        | 26 -------------------
 5 files changed, 33 insertions(+), 37 deletions(-)
 delete mode 100644 src/shared/types/checkReactTypeSpec.js

diff --git a/src/isomorphic/classic/element/ReactElementValidator.js b/src/isomorphic/classic/element/ReactElementValidator.js
index 324433338385b..9840ba3a59bb8 100644
--- a/src/isomorphic/classic/element/ReactElementValidator.js
+++ b/src/isomorphic/classic/element/ReactElementValidator.js
@@ -21,13 +21,12 @@
 var ReactCurrentOwner = require('ReactCurrentOwner');
 var ReactElement = require('ReactElement');
 
-var checkReactTypeSpec = require('checkReactTypeSpec');
-
 var canDefineProperty = require('canDefineProperty');
 var getComponentName = require('getComponentName');
 var getIteratorFn = require('getIteratorFn');
 
 if (__DEV__) {
+  var checkPropTypes = require('checkPropTypes');
   var warning = require('fbjs/lib/warning');
   var ReactDebugCurrentFrame = require('ReactDebugCurrentFrame');
   var {
@@ -193,7 +192,13 @@ function validatePropTypes(element) {
     : componentClass.propTypes;
 
   if (propTypes) {
-    checkReactTypeSpec(propTypes, element.props, 'prop', name);
+    checkPropTypes(
+      propTypes,
+      element.props,
+      'prop',
+      name,
+      ReactDebugCurrentFrame.getStackAddendum,
+    );
   }
   if (typeof componentClass.getDefaultProps === 'function') {
     warning(
diff --git a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
index 74059935308c9..edcaca7a6f9a0 100644
--- a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
+++ b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
@@ -13,7 +13,6 @@
 
 var PropTypes;
 var checkPropTypes;
-var checkReactTypeSpec;
 var React;
 var ReactDOM;
 
@@ -22,7 +21,6 @@ var MyComponent;
 
 function resetWarningCache() {
   jest.resetModules();
-  checkReactTypeSpec = require('checkReactTypeSpec');
   checkPropTypes = require('checkPropTypes');
 }
 
@@ -33,7 +31,7 @@ function getPropTypeWarningMessage(propTypes, object, componentName) {
     console.error.calls.reset();
   }
   resetWarningCache();
-  checkReactTypeSpec(propTypes, object, 'prop', 'testComponent');
+  checkPropTypes(propTypes, object, 'prop', 'testComponent');
   const callCount = console.error.calls.count();
   if (callCount > 1) {
     throw new Error('Too many warnings.');
diff --git a/src/renderers/shared/fiber/ReactFiberContext.js b/src/renderers/shared/fiber/ReactFiberContext.js
index 0f45d75323ff9..67f37d1776162 100644
--- a/src/renderers/shared/fiber/ReactFiberContext.js
+++ b/src/renderers/shared/fiber/ReactFiberContext.js
@@ -15,6 +15,7 @@
 import type {Fiber} from 'ReactFiber';
 import type {StackCursor} from 'ReactFiberStack';
 
+var React = require('react');
 var emptyObject = require('fbjs/lib/emptyObject');
 var getComponentName = require('getComponentName');
 var invariant = require('fbjs/lib/invariant');
@@ -33,7 +34,6 @@ const {
 } = require('ReactFiberStack');
 
 if (__DEV__) {
-  var checkReactTypeSpec = require('checkReactTypeSpec');
   var ReactDebugCurrentFrame = require('react/lib/ReactDebugCurrentFrame');
   var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');
   var {
@@ -105,7 +105,14 @@ exports.getMaskedContext = function(
   if (__DEV__) {
     const name = getComponentName(workInProgress) || 'Unknown';
     ReactDebugCurrentFrame.current = workInProgress;
-    checkReactTypeSpec(contextTypes, context, 'context', name);
+    // $FlowFixMe - We know this export exists now, need to wait for Flow update
+    React.checkPropTypes(
+      contextTypes,
+      context,
+      'context',
+      name,
+      ReactDebugCurrentFrame.getStackAddendum,
+    );
     ReactDebugCurrentFrame.current = null;
   }
 
@@ -212,7 +219,14 @@ function processChildContext(
     // TODO: remove this hack when we delete unstable_renderSubtree in Fiber.
     const workInProgress = isReconciling ? fiber : null;
     ReactDebugCurrentFrame.current = workInProgress;
-    checkReactTypeSpec(childContextTypes, childContext, 'child context', name);
+    // $FlowFixMe - We know this export exists now, need to wait for Flow update
+    React.checkPropTypes(
+      childContextTypes,
+      childContext,
+      'child context',
+      name,
+      ReactDebugCurrentFrame.getStackAddendum,
+    );
     ReactDebugCurrentFrame.current = null;
   }
 
diff --git a/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js b/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
index 5dfcc45d440c3..d2217db557af9 100644
--- a/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
+++ b/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
@@ -23,7 +23,6 @@ var ReactNodeTypes = require('ReactNodeTypes');
 var ReactReconciler = require('ReactReconciler');
 
 if (__DEV__) {
-  var checkReactTypeSpec = require('checkReactTypeSpec');
   var ReactDebugCurrentFrame = require('react/lib/ReactDebugCurrentFrame');
   var warningAboutMissingGetChildContext = {};
 }
@@ -730,7 +729,13 @@ var ReactCompositeComponent = {
   _checkContextTypes: function(typeSpecs, values, location: string) {
     if (__DEV__) {
       ReactDebugCurrentFrame.current = this._debugID;
-      checkReactTypeSpec(typeSpecs, values, location, this.getName());
+      React.checkPropTypes(
+        typeSpecs,
+        values,
+        location,
+        this.getName(),
+        ReactDebugCurrentFrame.getStackAddendum,
+      );
       ReactDebugCurrentFrame.current = null;
     }
   },
diff --git a/src/shared/types/checkReactTypeSpec.js b/src/shared/types/checkReactTypeSpec.js
deleted file mode 100644
index 131e23e1a5f8b..0000000000000
--- a/src/shared/types/checkReactTypeSpec.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule checkReactTypeSpec
- */
-
-'use strict';
-
-var checkPropTypes = require('react/lib/checkPropTypes');
-var {getStackAddendum} = require('react/lib/ReactDebugCurrentFrame');
-
-function checkReactTypeSpec(
-  typeSpecs,
-  values,
-  location: string,
-  componentName,
-) {
-  checkPropTypes(typeSpecs, values, location, componentName, getStackAddendum);
-}
-
-module.exports = checkReactTypeSpec;

From e303e00d065c2da9b6acec07ebc85337cba3f442 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Fri, 7 Apr 2017 16:17:36 +0100
Subject: [PATCH 066/153] Tweak Rollup setup (#9364)

* Remove unused Rollup shim and exports

* Add a way to build multiple bundles
---
 scripts/rollup/build.js     | 32 +++++++++++++++++++++--------
 scripts/rollup/modules.js   | 33 ------------------------------
 scripts/rollup/results.json | 40 ++++++++++++++++++-------------------
 3 files changed, 44 insertions(+), 61 deletions(-)

diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js
index 30d8d29e9a874..b557a11926504 100644
--- a/scripts/rollup/build.js
+++ b/scripts/rollup/build.js
@@ -31,8 +31,12 @@ const RN_DEV = Bundles.bundleTypes.RN_DEV;
 const RN_PROD = Bundles.bundleTypes.RN_PROD;
 
 const reactVersion = require('../../package.json').version;
-const inputBundleType = argv.type;
-const inputBundleName = argv._ && argv._[0];
+const requestedBundleTypes = (argv.type || '')
+  .split(',')
+  .map(type => type.toUpperCase());
+const requestedBundleNames = (argv._[0] || '')
+  .split(',')
+  .map(type => type.toLowerCase());
 
 // used for when we property mangle with uglify/gcc
 const mangleRegex = new RegExp(
@@ -294,14 +298,26 @@ function getPlugins(
 }
 
 function createBundle(bundle, bundleType) {
-  if (
-    (inputBundleType && bundleType.indexOf(inputBundleType) === -1) ||
-    bundle.bundleTypes.indexOf(bundleType) === -1 ||
-    (inputBundleName && bundle.label.indexOf(inputBundleName) === -1)
-  ) {
-    // Skip this bundle because its config doesn't specify this target.
+  const shouldSkipBundleType = bundle.bundleTypes.indexOf(bundleType) === -1;
+  if (shouldSkipBundleType) {
     return Promise.resolve();
   }
+  if (requestedBundleTypes.length > 0) {
+    const isAskingForDifferentType = requestedBundleTypes.every(
+      requestedType => bundleType.indexOf(requestedType) === -1
+    );
+    if (isAskingForDifferentType) {
+      return Promise.resolve();
+    }
+  }
+  if (requestedBundleNames.length > 0) {
+    const isAskingForDifferentNames = requestedBundleNames.every(
+      requestedName => bundle.label.indexOf(requestedName) === -1
+    );
+    if (isAskingForDifferentNames) {
+      return Promise.resolve();
+    }
+  }
 
   const filename = getFilename(bundle.name, bundle.hasteName, bundleType);
   const logKey = chalk.white.bold(filename) +
diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js
index 2be3391469332..832e19b05c62e 100644
--- a/scripts/rollup/modules.js
+++ b/scripts/rollup/modules.js
@@ -255,28 +255,6 @@ function getReactCurrentOwnerModuleAlias(bundleType, isRenderer) {
   }
 }
 
-// this works almost identically to the ReactCurrentOwner shim above
-const shimReactCheckPropTypes = resolve(
-  './scripts/rollup/shims/rollup/ReactCheckPropTypesRollupShim.js'
-);
-const realCheckPropTypes = resolve(
-  './src/isomorphic/classic/types/checkPropTypes.js'
-);
-
-function getReactCheckPropTypesModuleAlias(bundleType, isRenderer) {
-  if (isRenderer) {
-    return {
-      checkPropTypes: shimReactCheckPropTypes,
-      'react/lib/checkPropTypes': shimReactCheckPropTypes,
-    };
-  } else {
-    return {
-      checkPropTypes: realCheckPropTypes,
-      'react/lib/checkPropTypes': realCheckPropTypes,
-    };
-  }
-}
-
 // this works almost identically to the ReactCurrentOwner shim above
 const shimReactComponentTreeHook = resolve(
   './scripts/rollup/shims/rollup/ReactComponentTreeHookRollupShim.js'
@@ -323,7 +301,6 @@ function replaceDevOnlyStubbedModules(bundleType) {
 function getAliases(paths, bundleType, isRenderer, extractErrors) {
   return Object.assign(
     getReactCurrentOwnerModuleAlias(bundleType, isRenderer),
-    getReactCheckPropTypesModuleAlias(bundleType, isRenderer),
     getReactComponentTreeHookModuleAlias(bundleType, isRenderer),
     createModuleMap(
       paths,
@@ -353,17 +330,7 @@ module.exports = {
   getExcludedHasteGlobs,
   getDefaultReplaceModules,
   getAliases,
-  createModuleMap,
-  getNodeModules,
-  replaceInternalModules,
-  getInternalModules,
-  getFbjsModuleAliases,
-  replaceFbjsModuleAliases,
   ignoreFBModules,
   ignoreReactNativeModules,
   getExternalModules,
-  getReactCurrentOwnerModuleAlias,
-  getReactCheckPropTypesModuleAlias,
-  getReactComponentTreeHookModuleAlias,
-  replaceDevOnlyStubbedModules,
 };
diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
index f2b0466682d6b..18e29d0eae1f4 100644
--- a/scripts/rollup/results.json
+++ b/scripts/rollup/results.json
@@ -2,24 +2,24 @@
   "branch": "master",
   "bundleSizes": {
     "react.development.js (UMD_DEV)": {
-      "size": 116402,
-      "gzip": 29598
+      "size": 116208,
+      "gzip": 29564
     },
     "react.production.min.js (UMD_PROD)": {
       "size": 13719,
       "gzip": 5080
     },
     "react-dom.development.js (UMD_DEV)": {
-      "size": 564925,
-      "gzip": 130471
+      "size": 564771,
+      "gzip": 130439
     },
     "react-dom.production.min.js (UMD_PROD)": {
       "size": 120123,
       "gzip": 37844
     },
     "react-dom-server.development.js (UMD_DEV)": {
-      "size": 477377,
-      "gzip": 115561
+      "size": 477021,
+      "gzip": 115494
     },
     "react-dom-server.production.min.js (UMD_PROD)": {
       "size": 106349,
@@ -34,56 +34,56 @@
       "gzip": 28976
     },
     "react.development.js (NODE_DEV)": {
-      "size": 109416,
-      "gzip": 27554
+      "size": 109222,
+      "gzip": 27519
     },
     "react.production.min.js (NODE_PROD)": {
       "size": 12615,
       "gzip": 4659
     },
     "React-dev.js (FB_DEV)": {
-      "size": 110901,
-      "gzip": 28115
+      "size": 110705,
+      "gzip": 28075
     },
     "React-prod.js (FB_PROD)": {
       "size": 56205,
       "gzip": 14329
     },
     "ReactDOMStack-dev.js (FB_DEV)": {
-      "size": 523568,
-      "gzip": 124900
+      "size": 523202,
+      "gzip": 124830
     },
     "ReactDOMStack-prod.js (FB_PROD)": {
       "size": 351707,
       "gzip": 84367
     },
     "react-dom.development.js (NODE_DEV)": {
-      "size": 543299,
-      "gzip": 125435
+      "size": 543145,
+      "gzip": 125402
     },
     "react-dom.production.min.js (NODE_PROD)": {
       "size": 116802,
       "gzip": 36707
     },
     "ReactDOMFiber-dev.js (FB_DEV)": {
-      "size": 797779,
-      "gzip": 184190
+      "size": 797617,
+      "gzip": 184146
     },
     "ReactDOMFiber-prod.js (FB_PROD)": {
       "size": 407360,
       "gzip": 93460
     },
     "react-dom-server.development.js (NODE_DEV)": {
-      "size": 446778,
-      "gzip": 107862
+      "size": 446422,
+      "gzip": 107796
     },
     "react-dom-server.production.min.js (NODE_PROD)": {
       "size": 101204,
       "gzip": 31227
     },
     "ReactDOMServerStack-dev.js (FB_DEV)": {
-      "size": 445529,
-      "gzip": 107719
+      "size": 445173,
+      "gzip": 107652
     },
     "ReactDOMServerStack-prod.js (FB_PROD)": {
       "size": 332974,

From d9fd08df265b51a64b829f4f857b18ebc671879b Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Fri, 7 Apr 2017 17:03:22 +0100
Subject: [PATCH 067/153] Make ReactDebugCurrentFrame shared state between core
 and renderers (#9365)

---
 scripts/rollup/modules.js                     | 28 +++++++-
 scripts/rollup/results.json                   | 70 +++++++++----------
 .../ReactDebugCurrentFrameRollupShim.js       |  3 +
 src/fb/ReactFBEntry.js                        |  3 +-
 src/umd/ReactUMDEntry.js                      |  3 +-
 5 files changed, 67 insertions(+), 40 deletions(-)
 create mode 100644 scripts/rollup/shims/rollup/ReactDebugCurrentFrameRollupShim.js

diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js
index 832e19b05c62e..03f897a1972e4 100644
--- a/scripts/rollup/modules.js
+++ b/scripts/rollup/modules.js
@@ -46,7 +46,9 @@ const fbjsModules = [
 ];
 
 const devOnlyFilesToStubOut = [
+  "'ReactDebugCurrentFrame'",
   "'ReactComponentTreeHook'",
+  "'react/lib/ReactDebugCurrentFrame'",
   "'react/lib/ReactComponentTreeHook'",
   "'react-dom/lib/ReactPerf'",
   "'react-dom/lib/ReactTestUtils'",
@@ -169,9 +171,6 @@ function getInternalModules() {
   // it doesn't pick them up and assumes they're external
   return {
     reactProdInvariant: resolve('./src/shared/utils/reactProdInvariant.js'),
-    'react/lib/ReactDebugCurrentFrame': resolve(
-      './src/isomorphic/classic/element/ReactDebugCurrentFrame.js'
-    ),
   };
 }
 
@@ -277,6 +276,28 @@ function getReactComponentTreeHookModuleAlias(bundleType, isRenderer) {
   }
 }
 
+// this works almost identically to the ReactCurrentOwner shim above
+const shimReactDebugCurrentFrame = resolve(
+  './scripts/rollup/shims/rollup/ReactDebugCurrentFrameRollupShim.js'
+);
+const realReactDebugCurrentFrame = resolve(
+  './src/isomorphic/classic/element/ReactDebugCurrentFrame.js'
+);
+
+function getReactDebugCurrentFrameModuleAlias(bundleType, isRenderer) {
+  if (isRenderer) {
+    return {
+      ReactDebugCurrentFrame: shimReactDebugCurrentFrame,
+      'react/lib/ReactDebugCurrentFrame': shimReactDebugCurrentFrame,
+    };
+  } else {
+    return {
+      ReactDebugCurrentFrame: realReactDebugCurrentFrame,
+      'react/lib/ReactDebugCurrentFrame': realReactDebugCurrentFrame,
+    };
+  }
+}
+
 const devOnlyModuleStub = `'${resolve('./scripts/rollup/shims/rollup/DevOnlyStubShim.js')}'`;
 
 function replaceDevOnlyStubbedModules(bundleType) {
@@ -302,6 +323,7 @@ function getAliases(paths, bundleType, isRenderer, extractErrors) {
   return Object.assign(
     getReactCurrentOwnerModuleAlias(bundleType, isRenderer),
     getReactComponentTreeHookModuleAlias(bundleType, isRenderer),
+    getReactDebugCurrentFrameModuleAlias(bundleType, isRenderer),
     createModuleMap(
       paths,
       extractErrors && extractErrorCodes(errorCodeOpts),
diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
index 18e29d0eae1f4..ee47159e811e9 100644
--- a/scripts/rollup/results.json
+++ b/scripts/rollup/results.json
@@ -1,41 +1,41 @@
 {
-  "branch": "master",
+  "branch": "debug-frame",
   "bundleSizes": {
     "react.development.js (UMD_DEV)": {
-      "size": 116208,
-      "gzip": 29564
+      "size": 116245,
+      "gzip": 29572
     },
     "react.production.min.js (UMD_PROD)": {
       "size": 13719,
       "gzip": 5080
     },
     "react-dom.development.js (UMD_DEV)": {
-      "size": 564771,
-      "gzip": 130439
+      "size": 563524,
+      "gzip": 130148
     },
     "react-dom.production.min.js (UMD_PROD)": {
       "size": 120123,
       "gzip": 37844
     },
     "react-dom-server.development.js (UMD_DEV)": {
-      "size": 477021,
-      "gzip": 115494
+      "size": 475780,
+      "gzip": 115177
     },
     "react-dom-server.production.min.js (UMD_PROD)": {
       "size": 106349,
       "gzip": 32998
     },
     "react-art.development.js (UMD_DEV)": {
-      "size": 341151,
-      "gzip": 76261
+      "size": 339599,
+      "gzip": 75952
     },
     "react-art.production.min.js (UMD_PROD)": {
       "size": 94939,
       "gzip": 28976
     },
     "react.development.js (NODE_DEV)": {
-      "size": 109222,
-      "gzip": 27519
+      "size": 109259,
+      "gzip": 27527
     },
     "react.production.min.js (NODE_PROD)": {
       "size": 12615,
@@ -50,64 +50,64 @@
       "gzip": 14329
     },
     "ReactDOMStack-dev.js (FB_DEV)": {
-      "size": 523202,
-      "gzip": 124830
+      "size": 521957,
+      "gzip": 124586
     },
     "ReactDOMStack-prod.js (FB_PROD)": {
       "size": 351707,
       "gzip": 84367
     },
     "react-dom.development.js (NODE_DEV)": {
-      "size": 543145,
-      "gzip": 125402
+      "size": 541898,
+      "gzip": 125114
     },
     "react-dom.production.min.js (NODE_PROD)": {
       "size": 116802,
       "gzip": 36707
     },
     "ReactDOMFiber-dev.js (FB_DEV)": {
-      "size": 797617,
-      "gzip": 184146
+      "size": 796380,
+      "gzip": 183920
     },
     "ReactDOMFiber-prod.js (FB_PROD)": {
       "size": 407360,
       "gzip": 93460
     },
     "react-dom-server.development.js (NODE_DEV)": {
-      "size": 446422,
-      "gzip": 107796
+      "size": 445181,
+      "gzip": 107467
     },
     "react-dom-server.production.min.js (NODE_PROD)": {
       "size": 101204,
       "gzip": 31227
     },
     "ReactDOMServerStack-dev.js (FB_DEV)": {
-      "size": 445173,
-      "gzip": 107652
+      "size": 443932,
+      "gzip": 107406
     },
     "ReactDOMServerStack-prod.js (FB_PROD)": {
       "size": 332974,
       "gzip": 80219
     },
     "ReactARTStack-dev.js (FB_DEV)": {
-      "size": 494340,
-      "gzip": 118840
+      "size": 492711,
+      "gzip": 118489
     },
     "ReactARTStack-prod.js (FB_PROD)": {
       "size": 365115,
       "gzip": 87595
     },
     "react-art.development.js (NODE_DEV)": {
-      "size": 266386,
-      "gzip": 57183
+      "size": 264816,
+      "gzip": 56881
     },
     "react-art.production.min.js (NODE_PROD)": {
       "size": 56517,
       "gzip": 17109
     },
     "ReactARTFiber-dev.js (FB_DEV)": {
-      "size": 265561,
-      "gzip": 57011
+      "size": 263991,
+      "gzip": 56709
     },
     "ReactARTFiber-prod.js (FB_PROD)": {
       "size": 205194,
@@ -122,20 +122,20 @@
       "gzip": 84001
     },
     "ReactTestRendererFiber-dev.js (FB_DEV)": {
-      "size": 263452,
-      "gzip": 55974
+      "size": 261900,
+      "gzip": 55671
     },
     "ReactTestRendererStack-dev.js (FB_DEV)": {
-      "size": 155222,
-      "gzip": 35662
+      "size": 151142,
+      "gzip": 34709
     },
     "react-noop-renderer.development.js (NODE_DEV)": {
-      "size": 255447,
-      "gzip": 53933
+      "size": 253895,
+      "gzip": 53629
     },
     "react-test-renderer.development.js (NODE_DEV)": {
-      "size": 264286,
-      "gzip": 56152
+      "size": 262734,
+      "gzip": 55847
     }
   }
 }
\ No newline at end of file
diff --git a/scripts/rollup/shims/rollup/ReactDebugCurrentFrameRollupShim.js b/scripts/rollup/shims/rollup/ReactDebugCurrentFrameRollupShim.js
new file mode 100644
index 0000000000000..2174fb0166844
--- /dev/null
+++ b/scripts/rollup/shims/rollup/ReactDebugCurrentFrameRollupShim.js
@@ -0,0 +1,3 @@
+var ReactInternals = require('react').__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+
+module.exports = ReactInternals.ReactDebugCurrentFrame;
diff --git a/src/fb/ReactFBEntry.js b/src/fb/ReactFBEntry.js
index 74add5c91bc8b..e4d70b5d5994a 100644
--- a/src/fb/ReactFBEntry.js
+++ b/src/fb/ReactFBEntry.js
@@ -27,8 +27,9 @@ if (__DEV__) {
   Object.assign(
     ReactFBEntry.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
     {
-      // ReactComponentTreeHook should not be included in production.
+      // These should not be included in production.
       ReactComponentTreeHook: require('react/lib/ReactComponentTreeHook'),
+      ReactDebugCurrentFrame: require('react/lib/ReactDebugCurrentFrame'),
     },
   );
 }
diff --git a/src/umd/ReactUMDEntry.js b/src/umd/ReactUMDEntry.js
index fd08211201659..1ab1076c8069b 100644
--- a/src/umd/ReactUMDEntry.js
+++ b/src/umd/ReactUMDEntry.js
@@ -27,8 +27,9 @@ if (__DEV__) {
   Object.assign(
     ReactUMDEntry.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
     {
-      // ReactComponentTreeHook should not be included in production.
+      // These should not be included in production.
       ReactComponentTreeHook: require('react/lib/ReactComponentTreeHook'),
+      ReactDebugCurrentFrame: require('react/lib/ReactDebugCurrentFrame'),
     },
   );
 }

From d88696941d27dde3fec4d87b8e9d9ef3eaad6c5e Mon Sep 17 00:00:00 2001
From: Dan Abramov <gaearon@fb.com>
Date: Fri, 7 Apr 2017 18:43:19 +0100
Subject: [PATCH 068/153] 16.0.0-alpha.8

---
 package.json                              |  2 +-
 packages/react-art/package.json           |  4 ++--
 packages/react-dom/package.json           |  4 ++--
 packages/react-noop-renderer/package.json |  2 +-
 packages/react-test-renderer/package.json |  4 ++--
 packages/react/package.json               |  2 +-
 scripts/rollup/results.json               | 16 ++++++++--------
 src/ReactVersion.js                       |  2 +-
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 9cc3af3f92680..80b6c1d734d89 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-build",
   "private": true,
-  "version": "16.0.0-alpha.7",
+  "version": "16.0.0-alpha.8",
   "devDependencies": {
     "aliasify": "^2.0.0",
     "art": "^0.10.1",
diff --git a/packages/react-art/package.json b/packages/react-art/package.json
index b550b1e0fba68..8f9ddca085cd5 100644
--- a/packages/react-art/package.json
+++ b/packages/react-art/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-art",
-  "version": "16.0.0-alpha.7",
+  "version": "16.0.0-alpha.8",
   "description": "React ART is a JavaScript library for drawing vector graphics using React. It provides declarative and reactive bindings to the ART library. Using the same declarative API you can render the output to either Canvas, SVG or VML (IE8).",
   "main": "index.js",
   "repository": "facebook/react",
@@ -23,7 +23,7 @@
     "object-assign": "^4.1.0"
   },
   "peerDependencies": {
-    "react": "^16.0.0-alpha.7"
+    "react": "^16.0.0-alpha.8"
   },
   "files": [
     "LICENSE",
diff --git a/packages/react-dom/package.json b/packages/react-dom/package.json
index 831a2bed68e5e..a4a7f48e9a93e 100644
--- a/packages/react-dom/package.json
+++ b/packages/react-dom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-dom",
-  "version": "16.0.0-alpha.7",
+  "version": "16.0.0-alpha.8",
   "description": "React package for working with the DOM.",
   "main": "index.js",
   "repository": "facebook/react",
@@ -18,7 +18,7 @@
     "object-assign": "^4.1.0"
   },
   "peerDependencies": {
-    "react": "^16.0.0-alpha.7"
+    "react": "^16.0.0-alpha.8"
   },
   "files": [
     "LICENSE",
diff --git a/packages/react-noop-renderer/package.json b/packages/react-noop-renderer/package.json
index 0402ad8d006dd..dd0906e193462 100644
--- a/packages/react-noop-renderer/package.json
+++ b/packages/react-noop-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-noop-renderer",
-  "version": "16.0.0-alpha.7",
+  "version": "16.0.0-alpha.8",
   "private": true,
   "description": "React package for testing the Fiber reconciler.",
   "main": "index.js",
diff --git a/packages/react-test-renderer/package.json b/packages/react-test-renderer/package.json
index eb2b8732f3e4c..ef15cc2e25361 100644
--- a/packages/react-test-renderer/package.json
+++ b/packages/react-test-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-test-renderer",
-  "version": "16.0.0-alpha.7",
+  "version": "16.0.0-alpha.8",
   "description": "React package for snapshot testing.",
   "main": "index.js",
   "repository": "facebook/react",
@@ -19,7 +19,7 @@
     "object-assign": "^4.1.0"
   },
   "peerDependencies": {
-    "react": "^16.0.0-alpha.7"
+    "react": "^16.0.0-alpha.8"
   },
   "files": [
     "LICENSE",
diff --git a/packages/react/package.json b/packages/react/package.json
index 4ce3cc5b9ade9..1fc717340ef0f 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react",
   "description": "React is a JavaScript library for building user interfaces.",
-  "version": "16.0.0-alpha.7",
+  "version": "16.0.0-alpha.8",
   "keywords": [
     "react"
   ],
diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
index ee47159e811e9..ea610c1fd6d44 100644
--- a/scripts/rollup/results.json
+++ b/scripts/rollup/results.json
@@ -1,5 +1,5 @@
 {
-  "branch": "debug-frame",
+  "branch": "master",
   "bundleSizes": {
     "react.development.js (UMD_DEV)": {
       "size": 116245,
@@ -23,7 +23,7 @@
     },
     "react-dom-server.production.min.js (UMD_PROD)": {
       "size": 106349,
-      "gzip": 32998
+      "gzip": 32997
     },
     "react-art.development.js (UMD_DEV)": {
       "size": 339599,
@@ -31,7 +31,7 @@
     },
     "react-art.production.min.js (UMD_PROD)": {
       "size": 94939,
-      "gzip": 28976
+      "gzip": 28977
     },
     "react.development.js (NODE_DEV)": {
       "size": 109259,
@@ -42,8 +42,8 @@
       "gzip": 4659
     },
     "React-dev.js (FB_DEV)": {
-      "size": 110705,
-      "gzip": 28075
+      "size": 110742,
+      "gzip": 28082
     },
     "React-prod.js (FB_PROD)": {
       "size": 56205,
@@ -55,7 +55,7 @@
     },
     "ReactDOMStack-prod.js (FB_PROD)": {
       "size": 351707,
-      "gzip": 84367
+      "gzip": 84366
     },
     "react-dom.development.js (NODE_DEV)": {
       "size": 541898,
@@ -87,7 +87,7 @@
     },
     "ReactDOMServerStack-prod.js (FB_PROD)": {
       "size": 332974,
-      "gzip": 80219
+      "gzip": 80217
     },
     "ReactARTStack-dev.js (FB_DEV)": {
       "size": 492711,
@@ -95,7 +95,7 @@
     },
     "ReactARTStack-prod.js (FB_PROD)": {
       "size": 365115,
-      "gzip": 87595
+      "gzip": 87596
     },
     "react-art.development.js (NODE_DEV)": {
       "size": 264816,
diff --git a/src/ReactVersion.js b/src/ReactVersion.js
index 9df23ee824959..d6ec94ed53dee 100644
--- a/src/ReactVersion.js
+++ b/src/ReactVersion.js
@@ -11,4 +11,4 @@
 
 'use strict';
 
-module.exports = '16.0.0-alpha.7';
+module.exports = '16.0.0-alpha.8';

From 6eaa539ad5fc608473540496b0f3b9c1688afeb0 Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Fri, 7 Apr 2017 13:47:54 -0700
Subject: [PATCH 069/153] Update example snippet in old 'React.addons' doc page
 (#9363)

* Update example snippet in old 'React.addons' doc page

This makes the example more consistent.

* Add back the pointers in docs that were mistakenly removed

In https://github.com/facebook/react/pull/9359 we accidentally removed
pointers in some doc pages. Putting them back now.

* Link to npm package instead of github page

This seems like a more stable place to link to in the 'context'
document.
Based on @bvaughn's feedback in https://github.com/facebook/react/pull/9359
---
 docs/docs/addons.md                     | 4 ++--
 docs/docs/components-and-props.md       | 2 ++
 docs/docs/composition-vs-inheritance.md | 2 ++
 docs/docs/conditional-rendering.md      | 2 ++
 docs/docs/context.md                    | 2 +-
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/docs/docs/addons.md b/docs/docs/addons.md
index 982f5e481fc59..d0f6a770b8ec4 100644
--- a/docs/docs/addons.md
+++ b/docs/docs/addons.md
@@ -34,8 +34,8 @@ The add-ons below are considered legacy and their use is discouraged.
 You can install the add-ons individually from npm (e.g. `npm install react-addons-create-fragment`) and import them:
 
 ```javascript
-import Perf from 'react-addons-perf'; // ES6
-var Perf = require('react-addons-perf'); // ES5 with npm
+import createFragment from 'react-addons-create-fragment'; // ES6
+var createFragment = require('react-addons-create-fragment'); // ES5 with npm
 ```
 
 When using a CDN, you can use `react-with-addons.js` instead of `react.js`:
diff --git a/docs/docs/components-and-props.md b/docs/docs/components-and-props.md
index d1bf5ca9d3664..150138fb91b60 100644
--- a/docs/docs/components-and-props.md
+++ b/docs/docs/components-and-props.md
@@ -12,6 +12,8 @@ redirect_from:
   - "docs/transferring-props-zh-CN.html"
   - "tips/props-in-getInitialState-as-anti-pattern.html"
   - "tips/communicate-between-components.html"
+prev: rendering-elements.html
+next: state-and-lifecycle.html
 ---
 
 Components let you split the UI into independent, reusable pieces, and think about each piece in isolation.
diff --git a/docs/docs/composition-vs-inheritance.md b/docs/docs/composition-vs-inheritance.md
index 2817811a669c4..0ac5cd45b21cc 100644
--- a/docs/docs/composition-vs-inheritance.md
+++ b/docs/docs/composition-vs-inheritance.md
@@ -3,6 +3,8 @@ id: composition-vs-inheritance
 title: Composition vs Inheritance
 permalink: docs/composition-vs-inheritance.html
 redirect_from: "docs/multiple-components.html"
+prev: lifting-state-up.html
+next: thinking-in-react.html
 ---
 
 React has a powerful composition model, and we recommend using composition instead of inheritance to reuse code between components.
diff --git a/docs/docs/conditional-rendering.md b/docs/docs/conditional-rendering.md
index 7cfc60a8f9531..ea1be02a4c850 100644
--- a/docs/docs/conditional-rendering.md
+++ b/docs/docs/conditional-rendering.md
@@ -2,6 +2,8 @@
 id: conditional-rendering
 title: Conditional Rendering
 permalink: docs/conditional-rendering.html
+prev: handling-events.html
+next: lists-and-keys.html
 redirect_from: "tips/false-in-jsx.html"
 ---
 
diff --git a/docs/docs/context.md b/docs/docs/context.md
index e3efaf5d5b308..718e941a06418 100644
--- a/docs/docs/context.md
+++ b/docs/docs/context.md
@@ -5,7 +5,7 @@ permalink: docs/context.html
 ---
 
 >Note:
-> As of React v15.5 the `React.PropTypes` helper is deprecated, and we recommend using the [`prop-types` library](https://github.com/aackerman/PropTypes) to define `contextTypes`.
+> As of React v15.5 the `React.PropTypes` helper is deprecated, and we recommend using the [`prop-types` library](https://www.npmjs.com/package/prop-types) to define `contextTypes`.
 
 With React, it's easy to track the flow of data through your React components. When you look at a component, you can see which props are being passed, which makes your apps easy to reason about.
 

From 72196da82915bee400edb1599d4223926aa2a8a0 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Fri, 7 Apr 2017 22:07:10 +0100
Subject: [PATCH 070/153] Replace shims with explicit React access from the
 renderers for shared global state (#9366)

* Remove non-existent /lib/ from souce files

* Replace all shims with explicit access

This deletes shims and changes to access require('react').__DO_NOT_USE__ from renderers for global shared state.

I cloned flattenChildren() and traverseAllChildren() because they relied on CurrentOwner but were used both from Stack and Isomorphic. The stack implementations will die, and the isomorphic ones can be changed to be optimized for Children specifically in the future.

I also deleted UMD shims because they are now unnecessary. I moved the internals assignment to main modules since they're now used in tests, and made them direct UMD entry points.
---
 scripts/rollup/bundles.js                     |  19 +-
 scripts/rollup/modules.js                     | 101 +--------
 scripts/rollup/results.json                   | 106 ++++-----
 .../rollup/ReactCheckPropTypesRollupShim.js   |   3 -
 .../ReactComponentTreeHookRollupShim.js       |   3 -
 .../rollup/ReactCurrentOwnerRollupShim.js     |   3 -
 src/fb/ReactDOMFBEntry.js                     |  11 +-
 src/fb/ReactDOMFiberFBEntry.js                |  66 +++---
 src/fb/ReactFBEntry.js                        |  31 +--
 src/isomorphic/React.js                       |  12 ++
 .../children}/flattenChildren.js              |   4 +-
 .../children}/traverseAllChildren.js          |   2 +-
 .../__tests__/ReactComponentTreeHook-test.js  |   4 +-
 .../ReactComponentTreeHook-test.native.js     |   2 +-
 .../__tests__/ReactCompositeComponent-test.js |   2 +-
 .../ReactHostOperationHistoryHook-test.js     |   2 +-
 src/renderers/__tests__/ReactPerf-test.js     |   2 +-
 src/renderers/__tests__/refs-test.js          |   4 +-
 src/renderers/dom/ReactDOM.js                 |   5 +
 src/renderers/dom/fiber/ReactDOMFiber.js      |   5 +
 src/renderers/dom/shared/findDOMNode.js       |   2 +-
 .../shared/hooks/ReactDOMInvalidARIAHook.js   |   3 +-
 .../hooks/ReactDOMNullInputValuePropHook.js   |   5 +-
 .../hooks/ReactDOMUnknownPropertyHook.js      |   2 +-
 src/renderers/dom/stack/client/ReactMount.js  |   2 +-
 src/renderers/native/findNodeHandle.js        |   2 +-
 src/renderers/shared/ReactDebugTool.js        |   2 +-
 .../shared/ReactGlobalSharedState.js          |  27 +++
 src/renderers/shared/fiber/ReactChildFiber.js |   2 +-
 .../shared/fiber/ReactFiberBeginWork.js       |   2 +-
 .../shared/fiber/ReactFiberContext.js         |   2 +-
 .../shared/fiber/ReactFiberScheduler.js       |   2 +-
 .../shared/fiber/ReactFiberTreeReflection.js  |   2 +-
 .../stack/reconciler/ReactChildReconciler.js  |  10 +-
 .../reconciler/ReactCompositeComponent.js     |   4 +-
 .../stack/reconciler/ReactMultiChild.js       |  11 +-
 .../shared/stack/reconciler/ReactRef.js       |   2 +-
 .../stack/reconciler/ReactUpdateQueue.js      |   2 +-
 .../stack/reconciler/flattenStackChildren.js  | 103 +++++++++
 .../stack/reconciler/traverseStackChildren.js | 201 ++++++++++++++++++
 src/test/ReactComponentTreeTestUtils.js       |   2 +-
 src/test/ReactTestUtils.js                    |   2 +-
 src/umd/ReactDOMServerUMDEntry.js             |  16 --
 src/umd/ReactDOMUMDEntry.js                   |  23 --
 src/umd/ReactUMDEntry.js                      |  37 ----
 .../shims/ReactComponentTreeHookUMDShim.js    |  18 --
 src/umd/shims/ReactCurrentOwnerUMDShim.js     |  18 --
 src/umd/shims/ReactUMDShim.js                 |  16 --
 48 files changed, 509 insertions(+), 398 deletions(-)
 delete mode 100644 scripts/rollup/shims/rollup/ReactCheckPropTypesRollupShim.js
 delete mode 100644 scripts/rollup/shims/rollup/ReactComponentTreeHookRollupShim.js
 delete mode 100644 scripts/rollup/shims/rollup/ReactCurrentOwnerRollupShim.js
 rename src/{shared/utils => isomorphic/children}/flattenChildren.js (94%)
 rename src/{shared/utils => isomorphic/children}/traverseAllChildren.js (98%)
 create mode 100644 src/renderers/shared/ReactGlobalSharedState.js
 create mode 100644 src/renderers/shared/stack/reconciler/flattenStackChildren.js
 create mode 100644 src/renderers/shared/stack/reconciler/traverseStackChildren.js
 delete mode 100644 src/umd/ReactDOMServerUMDEntry.js
 delete mode 100644 src/umd/ReactDOMUMDEntry.js
 delete mode 100644 src/umd/ReactUMDEntry.js
 delete mode 100644 src/umd/shims/ReactComponentTreeHookUMDShim.js
 delete mode 100644 src/umd/shims/ReactCurrentOwnerUMDShim.js
 delete mode 100644 src/umd/shims/ReactUMDShim.js

diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index a9010f0d0db35..fc221c5a5809c 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -44,7 +44,7 @@ const bundles = [
       moduleName: 'React',
       sourceMap: false,
     },
-    entry: 'src/umd/ReactUMDEntry.js',
+    entry: 'src/isomorphic/React.js',
     externals: [],
     fbEntry: 'src/fb/ReactFBEntry.js',
     hasteName: 'React',
@@ -53,9 +53,6 @@ const bundles = [
     manglePropertiesOnProd: false,
     name: 'react',
     paths: [
-      'src/umd/ReactUMDEntry.js',
-      'src/umd/shims/**/*.js',
-
       'src/isomorphic/**/*.js',
       'src/addons/**/*.js',
 
@@ -76,7 +73,7 @@ const bundles = [
       moduleName: 'ReactDOM',
       sourceMap: false,
     },
-    entry: 'src/umd/ReactDOMUMDEntry.js',
+    entry: 'src/renderers/dom/ReactDOM.js',
     externals: [],
     fbEntry: 'src/fb/ReactDOMFBEntry.js',
     hasteName: 'ReactDOMStack',
@@ -85,8 +82,6 @@ const bundles = [
     manglePropertiesOnProd: false,
     name: 'react-dom-stack',
     paths: [
-      'src/umd/ReactDOMUMDEntry.js',
-
       'src/renderers/dom/**/*.js',
       'src/renderers/shared/**/*.js',
       'src/test/**/*.js', // ReactTestUtils is currently very coupled to DOM.
@@ -106,7 +101,7 @@ const bundles = [
       moduleName: 'ReactDOM',
       sourceMap: false,
     },
-    entry: 'src/umd/ReactDOMUMDEntry.js',
+    entry: 'src/renderers/dom/fiber/ReactDOMFiber.js',
     externals: [],
     fbEntry: 'src/fb/ReactDOMFiberFBEntry.js',
     hasteName: 'ReactDOMFiber',
@@ -115,8 +110,6 @@ const bundles = [
     manglePropertiesOnProd: false,
     name: 'react-dom',
     paths: [
-      'src/umd/ReactDOMUMDEntry.js',
-
       'src/renderers/dom/**/*.js',
       'src/renderers/shared/**/*.js',
       'src/test/**/*.js', // ReactTestUtils is currently very coupled to DOM.
@@ -139,17 +132,15 @@ const bundles = [
       moduleName: 'ReactDOMServer',
       sourceMap: false,
     },
-    entry: 'src/umd/ReactDOMServerUMDEntry.js',
+    entry: 'src/renderers/dom/ReactDOMServer.js',
     externals: [],
-    fbEntry: 'src/umd/ReactDOMServerUMDEntry.js',
+    fbEntry: 'src/renderers/dom/ReactDOMServer.js',
     hasteName: 'ReactDOMServerStack',
     isRenderer: true,
     label: 'dom-server',
     manglePropertiesOnProd: false,
     name: 'react-dom/server',
     paths: [
-      'src/umd/ReactDOMServerUMDEntry.js',
-
       'src/renderers/dom/**/*.js',
       'src/renderers/shared/**/*.js',
 
diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js
index 03f897a1972e4..e6b1904a468d0 100644
--- a/scripts/rollup/modules.js
+++ b/scripts/rollup/modules.js
@@ -48,10 +48,8 @@ const fbjsModules = [
 const devOnlyFilesToStubOut = [
   "'ReactDebugCurrentFrame'",
   "'ReactComponentTreeHook'",
-  "'react/lib/ReactDebugCurrentFrame'",
-  "'react/lib/ReactComponentTreeHook'",
-  "'react-dom/lib/ReactPerf'",
-  "'react-dom/lib/ReactTestUtils'",
+  "'ReactPerf'",
+  "'ReactTestUtils'",
 ];
 
 // this function builds up a very niave Haste-like moduleMap
@@ -114,7 +112,6 @@ function ignoreFBModules() {
     'ReactDOMFeatureFlags',
     // In FB bundles, we preserve an inline require to ReactCurrentOwner.
     // See the explanation in FB version of ReactCurrentOwner in www:
-    'react/lib/ReactCurrentOwner',
     'ReactCurrentOwner',
   ];
 }
@@ -157,7 +154,7 @@ function getExternalModules(externals, bundleType, isRenderer) {
     case FB_DEV:
     case FB_PROD:
       fbjsModules.forEach(module => externalModules.push(module));
-      externalModules.push('react/lib/ReactCurrentOwner', 'ReactCurrentOwner');
+      externalModules.push('ReactCurrentOwner');
       if (isRenderer) {
         externalModules.push('React');
       }
@@ -177,9 +174,6 @@ function getInternalModules() {
 function replaceInternalModules() {
   // we inline these modules in the bundles rather than leave them as external
   return {
-    "'react-dom/lib/ReactPerf'": `'${resolve('./src/renderers/shared/ReactPerf.js')}'`,
-    "'react-dom/lib/ReactTestUtils'": `'${resolve('./src/test/ReactTestUtils.js')}'`,
-    "'react-dom/lib/ReactInstanceMap'": `'${resolve('./src/renderers/shared/shared/ReactInstanceMap.js')}'`,
     "'react-dom'": `'${resolve('./src/renderers/dom/ReactDOM.js')}'`,
   };
 }
@@ -209,92 +203,16 @@ function getFbjsModuleAliases(bundleType) {
 
 function replaceFbjsModuleAliases(bundleType) {
   switch (bundleType) {
-    case UMD_DEV:
-    case UMD_PROD:
-    case NODE_DEV:
-    case NODE_PROD:
-    case RN_DEV:
-    case RN_PROD:
-      return {};
     case FB_DEV:
     case FB_PROD:
-      // additionally we add mappings for "react"
-      // so they work correctly on FB, this will change soon
+      // Haste at FB doesn't currently allow case sensitive names,
+      // and product code already uses "React". In the future,
+      // we will either allow both variants or migrate to lowercase.
       return {
         "'react'": "'React'",
       };
-  }
-}
-
-// for renderers, we want them to require the __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner
-// on the React bundle itself rather than require module directly.
-// For the React bundle, ReactCurrentOwner should be bundled as part of the bundle
-// itself and exposed on __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED
-const shimReactCurrentOwner = resolve(
-  './scripts/rollup/shims/rollup/ReactCurrentOwnerRollupShim.js'
-);
-const realReactCurrentOwner = resolve(
-  './src/isomorphic/classic/element/ReactCurrentOwner.js'
-);
-
-function getReactCurrentOwnerModuleAlias(bundleType, isRenderer) {
-  if (bundleType === FB_DEV || bundleType === FB_DEV) {
-    return {};
-  }
-  if (isRenderer) {
-    return {
-      ReactCurrentOwner: shimReactCurrentOwner,
-      'react/lib/ReactCurrentOwner': shimReactCurrentOwner,
-    };
-  } else {
-    return {
-      ReactCurrentOwner: realReactCurrentOwner,
-      'react/lib/ReactCurrentOwner': realReactCurrentOwner,
-    };
-  }
-}
-
-// this works almost identically to the ReactCurrentOwner shim above
-const shimReactComponentTreeHook = resolve(
-  './scripts/rollup/shims/rollup/ReactComponentTreeHookRollupShim.js'
-);
-const realReactComponentTreeHook = resolve(
-  './src/isomorphic/hooks/ReactComponentTreeHook.js'
-);
-
-function getReactComponentTreeHookModuleAlias(bundleType, isRenderer) {
-  if (isRenderer) {
-    return {
-      ReactComponentTreeHook: shimReactComponentTreeHook,
-      'react/lib/ReactComponentTreeHook': shimReactComponentTreeHook,
-    };
-  } else {
-    return {
-      ReactComponentTreeHook: realReactComponentTreeHook,
-      'react/lib/ReactComponentTreeHook': realReactComponentTreeHook,
-    };
-  }
-}
-
-// this works almost identically to the ReactCurrentOwner shim above
-const shimReactDebugCurrentFrame = resolve(
-  './scripts/rollup/shims/rollup/ReactDebugCurrentFrameRollupShim.js'
-);
-const realReactDebugCurrentFrame = resolve(
-  './src/isomorphic/classic/element/ReactDebugCurrentFrame.js'
-);
-
-function getReactDebugCurrentFrameModuleAlias(bundleType, isRenderer) {
-  if (isRenderer) {
-    return {
-      ReactDebugCurrentFrame: shimReactDebugCurrentFrame,
-      'react/lib/ReactDebugCurrentFrame': shimReactDebugCurrentFrame,
-    };
-  } else {
-    return {
-      ReactDebugCurrentFrame: realReactDebugCurrentFrame,
-      'react/lib/ReactDebugCurrentFrame': realReactDebugCurrentFrame,
-    };
+    default:
+      return {};
   }
 }
 
@@ -321,9 +239,6 @@ function replaceDevOnlyStubbedModules(bundleType) {
 
 function getAliases(paths, bundleType, isRenderer, extractErrors) {
   return Object.assign(
-    getReactCurrentOwnerModuleAlias(bundleType, isRenderer),
-    getReactComponentTreeHookModuleAlias(bundleType, isRenderer),
-    getReactDebugCurrentFrameModuleAlias(bundleType, isRenderer),
     createModuleMap(
       paths,
       extractErrors && extractErrorCodes(errorCodeOpts),
diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
index ea610c1fd6d44..9d4a85e8cc540 100644
--- a/scripts/rollup/results.json
+++ b/scripts/rollup/results.json
@@ -1,29 +1,29 @@
 {
-  "branch": "master",
+  "branch": "remove-lib-in-source",
   "bundleSizes": {
     "react.development.js (UMD_DEV)": {
-      "size": 116245,
-      "gzip": 29572
+      "size": 116098,
+      "gzip": 29520
     },
     "react.production.min.js (UMD_PROD)": {
-      "size": 13719,
-      "gzip": 5080
+      "size": 13707,
+      "gzip": 5073
     },
     "react-dom.development.js (UMD_DEV)": {
-      "size": 563524,
-      "gzip": 130148
+      "size": 563844,
+      "gzip": 130190
     },
     "react-dom.production.min.js (UMD_PROD)": {
-      "size": 120123,
-      "gzip": 37844
+      "size": 120191,
+      "gzip": 37860
     },
     "react-dom-server.development.js (UMD_DEV)": {
-      "size": 475780,
-      "gzip": 115177
+      "size": 476049,
+      "gzip": 115267
     },
     "react-dom-server.production.min.js (UMD_PROD)": {
-      "size": 106349,
-      "gzip": 32997
+      "size": 106489,
+      "gzip": 33035
     },
     "react-art.development.js (UMD_DEV)": {
       "size": 339599,
@@ -34,68 +34,68 @@
       "gzip": 28977
     },
     "react.development.js (NODE_DEV)": {
-      "size": 109259,
-      "gzip": 27527
+      "size": 109110,
+      "gzip": 27479
     },
     "react.production.min.js (NODE_PROD)": {
-      "size": 12615,
-      "gzip": 4659
+      "size": 12598,
+      "gzip": 4649
     },
     "React-dev.js (FB_DEV)": {
-      "size": 110742,
-      "gzip": 28082
+      "size": 110875,
+      "gzip": 28140
     },
     "React-prod.js (FB_PROD)": {
-      "size": 56205,
-      "gzip": 14329
+      "size": 56406,
+      "gzip": 14416
     },
     "ReactDOMStack-dev.js (FB_DEV)": {
-      "size": 521957,
-      "gzip": 124586
+      "size": 522626,
+      "gzip": 124708
     },
     "ReactDOMStack-prod.js (FB_PROD)": {
-      "size": 351707,
-      "gzip": 84366
+      "size": 352708,
+      "gzip": 84660
     },
     "react-dom.development.js (NODE_DEV)": {
-      "size": 541898,
-      "gzip": 125114
+      "size": 542218,
+      "gzip": 125162
     },
     "react-dom.production.min.js (NODE_PROD)": {
-      "size": 116802,
-      "gzip": 36707
+      "size": 116858,
+      "gzip": 36717
     },
     "ReactDOMFiber-dev.js (FB_DEV)": {
-      "size": 796380,
-      "gzip": 183920
+      "size": 797268,
+      "gzip": 184134
     },
     "ReactDOMFiber-prod.js (FB_PROD)": {
-      "size": 407360,
-      "gzip": 93460
+      "size": 407540,
+      "gzip": 93567
     },
     "react-dom-server.development.js (NODE_DEV)": {
-      "size": 445181,
-      "gzip": 107467
+      "size": 445452,
+      "gzip": 107574
     },
     "react-dom-server.production.min.js (NODE_PROD)": {
-      "size": 101204,
-      "gzip": 31227
+      "size": 101344,
+      "gzip": 31273
     },
     "ReactDOMServerStack-dev.js (FB_DEV)": {
-      "size": 443932,
-      "gzip": 107406
+      "size": 444144,
+      "gzip": 107423
     },
     "ReactDOMServerStack-prod.js (FB_PROD)": {
-      "size": 332974,
-      "gzip": 80217
+      "size": 333744,
+      "gzip": 80424
     },
     "ReactARTStack-dev.js (FB_DEV)": {
-      "size": 492711,
-      "gzip": 118489
+      "size": 492651,
+      "gzip": 118470
     },
     "ReactARTStack-prod.js (FB_PROD)": {
-      "size": 365115,
-      "gzip": 87596
+      "size": 365055,
+      "gzip": 87582
     },
     "react-art.development.js (NODE_DEV)": {
       "size": 264816,
@@ -106,12 +106,12 @@
       "gzip": 17109
     },
     "ReactARTFiber-dev.js (FB_DEV)": {
-      "size": 263991,
-      "gzip": 56709
+      "size": 263951,
+      "gzip": 56683
     },
     "ReactARTFiber-prod.js (FB_PROD)": {
-      "size": 205194,
-      "gzip": 43039
+      "size": 205154,
+      "gzip": 43017
     },
     "ReactNativeStack.js (RN)": {
       "size": 233993,
@@ -122,12 +122,12 @@
       "gzip": 84001
     },
     "ReactTestRendererFiber-dev.js (FB_DEV)": {
-      "size": 261900,
-      "gzip": 55671
+      "size": 261860,
+      "gzip": 55645
     },
     "ReactTestRendererStack-dev.js (FB_DEV)": {
-      "size": 151142,
-      "gzip": 34709
+      "size": 151102,
+      "gzip": 34699
     },
     "react-noop-renderer.development.js (NODE_DEV)": {
       "size": 253895,
diff --git a/scripts/rollup/shims/rollup/ReactCheckPropTypesRollupShim.js b/scripts/rollup/shims/rollup/ReactCheckPropTypesRollupShim.js
deleted file mode 100644
index f8866b76e6f1d..0000000000000
--- a/scripts/rollup/shims/rollup/ReactCheckPropTypesRollupShim.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var React = require('react');
-
-module.exports = React.checkPropTypes;
diff --git a/scripts/rollup/shims/rollup/ReactComponentTreeHookRollupShim.js b/scripts/rollup/shims/rollup/ReactComponentTreeHookRollupShim.js
deleted file mode 100644
index bcdc4d8787409..0000000000000
--- a/scripts/rollup/shims/rollup/ReactComponentTreeHookRollupShim.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var ReactInternals = require('react').__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
-
-module.exports = ReactInternals.ReactComponentTreeHook;
diff --git a/scripts/rollup/shims/rollup/ReactCurrentOwnerRollupShim.js b/scripts/rollup/shims/rollup/ReactCurrentOwnerRollupShim.js
deleted file mode 100644
index 3e5579b86c5af..0000000000000
--- a/scripts/rollup/shims/rollup/ReactCurrentOwnerRollupShim.js
+++ /dev/null
@@ -1,3 +0,0 @@
-var ReactInternals = require('react').__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
-
-module.exports = ReactInternals.ReactCurrentOwner;
diff --git a/src/fb/ReactDOMFBEntry.js b/src/fb/ReactDOMFBEntry.js
index 7545c5ce3feec..754febaf3637a 100644
--- a/src/fb/ReactDOMFBEntry.js
+++ b/src/fb/ReactDOMFBEntry.js
@@ -11,7 +11,7 @@
 
 var ReactDOM = require('ReactDOM');
 
-ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
+Object.assign(ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, {
   // These should be easy to copy into react_contrib and remove from here:
   adler32: require('adler32'),
   getVendorPrefixedEventName: require('getVendorPrefixedEventName'),
@@ -29,25 +29,24 @@ ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
   SyntheticKeyboardEvent: require('SyntheticKeyboardEvent'),
   SyntheticMouseEvent: require('SyntheticMouseEvent'),
   // These are real internal dependencies that are trickier to remove:
-  EventPluginHub: require('EventPluginHub'),
   ReactBrowserEventEmitter: require('ReactBrowserEventEmitter'),
   ReactErrorUtils: require('ReactErrorUtils'),
   ReactDOMComponentTree: require('ReactDOMComponentTree'),
-  ReactInstanceMap: require('react-dom/lib/ReactInstanceMap'),
+  ReactInstanceMap: require('ReactInstanceMap'),
   // This is used for ajaxify on www:
   DOMProperty: require('DOMProperty'),
   // These are dependencies of TapEventPlugin:
   EventPluginUtils: require('EventPluginUtils'),
   EventPropagators: require('EventPropagators'),
   SyntheticUIEvent: require('SyntheticUIEvent'),
-};
+});
 
 if (__DEV__) {
   Object.assign(ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, {
     // ReactPerf and ReactTestUtils currently only work with the DOM renderer
     // so we expose them from here, but only in DEV mode.
-    ReactPerf: require('react-dom/lib/ReactPerf'),
-    ReactTestUtils: require('react-dom/lib/ReactTestUtils'),
+    ReactPerf: require('ReactPerf'),
+    ReactTestUtils: require('ReactTestUtils'),
   });
 }
 
diff --git a/src/fb/ReactDOMFiberFBEntry.js b/src/fb/ReactDOMFiberFBEntry.js
index c019d38c00424..188b9c71248ca 100644
--- a/src/fb/ReactDOMFiberFBEntry.js
+++ b/src/fb/ReactDOMFiberFBEntry.js
@@ -11,37 +11,39 @@
 
 var ReactDOMFiber = require('ReactDOMFiber');
 
-ReactDOMFiber.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
-  // These should be easy to copy into react_contrib and remove from here:
-  adler32: require('adler32'),
-  getVendorPrefixedEventName: require('getVendorPrefixedEventName'),
-  getEventCharCode: require('getEventCharCode'),
-  getEventKey: require('getEventKey'),
-  getEventTarget: require('getEventTarget'),
-  isEventSupported: require('isEventSupported'),
-  setInnerHTML: require('setInnerHTML'),
-  setTextContent: require('setTextContent'),
-  PooledClass: require('PooledClass'),
-  ReactDOMSelection: require('ReactDOMSelection'),
-  ReactInputSelection: require('ReactInputSelection'),
-  // These are mostly used in incorrect Flow typings and are codemoddable:
-  SyntheticEvent: require('SyntheticEvent'),
-  SyntheticKeyboardEvent: require('SyntheticKeyboardEvent'),
-  SyntheticMouseEvent: require('SyntheticMouseEvent'),
-  // These are real internal dependencies that are trickier to remove:
-  EventPluginHub: require('EventPluginHub'),
-  ReactBrowserEventEmitter: require('ReactBrowserEventEmitter'),
-  ReactErrorUtils: require('ReactErrorUtils'),
-  ReactFiberErrorLogger: require('ReactFiberErrorLogger'),
-  ReactDOMComponentTree: require('ReactDOMComponentTree'),
-  ReactInstanceMap: require('react-dom/lib/ReactInstanceMap'),
-  // This is used for ajaxify on www:
-  DOMProperty: require('DOMProperty'),
-  // These are dependencies of TapEventPlugin:
-  EventPluginUtils: require('EventPluginUtils'),
-  EventPropagators: require('EventPropagators'),
-  SyntheticUIEvent: require('SyntheticUIEvent'),
-};
+Object.assign(
+  ReactDOMFiber.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
+  {
+    // These should be easy to copy into react_contrib and remove from here:
+    adler32: require('adler32'),
+    getVendorPrefixedEventName: require('getVendorPrefixedEventName'),
+    getEventCharCode: require('getEventCharCode'),
+    getEventKey: require('getEventKey'),
+    getEventTarget: require('getEventTarget'),
+    isEventSupported: require('isEventSupported'),
+    setInnerHTML: require('setInnerHTML'),
+    setTextContent: require('setTextContent'),
+    PooledClass: require('PooledClass'),
+    ReactDOMSelection: require('ReactDOMSelection'),
+    ReactInputSelection: require('ReactInputSelection'),
+    // These are mostly used in incorrect Flow typings and are codemoddable:
+    SyntheticEvent: require('SyntheticEvent'),
+    SyntheticKeyboardEvent: require('SyntheticKeyboardEvent'),
+    SyntheticMouseEvent: require('SyntheticMouseEvent'),
+    // These are real internal dependencies that are trickier to remove:
+    ReactBrowserEventEmitter: require('ReactBrowserEventEmitter'),
+    ReactErrorUtils: require('ReactErrorUtils'),
+    ReactFiberErrorLogger: require('ReactFiberErrorLogger'),
+    ReactDOMComponentTree: require('ReactDOMComponentTree'),
+    ReactInstanceMap: require('ReactInstanceMap'),
+    // This is used for ajaxify on www:
+    DOMProperty: require('DOMProperty'),
+    // These are dependencies of TapEventPlugin:
+    EventPluginUtils: require('EventPluginUtils'),
+    EventPropagators: require('EventPropagators'),
+    SyntheticUIEvent: require('SyntheticUIEvent'),
+  },
+);
 
 if (__DEV__) {
   Object.assign(
@@ -49,7 +51,7 @@ if (__DEV__) {
     {
       // ReactPerf and ReactTestUtils currently only work with the DOM renderer
       // so we expose them from here, but only in DEV mode.
-      ReactTestUtils: require('react-dom/lib/ReactTestUtils'),
+      ReactTestUtils: require('ReactTestUtils'),
     },
   );
 }
diff --git a/src/fb/ReactFBEntry.js b/src/fb/ReactFBEntry.js
index e4d70b5d5994a..ac3fe41e622d9 100644
--- a/src/fb/ReactFBEntry.js
+++ b/src/fb/ReactFBEntry.js
@@ -11,27 +11,12 @@
 
 var React = require('React');
 
-// `version` will be added here by the React module.
-var ReactFBEntry = Object.assign(
-  {
-    __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
-      ReactChildren: require('ReactChildren'),
-      getComponentName: require('getComponentName'),
-      flattenChildren: require('flattenChildren'),
-    },
-  },
-  React,
-);
+// Add existing internal dependencies from www codebase.
+// The goal is to get rid of these with time or turn them into public APIs.
+Object.assign(React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, {
+  ReactChildren: require('ReactChildren'),
+  getComponentName: require('getComponentName'),
+  flattenChildren: require('flattenChildren'),
+});
 
-if (__DEV__) {
-  Object.assign(
-    ReactFBEntry.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
-    {
-      // These should not be included in production.
-      ReactComponentTreeHook: require('react/lib/ReactComponentTreeHook'),
-      ReactDebugCurrentFrame: require('react/lib/ReactDebugCurrentFrame'),
-    },
-  );
-}
-
-module.exports = ReactFBEntry;
+module.exports = React;
diff --git a/src/isomorphic/React.js b/src/isomorphic/React.js
index 4e03036be26e8..5e57605f1c0fc 100644
--- a/src/isomorphic/React.js
+++ b/src/isomorphic/React.js
@@ -84,6 +84,18 @@ var React = {
   DOM: ReactDOMFactories,
 
   version: ReactVersion,
+
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
+    ReactCurrentOwner: require('ReactCurrentOwner'),
+  },
 };
 
+if (__DEV__) {
+  Object.assign(React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, {
+    // These should not be included in production.
+    ReactComponentTreeHook: require('ReactComponentTreeHook'),
+    ReactDebugCurrentFrame: require('ReactDebugCurrentFrame'),
+  });
+}
+
 module.exports = React;
diff --git a/src/shared/utils/flattenChildren.js b/src/isomorphic/children/flattenChildren.js
similarity index 94%
rename from src/shared/utils/flattenChildren.js
rename to src/isomorphic/children/flattenChildren.js
index 21a5da7140abb..c6caa802bea29 100644
--- a/src/shared/utils/flattenChildren.js
+++ b/src/isomorphic/children/flattenChildren.js
@@ -28,7 +28,7 @@ if (
   // https://github.com/facebook/react/issues/7240
   // Remove the inline requires when we don't need them anymore:
   // https://github.com/facebook/react/pull/7178
-  ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
+  ReactComponentTreeHook = require('ReactComponentTreeHook');
 }
 
 /**
@@ -49,7 +49,7 @@ function flattenSingleChildIntoContext(
     const keyUnique = result[name] === undefined;
     if (__DEV__) {
       if (!ReactComponentTreeHook) {
-        ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
+        ReactComponentTreeHook = require('ReactComponentTreeHook');
       }
       if (!keyUnique) {
         warning(
diff --git a/src/shared/utils/traverseAllChildren.js b/src/isomorphic/children/traverseAllChildren.js
similarity index 98%
rename from src/shared/utils/traverseAllChildren.js
rename to src/isomorphic/children/traverseAllChildren.js
index dd8b49fb58006..a68d1816d68ab 100644
--- a/src/shared/utils/traverseAllChildren.js
+++ b/src/isomorphic/children/traverseAllChildren.js
@@ -11,8 +11,8 @@
 
 'use strict';
 
-var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
 var REACT_ELEMENT_TYPE = require('ReactElementSymbol');
+var ReactCurrentOwner = require('ReactCurrentOwner');
 
 var getIteratorFn = require('getIteratorFn');
 var invariant = require('fbjs/lib/invariant');
diff --git a/src/renderers/__tests__/ReactComponentTreeHook-test.js b/src/renderers/__tests__/ReactComponentTreeHook-test.js
index 0decdcd72fa88..2182aabf38c95 100644
--- a/src/renderers/__tests__/ReactComponentTreeHook-test.js
+++ b/src/renderers/__tests__/ReactComponentTreeHook-test.js
@@ -29,7 +29,7 @@ describe('ReactComponentTreeHook', () => {
     ReactDOM = require('react-dom');
     ReactDOMServer = require('react-dom/server');
     ReactInstanceMap = require('ReactInstanceMap');
-    ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
+    ReactComponentTreeHook = require('ReactComponentTreeHook');
     ReactComponentTreeTestUtils = require('ReactComponentTreeTestUtils');
   });
 
@@ -2123,7 +2123,7 @@ describe('ReactComponentTreeHook', () => {
       ReactDOM = require('react-dom');
       ReactDOMServer = require('react-dom/server');
       ReactInstanceMap = require('ReactInstanceMap');
-      ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
+      ReactComponentTreeHook = require('ReactComponentTreeHook');
       ReactComponentTreeTestUtils = require('ReactComponentTreeTestUtils');
     });
 
diff --git a/src/renderers/__tests__/ReactComponentTreeHook-test.native.js b/src/renderers/__tests__/ReactComponentTreeHook-test.native.js
index 2de9bff4eff77..dd7be7d7014ce 100644
--- a/src/renderers/__tests__/ReactComponentTreeHook-test.native.js
+++ b/src/renderers/__tests__/ReactComponentTreeHook-test.native.js
@@ -36,7 +36,7 @@ describeStack('ReactComponentTreeHook', () => {
     React = require('react');
     ReactNative = require('ReactNative');
     ReactInstanceMap = require('ReactInstanceMap');
-    ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
+    ReactComponentTreeHook = require('ReactComponentTreeHook');
     ReactComponentTreeTestUtils = require('ReactComponentTreeTestUtils');
     View = require('View');
     createReactNativeComponentClass = require('createReactNativeComponentClass');
diff --git a/src/renderers/__tests__/ReactCompositeComponent-test.js b/src/renderers/__tests__/ReactCompositeComponent-test.js
index 7259ec57b2a6b..7a7be1a0d1926 100644
--- a/src/renderers/__tests__/ReactCompositeComponent-test.js
+++ b/src/renderers/__tests__/ReactCompositeComponent-test.js
@@ -30,7 +30,7 @@ describe('ReactCompositeComponent', () => {
     ReactDOM = require('react-dom');
     ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
     ReactDOMServer = require('react-dom/server');
-    ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
+    ReactCurrentOwner = require('ReactCurrentOwner');
     ReactPropTypes = require('ReactPropTypes');
     ReactTestUtils = require('ReactTestUtils');
     shallowEqual = require('fbjs/lib/shallowEqual');
diff --git a/src/renderers/__tests__/ReactHostOperationHistoryHook-test.js b/src/renderers/__tests__/ReactHostOperationHistoryHook-test.js
index b787fa13f575d..81fc2683eb0c8 100644
--- a/src/renderers/__tests__/ReactHostOperationHistoryHook-test.js
+++ b/src/renderers/__tests__/ReactHostOperationHistoryHook-test.js
@@ -27,7 +27,7 @@ describeStack('ReactHostOperationHistoryHook', () => {
     jest.resetModules();
 
     React = require('react');
-    ReactPerf = require('react-dom/lib/ReactPerf');
+    ReactPerf = require('ReactPerf');
     ReactDOM = require('react-dom');
     ReactDOMComponentTree = require('ReactDOMComponentTree');
     ReactHostOperationHistoryHook = require('ReactHostOperationHistoryHook');
diff --git a/src/renderers/__tests__/ReactPerf-test.js b/src/renderers/__tests__/ReactPerf-test.js
index 7957266e6d70c..f01b3193d0fdb 100644
--- a/src/renderers/__tests__/ReactPerf-test.js
+++ b/src/renderers/__tests__/ReactPerf-test.js
@@ -41,7 +41,7 @@ describeStack('ReactPerf', () => {
 
     React = require('react');
     ReactDOM = require('react-dom');
-    ReactPerf = require('react-dom/lib/ReactPerf');
+    ReactPerf = require('ReactPerf');
     ReactTestUtils = require('ReactTestUtils');
     emptyFunction = require('fbjs/lib/emptyFunction');
 
diff --git a/src/renderers/__tests__/refs-test.js b/src/renderers/__tests__/refs-test.js
index 758fb51af04bf..202a101f1c8dc 100644
--- a/src/renderers/__tests__/refs-test.js
+++ b/src/renderers/__tests__/refs-test.js
@@ -317,7 +317,7 @@ describe('string refs between fiber and stack', () => {
 
   it('attaches, detaches from fiber component with stack layer', () => {
     spyOn(console, 'error');
-    const ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
+    const ReactCurrentOwner = require('ReactCurrentOwner');
     const ReactDOM = require('react-dom');
     const ReactDOMFiber = require('ReactDOMFiber');
     const ReactInstanceMap = require('ReactInstanceMap');
@@ -364,7 +364,7 @@ describe('string refs between fiber and stack', () => {
 
   it('attaches, detaches from stack component with fiber layer', () => {
     spyOn(console, 'error');
-    const ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
+    const ReactCurrentOwner = require('ReactCurrentOwner');
     const ReactDOM = require('react-dom');
     const ReactDOMFiber = require('ReactDOMFiber');
     const ReactInstanceMap = require('ReactInstanceMap');
diff --git a/src/renderers/dom/ReactDOM.js b/src/renderers/dom/ReactDOM.js
index 23a189f0c5c43..f5f976ea7d4aa 100644
--- a/src/renderers/dom/ReactDOM.js
+++ b/src/renderers/dom/ReactDOM.js
@@ -38,6 +38,11 @@ var ReactDOM = {
   unstable_batchedUpdates: ReactGenericBatching.batchedUpdates,
   unstable_renderSubtreeIntoContainer: ReactMount.renderSubtreeIntoContainer,
   /* eslint-enable camelcase */
+
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
+    // For TapEventPlugin which is popular in open source
+    EventPluginHub: require('EventPluginHub'),
+  },
 };
 
 // Inject the runtime into a devtools global hook regardless of browser.
diff --git a/src/renderers/dom/fiber/ReactDOMFiber.js b/src/renderers/dom/fiber/ReactDOMFiber.js
index be4d800a7dfaa..80598dfb69079 100644
--- a/src/renderers/dom/fiber/ReactDOMFiber.js
+++ b/src/renderers/dom/fiber/ReactDOMFiber.js
@@ -539,6 +539,11 @@ var ReactDOM = {
   unstable_batchedUpdates: ReactGenericBatching.batchedUpdates,
 
   unstable_deferredUpdates: DOMRenderer.deferredUpdates,
+
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
+    // For TapEventPlugin which is popular in open source
+    EventPluginHub: require('EventPluginHub'),
+  },
 };
 
 if (typeof injectInternals === 'function') {
diff --git a/src/renderers/dom/shared/findDOMNode.js b/src/renderers/dom/shared/findDOMNode.js
index ea1ef8d0f423d..35aa38518dd29 100644
--- a/src/renderers/dom/shared/findDOMNode.js
+++ b/src/renderers/dom/shared/findDOMNode.js
@@ -10,8 +10,8 @@
  * @flow
  */
 
-var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
 var ReactInstanceMap = require('ReactInstanceMap');
+var {ReactCurrentOwner} = require('ReactGlobalSharedState');
 
 var getComponentName = require('getComponentName');
 var invariant = require('fbjs/lib/invariant');
diff --git a/src/renderers/dom/shared/hooks/ReactDOMInvalidARIAHook.js b/src/renderers/dom/shared/hooks/ReactDOMInvalidARIAHook.js
index fb89d76220a66..6ada3db767a02 100644
--- a/src/renderers/dom/shared/hooks/ReactDOMInvalidARIAHook.js
+++ b/src/renderers/dom/shared/hooks/ReactDOMInvalidARIAHook.js
@@ -20,9 +20,10 @@ var warnedProperties = {};
 var rARIA = new RegExp('^(aria)-[' + DOMProperty.ATTRIBUTE_NAME_CHAR + ']*$');
 
 if (__DEV__) {
+  var {ReactComponentTreeHook} = require('ReactGlobalSharedState');
   var {
     getStackAddendumByID,
-  } = require('react/lib/ReactComponentTreeHook');
+  } = ReactComponentTreeHook;
 }
 
 function getStackAddendum(debugID) {
diff --git a/src/renderers/dom/shared/hooks/ReactDOMNullInputValuePropHook.js b/src/renderers/dom/shared/hooks/ReactDOMNullInputValuePropHook.js
index 92e2cf2c197d4..6b722b48641af 100644
--- a/src/renderers/dom/shared/hooks/ReactDOMNullInputValuePropHook.js
+++ b/src/renderers/dom/shared/hooks/ReactDOMNullInputValuePropHook.js
@@ -15,9 +15,8 @@ var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');
 var warning = require('fbjs/lib/warning');
 
 if (__DEV__) {
-  var {
-    getStackAddendumByID,
-  } = require('react/lib/ReactComponentTreeHook');
+  var {ReactComponentTreeHook} = require('ReactGlobalSharedState');
+  var {getStackAddendumByID} = ReactComponentTreeHook;
 }
 
 var didWarnValueNull = false;
diff --git a/src/renderers/dom/shared/hooks/ReactDOMUnknownPropertyHook.js b/src/renderers/dom/shared/hooks/ReactDOMUnknownPropertyHook.js
index c603e4ca76865..86b28f92e24c0 100644
--- a/src/renderers/dom/shared/hooks/ReactDOMUnknownPropertyHook.js
+++ b/src/renderers/dom/shared/hooks/ReactDOMUnknownPropertyHook.js
@@ -13,8 +13,8 @@
 
 var DOMProperty = require('DOMProperty');
 var EventPluginRegistry = require('EventPluginRegistry');
-var ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
 var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');
+var {ReactComponentTreeHook} = require('ReactGlobalSharedState');
 
 var warning = require('fbjs/lib/warning');
 
diff --git a/src/renderers/dom/stack/client/ReactMount.js b/src/renderers/dom/stack/client/ReactMount.js
index 93c21c84a2d91..9cbc2c91e44ed 100644
--- a/src/renderers/dom/stack/client/ReactMount.js
+++ b/src/renderers/dom/stack/client/ReactMount.js
@@ -14,7 +14,6 @@
 var DOMLazyTree = require('DOMLazyTree');
 var DOMProperty = require('DOMProperty');
 var React = require('react');
-var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
 var ReactDOMComponentTree = require('ReactDOMComponentTree');
 var ReactDOMContainerInfo = require('ReactDOMContainerInfo');
 var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
@@ -25,6 +24,7 @@ var ReactMarkupChecksum = require('ReactMarkupChecksum');
 var ReactReconciler = require('ReactReconciler');
 var ReactUpdateQueue = require('ReactUpdateQueue');
 var ReactUpdates = require('ReactUpdates');
+var {ReactCurrentOwner} = require('ReactGlobalSharedState');
 
 var getContextForSubtree = require('getContextForSubtree');
 var instantiateReactComponent = require('instantiateReactComponent');
diff --git a/src/renderers/native/findNodeHandle.js b/src/renderers/native/findNodeHandle.js
index 68ec7e503da84..10008836ff70c 100644
--- a/src/renderers/native/findNodeHandle.js
+++ b/src/renderers/native/findNodeHandle.js
@@ -12,8 +12,8 @@
 
 'use strict';
 
-var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
 var ReactInstanceMap = require('ReactInstanceMap');
+var {ReactCurrentOwner} = require('ReactGlobalSharedState');
 
 var invariant = require('fbjs/lib/invariant');
 var warning = require('fbjs/lib/warning');
diff --git a/src/renderers/shared/ReactDebugTool.js b/src/renderers/shared/ReactDebugTool.js
index b5ad9efeb9e1b..7be3d38fe73fb 100644
--- a/src/renderers/shared/ReactDebugTool.js
+++ b/src/renderers/shared/ReactDebugTool.js
@@ -14,8 +14,8 @@
 
 var ReactInvalidSetStateWarningHook = require('ReactInvalidSetStateWarningHook');
 var ReactHostOperationHistoryHook = require('ReactHostOperationHistoryHook');
-var ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
 var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
+var {ReactComponentTreeHook} = require('ReactGlobalSharedState');
 
 var performanceNow = require('fbjs/lib/performanceNow');
 var warning = require('fbjs/lib/warning');
diff --git a/src/renderers/shared/ReactGlobalSharedState.js b/src/renderers/shared/ReactGlobalSharedState.js
new file mode 100644
index 0000000000000..b9107b435857e
--- /dev/null
+++ b/src/renderers/shared/ReactGlobalSharedState.js
@@ -0,0 +1,27 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactGlobalSharedState
+ */
+
+'use strict';
+
+var ReactInternals = require('react').__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+
+var ReactGlobalSharedState = {
+  ReactCurrentOwner: ReactInternals.ReactCurrentOwner,
+};
+
+if (__DEV__) {
+  Object.assign(ReactGlobalSharedState, {
+    ReactComponentTreeHook: ReactInternals.ReactComponentTreeHook,
+    ReactDebugCurrentFrame: ReactInternals.ReactDebugCurrentFrame,
+  });
+}
+
+module.exports = ReactGlobalSharedState;
diff --git a/src/renderers/shared/fiber/ReactChildFiber.js b/src/renderers/shared/fiber/ReactChildFiber.js
index f56c80e1b9e7b..ac6eab0138dfe 100644
--- a/src/renderers/shared/fiber/ReactChildFiber.js
+++ b/src/renderers/shared/fiber/ReactChildFiber.js
@@ -36,7 +36,7 @@ var emptyObject = require('fbjs/lib/emptyObject');
 var getIteratorFn = require('getIteratorFn');
 var invariant = require('fbjs/lib/invariant');
 var ReactFeatureFlags = require('ReactFeatureFlags');
-var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
+var {ReactCurrentOwner} = require('ReactGlobalSharedState');
 
 if (__DEV__) {
   var {getCurrentFiberStackAddendum} = require('ReactDebugCurrentFiber');
diff --git a/src/renderers/shared/fiber/ReactFiberBeginWork.js b/src/renderers/shared/fiber/ReactFiberBeginWork.js
index ad58d044613f2..3787e98be02d9 100644
--- a/src/renderers/shared/fiber/ReactFiberBeginWork.js
+++ b/src/renderers/shared/fiber/ReactFiberBeginWork.js
@@ -60,8 +60,8 @@ var {
   Err,
   Ref,
 } = require('ReactTypeOfSideEffect');
-var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
 var ReactFiberClassComponent = require('ReactFiberClassComponent');
+var {ReactCurrentOwner} = require('ReactGlobalSharedState');
 var invariant = require('fbjs/lib/invariant');
 
 if (__DEV__) {
diff --git a/src/renderers/shared/fiber/ReactFiberContext.js b/src/renderers/shared/fiber/ReactFiberContext.js
index 67f37d1776162..e60fdd850eb16 100644
--- a/src/renderers/shared/fiber/ReactFiberContext.js
+++ b/src/renderers/shared/fiber/ReactFiberContext.js
@@ -34,8 +34,8 @@ const {
 } = require('ReactFiberStack');
 
 if (__DEV__) {
-  var ReactDebugCurrentFrame = require('react/lib/ReactDebugCurrentFrame');
   var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');
+  var {ReactDebugCurrentFrame} = require('ReactGlobalSharedState');
   var {
     startPhaseTimer,
     stopPhaseTimer,
diff --git a/src/renderers/shared/fiber/ReactFiberScheduler.js b/src/renderers/shared/fiber/ReactFiberScheduler.js
index 520b1c895435b..80ff10825e531 100644
--- a/src/renderers/shared/fiber/ReactFiberScheduler.js
+++ b/src/renderers/shared/fiber/ReactFiberScheduler.js
@@ -45,8 +45,8 @@ var ReactFiberBeginWork = require('ReactFiberBeginWork');
 var ReactFiberCompleteWork = require('ReactFiberCompleteWork');
 var ReactFiberCommitWork = require('ReactFiberCommitWork');
 var ReactFiberHostContext = require('ReactFiberHostContext');
-var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
 var ReactFeatureFlags = require('ReactFeatureFlags');
+var {ReactCurrentOwner} = require('ReactGlobalSharedState');
 var getComponentName = require('getComponentName');
 
 var {cloneFiber} = require('ReactFiber');
diff --git a/src/renderers/shared/fiber/ReactFiberTreeReflection.js b/src/renderers/shared/fiber/ReactFiberTreeReflection.js
index 1cd0dea6ed743..b527587c45ee9 100644
--- a/src/renderers/shared/fiber/ReactFiberTreeReflection.js
+++ b/src/renderers/shared/fiber/ReactFiberTreeReflection.js
@@ -15,7 +15,7 @@
 import type {Fiber} from 'ReactFiber';
 
 var ReactInstanceMap = require('ReactInstanceMap');
-var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
+var {ReactCurrentOwner} = require('ReactGlobalSharedState');
 
 var getComponentName = require('getComponentName');
 var invariant = require('fbjs/lib/invariant');
diff --git a/src/renderers/shared/stack/reconciler/ReactChildReconciler.js b/src/renderers/shared/stack/reconciler/ReactChildReconciler.js
index 7c9a13bfd064a..b0eedb0af9544 100644
--- a/src/renderers/shared/stack/reconciler/ReactChildReconciler.js
+++ b/src/renderers/shared/stack/reconciler/ReactChildReconciler.js
@@ -17,7 +17,7 @@ var ReactReconciler = require('ReactReconciler');
 
 var instantiateReactComponent = require('instantiateReactComponent');
 var shouldUpdateReactComponent = require('shouldUpdateReactComponent');
-var traverseAllChildren = require('traverseAllChildren');
+var traverseStackChildren = require('traverseStackChildren');
 var warning = require('fbjs/lib/warning');
 
 var ReactComponentTreeHook;
@@ -32,7 +32,7 @@ if (
   // https://github.com/facebook/react/issues/7240
   // Remove the inline requires when we don't need them anymore:
   // https://github.com/facebook/react/pull/7178
-  ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
+  ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook;
 }
 
 function instantiateChild(childInstances, child, name, selfDebugID) {
@@ -40,7 +40,7 @@ function instantiateChild(childInstances, child, name, selfDebugID) {
   var keyUnique = childInstances[name] === undefined;
   if (__DEV__) {
     if (!ReactComponentTreeHook) {
-      ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
+      ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook;
     }
     if (!keyUnique) {
       warning(
@@ -84,14 +84,14 @@ var ReactChildReconciler = {
     var childInstances = {};
 
     if (__DEV__) {
-      traverseAllChildren(
+      traverseStackChildren(
         nestedChildNodes,
         (childInsts, child, name) =>
           instantiateChild(childInsts, child, name, selfDebugID),
         childInstances,
       );
     } else {
-      traverseAllChildren(nestedChildNodes, instantiateChild, childInstances);
+      traverseStackChildren(nestedChildNodes, instantiateChild, childInstances);
     }
     return childInstances;
   },
diff --git a/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js b/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
index d2217db557af9..6649dffaf64b5 100644
--- a/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
+++ b/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
@@ -14,16 +14,16 @@
 var React = require('react');
 var ReactComponentEnvironment = require('ReactComponentEnvironment');
 var ReactCompositeComponentTypes = require('ReactCompositeComponentTypes');
-var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
 var ReactErrorUtils = require('ReactErrorUtils');
 var ReactFeatureFlags = require('ReactFeatureFlags');
 var ReactInstanceMap = require('ReactInstanceMap');
 var ReactInstrumentation = require('ReactInstrumentation');
 var ReactNodeTypes = require('ReactNodeTypes');
 var ReactReconciler = require('ReactReconciler');
+var {ReactCurrentOwner} = require('ReactGlobalSharedState');
 
 if (__DEV__) {
-  var ReactDebugCurrentFrame = require('react/lib/ReactDebugCurrentFrame');
+  var {ReactDebugCurrentFrame} = require('ReactGlobalSharedState');
   var warningAboutMissingGetChildContext = {};
 }
 
diff --git a/src/renderers/shared/stack/reconciler/ReactMultiChild.js b/src/renderers/shared/stack/reconciler/ReactMultiChild.js
index 19fd366a38e61..8bde4e26ffffa 100644
--- a/src/renderers/shared/stack/reconciler/ReactMultiChild.js
+++ b/src/renderers/shared/stack/reconciler/ReactMultiChild.js
@@ -15,12 +15,12 @@ var ReactComponentEnvironment = require('ReactComponentEnvironment');
 var ReactInstanceMap = require('ReactInstanceMap');
 var ReactInstrumentation = require('ReactInstrumentation');
 
-var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
 var ReactReconciler = require('ReactReconciler');
 var ReactChildReconciler = require('ReactChildReconciler');
+var {ReactCurrentOwner} = require('ReactGlobalSharedState');
 
 var emptyFunction = require('fbjs/lib/emptyFunction');
-var flattenChildren = require('flattenChildren');
+var flattenStackChildren = require('flattenStackChildren');
 var invariant = require('fbjs/lib/invariant');
 
 /**
@@ -212,7 +212,7 @@ var ReactMultiChild = {
       if (this._currentElement) {
         try {
           ReactCurrentOwner.current = this._currentElement._owner;
-          nextChildren = flattenChildren(
+          nextChildren = flattenStackChildren(
             nextNestedChildrenElements,
             selfDebugID,
           );
@@ -233,7 +233,10 @@ var ReactMultiChild = {
         return nextChildren;
       }
     }
-    nextChildren = flattenChildren(nextNestedChildrenElements, selfDebugID);
+    nextChildren = flattenStackChildren(
+      nextNestedChildrenElements,
+      selfDebugID,
+    );
     ReactChildReconciler.updateChildren(
       prevChildren,
       nextChildren,
diff --git a/src/renderers/shared/stack/reconciler/ReactRef.js b/src/renderers/shared/stack/reconciler/ReactRef.js
index cae62c717b26f..89abe98df736f 100644
--- a/src/renderers/shared/stack/reconciler/ReactRef.js
+++ b/src/renderers/shared/stack/reconciler/ReactRef.js
@@ -21,7 +21,7 @@ var ReactRef = {};
 
 if (__DEV__) {
   var ReactCompositeComponentTypes = require('ReactCompositeComponentTypes');
-  var ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
+  var {ReactComponentTreeHook} = require('ReactGlobalSharedState');
   var warning = require('fbjs/lib/warning');
 
   var warnedAboutStatelessRefs = {};
diff --git a/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js b/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js
index 20cbb87fbbe40..e34cfee15b960 100644
--- a/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js
+++ b/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js
@@ -11,10 +11,10 @@
 
 'use strict';
 
-var ReactCurrentOwner = require('react/lib/ReactCurrentOwner');
 var ReactInstanceMap = require('ReactInstanceMap');
 var ReactInstrumentation = require('ReactInstrumentation');
 var ReactUpdates = require('ReactUpdates');
+var {ReactCurrentOwner} = require('ReactGlobalSharedState');
 
 if (__DEV__) {
   var warning = require('fbjs/lib/warning');
diff --git a/src/renderers/shared/stack/reconciler/flattenStackChildren.js b/src/renderers/shared/stack/reconciler/flattenStackChildren.js
new file mode 100644
index 0000000000000..4abb79e78f054
--- /dev/null
+++ b/src/renderers/shared/stack/reconciler/flattenStackChildren.js
@@ -0,0 +1,103 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule flattenStackChildren
+ * @flow
+ */
+
+'use strict';
+
+var KeyEscapeUtils = require('KeyEscapeUtils');
+var traverseStackChildren = require('traverseStackChildren');
+var warning = require('fbjs/lib/warning');
+
+var ReactComponentTreeHook;
+
+if (
+  typeof process !== 'undefined' &&
+  process.env &&
+  process.env.NODE_ENV === 'test'
+) {
+  // Temporary hack.
+  // Inline requires don't work well with Jest:
+  // https://github.com/facebook/react/issues/7240
+  // Remove the inline requires when we don't need them anymore:
+  // https://github.com/facebook/react/pull/7178
+  ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook;
+}
+
+/**
+ * @param {function} traverseContext Context passed through traversal.
+ * @param {?ReactComponent} child React child component.
+ * @param {!string} name String name of key path to child.
+ * @param {number=} selfDebugID Optional debugID of the current internal instance.
+ */
+function flattenSingleChildIntoContext(
+  traverseContext: mixed,
+  child: ReactElement<any>,
+  name: string,
+  selfDebugID?: number,
+): void {
+  // We found a component instance.
+  if (traverseContext && typeof traverseContext === 'object') {
+    const result = traverseContext;
+    const keyUnique = result[name] === undefined;
+    if (__DEV__) {
+      if (!ReactComponentTreeHook) {
+        ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook;
+      }
+      if (!keyUnique) {
+        warning(
+          false,
+          'flattenChildren(...): Encountered two children with the same key, ' +
+            '`%s`. Child keys must be unique; when two children share a key, only ' +
+            'the first child will be used.%s',
+          KeyEscapeUtils.unescape(name),
+          ReactComponentTreeHook.getStackAddendumByID(selfDebugID),
+        );
+      }
+    }
+    if (keyUnique && child != null) {
+      result[name] = child;
+    }
+  }
+}
+
+/**
+ * Flattens children that are typically specified as `props.children`. Any null
+ * children will not be included in the resulting object.
+ * @return {!object} flattened children keyed by name.
+ */
+function flattenStackChildren(
+  children: ReactElement<any>,
+  selfDebugID?: number,
+): ?{[name: string]: ReactElement<any>} {
+  if (children == null) {
+    return children;
+  }
+  var result = {};
+
+  if (__DEV__) {
+    traverseStackChildren(
+      children,
+      (traverseContext, child, name) =>
+        flattenSingleChildIntoContext(
+          traverseContext,
+          child,
+          name,
+          selfDebugID,
+        ),
+      result,
+    );
+  } else {
+    traverseStackChildren(children, flattenSingleChildIntoContext, result);
+  }
+  return result;
+}
+
+module.exports = flattenStackChildren;
diff --git a/src/renderers/shared/stack/reconciler/traverseStackChildren.js b/src/renderers/shared/stack/reconciler/traverseStackChildren.js
new file mode 100644
index 0000000000000..b717ea28fbc02
--- /dev/null
+++ b/src/renderers/shared/stack/reconciler/traverseStackChildren.js
@@ -0,0 +1,201 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule traverseStackChildren
+ */
+
+'use strict';
+
+var REACT_ELEMENT_TYPE = require('ReactElementSymbol');
+var {ReactCurrentOwner} = require('ReactGlobalSharedState');
+
+var getIteratorFn = require('getIteratorFn');
+var invariant = require('fbjs/lib/invariant');
+var KeyEscapeUtils = require('KeyEscapeUtils');
+var warning = require('fbjs/lib/warning');
+
+var SEPARATOR = '.';
+var SUBSEPARATOR = ':';
+
+/**
+ * This is inlined from ReactElement since this file is shared between
+ * isomorphic and renderers. We could extract this to a
+ *
+ */
+
+/**
+ * TODO: Test that a single child and an array with one item have the same key
+ * pattern.
+ */
+
+var didWarnAboutMaps = false;
+
+/**
+ * Generate a key string that identifies a component within a set.
+ *
+ * @param {*} component A component that could contain a manual key.
+ * @param {number} index Index that is used if a manual key is not provided.
+ * @return {string}
+ */
+function getComponentKey(component, index) {
+  // Do some typechecking here since we call this blindly. We want to ensure
+  // that we don't block potential future ES APIs.
+  if (component && typeof component === 'object' && component.key != null) {
+    // Explicit key
+    return KeyEscapeUtils.escape(component.key);
+  }
+  // Implicit key determined by the index in the set
+  return index.toString(36);
+}
+
+/**
+ * @param {?*} children Children tree container.
+ * @param {!string} nameSoFar Name of the key path so far.
+ * @param {!function} callback Callback to invoke with each child found.
+ * @param {?*} traverseContext Used to pass information throughout the traversal
+ * process.
+ * @return {!number} The number of children in this subtree.
+ */
+function traverseStackChildrenImpl(
+  children,
+  nameSoFar,
+  callback,
+  traverseContext,
+) {
+  var type = typeof children;
+
+  if (type === 'undefined' || type === 'boolean') {
+    // All of the above are perceived as null.
+    children = null;
+  }
+
+  if (
+    children === null ||
+    type === 'string' ||
+    type === 'number' ||
+    // The following is inlined from ReactElement. This means we can optimize
+    // some checks. React Fiber also inlines this logic for similar purposes.
+    (type === 'object' && children.$$typeof === REACT_ELEMENT_TYPE)
+  ) {
+    callback(
+      traverseContext,
+      children,
+      // If it's the only child, treat the name as if it was wrapped in an array
+      // so that it's consistent if the number of children grows.
+      nameSoFar === '' ? SEPARATOR + getComponentKey(children, 0) : nameSoFar,
+    );
+    return 1;
+  }
+
+  var child;
+  var nextName;
+  var subtreeCount = 0; // Count of children found in the current subtree.
+  var nextNamePrefix = nameSoFar === '' ? SEPARATOR : nameSoFar + SUBSEPARATOR;
+
+  if (Array.isArray(children)) {
+    for (var i = 0; i < children.length; i++) {
+      child = children[i];
+      nextName = nextNamePrefix + getComponentKey(child, i);
+      subtreeCount += traverseStackChildrenImpl(
+        child,
+        nextName,
+        callback,
+        traverseContext,
+      );
+    }
+  } else {
+    var iteratorFn = getIteratorFn(children);
+    if (iteratorFn) {
+      if (__DEV__) {
+        // Warn about using Maps as children
+        if (iteratorFn === children.entries) {
+          let mapsAsChildrenAddendum = '';
+          if (ReactCurrentOwner.current) {
+            var mapsAsChildrenOwnerName = ReactCurrentOwner.current.getName();
+            if (mapsAsChildrenOwnerName) {
+              mapsAsChildrenAddendum = '\n\nCheck the render method of `' +
+                mapsAsChildrenOwnerName +
+                '`.';
+            }
+          }
+          warning(
+            didWarnAboutMaps,
+            'Using Maps as children is unsupported and will likely yield ' +
+              'unexpected results. Convert it to a sequence/iterable of keyed ' +
+              'ReactElements instead.%s',
+            mapsAsChildrenAddendum,
+          );
+          didWarnAboutMaps = true;
+        }
+      }
+
+      var iterator = iteratorFn.call(children);
+      var step;
+      var ii = 0;
+      while (!(step = iterator.next()).done) {
+        child = step.value;
+        nextName = nextNamePrefix + getComponentKey(child, ii++);
+        subtreeCount += traverseStackChildrenImpl(
+          child,
+          nextName,
+          callback,
+          traverseContext,
+        );
+      }
+    } else if (type === 'object') {
+      var addendum = '';
+      if (__DEV__) {
+        addendum = ' If you meant to render a collection of children, use an array ' +
+          'instead.';
+        if (ReactCurrentOwner.current) {
+          var name = ReactCurrentOwner.current.getName();
+          if (name) {
+            addendum += '\n\nCheck the render method of `' + name + '`.';
+          }
+        }
+      }
+      var childrenString = '' + children;
+      invariant(
+        false,
+        'Objects are not valid as a React child (found: %s).%s',
+        childrenString === '[object Object]'
+          ? 'object with keys {' + Object.keys(children).join(', ') + '}'
+          : childrenString,
+        addendum,
+      );
+    }
+  }
+
+  return subtreeCount;
+}
+
+/**
+ * Traverses children that are typically specified as `props.children`, but
+ * might also be specified through attributes:
+ *
+ * - `traverseStackChildren(this.props.children, ...)`
+ * - `traverseStackChildren(this.props.leftPanelChildren, ...)`
+ *
+ * The `traverseContext` is an optional argument that is passed through the
+ * entire traversal. It can be used to store accumulations or anything else that
+ * the callback might find relevant.
+ *
+ * @param {?*} children Children tree object.
+ * @param {!function} callback To invoke upon traversing each child.
+ * @param {?*} traverseContext Context for traversal.
+ * @return {!number} The number of children in this subtree.
+ */
+function traverseStackChildren(children, callback, traverseContext) {
+  if (children == null) {
+    return 0;
+  }
+
+  return traverseStackChildrenImpl(children, '', callback, traverseContext);
+}
+
+module.exports = traverseStackChildren;
diff --git a/src/test/ReactComponentTreeTestUtils.js b/src/test/ReactComponentTreeTestUtils.js
index 91f4e36b8a2e2..10dca25e19b6b 100644
--- a/src/test/ReactComponentTreeTestUtils.js
+++ b/src/test/ReactComponentTreeTestUtils.js
@@ -11,7 +11,7 @@
 
 'use strict';
 
-var ReactComponentTreeHook = require('react/lib/ReactComponentTreeHook');
+var ReactComponentTreeHook = require('ReactComponentTreeHook');
 
 function getRootDisplayNames() {
   return ReactComponentTreeHook.getRootIDs().map(
diff --git a/src/test/ReactTestUtils.js b/src/test/ReactTestUtils.js
index d3190de877359..d0ca2fe4063e0 100644
--- a/src/test/ReactTestUtils.js
+++ b/src/test/ReactTestUtils.js
@@ -21,7 +21,7 @@ var ReactDOM = require('react-dom');
 var ReactDOMComponentTree = require('ReactDOMComponentTree');
 var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');
 var ReactFiberTreeReflection = require('ReactFiberTreeReflection');
-var ReactInstanceMap = require('react-dom/lib/ReactInstanceMap');
+var ReactInstanceMap = require('ReactInstanceMap');
 var ReactTypeOfWork = require('ReactTypeOfWork');
 var ReactGenericBatching = require('ReactGenericBatching');
 var SyntheticEvent = require('SyntheticEvent');
diff --git a/src/umd/ReactDOMServerUMDEntry.js b/src/umd/ReactDOMServerUMDEntry.js
deleted file mode 100644
index 7a55540e2b729..0000000000000
--- a/src/umd/ReactDOMServerUMDEntry.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule ReactDOMServerUMDEntry
- */
-
-'use strict';
-
-var ReactDOMServer = require('ReactDOMServer');
-
-module.exports = ReactDOMServer;
diff --git a/src/umd/ReactDOMUMDEntry.js b/src/umd/ReactDOMUMDEntry.js
deleted file mode 100644
index 1749f30acc484..0000000000000
--- a/src/umd/ReactDOMUMDEntry.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule ReactDOMUMDEntry
- */
-
-'use strict';
-
-var ReactDOM = require('ReactDOMFiber');
-
-var ReactDOMUMDEntry = Object.assign(ReactDOM, {
-  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
-    // For TapEventPlugin which is popular in open source
-    EventPluginHub: require('EventPluginHub'),
-  },
-});
-
-module.exports = ReactDOMUMDEntry;
diff --git a/src/umd/ReactUMDEntry.js b/src/umd/ReactUMDEntry.js
deleted file mode 100644
index 1ab1076c8069b..0000000000000
--- a/src/umd/ReactUMDEntry.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule ReactUMDEntry
- */
-
-'use strict';
-
-var React = require('React');
-
-// `version` will be added here by the React module.
-var ReactUMDEntry = Object.assign(
-  {
-    __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
-      ReactCurrentOwner: require('react/lib/ReactCurrentOwner'),
-    },
-  },
-  React,
-);
-
-if (__DEV__) {
-  Object.assign(
-    ReactUMDEntry.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
-    {
-      // These should not be included in production.
-      ReactComponentTreeHook: require('react/lib/ReactComponentTreeHook'),
-      ReactDebugCurrentFrame: require('react/lib/ReactDebugCurrentFrame'),
-    },
-  );
-}
-
-module.exports = ReactUMDEntry;
diff --git a/src/umd/shims/ReactComponentTreeHookUMDShim.js b/src/umd/shims/ReactComponentTreeHookUMDShim.js
deleted file mode 100644
index 82a5cf6e15215..0000000000000
--- a/src/umd/shims/ReactComponentTreeHookUMDShim.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule ReactComponentTreeHookUMDShim
- */
-
-/* globals React */
-
-'use strict';
-
-var ReactInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
-
-module.exports = ReactInternals.ReactComponentTreeHook;
diff --git a/src/umd/shims/ReactCurrentOwnerUMDShim.js b/src/umd/shims/ReactCurrentOwnerUMDShim.js
deleted file mode 100644
index 79ef232b54b07..0000000000000
--- a/src/umd/shims/ReactCurrentOwnerUMDShim.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule ReactCurrentOwnerUMDShim
- */
-
-/* globals React */
-
-'use strict';
-
-var ReactInternals = React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
-
-module.exports = ReactInternals.ReactCurrentOwner;
diff --git a/src/umd/shims/ReactUMDShim.js b/src/umd/shims/ReactUMDShim.js
deleted file mode 100644
index 84ae35c47505b..0000000000000
--- a/src/umd/shims/ReactUMDShim.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule ReactUMDShim
- */
-
-/* globals React */
-
-'use strict';
-
-module.exports = React;

From e5ce3fd368fd3022a910550c8b5c9639997d613a Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@me.com>
Date: Fri, 7 Apr 2017 14:41:16 -0700
Subject: [PATCH 071/153] Blog post and changelog for 15.5.0 (#9368)

---
 CHANGELOG.md                            |  28 +++
 docs/_data/authors.yml                  |   3 +
 docs/_posts/2017-04-07-react-v15.5.0.md | 227 ++++++++++++++++++++++++
 3 files changed, 258 insertions(+)
 create mode 100644 docs/_posts/2017-04-07-react-v15.5.0.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ce56e7e77896..3765106bc4ccc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## 15.5.0 (April 7, 2017)
+
+### React
+
+* Added a deprecation warning for `React.createClass`. Points users to create-react-class instead. ([@acdlite](https://github.com/acdlite) in [d9a4fa4](https://github.com/facebook/react/commit/d9a4fa4f51c6da895e1655f32255cf72c0fe620e))
+* Added a deprecation warning for `React.PropTypes`. Points users to prop-types instead. ([@acdlite](https://github.com/acdlite) in [043845c](https://github.com/facebook/react/commit/043845ce75ea0812286bbbd9d34994bb7e01eb28))
+* Fixed an issue when using `ReactDOM` together with `ReactDOMServer`. ([@wacii](https://github.com/wacii) in [#9005](https://github.com/facebook/react/pull/9005))
+* Fixed issue with Closure Compiler. ([@anmonteiro](https://github.com/anmonteiro) in [#8895](https://github.com/facebook/react/pull/8895))
+* Another fix for Closure Compiler. ([@Shastel](https://github.com/Shastel) in [#8882](https://github.com/facebook/react/pull/8882))
+* Added component stack info to invalid element type warning. ([@n3tr](https://github.com/n3tr) in [#8495](https://github.com/facebook/react/pull/8495))
+
+### React DOM
+
+* Fixed Chrome bug when backspacing in number inputs. ([@nhunzaker](https://github.com/nhunzaker) in [#7359](https://github.com/facebook/react/pull/7359))
+* Added `react-dom/test-utils`, which exports the React Test Utils. ([@bvaughn](https://github.com/bvaughn))
+
+### React Test Renderer
+
+* Fixed bug where `componentWillUnmount` was not called for children. ([@gre](https://github.com/gre) in [#8512](https://github.com/facebook/react/pull/8512))
+* Added `react-test-renderer/shallow`, which exports the shallow renderer. ([@bvaughn](https://github.com/bvaughn))
+
+### React Addons
+
+* Last release for addons; they will no longer be actively maintained.
+* Removed `peerDependencies` so that addons continue to work indefinitely. ([@acdlite](https://github.com/acdlite) and [@bvaughn](https://github.com/bvaughn) in [8a06cd7](https://github.com/facebook/react/commit/8a06cd7a786822fce229197cac8125a551e8abfa) and [67a8db3](https://github.com/facebook/react/commit/67a8db3650d724a51e70be130e9008806402678a))
+* Updated to remove references to `React.createClass` and `React.PropTypes` ([@acdlite](https://github.com/acdlite) in [12a96b9](https://github.com/facebook/react/commit/12a96b94823d6b6de6b1ac13bd576864abd50175))
+* `react-addons-test-utils` is deprecated. Use `react-dom/test-utils` and `react-test-renderer/shallow` instead. ([@bvaughn](https://github.com/bvaughn))
+
 ## 15.4.2 (January 6, 2017)
 
 ### React
diff --git a/docs/_data/authors.yml b/docs/_data/authors.yml
index eff00b7e2eb59..d52ee1d96d528 100644
--- a/docs/_data/authors.yml
+++ b/docs/_data/authors.yml
@@ -1,6 +1,9 @@
 # Map of short name to more information. `name` will be used but if you don't
 # want to use your real name, just use whatever. If url is included, your name
 # will be a link to the provided url.
+acdlite:
+  name: Andrew Clark
+  url: https://twitter.com/acdlite
 benigeri:
   name: Paul Benigeri
   url: https://github.com/benigeri
diff --git a/docs/_posts/2017-04-07-react-v15.5.0.md b/docs/_posts/2017-04-07-react-v15.5.0.md
new file mode 100644
index 0000000000000..050c304442c4d
--- /dev/null
+++ b/docs/_posts/2017-04-07-react-v15.5.0.md
@@ -0,0 +1,227 @@
+---
+title: "React v15.5.0"
+author: acdlite
+---
+
+It's been exactly one year since the last breaking change to React. Our next major release, React 16, will include some exciting improvements, including a [complete rewrite](https://www.youtube.com/watch?v=ZCuYPiUIONs) of React's internals. [We take stability seriously](/react/contributing/design-principles.html#stability), and are committed to bringing those improvements to all of our users with minimal effort.
+
+To that end, today we're releasing React 15.5.0.
+
+### New Deprecation Warnings
+
+The biggest change is that we've extracted `React.PropTypes` and `React.createClass` into their own packages. Both are still accessible via the main `React` object, but using either will log a one-time deprecation warning to the console when in development mode. This will enable future code size optimizations.
+
+These warnings will not affect the behavior of your application. However, we realize they may cause some frustration, particularly if you use a testing framework that treats `console.error` as a failure.
+
+**Adding new warnings is not something we do lightly.** Warnings in React are not mere suggestions — they are integral to our strategy of keeping as many people as possible on the latest version of React. We never add warnings without providing an incremental path forward.
+
+So while the warnings may cause frustration in the short-term, we believe **prodding developers to migrate their codebases now prevents greater frustration in the future**. Proactively fixing warnings ensures you are prepared for the next major release. If your app produces zero warnings in 15.5, it should continue to work in 16 without any changes.
+
+For each of these new deprecations, we've provided a codemod to automatically migrate your code. They are available as part of the [react-codemod](https://github.com/reactjs/react-codemod) project.
+
+### Migrating from React.PropTypes
+
+Prop types are a feature for runtime validation of props during development. We've extracted the built-in prop types to a separate package to reflect the fact that not everybody uses them.
+
+In 15.5, instead of accessing `PropTypes` from the main `React` object, install the `prop-types` package and import them from there:
+
+```js{11,16,25}
+// Before (15.4 and below)
+import React from 'react';
+
+class Component extends React.Component {
+  render() {
+    return <div>{this.props.text}</div>;
+  }
+}
+
+Component.propTypes = {
+  text: React.PropTypes.string.isRequired,
+}
+
+// After (15.5)
+import React from 'react';
+import PropTypes from 'prop-types';
+
+class Component extends React.Component {
+  render() {
+    return <div>{this.props.text}</div>;
+  }
+}
+
+Component.propTypes = {
+  text: PropTypes.string.isRequired,
+};
+```
+
+The [codemod](https://github.com/reactjs/react-codemod#react-proptypes-to-prop-types) for this change performs this conversion automatically. Basic usage:
+
+```bash
+jscodeshift -t react-codemod/transforms/React-PropTypes-to-prop-types.js <path>
+```
+
+
+The `propTypes`, `contextTypes`, and `childContextTypes` APIs will work exactly as before. The only change is that the built-in validators now live in a separate package.
+
+You may also consider using [Flow](https://flow.org/) to statically type check your JavaScript code, including [React components](https://flow.org/en/docs/frameworks/react/#setup-flow-with-react-a-classtoc-idtoc-setup-flow-with-react-hreftoc-setup-flow-with-reacta).
+
+### Migrating from React.createClass
+
+When React was initially released, there was no idiomatic way to create classes in JavaScript, so we provided our own: `React.createClass`.
+
+Later, classes were added to the language as part of ES2015, so we added the ability to create React components using JavaScript classes. **Along with functional components, JavaScript classes are now the [preferred way to create components in React](/react/docs/components-and-props.html#functional-and-class-components).**
+
+For your existing `createClass` components, we recommend that you migrate them to JavaScript classes. However, if you have components that rely on mixins, converting to classes may not be immediately feasible. If so, `create-react-class` is available on npm as a drop-in replacement:
+
+```js{4,13,15}
+// Before (15.4 and below)
+var React = require('react');
+
+var Component = React.createClass({
+  mixins: [MixinA],
+  render() {
+    return <Child />;
+  }
+});
+
+// After (15.5)
+var React = require('react');
+var createReactClass = require('create-react-class');
+
+var Component = createReactClass({
+  mixins: [MixinA],
+  render() {
+    return <Child />;
+  }
+});
+```
+
+Your components will continue to work the same as they did before.
+
+The [codemod](https://github.com/reactjs/react-codemod#explanation-of-the-new-es2015-class-transform-with-property-initializers) for this change attempts to convert a `createClass` component to a JavaScript class, with a fallback to `create-react-class` if necessary. It has converted thousands of components internally at Facebook.
+
+Basic usage:
+
+```bash
+jscodeshift -t react-codemod/transforms/class.js path/to/components
+```
+
+### Discontinuing support for React Addons
+
+We're discontinuing active maintenance of React Addons packages. In truth, most of these packages haven't been actively maintained in a long time. They will continue to work indefinitely, but we recommend migrating away as soon as you can to prevent future breakages.
+
+- **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`](/react/docs/react-api.html#react.purecomponent) instead.
+- **react-addons-shallow-compare** - Use [`React.PureComponent`](/react/docs/react-api.html#react.purecomponent) 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.
+
+We're also discontinuing support for the `react-with-addons` UMD build. It will be removed in React 16.
+
+### React Test Utils
+
+Currently, the React Test Utils live inside `react-addons-test-utils`. As of 15.5, we're deprecating that package and moving them to `react-dom/test-utils` instead:
+
+```js
+// Before (15.4 and below)
+import TestUtils from 'react-addons-test-utils';
+
+// After (15.5)
+import TestUtils from 'react-dom/test-utils';
+```
+
+This reflects the fact that what we call the Test Utils are really a set of APIs that wrap the DOM renderer.
+
+The exception is shallow rendering, which is not DOM-specific. The shallow renderer has been moved to `react-test-renderer/shallow`.
+
+```js{2,5}
+// Before (15.4 and below)
+import { createRenderer } from 'react-addons-test-utils';
+
+// After (15.5)
+import { createRenderer } from 'react-test-renderer/shallow';
+```
+
+---
+
+## Acknowledgements
+
+A special thank you to these folks for transferring ownership of npm package names:
+
+- [Jason Miller](https://github.com/developit)
+- [Aaron Ackerman](https://github.com/aackerman)
+- [Vinicius Marson](https://github.com/viniciusmarson)
+
+---
+
+## Installation
+
+We recommend using [Yarn](https://yarnpkg.com/) or [npm](https://www.npmjs.com/) for managing front-end dependencies. If you're new to package managers, the [Yarn documentation](https://yarnpkg.com/en/docs/getting-started) is a good place to get started.
+
+To install React with Yarn, run:
+
+```bash
+yarn add react@15.5.0 react-dom@15.5.0
+```
+
+To install React with npm, run:
+
+```bash
+npm install --save react@15.5.0 react-dom@15.5.0
+```
+
+We recommend using a bundler like [webpack](https://webpack.js.org/) or [Browserify](http://browserify.org/) so you can write modular code and bundle it together into small packages to optimize load time.
+
+Remember that by default, React runs extra checks and provides helpful warnings in development mode. When deploying your app, make sure to [compile it in production mode](/react/docs/installation.html#development-and-production-versions).
+
+In case you don't use a bundler, we also provide pre-built bundles in the npm packages which you can [include as script tags](/react/docs/installation.html#using-a-cdn) on your page:
+
+* **React**  
+  Dev build with warnings: [react/dist/react.js](https://unpkg.com/react@15.5.0/dist/react.js)  
+  Minified build for production: [react/dist/react.min.js](https://unpkg.com/react@15.5.0/dist/react.min.js)  
+* **React with Add-Ons**  
+  Dev build with warnings: [react/dist/react-with-addons.js](https://unpkg.com/react@15.5.0/dist/react-with-addons.js)  
+  Minified build for production: [react/dist/react-with-addons.min.js](https://unpkg.com/react@15.5.0/dist/react-with-addons.min.js)  
+* **React DOM** (include React in the page before React DOM)  
+  Dev build with warnings: [react-dom/dist/react-dom.js](https://unpkg.com/react-dom@15.5.0/dist/react-dom.js)  
+  Minified build for production: [react-dom/dist/react-dom.min.js](https://unpkg.com/react-dom@15.5.0/dist/react-dom.min.js)  
+* **React DOM Server** (include React in the page before React DOM Server)  
+  Dev build with warnings: [react-dom/dist/react-dom-server.js](https://unpkg.com/react-dom@15.5.0/dist/react-dom-server.js)  
+  Minified build for production: [react-dom/dist/react-dom-server.min.js](https://unpkg.com/react-dom@15.5.0/dist/react-dom-server.min.js)
+
+We've also published version `15.5.0` of the `react`, `react-dom`, and addons packages on npm and the `react` package on bower.
+
+---
+
+## Changelog
+
+## 15.5.0 (April 7, 2017)
+
+### React
+
+* Added a deprecation warning for `React.createClass`. Points users to create-react-class instead. ([@acdlite](https://github.com/acdlite) in [d9a4fa4](https://github.com/facebook/react/commit/d9a4fa4f51c6da895e1655f32255cf72c0fe620e))
+* Added a deprecation warning for `React.PropTypes`. Points users to prop-types instead. ([@acdlite](https://github.com/acdlite) in [043845c](https://github.com/facebook/react/commit/043845ce75ea0812286bbbd9d34994bb7e01eb28))
+* Fixed an issue when using `ReactDOM` together with `ReactDOMServer`. ([@wacii](https://github.com/wacii) in [#9005](https://github.com/facebook/react/pull/9005))
+* Fixed issue with Closure Compiler. ([@anmonteiro](https://github.com/anmonteiro) in [#8895](https://github.com/facebook/react/pull/8895))
+* Another fix for Closure Compiler. ([@Shastel](https://github.com/Shastel) in [#8882](https://github.com/facebook/react/pull/8882))
+* Added component stack info to invalid element type warning. ([@n3tr](https://github.com/n3tr) in [#8495](https://github.com/facebook/react/pull/8495))
+
+### React DOM
+
+* Fixed Chrome bug when backspacing in number inputs. ([@nhunzaker](https://github.com/nhunzaker) in [#7359](https://github.com/facebook/react/pull/7359))
+* Added `react-dom/test-utils`, which exports the React Test Utils. ([@bvaughn](https://github.com/bvaughn))
+
+### React Test Renderer
+
+* Fixed bug where `componentWillUnmount` was not called for children. ([@gre](https://github.com/gre) in [#8512](https://github.com/facebook/react/pull/8512))
+* Added `react-test-renderer/shallow`, which exports the shallow renderer. ([@bvaughn](https://github.com/bvaughn))
+
+### React Addons
+
+* Last release for addons; they will no longer be actively maintained.
+* Removed `peerDependencies` so that addons continue to work indefinitely. ([@acdlite](https://github.com/acdlite) and [@bvaughn](https://github.com/bvaughn) in [8a06cd7](https://github.com/facebook/react/commit/8a06cd7a786822fce229197cac8125a551e8abfa) and [67a8db3](https://github.com/facebook/react/commit/67a8db3650d724a51e70be130e9008806402678a))
+* Updated to remove references to `React.createClass` and `React.PropTypes` ([@acdlite](https://github.com/acdlite) in [12a96b9](https://github.com/facebook/react/commit/12a96b94823d6b6de6b1ac13bd576864abd50175))
+* `react-addons-test-utils` is deprecated. Use `react-dom/test-utils` and `react-test-renderer/shallow` instead. ([@bvaughn](https://github.com/bvaughn))

From d3d4b599b9da62178a5cfad621f815ff5127e4cb Mon Sep 17 00:00:00 2001
From: Aaron Ackerman <theron17@gmail.com>
Date: Fri, 7 Apr 2017 22:05:34 -0500
Subject: [PATCH 072/153] Point users to the npm page instead of the github
 project for prop-types (#9373)

---
 docs/docs/typechecking-with-proptypes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/typechecking-with-proptypes.md b/docs/docs/typechecking-with-proptypes.md
index 63c3241c2e1ce..ce5e0aedee977 100644
--- a/docs/docs/typechecking-with-proptypes.md
+++ b/docs/docs/typechecking-with-proptypes.md
@@ -7,7 +7,7 @@ redirect_from:
 ---
 
 > Note:
-> `React.PropTypes` is deprecated as of React v15.5. Please use [the `prop-types` library instead](https://github.com/aackerman/PropTypes).
+> `React.PropTypes` is deprecated as of React v15.5. Please use [the `prop-types` library instead](https://www.npmjs.com/package/prop-types).
 
 As your app grows, you can catch a lot of bugs with typechecking. For some applications, you can use JavaScript extensions like [Flow](https://flowtype.org/) or [TypeScript](https://www.typescriptlang.org/) to typecheck your whole application. But even if you don't use those, React has some built-in typechecking abilities. To run typechecking on the props for a component, you can assign the special `propTypes` property:
 

From 6c8fd16a065913d64306bb7ea2693b135393542d Mon Sep 17 00:00:00 2001
From: Luke Belliveau <luke.belliveau@gmail.com>
Date: Sun, 9 Apr 2017 14:37:41 -0500
Subject: [PATCH 073/153] Amended implementation-notes.md with link to Dan
 Abramov's post describing difference between React components, elements, and
 instances (#9388)

* Amended implementation-notes.md to include a link to a blog post by Dan Abramov, explaining the difference between components, elements, and instances. An understanding of this distinction is crucial in tracing through Implementation pseudocode, and reading Dan's blog first may ease newcomers into understanding the implementation.

* adjusted wording to maintain stylistic consistency with rest of content, per @aweary's request
---
 docs/contributing/implementation-notes.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/contributing/implementation-notes.md b/docs/contributing/implementation-notes.md
index 2252a006cac71..2309dd721cc1b 100644
--- a/docs/contributing/implementation-notes.md
+++ b/docs/contributing/implementation-notes.md
@@ -11,6 +11,8 @@ This section is a collection of implementation notes for the [stack reconciler](
 
 It is very technical and assumes a strong understanding of React public API as well as how it's divided into core, renderers, and the reconciler. If you're not very familiar with the React codebase, read [the codebase overview](/react/contributing/codebase-overview.html) first.
 
+It also assumes an understanding of the [differences between React components, their instances, and elements](/react/blog/2015/12/18/react-components-elements-and-instances.html).
+
 The stack reconciler is powering all the React production code today. It is located in [`src/renderers/shared/stack/reconciler`](https://github.com/facebook/react/tree/master/src/renderers/shared/stack) and is used by both React DOM and React Native.
 
 ### Video: Building React from Scratch

From 457b812c262931239682e5cbb57c5bd5900d218b Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Mon, 10 Apr 2017 22:01:56 +0100
Subject: [PATCH 074/153] Fix ReactARTStack bundles to not include DOM Stack
 inside (#9394)

* Move ReactDOMFrameScheduling.js to shared (between dom and art)

* Fix ReactARTStack bundles to not include DOM Stack inside
---
 scripts/rollup/build.js                       |  9 +++-
 scripts/rollup/bundles.js                     |  6 +--
 scripts/rollup/modules.js                     |  8 ---
 scripts/rollup/results.json                   | 50 +++++++++----------
 .../ReactDOMFrameScheduling.js                |  0
 src/test/ReactTestUtils.js                    |  2 +-
 6 files changed, 36 insertions(+), 39 deletions(-)
 rename src/renderers/{dom/fiber => shared}/ReactDOMFrameScheduling.js (100%)

diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js
index b557a11926504..7f3055b099239 100644
--- a/scripts/rollup/build.js
+++ b/scripts/rollup/build.js
@@ -246,12 +246,19 @@ function getPlugins(
   manglePropertiesOnProd
 ) {
   const plugins = [
-    replace(Modules.getDefaultReplaceModules(bundleType)),
     babel(updateBabelConfig(babelOpts, bundleType)),
     alias(
       Modules.getAliases(paths, bundleType, isRenderer, argv.extractErrors)
     ),
   ];
+
+  const replaceModules = Modules.getDefaultReplaceModules(bundleType);
+  // We have to do this check because Rollup breaks on empty object.
+  // TODO: file an issue with rollup-plugin-replace.
+  if (Object.keys(replaceModules).length > 0) {
+    plugins.unshift(replace(replaceModules));
+  }
+
   switch (bundleType) {
     case UMD_DEV:
     case NODE_DEV:
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index fc221c5a5809c..69b04f0b73d0f 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -169,6 +169,7 @@ const bundles = [
       'art/modes/current',
       'art/modes/fast-noSideEffects',
       'art/core/transform',
+      'react-dom',
     ],
     fbEntry: 'src/renderers/art/ReactARTStack.js',
     hasteName: 'ReactARTStack',
@@ -177,8 +178,6 @@ const bundles = [
     manglePropertiesOnProd: false,
     name: 'react-art',
     paths: [
-      // TODO: it relies on ReactDOMFrameScheduling. Need to move to shared/?
-      'src/renderers/dom/**/*.js',
       'src/renderers/art/**/*.js',
       'src/renderers/shared/**/*.js',
 
@@ -204,6 +203,7 @@ const bundles = [
       'art/modes/current',
       'art/modes/fast-noSideEffects',
       'art/core/transform',
+      'react-dom',
     ],
     fbEntry: 'src/renderers/art/ReactARTFiber.js',
     hasteName: 'ReactARTFiber',
@@ -212,8 +212,6 @@ const bundles = [
     manglePropertiesOnProd: false,
     name: 'react-art',
     paths: [
-      // TODO: it relies on ReactDOMFrameScheduling. Need to move to shared/?
-      'src/renderers/dom/**/*.js',
       'src/renderers/art/**/*.js',
       'src/renderers/shared/**/*.js',
 
diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js
index e6b1904a468d0..801b94e3c4f43 100644
--- a/scripts/rollup/modules.js
+++ b/scripts/rollup/modules.js
@@ -171,13 +171,6 @@ function getInternalModules() {
   };
 }
 
-function replaceInternalModules() {
-  // we inline these modules in the bundles rather than leave them as external
-  return {
-    "'react-dom'": `'${resolve('./src/renderers/dom/ReactDOM.js')}'`,
-  };
-}
-
 function getFbjsModuleAliases(bundleType) {
   switch (bundleType) {
     case UMD_DEV:
@@ -253,7 +246,6 @@ function getAliases(paths, bundleType, isRenderer, extractErrors) {
 function getDefaultReplaceModules(bundleType) {
   return Object.assign(
     {},
-    replaceInternalModules(),
     replaceFbjsModuleAliases(bundleType),
     replaceDevOnlyStubbedModules(bundleType)
   );
diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
index 9d4a85e8cc540..88406fe9dfaaf 100644
--- a/scripts/rollup/results.json
+++ b/scripts/rollup/results.json
@@ -1,5 +1,5 @@
 {
-  "branch": "remove-lib-in-source",
+  "branch": "bundle-fixes",
   "bundleSizes": {
     "react.development.js (UMD_DEV)": {
       "size": 116098,
@@ -26,12 +26,12 @@
       "gzip": 33035
     },
     "react-art.development.js (UMD_DEV)": {
-      "size": 339599,
-      "gzip": 75952
+      "size": 339929,
+      "gzip": 76018
     },
     "react-art.production.min.js (UMD_PROD)": {
-      "size": 94939,
-      "gzip": 28977
+      "size": 95013,
+      "gzip": 28991
     },
     "react.development.js (NODE_DEV)": {
       "size": 109110,
@@ -90,28 +90,28 @@
       "gzip": 80424
     },
     "ReactARTStack-dev.js (FB_DEV)": {
-      "size": 492651,
-      "gzip": 118470
+      "size": 141589,
+      "gzip": 32280
     },
     "ReactARTStack-prod.js (FB_PROD)": {
-      "size": 365055,
-      "gzip": 87582
+      "size": 99762,
+      "gzip": 22576
     },
     "react-art.development.js (NODE_DEV)": {
-      "size": 264816,
-      "gzip": 56881
+      "size": 265123,
+      "gzip": 56951
     },
     "react-art.production.min.js (NODE_PROD)": {
-      "size": 56517,
-      "gzip": 17109
+      "size": 56591,
+      "gzip": 17132
     },
     "ReactARTFiber-dev.js (FB_DEV)": {
-      "size": 263951,
-      "gzip": 56683
+      "size": 264301,
+      "gzip": 56758
     },
     "ReactARTFiber-prod.js (FB_PROD)": {
-      "size": 205154,
-      "gzip": 43017
+      "size": 205292,
+      "gzip": 43132
     },
     "ReactNativeStack.js (RN)": {
       "size": 233993,
@@ -122,20 +122,20 @@
       "gzip": 84001
     },
     "ReactTestRendererFiber-dev.js (FB_DEV)": {
-      "size": 261860,
-      "gzip": 55645
+      "size": 262210,
+      "gzip": 55722
     },
     "ReactTestRendererStack-dev.js (FB_DEV)": {
-      "size": 151102,
-      "gzip": 34699
+      "size": 151425,
+      "gzip": 34728
     },
     "react-noop-renderer.development.js (NODE_DEV)": {
-      "size": 253895,
-      "gzip": 53629
+      "size": 254207,
+      "gzip": 53701
     },
     "react-test-renderer.development.js (NODE_DEV)": {
-      "size": 262734,
-      "gzip": 55847
+      "size": 263041,
+      "gzip": 55919
     }
   }
 }
\ No newline at end of file
diff --git a/src/renderers/dom/fiber/ReactDOMFrameScheduling.js b/src/renderers/shared/ReactDOMFrameScheduling.js
similarity index 100%
rename from src/renderers/dom/fiber/ReactDOMFrameScheduling.js
rename to src/renderers/shared/ReactDOMFrameScheduling.js
diff --git a/src/test/ReactTestUtils.js b/src/test/ReactTestUtils.js
index d0ca2fe4063e0..f320be4bd12b5 100644
--- a/src/test/ReactTestUtils.js
+++ b/src/test/ReactTestUtils.js
@@ -17,7 +17,7 @@ var EventPluginRegistry = require('EventPluginRegistry');
 var EventPropagators = require('EventPropagators');
 var React = require('react');
 var ReactControlledComponent = require('ReactControlledComponent');
-var ReactDOM = require('react-dom');
+var ReactDOM = require('ReactDOM');
 var ReactDOMComponentTree = require('ReactDOMComponentTree');
 var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');
 var ReactFiberTreeReflection = require('ReactFiberTreeReflection');

From c2309bf4b58548872c819bd94859ad0a39e17632 Mon Sep 17 00:00:00 2001
From: Maciej Kasprzyk <kapustka.maciek@gmail.com>
Date: Mon, 10 Apr 2017 23:26:09 +0200
Subject: [PATCH 075/153] Delete examples dir from codebase overview (#9397)

Removes doc about folder that no longer exists.
---
 docs/contributing/codebase-overview.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/contributing/codebase-overview.md b/docs/contributing/codebase-overview.md
index 045f2c9030231..637c4893241ec 100644
--- a/docs/contributing/codebase-overview.md
+++ b/docs/contributing/codebase-overview.md
@@ -66,7 +66,6 @@ After cloning the [React repository](https://github.com/facebook/react), you wil
 
 * [`src`](https://github.com/facebook/react/tree/master/src) is the source code of React. **If your change is related to the code, `src` is where you'll spend most of your time.**
 * [`docs`](https://github.com/facebook/react/tree/master/docs) is the React documentation website. When you change APIs, make sure to update the relevant Markdown files.
-* [`examples`](https://github.com/facebook/react/tree/master/examples) contains a few small React demos with different build setups.
 * [`packages`](https://github.com/facebook/react/tree/master/packages) contains metadata (such as `package.json`) for all packages in the React repository. Nevertheless, their source code is still located inside [`src`](https://github.com/facebook/react/tree/master/src).
 * `build` is the build output of React. It is not in the repository but it will appear in your React clone after you [build it](/react/contributing/how-to-contribute.html#development-workflow) for the first time.
 

From 5cfaa7cf68564b8d96c94fa0d45e7feb6dc80895 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Tue, 21 Mar 2017 18:36:38 -0700
Subject: [PATCH 076/153] Delete createClass

Remove createClass from isomorphic package
---
 src/isomorphic/React.js                       |   2 -
 src/isomorphic/classic/class/ReactClass.js    | 833 ------------------
 .../classic/class/__tests__/ReactBind-test.js | 152 ----
 .../class/__tests__/ReactBindOptout-test.js   | 206 -----
 .../class/__tests__/ReactClass-test.js        | 348 --------
 .../class/__tests__/ReactClassMixin-test.js   | 532 -----------
 6 files changed, 2073 deletions(-)
 delete mode 100644 src/isomorphic/classic/class/ReactClass.js
 delete mode 100644 src/isomorphic/classic/class/__tests__/ReactBind-test.js
 delete mode 100644 src/isomorphic/classic/class/__tests__/ReactBindOptout-test.js
 delete mode 100644 src/isomorphic/classic/class/__tests__/ReactClass-test.js
 delete mode 100644 src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js

diff --git a/src/isomorphic/React.js b/src/isomorphic/React.js
index 5e57605f1c0fc..a37649a3197b6 100644
--- a/src/isomorphic/React.js
+++ b/src/isomorphic/React.js
@@ -13,7 +13,6 @@
 
 var ReactBaseClasses = require('ReactBaseClasses');
 var ReactChildren = require('ReactChildren');
-var ReactClass = require('ReactClass');
 var ReactDOMFactories = require('ReactDOMFactories');
 var ReactElement = require('ReactElement');
 var ReactPropTypes = require('ReactPropTypes');
@@ -75,7 +74,6 @@ var React = {
   // Classic
 
   PropTypes: ReactPropTypes,
-  createClass: ReactClass.createClass,
   createFactory: createFactory,
   createMixin: createMixin,
 
diff --git a/src/isomorphic/classic/class/ReactClass.js b/src/isomorphic/classic/class/ReactClass.js
deleted file mode 100644
index fb1c07ec08b75..0000000000000
--- a/src/isomorphic/classic/class/ReactClass.js
+++ /dev/null
@@ -1,833 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule ReactClass
- */
-
-'use strict';
-
-var ReactBaseClasses = require('ReactBaseClasses');
-var ReactElement = require('ReactElement');
-var ReactNoopUpdateQueue = require('ReactNoopUpdateQueue');
-
-var emptyObject = require('fbjs/lib/emptyObject');
-var invariant = require('fbjs/lib/invariant');
-var warning = require('fbjs/lib/warning');
-
-var ReactComponent = ReactBaseClasses.Component;
-
-var MIXINS_KEY = 'mixins';
-
-// Helper function to allow the creation of anonymous functions which do not
-// have .name set to the name of the variable being assigned to.
-function identity(fn) {
-  return fn;
-}
-
-/**
- * Policies that describe methods in `ReactClassInterface`.
- */
-type SpecPolicy =
-  /**
-   * These methods may be defined only once by the class specification or mixin.
-   */
-  | 'DEFINE_ONCE' /**
-   * These methods may be defined by both the class specification and mixins.
-   * Subsequent definitions will be chained. These methods must return void.
-   */
-  | 'DEFINE_MANY' /**
-   * These methods are overriding the base class.
-   */
-  | 'OVERRIDE_BASE' /**
-   * These methods are similar to DEFINE_MANY, except we assume they return
-   * objects. We try to merge the keys of the return values of all the mixed in
-   * functions. If there is a key conflict we throw.
-   */
-  | 'DEFINE_MANY_MERGED';
-
-/**
- * Composite components are higher-level components that compose other composite
- * or host components.
- *
- * To create a new type of `ReactClass`, pass a specification of
- * your new class to `React.createClass`. The only requirement of your class
- * specification is that you implement a `render` method.
- *
- *   var MyComponent = React.createClass({
- *     render: function() {
- *       return <div>Hello World</div>;
- *     }
- *   });
- *
- * The class specification supports a specific protocol of methods that have
- * special meaning (e.g. `render`). See `ReactClassInterface` for
- * more the comprehensive protocol. Any other properties and methods in the
- * class specification will be available on the prototype.
- *
- * @interface ReactClassInterface
- * @internal
- */
-var ReactClassInterface: {[key: string]: SpecPolicy} = {
-  /**
-   * An array of Mixin objects to include when defining your component.
-   *
-   * @type {array}
-   * @optional
-   */
-  mixins: 'DEFINE_MANY',
-
-  /**
-   * An object containing properties and methods that should be defined on
-   * the component's constructor instead of its prototype (static methods).
-   *
-   * @type {object}
-   * @optional
-   */
-  statics: 'DEFINE_MANY',
-
-  /**
-   * Definition of prop types for this component.
-   *
-   * @type {object}
-   * @optional
-   */
-  propTypes: 'DEFINE_MANY',
-
-  /**
-   * Definition of context types for this component.
-   *
-   * @type {object}
-   * @optional
-   */
-  contextTypes: 'DEFINE_MANY',
-
-  /**
-   * Definition of context types this component sets for its children.
-   *
-   * @type {object}
-   * @optional
-   */
-  childContextTypes: 'DEFINE_MANY',
-
-  // ==== Definition methods ====
-
-  /**
-   * Invoked when the component is mounted. Values in the mapping will be set on
-   * `this.props` if that prop is not specified (i.e. using an `in` check).
-   *
-   * This method is invoked before `getInitialState` and therefore cannot rely
-   * on `this.state` or use `this.setState`.
-   *
-   * @return {object}
-   * @optional
-   */
-  getDefaultProps: 'DEFINE_MANY_MERGED',
-
-  /**
-   * Invoked once before the component is mounted. The return value will be used
-   * as the initial value of `this.state`.
-   *
-   *   getInitialState: function() {
-   *     return {
-   *       isOn: false,
-   *       fooBaz: new BazFoo()
-   *     }
-   *   }
-   *
-   * @return {object}
-   * @optional
-   */
-  getInitialState: 'DEFINE_MANY_MERGED',
-
-  /**
-   * @return {object}
-   * @optional
-   */
-  getChildContext: 'DEFINE_MANY_MERGED',
-
-  /**
-   * Uses props from `this.props` and state from `this.state` to render the
-   * structure of the component.
-   *
-   * No guarantees are made about when or how often this method is invoked, so
-   * it must not have side effects.
-   *
-   *   render: function() {
-   *     var name = this.props.name;
-   *     return <div>Hello, {name}!</div>;
-   *   }
-   *
-   * @return {ReactComponent}
-   * @required
-   */
-  render: 'DEFINE_ONCE',
-
-  // ==== Delegate methods ====
-
-  /**
-   * Invoked when the component is initially created and about to be mounted.
-   * This may have side effects, but any external subscriptions or data created
-   * by this method must be cleaned up in `componentWillUnmount`.
-   *
-   * @optional
-   */
-  componentWillMount: 'DEFINE_MANY',
-
-  /**
-   * Invoked when the component has been mounted and has a DOM representation.
-   * However, there is no guarantee that the DOM node is in the document.
-   *
-   * Use this as an opportunity to operate on the DOM when the component has
-   * been mounted (initialized and rendered) for the first time.
-   *
-   * @param {DOMElement} rootNode DOM element representing the component.
-   * @optional
-   */
-  componentDidMount: 'DEFINE_MANY',
-
-  /**
-   * Invoked before the component receives new props.
-   *
-   * Use this as an opportunity to react to a prop transition by updating the
-   * state using `this.setState`. Current props are accessed via `this.props`.
-   *
-   *   componentWillReceiveProps: function(nextProps, nextContext) {
-   *     this.setState({
-   *       likesIncreasing: nextProps.likeCount > this.props.likeCount
-   *     });
-   *   }
-   *
-   * NOTE: There is no equivalent `componentWillReceiveState`. An incoming prop
-   * transition may cause a state change, but the opposite is not true. If you
-   * need it, you are probably looking for `componentWillUpdate`.
-   *
-   * @param {object} nextProps
-   * @optional
-   */
-  componentWillReceiveProps: 'DEFINE_MANY',
-
-  /**
-   * Invoked while deciding if the component should be updated as a result of
-   * receiving new props, state and/or context.
-   *
-   * Use this as an opportunity to `return false` when you're certain that the
-   * transition to the new props/state/context will not require a component
-   * update.
-   *
-   *   shouldComponentUpdate: function(nextProps, nextState, nextContext) {
-   *     return !equal(nextProps, this.props) ||
-   *       !equal(nextState, this.state) ||
-   *       !equal(nextContext, this.context);
-   *   }
-   *
-   * @param {object} nextProps
-   * @param {?object} nextState
-   * @param {?object} nextContext
-   * @return {boolean} True if the component should update.
-   * @optional
-   */
-  shouldComponentUpdate: 'DEFINE_ONCE',
-
-  /**
-   * Invoked when the component is about to update due to a transition from
-   * `this.props`, `this.state` and `this.context` to `nextProps`, `nextState`
-   * and `nextContext`.
-   *
-   * Use this as an opportunity to perform preparation before an update occurs.
-   *
-   * NOTE: You **cannot** use `this.setState()` in this method.
-   *
-   * @param {object} nextProps
-   * @param {?object} nextState
-   * @param {?object} nextContext
-   * @param {ReactReconcileTransaction} transaction
-   * @optional
-   */
-  componentWillUpdate: 'DEFINE_MANY',
-
-  /**
-   * Invoked when the component's DOM representation has been updated.
-   *
-   * Use this as an opportunity to operate on the DOM when the component has
-   * been updated.
-   *
-   * @param {object} prevProps
-   * @param {?object} prevState
-   * @param {?object} prevContext
-   * @param {DOMElement} rootNode DOM element representing the component.
-   * @optional
-   */
-  componentDidUpdate: 'DEFINE_MANY',
-
-  /**
-   * Invoked when the component is about to be removed from its parent and have
-   * its DOM representation destroyed.
-   *
-   * Use this as an opportunity to deallocate any external resources.
-   *
-   * NOTE: There is no `componentDidUnmount` since your component will have been
-   * destroyed by that point.
-   *
-   * @optional
-   */
-  componentWillUnmount: 'DEFINE_MANY',
-
-  // ==== Advanced methods ====
-
-  /**
-   * Updates the component's currently mounted DOM representation.
-   *
-   * By default, this implements React's rendering and reconciliation algorithm.
-   * Sophisticated clients may wish to override this.
-   *
-   * @param {ReactReconcileTransaction} transaction
-   * @internal
-   * @overridable
-   */
-  updateComponent: 'OVERRIDE_BASE',
-};
-
-/**
- * Mapping from class specification keys to special processing functions.
- *
- * Although these are declared like instance properties in the specification
- * when defining classes using `React.createClass`, they are actually static
- * and are accessible on the constructor instead of the prototype. Despite
- * being static, they must be defined outside of the "statics" key under
- * which all other static methods are defined.
- */
-var RESERVED_SPEC_KEYS = {
-  displayName: function(Constructor, displayName) {
-    Constructor.displayName = displayName;
-  },
-  mixins: function(Constructor, mixins) {
-    if (mixins) {
-      for (var i = 0; i < mixins.length; i++) {
-        mixSpecIntoComponent(Constructor, mixins[i]);
-      }
-    }
-  },
-  childContextTypes: function(Constructor, childContextTypes) {
-    if (__DEV__) {
-      validateTypeDef(Constructor, childContextTypes, 'child context');
-    }
-    Constructor.childContextTypes = Object.assign(
-      {},
-      Constructor.childContextTypes,
-      childContextTypes,
-    );
-  },
-  contextTypes: function(Constructor, contextTypes) {
-    if (__DEV__) {
-      validateTypeDef(Constructor, contextTypes, 'context');
-    }
-    Constructor.contextTypes = Object.assign(
-      {},
-      Constructor.contextTypes,
-      contextTypes,
-    );
-  },
-  /**
-   * Special case getDefaultProps which should move into statics but requires
-   * automatic merging.
-   */
-  getDefaultProps: function(Constructor, getDefaultProps) {
-    if (Constructor.getDefaultProps) {
-      Constructor.getDefaultProps = createMergedResultFunction(
-        Constructor.getDefaultProps,
-        getDefaultProps,
-      );
-    } else {
-      Constructor.getDefaultProps = getDefaultProps;
-    }
-  },
-  propTypes: function(Constructor, propTypes) {
-    if (__DEV__) {
-      validateTypeDef(Constructor, propTypes, 'prop');
-    }
-    Constructor.propTypes = Object.assign({}, Constructor.propTypes, propTypes);
-  },
-  statics: function(Constructor, statics) {
-    mixStaticSpecIntoComponent(Constructor, statics);
-  },
-  autobind: function() {}, // noop
-};
-
-function validateTypeDef(Constructor, typeDef, location: string) {
-  for (var propName in typeDef) {
-    if (typeDef.hasOwnProperty(propName)) {
-      // use a warning instead of an invariant so components
-      // don't show up in prod but only in __DEV__
-      warning(
-        typeof typeDef[propName] === 'function',
-        '%s: %s type `%s` is invalid; it must be a function, usually from ' +
-          'React.PropTypes.',
-        Constructor.displayName || 'ReactClass',
-        location,
-        propName,
-      );
-    }
-  }
-}
-
-function validateMethodOverride(isAlreadyDefined, name) {
-  var specPolicy = ReactClassInterface.hasOwnProperty(name)
-    ? ReactClassInterface[name]
-    : null;
-
-  // Disallow overriding of base class methods unless explicitly allowed.
-  if (ReactClassMixin.hasOwnProperty(name)) {
-    invariant(
-      specPolicy === 'OVERRIDE_BASE',
-      'ReactClassInterface: You are attempting to override ' +
-        '`%s` from your class specification. Ensure that your method names ' +
-        'do not overlap with React methods.',
-      name,
-    );
-  }
-
-  // Disallow defining methods more than once unless explicitly allowed.
-  if (isAlreadyDefined) {
-    invariant(
-      specPolicy === 'DEFINE_MANY' || specPolicy === 'DEFINE_MANY_MERGED',
-      'ReactClassInterface: You are attempting to define ' +
-        '`%s` on your component more than once. This conflict may be due ' +
-        'to a mixin.',
-      name,
-    );
-  }
-}
-
-/**
- * Mixin helper which handles policy validation and reserved
- * specification keys when building React classes.
- */
-function mixSpecIntoComponent(Constructor, spec) {
-  if (!spec) {
-    if (__DEV__) {
-      var typeofSpec = typeof spec;
-      var isMixinValid = typeofSpec === 'object' && spec !== null;
-
-      warning(
-        isMixinValid,
-        "%s: You're attempting to include a mixin that is either null " +
-          'or not an object. Check the mixins included by the component, ' +
-          'as well as any mixins they include themselves. ' +
-          'Expected object but got %s.',
-        Constructor.displayName || 'ReactClass',
-        spec === null ? null : typeofSpec,
-      );
-    }
-
-    return;
-  }
-
-  invariant(
-    typeof spec !== 'function',
-    "ReactClass: You're attempting to " +
-      'use a component class or function as a mixin. Instead, just use a ' +
-      'regular object.',
-  );
-  invariant(
-    !ReactElement.isValidElement(spec),
-    "ReactClass: You're attempting to " +
-      'use a component as a mixin. Instead, just use a regular object.',
-  );
-
-  var proto = Constructor.prototype;
-  var autoBindPairs = proto.__reactAutoBindPairs;
-
-  // By handling mixins before any other properties, we ensure the same
-  // chaining order is applied to methods with DEFINE_MANY policy, whether
-  // mixins are listed before or after these methods in the spec.
-  if (spec.hasOwnProperty(MIXINS_KEY)) {
-    RESERVED_SPEC_KEYS.mixins(Constructor, spec.mixins);
-  }
-
-  for (var name in spec) {
-    if (!spec.hasOwnProperty(name)) {
-      continue;
-    }
-
-    if (name === MIXINS_KEY) {
-      // We have already handled mixins in a special case above.
-      continue;
-    }
-
-    var property = spec[name];
-    var isAlreadyDefined = proto.hasOwnProperty(name);
-    validateMethodOverride(isAlreadyDefined, name);
-
-    if (RESERVED_SPEC_KEYS.hasOwnProperty(name)) {
-      RESERVED_SPEC_KEYS[name](Constructor, property);
-    } else {
-      // Setup methods on prototype:
-      // The following member methods should not be automatically bound:
-      // 1. Expected ReactClass methods (in the "interface").
-      // 2. Overridden methods (that were mixed in).
-      var isReactClassMethod = ReactClassInterface.hasOwnProperty(name);
-      var isFunction = typeof property === 'function';
-      var shouldAutoBind = isFunction &&
-        !isReactClassMethod &&
-        !isAlreadyDefined &&
-        spec.autobind !== false;
-
-      if (shouldAutoBind) {
-        autoBindPairs.push(name, property);
-        proto[name] = property;
-      } else {
-        if (isAlreadyDefined) {
-          var specPolicy = ReactClassInterface[name];
-
-          // These cases should already be caught by validateMethodOverride.
-          invariant(
-            isReactClassMethod &&
-              (specPolicy === 'DEFINE_MANY_MERGED' ||
-                specPolicy === 'DEFINE_MANY'),
-            'ReactClass: Unexpected spec policy %s for key %s ' +
-              'when mixing in component specs.',
-            specPolicy,
-            name,
-          );
-
-          // For methods which are defined more than once, call the existing
-          // methods before calling the new property, merging if appropriate.
-          if (specPolicy === 'DEFINE_MANY_MERGED') {
-            proto[name] = createMergedResultFunction(proto[name], property);
-          } else if (specPolicy === 'DEFINE_MANY') {
-            proto[name] = createChainedFunction(proto[name], property);
-          }
-        } else {
-          proto[name] = property;
-          if (__DEV__) {
-            // Add verbose displayName to the function, which helps when looking
-            // at profiling tools.
-            if (typeof property === 'function' && spec.displayName) {
-              proto[name].displayName = spec.displayName + '_' + name;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-function mixStaticSpecIntoComponent(Constructor, statics) {
-  if (!statics) {
-    return;
-  }
-  for (var name in statics) {
-    var property = statics[name];
-    if (!statics.hasOwnProperty(name)) {
-      continue;
-    }
-
-    var isReserved = name in RESERVED_SPEC_KEYS;
-    invariant(
-      !isReserved,
-      'ReactClass: You are attempting to define a reserved ' +
-        'property, `%s`, that shouldn\'t be on the "statics" key. Define it ' +
-        'as an instance property instead; it will still be accessible on the ' +
-        'constructor.',
-      name,
-    );
-
-    var isInherited = name in Constructor;
-    invariant(
-      !isInherited,
-      'ReactClass: You are attempting to define ' +
-        '`%s` on your component more than once. This conflict may be ' +
-        'due to a mixin.',
-      name,
-    );
-    Constructor[name] = property;
-  }
-}
-
-/**
- * Merge two objects, but throw if both contain the same key.
- *
- * @param {object} one The first object, which is mutated.
- * @param {object} two The second object
- * @return {object} one after it has been mutated to contain everything in two.
- */
-function mergeIntoWithNoDuplicateKeys(one, two) {
-  invariant(
-    one && two && typeof one === 'object' && typeof two === 'object',
-    'mergeIntoWithNoDuplicateKeys(): Cannot merge non-objects.',
-  );
-
-  for (var key in two) {
-    if (two.hasOwnProperty(key)) {
-      invariant(
-        one[key] === undefined,
-        'mergeIntoWithNoDuplicateKeys(): ' +
-          'Tried to merge two objects with the same key: `%s`. This conflict ' +
-          'may be due to a mixin; in particular, this may be caused by two ' +
-          'getInitialState() or getDefaultProps() methods returning objects ' +
-          'with clashing keys.',
-        key,
-      );
-      one[key] = two[key];
-    }
-  }
-  return one;
-}
-
-/**
- * Creates a function that invokes two functions and merges their return values.
- *
- * @param {function} one Function to invoke first.
- * @param {function} two Function to invoke second.
- * @return {function} Function that invokes the two argument functions.
- * @private
- */
-function createMergedResultFunction(one, two) {
-  return function mergedResult() {
-    var a = one.apply(this, arguments);
-    var b = two.apply(this, arguments);
-    if (a == null) {
-      return b;
-    } else if (b == null) {
-      return a;
-    }
-    var c = {};
-    mergeIntoWithNoDuplicateKeys(c, a);
-    mergeIntoWithNoDuplicateKeys(c, b);
-    return c;
-  };
-}
-
-/**
- * Creates a function that invokes two functions and ignores their return vales.
- *
- * @param {function} one Function to invoke first.
- * @param {function} two Function to invoke second.
- * @return {function} Function that invokes the two argument functions.
- * @private
- */
-function createChainedFunction(one, two) {
-  return function chainedFunction() {
-    one.apply(this, arguments);
-    two.apply(this, arguments);
-  };
-}
-
-/**
- * Binds a method to the component.
- *
- * @param {object} component Component whose method is going to be bound.
- * @param {function} method Method to be bound.
- * @return {function} The bound method.
- */
-function bindAutoBindMethod(component, method) {
-  var boundMethod = method.bind(component);
-  if (__DEV__) {
-    boundMethod.__reactBoundContext = component;
-    boundMethod.__reactBoundMethod = method;
-    boundMethod.__reactBoundArguments = null;
-    var componentName = component.constructor.displayName;
-    var _bind = boundMethod.bind;
-    boundMethod.bind = function(newThis, ...args) {
-      // User is trying to bind() an autobound method; we effectively will
-      // ignore the value of "this" that the user is trying to use, so
-      // let's warn.
-      if (newThis !== component && newThis !== null) {
-        warning(
-          false,
-          'bind(): React component methods may only be bound to the ' +
-            'component instance.\n\nSee %s',
-          componentName,
-        );
-      } else if (!args.length) {
-        warning(
-          false,
-          'bind(): You are binding a component method to the component. ' +
-            'React does this for you automatically in a high-performance ' +
-            'way, so you can safely remove this call.\n\nSee %s',
-          componentName,
-        );
-        return boundMethod;
-      }
-      var reboundMethod = _bind.apply(boundMethod, arguments);
-      reboundMethod.__reactBoundContext = component;
-      reboundMethod.__reactBoundMethod = method;
-      reboundMethod.__reactBoundArguments = args;
-      return reboundMethod;
-    };
-  }
-  return boundMethod;
-}
-
-/**
- * Binds all auto-bound methods in a component.
- *
- * @param {object} component Component whose method is going to be bound.
- */
-function bindAutoBindMethods(component) {
-  var pairs = component.__reactAutoBindPairs;
-  for (var i = 0; i < pairs.length; i += 2) {
-    var autoBindKey = pairs[i];
-    var method = pairs[i + 1];
-    component[autoBindKey] = bindAutoBindMethod(component, method);
-  }
-}
-
-/**
- * Add more to the ReactClass base class. These are all legacy features and
- * therefore not already part of the modern ReactComponent.
- */
-var ReactClassMixin = {
-  /**
-   * TODO: This will be deprecated because state should always keep a consistent
-   * type signature and the only use case for this, is to avoid that.
-   */
-  replaceState: function(newState, callback) {
-    this.updater.enqueueReplaceState(this, newState, callback, 'replaceState');
-  },
-
-  /**
-   * Checks whether or not this composite component is mounted.
-   * @return {boolean} True if mounted, false otherwise.
-   * @protected
-   * @final
-   */
-  isMounted: function() {
-    return this.updater.isMounted(this);
-  },
-};
-
-var ReactClassComponent = function() {};
-Object.assign(
-  ReactClassComponent.prototype,
-  ReactComponent.prototype,
-  ReactClassMixin,
-);
-
-/**
- * Module for creating composite components.
- *
- * @class ReactClass
- */
-var ReactClass = {
-  /**
-   * Creates a composite component class given a class specification.
-   * See https://facebook.github.io/react/docs/react-api.html#createclass
-   *
-   * @param {object} spec Class specification (which must define `render`).
-   * @return {function} Component constructor function.
-   * @public
-   */
-  createClass: function(spec) {
-    // To keep our warnings more understandable, we'll use a little hack here to
-    // ensure that Constructor.name !== 'Constructor'. This makes sure we don't
-    // unnecessarily identify a class without displayName as 'Constructor'.
-    var Constructor = identity(function(props, context, updater) {
-      // This constructor gets overridden by mocks. The argument is used
-      // by mocks to assert on what gets mounted.
-
-      if (__DEV__) {
-        warning(
-          this instanceof Constructor,
-          'Something is calling a React component directly. Use a factory or ' +
-            'JSX instead. See: https://fb.me/react-legacyfactory',
-        );
-      }
-
-      // Wire up auto-binding
-      if (this.__reactAutoBindPairs.length) {
-        bindAutoBindMethods(this);
-      }
-
-      this.props = props;
-      this.context = context;
-      this.refs = emptyObject;
-      this.updater = updater || ReactNoopUpdateQueue;
-
-      this.state = null;
-
-      // ReactClasses doesn't have constructors. Instead, they use the
-      // getInitialState and componentWillMount methods for initialization.
-
-      var initialState = this.getInitialState ? this.getInitialState() : null;
-      if (__DEV__) {
-        // We allow auto-mocks to proceed as if they're returning null.
-        if (
-          initialState === undefined && this.getInitialState._isMockFunction
-        ) {
-          // This is probably bad practice. Consider warning here and
-          // deprecating this convenience.
-          initialState = null;
-        }
-      }
-      invariant(
-        typeof initialState === 'object' && !Array.isArray(initialState),
-        '%s.getInitialState(): must return an object or null',
-        Constructor.displayName || 'ReactCompositeComponent',
-      );
-
-      this.state = initialState;
-    });
-    Constructor.prototype = new ReactClassComponent();
-    Constructor.prototype.constructor = Constructor;
-    Constructor.prototype.__reactAutoBindPairs = [];
-
-    mixSpecIntoComponent(Constructor, spec);
-
-    // Initialize the defaultProps property after all mixins have been merged.
-    if (Constructor.getDefaultProps) {
-      Constructor.defaultProps = Constructor.getDefaultProps();
-    }
-
-    if (__DEV__) {
-      // This is a tag to indicate that the use of these method names is ok,
-      // since it's used with createClass. If it's not, then it's likely a
-      // mistake so we'll warn you to use the static property, property
-      // initializer or constructor respectively.
-      if (Constructor.getDefaultProps) {
-        Constructor.getDefaultProps.isReactClassApproved = {};
-      }
-      if (Constructor.prototype.getInitialState) {
-        Constructor.prototype.getInitialState.isReactClassApproved = {};
-      }
-    }
-
-    invariant(
-      Constructor.prototype.render,
-      'createClass(...): Class specification must implement a `render` method.',
-    );
-
-    if (__DEV__) {
-      warning(
-        !Constructor.prototype.componentShouldUpdate,
-        '%s has a method called ' +
-          'componentShouldUpdate(). Did you mean shouldComponentUpdate()? ' +
-          'The name is phrased as a question because the function is ' +
-          'expected to return a value.',
-        spec.displayName || 'A component',
-      );
-      warning(
-        !Constructor.prototype.componentWillRecieveProps,
-        '%s has a method called ' +
-          'componentWillRecieveProps(). Did you mean componentWillReceiveProps()?',
-        spec.displayName || 'A component',
-      );
-    }
-
-    // Reduce time spent doing lookups by setting these on the prototype.
-    for (var methodName in ReactClassInterface) {
-      if (!Constructor.prototype[methodName]) {
-        Constructor.prototype[methodName] = null;
-      }
-    }
-
-    return Constructor;
-  },
-};
-
-module.exports = ReactClass;
diff --git a/src/isomorphic/classic/class/__tests__/ReactBind-test.js b/src/isomorphic/classic/class/__tests__/ReactBind-test.js
deleted file mode 100644
index 051db5a8fed29..0000000000000
--- a/src/isomorphic/classic/class/__tests__/ReactBind-test.js
+++ /dev/null
@@ -1,152 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @emails react-core
- */
-/*global global:true*/
-'use strict';
-
-var React = require('react');
-var ReactTestUtils = require('ReactTestUtils');
-
-// TODO: Test render and all stock methods.
-describe('autobinding', () => {
-  it('Holds reference to instance', () => {
-    var mouseDidEnter = jest.fn();
-    var mouseDidLeave = jest.fn();
-    var mouseDidClick = jest.fn();
-
-    var TestBindComponent = React.createClass({
-      getInitialState: function() {
-        return {something: 'hi'};
-      },
-      onMouseEnter: mouseDidEnter,
-      onMouseLeave: mouseDidLeave,
-      onClick: mouseDidClick,
-
-      // auto binding only occurs on top level functions in class defs.
-      badIdeas: {
-        badBind: function() {
-          void this.state.something;
-        },
-      },
-
-      render: function() {
-        return (
-          <div
-            ref="child"
-            onMouseOver={this.onMouseEnter}
-            onMouseOut={this.onMouseLeave}
-            onClick={this.onClick}
-          />
-        );
-      },
-    });
-
-    var instance1 = ReactTestUtils.renderIntoDocument(<TestBindComponent />);
-    var rendered1 = instance1.refs.child;
-
-    var instance2 = ReactTestUtils.renderIntoDocument(<TestBindComponent />);
-    var rendered2 = instance2.refs.child;
-
-    expect(function() {
-      var badIdea = instance1.badIdeas.badBind;
-      badIdea();
-    }).toThrow();
-
-    expect(instance1.onClick).not.toBe(instance2.onClick);
-
-    ReactTestUtils.Simulate.click(rendered1);
-    expect(mouseDidClick.mock.instances.length).toBe(1);
-    expect(mouseDidClick.mock.instances[0]).toBe(instance1);
-
-    ReactTestUtils.Simulate.click(rendered2);
-    expect(mouseDidClick.mock.instances.length).toBe(2);
-    expect(mouseDidClick.mock.instances[1]).toBe(instance2);
-
-    ReactTestUtils.Simulate.mouseOver(rendered1);
-    expect(mouseDidEnter.mock.instances.length).toBe(1);
-    expect(mouseDidEnter.mock.instances[0]).toBe(instance1);
-
-    ReactTestUtils.Simulate.mouseOver(rendered2);
-    expect(mouseDidEnter.mock.instances.length).toBe(2);
-    expect(mouseDidEnter.mock.instances[1]).toBe(instance2);
-
-    ReactTestUtils.Simulate.mouseOut(rendered1);
-    expect(mouseDidLeave.mock.instances.length).toBe(1);
-    expect(mouseDidLeave.mock.instances[0]).toBe(instance1);
-
-    ReactTestUtils.Simulate.mouseOut(rendered2);
-    expect(mouseDidLeave.mock.instances.length).toBe(2);
-    expect(mouseDidLeave.mock.instances[1]).toBe(instance2);
-  });
-
-  it('works with mixins', () => {
-    var mouseDidClick = jest.fn();
-
-    var TestMixin = {
-      onClick: mouseDidClick,
-    };
-
-    var TestBindComponent = React.createClass({
-      mixins: [TestMixin],
-
-      render: function() {
-        return <div ref="child" onClick={this.onClick} />;
-      },
-    });
-
-    var instance1 = ReactTestUtils.renderIntoDocument(<TestBindComponent />);
-    var rendered1 = instance1.refs.child;
-
-    ReactTestUtils.Simulate.click(rendered1);
-    expect(mouseDidClick.mock.instances.length).toBe(1);
-    expect(mouseDidClick.mock.instances[0]).toBe(instance1);
-  });
-
-  it('warns if you try to bind to this', () => {
-    spyOn(console, 'error');
-
-    var TestBindComponent = React.createClass({
-      handleClick: function() {},
-      render: function() {
-        return <div onClick={this.handleClick.bind(this)} />;
-      },
-    });
-
-    ReactTestUtils.renderIntoDocument(<TestBindComponent />);
-
-    expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toBe(
-      'Warning: bind(): You are binding a component method to the component. ' +
-        'React does this for you automatically in a high-performance ' +
-        'way, so you can safely remove this call.\n\nSee TestBindComponent',
-    );
-  });
-
-  it('does not warn if you pass an auto-bound method to setState', () => {
-    spyOn(console, 'error');
-
-    var TestBindComponent = React.createClass({
-      getInitialState: function() {
-        return {foo: 1};
-      },
-      componentDidMount: function() {
-        this.setState({foo: 2}, this.handleUpdate);
-      },
-      handleUpdate: function() {},
-      render: function() {
-        return <div onClick={this.handleClick} />;
-      },
-    });
-
-    ReactTestUtils.renderIntoDocument(<TestBindComponent />);
-
-    expectDev(console.error.calls.count()).toBe(0);
-  });
-});
diff --git a/src/isomorphic/classic/class/__tests__/ReactBindOptout-test.js b/src/isomorphic/classic/class/__tests__/ReactBindOptout-test.js
deleted file mode 100644
index 086329338fa4d..0000000000000
--- a/src/isomorphic/classic/class/__tests__/ReactBindOptout-test.js
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @emails react-core
- */
-/*global global:true*/
-'use strict';
-
-var React = require('react');
-var ReactTestUtils = require('ReactTestUtils');
-
-// TODO: Test render and all stock methods.
-describe('autobind optout', () => {
-  it('should work with manual binding', () => {
-    var mouseDidEnter = jest.fn();
-    var mouseDidLeave = jest.fn();
-    var mouseDidClick = jest.fn();
-
-    var TestBindComponent = React.createClass({
-      autobind: false,
-      getInitialState: function() {
-        return {something: 'hi'};
-      },
-      onMouseEnter: mouseDidEnter,
-      onMouseLeave: mouseDidLeave,
-      onClick: mouseDidClick,
-
-      render: function() {
-        return (
-          <div
-            ref="child"
-            onMouseOver={this.onMouseEnter.bind(this)}
-            onMouseOut={this.onMouseLeave.bind(this)}
-            onClick={this.onClick.bind(this)}
-          />
-        );
-      },
-    });
-
-    var instance1 = ReactTestUtils.renderIntoDocument(<TestBindComponent />);
-    var rendered1 = instance1.refs.child;
-
-    var instance2 = ReactTestUtils.renderIntoDocument(<TestBindComponent />);
-    var rendered2 = instance2.refs.child;
-
-    ReactTestUtils.Simulate.click(rendered1);
-    expect(mouseDidClick.mock.instances.length).toBe(1);
-    expect(mouseDidClick.mock.instances[0]).toBe(instance1);
-
-    ReactTestUtils.Simulate.click(rendered2);
-    expect(mouseDidClick.mock.instances.length).toBe(2);
-    expect(mouseDidClick.mock.instances[1]).toBe(instance2);
-
-    ReactTestUtils.Simulate.mouseOver(rendered1);
-    expect(mouseDidEnter.mock.instances.length).toBe(1);
-    expect(mouseDidEnter.mock.instances[0]).toBe(instance1);
-
-    ReactTestUtils.Simulate.mouseOver(rendered2);
-    expect(mouseDidEnter.mock.instances.length).toBe(2);
-    expect(mouseDidEnter.mock.instances[1]).toBe(instance2);
-
-    ReactTestUtils.Simulate.mouseOut(rendered1);
-    expect(mouseDidLeave.mock.instances.length).toBe(1);
-    expect(mouseDidLeave.mock.instances[0]).toBe(instance1);
-
-    ReactTestUtils.Simulate.mouseOut(rendered2);
-    expect(mouseDidLeave.mock.instances.length).toBe(2);
-    expect(mouseDidLeave.mock.instances[1]).toBe(instance2);
-  });
-
-  it('should not hold reference to instance', () => {
-    var mouseDidClick = function() {
-      void this.state.something;
-    };
-
-    var TestBindComponent = React.createClass({
-      autobind: false,
-      getInitialState: function() {
-        return {something: 'hi'};
-      },
-      onClick: mouseDidClick,
-
-      // auto binding only occurs on top level functions in class defs.
-      badIdeas: {
-        badBind: function() {
-          void this.state.something;
-        },
-      },
-
-      render: function() {
-        return <div ref="child" onClick={this.onClick} />;
-      },
-    });
-
-    var instance1 = ReactTestUtils.renderIntoDocument(<TestBindComponent />);
-    var rendered1 = instance1.refs.child;
-
-    var instance2 = ReactTestUtils.renderIntoDocument(<TestBindComponent />);
-    var rendered2 = instance2.refs.child;
-
-    expect(function() {
-      var badIdea = instance1.badIdeas.badBind;
-      badIdea();
-    }).toThrow();
-
-    expect(instance1.onClick).toBe(instance2.onClick);
-
-    expect(function() {
-      ReactTestUtils.Simulate.click(rendered1);
-    }).toThrow();
-
-    expect(function() {
-      ReactTestUtils.Simulate.click(rendered2);
-    }).toThrow();
-  });
-
-  it('works with mixins that have not opted out of autobinding', () => {
-    var mouseDidClick = jest.fn();
-
-    var TestMixin = {
-      onClick: mouseDidClick,
-    };
-
-    var TestBindComponent = React.createClass({
-      mixins: [TestMixin],
-
-      render: function() {
-        return <div ref="child" onClick={this.onClick} />;
-      },
-    });
-
-    var instance1 = ReactTestUtils.renderIntoDocument(<TestBindComponent />);
-    var rendered1 = instance1.refs.child;
-
-    ReactTestUtils.Simulate.click(rendered1);
-    expect(mouseDidClick.mock.instances.length).toBe(1);
-    expect(mouseDidClick.mock.instances[0]).toBe(instance1);
-  });
-
-  it('works with mixins that have opted out of autobinding', () => {
-    var mouseDidClick = jest.fn();
-
-    var TestMixin = {
-      autobind: false,
-      onClick: mouseDidClick,
-    };
-
-    var TestBindComponent = React.createClass({
-      mixins: [TestMixin],
-
-      render: function() {
-        return <div ref="child" onClick={this.onClick.bind(this)} />;
-      },
-    });
-
-    var instance1 = ReactTestUtils.renderIntoDocument(<TestBindComponent />);
-    var rendered1 = instance1.refs.child;
-
-    ReactTestUtils.Simulate.click(rendered1);
-    expect(mouseDidClick.mock.instances.length).toBe(1);
-    expect(mouseDidClick.mock.instances[0]).toBe(instance1);
-  });
-
-  it('does not warn if you try to bind to this', () => {
-    spyOn(console, 'error');
-
-    var TestBindComponent = React.createClass({
-      autobind: false,
-      handleClick: function() {},
-      render: function() {
-        return <div onClick={this.handleClick.bind(this)} />;
-      },
-    });
-
-    ReactTestUtils.renderIntoDocument(<TestBindComponent />);
-
-    expectDev(console.error.calls.count()).toBe(0);
-  });
-
-  it('does not warn if you pass an manually bound method to setState', () => {
-    spyOn(console, 'error');
-
-    var TestBindComponent = React.createClass({
-      autobind: false,
-      getInitialState: function() {
-        return {foo: 1};
-      },
-      componentDidMount: function() {
-        this.setState({foo: 2}, this.handleUpdate.bind(this));
-      },
-      handleUpdate: function() {},
-      render: function() {
-        return <div />;
-      },
-    });
-
-    ReactTestUtils.renderIntoDocument(<TestBindComponent />);
-
-    expectDev(console.error.calls.count()).toBe(0);
-  });
-});
diff --git a/src/isomorphic/classic/class/__tests__/ReactClass-test.js b/src/isomorphic/classic/class/__tests__/ReactClass-test.js
deleted file mode 100644
index 4ab5ad7dac01e..0000000000000
--- a/src/isomorphic/classic/class/__tests__/ReactClass-test.js
+++ /dev/null
@@ -1,348 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @emails react-core
- */
-
-'use strict';
-
-var React;
-var ReactDOM;
-var ReactTestUtils;
-
-describe('ReactClass-spec', () => {
-  beforeEach(() => {
-    React = require('react');
-    ReactDOM = require('react-dom');
-    ReactTestUtils = require('ReactTestUtils');
-  });
-
-  it('should throw when `render` is not specified', () => {
-    expect(function() {
-      React.createClass({});
-    }).toThrowError(
-      'createClass(...): Class specification must implement a `render` method.',
-    );
-  });
-
-  it('should copy `displayName` onto the Constructor', () => {
-    var TestComponent = React.createClass({
-      render: function() {
-        return <div />;
-      },
-    });
-
-    expect(TestComponent.displayName).toBe('TestComponent');
-  });
-
-  it('should copy prop types onto the Constructor', () => {
-    var propValidator = jest.fn();
-    var TestComponent = React.createClass({
-      propTypes: {
-        value: propValidator,
-      },
-      render: function() {
-        return <div />;
-      },
-    });
-
-    expect(TestComponent.propTypes).toBeDefined();
-    expect(TestComponent.propTypes.value).toBe(propValidator);
-  });
-
-  it('should warn on invalid prop types', () => {
-    spyOn(console, 'error');
-    React.createClass({
-      displayName: 'Component',
-      propTypes: {
-        prop: null,
-      },
-      render: function() {
-        return <span>{this.props.prop}</span>;
-      },
-    });
-    expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toBe(
-      'Warning: Component: prop type `prop` is invalid; ' +
-        'it must be a function, usually from React.PropTypes.',
-    );
-  });
-
-  it('should warn on invalid context types', () => {
-    spyOn(console, 'error');
-    React.createClass({
-      displayName: 'Component',
-      contextTypes: {
-        prop: null,
-      },
-      render: function() {
-        return <span>{this.props.prop}</span>;
-      },
-    });
-    expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toBe(
-      'Warning: Component: context type `prop` is invalid; ' +
-        'it must be a function, usually from React.PropTypes.',
-    );
-  });
-
-  it('should throw on invalid child context types', () => {
-    spyOn(console, 'error');
-    React.createClass({
-      displayName: 'Component',
-      childContextTypes: {
-        prop: null,
-      },
-      render: function() {
-        return <span>{this.props.prop}</span>;
-      },
-    });
-    expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toBe(
-      'Warning: Component: child context type `prop` is invalid; ' +
-        'it must be a function, usually from React.PropTypes.',
-    );
-  });
-
-  it('should warn when mispelling shouldComponentUpdate', () => {
-    spyOn(console, 'error');
-
-    React.createClass({
-      componentShouldUpdate: function() {
-        return false;
-      },
-      render: function() {
-        return <div />;
-      },
-    });
-    expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toBe(
-      'Warning: A component has a method called componentShouldUpdate(). Did you ' +
-        'mean shouldComponentUpdate()? The name is phrased as a question ' +
-        'because the function is expected to return a value.',
-    );
-
-    React.createClass({
-      displayName: 'NamedComponent',
-      componentShouldUpdate: function() {
-        return false;
-      },
-      render: function() {
-        return <div />;
-      },
-    });
-    expectDev(console.error.calls.count()).toBe(2);
-    expectDev(console.error.calls.argsFor(1)[0]).toBe(
-      'Warning: NamedComponent has a method called componentShouldUpdate(). Did you ' +
-        'mean shouldComponentUpdate()? The name is phrased as a question ' +
-        'because the function is expected to return a value.',
-    );
-  });
-
-  it('should warn when mispelling componentWillReceiveProps', () => {
-    spyOn(console, 'error');
-    React.createClass({
-      componentWillRecieveProps: function() {
-        return false;
-      },
-      render: function() {
-        return <div />;
-      },
-    });
-    expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toBe(
-      'Warning: A component has a method called componentWillRecieveProps(). Did you ' +
-        'mean componentWillReceiveProps()?',
-    );
-  });
-
-  it('should throw if a reserved property is in statics', () => {
-    expect(function() {
-      React.createClass({
-        statics: {
-          getDefaultProps: function() {
-            return {
-              foo: 0,
-            };
-          },
-        },
-
-        render: function() {
-          return <span />;
-        },
-      });
-    }).toThrowError(
-      'ReactClass: You are attempting to define a reserved property, ' +
-        '`getDefaultProps`, that shouldn\'t be on the "statics" key. Define ' +
-        'it as an instance property instead; it will still be accessible on ' +
-        'the constructor.',
-    );
-  });
-
-  // TODO: Consider actually moving these to statics or drop this unit test.
-
-  xit('should warn when using deprecated non-static spec keys', () => {
-    spyOn(console, 'error');
-    React.createClass({
-      mixins: [{}],
-      propTypes: {
-        foo: React.PropTypes.string,
-      },
-      contextTypes: {
-        foo: React.PropTypes.string,
-      },
-      childContextTypes: {
-        foo: React.PropTypes.string,
-      },
-      render: function() {
-        return <div />;
-      },
-    });
-    expectDev(console.error.calls.count()).toBe(4);
-    expectDev(console.error.calls.argsFor(0)[0]).toBe(
-      'createClass(...): `mixins` is now a static property and should ' +
-        'be defined inside "statics".',
-    );
-    expectDev(console.error.calls.argsFor(1)[0]).toBe(
-      'createClass(...): `propTypes` is now a static property and should ' +
-        'be defined inside "statics".',
-    );
-    expectDev(console.error.calls.argsFor(2)[0]).toBe(
-      'createClass(...): `contextTypes` is now a static property and ' +
-        'should be defined inside "statics".',
-    );
-    expectDev(console.error.calls.argsFor(3)[0]).toBe(
-      'createClass(...): `childContextTypes` is now a static property and ' +
-        'should be defined inside "statics".',
-    );
-  });
-
-  it('should support statics', () => {
-    var Component = React.createClass({
-      statics: {
-        abc: 'def',
-        def: 0,
-        ghi: null,
-        jkl: 'mno',
-        pqr: function() {
-          return this;
-        },
-      },
-
-      render: function() {
-        return <span />;
-      },
-    });
-    var instance = <Component />;
-    instance = ReactTestUtils.renderIntoDocument(instance);
-    expect(instance.constructor.abc).toBe('def');
-    expect(Component.abc).toBe('def');
-    expect(instance.constructor.def).toBe(0);
-    expect(Component.def).toBe(0);
-    expect(instance.constructor.ghi).toBe(null);
-    expect(Component.ghi).toBe(null);
-    expect(instance.constructor.jkl).toBe('mno');
-    expect(Component.jkl).toBe('mno');
-    expect(instance.constructor.pqr()).toBe(Component);
-    expect(Component.pqr()).toBe(Component);
-  });
-
-  it('should work with object getInitialState() return values', () => {
-    var Component = React.createClass({
-      getInitialState: function() {
-        return {
-          occupation: 'clown',
-        };
-      },
-      render: function() {
-        return <span />;
-      },
-    });
-    var instance = <Component />;
-    instance = ReactTestUtils.renderIntoDocument(instance);
-    expect(instance.state.occupation).toEqual('clown');
-  });
-
-  it('renders based on context getInitialState', () => {
-    var Foo = React.createClass({
-      contextTypes: {
-        className: React.PropTypes.string,
-      },
-      getInitialState() {
-        return {className: this.context.className};
-      },
-      render() {
-        return <span className={this.state.className} />;
-      },
-    });
-
-    var Outer = React.createClass({
-      childContextTypes: {
-        className: React.PropTypes.string,
-      },
-      getChildContext() {
-        return {className: 'foo'};
-      },
-      render() {
-        return <Foo />;
-      },
-    });
-
-    var container = document.createElement('div');
-    ReactDOM.render(<Outer />, container);
-    expect(container.firstChild.className).toBe('foo');
-  });
-
-  it('should throw with non-object getInitialState() return values', () => {
-    [['an array'], 'a string', 1234].forEach(function(state) {
-      var Component = React.createClass({
-        getInitialState: function() {
-          return state;
-        },
-        render: function() {
-          return <span />;
-        },
-      });
-      var instance = <Component />;
-      expect(function() {
-        instance = ReactTestUtils.renderIntoDocument(instance);
-      }).toThrowError(
-        'Component.getInitialState(): must return an object or null',
-      );
-    });
-  });
-
-  it('should work with a null getInitialState() return value', () => {
-    var Component = React.createClass({
-      getInitialState: function() {
-        return null;
-      },
-      render: function() {
-        return <span />;
-      },
-    });
-    expect(() =>
-      ReactTestUtils.renderIntoDocument(<Component />)).not.toThrow();
-  });
-
-  it('should throw when using legacy factories', () => {
-    spyOn(console, 'error');
-    var Component = React.createClass({
-      render() {
-        return <div />;
-      },
-    });
-
-    expect(() => Component()).toThrow();
-    expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toBe(
-      'Warning: Something is calling a React component directly. Use a ' +
-        'factory or JSX instead. See: https://fb.me/react-legacyfactory',
-    );
-  });
-});
diff --git a/src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js b/src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js
deleted file mode 100644
index 2f079a69fc19d..0000000000000
--- a/src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js
+++ /dev/null
@@ -1,532 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @emails react-core
- */
-
-'use strict';
-
-var React;
-var ReactTestUtils;
-
-var TestComponent;
-var TestComponentWithPropTypes;
-var TestComponentWithReverseSpec;
-var mixinPropValidator;
-var componentPropValidator;
-
-describe('ReactClass-mixin', () => {
-  beforeEach(() => {
-    React = require('react');
-    ReactTestUtils = require('ReactTestUtils');
-    mixinPropValidator = jest.fn();
-    componentPropValidator = jest.fn();
-
-    var MixinA = {
-      propTypes: {
-        propA: function() {},
-      },
-      componentDidMount: function() {
-        this.props.listener('MixinA didMount');
-      },
-    };
-
-    var MixinB = {
-      mixins: [MixinA],
-      propTypes: {
-        propB: function() {},
-      },
-      componentDidMount: function() {
-        this.props.listener('MixinB didMount');
-      },
-    };
-
-    var MixinBWithReverseSpec = {
-      componentDidMount: function() {
-        this.props.listener('MixinBWithReverseSpec didMount');
-      },
-      mixins: [MixinA],
-    };
-
-    var MixinC = {
-      statics: {
-        staticC: function() {},
-      },
-      componentDidMount: function() {
-        this.props.listener('MixinC didMount');
-      },
-    };
-
-    var MixinD = {
-      propTypes: {
-        value: mixinPropValidator,
-      },
-    };
-
-    TestComponent = React.createClass({
-      mixins: [MixinB, MixinC, MixinD],
-      statics: {
-        staticComponent: function() {},
-      },
-      propTypes: {
-        propComponent: function() {},
-      },
-      componentDidMount: function() {
-        this.props.listener('Component didMount');
-      },
-      render: function() {
-        return <div />;
-      },
-    });
-
-    TestComponentWithReverseSpec = React.createClass({
-      render: function() {
-        return <div />;
-      },
-      componentDidMount: function() {
-        this.props.listener('Component didMount');
-      },
-      mixins: [MixinBWithReverseSpec, MixinC, MixinD],
-    });
-
-    TestComponentWithPropTypes = React.createClass({
-      mixins: [MixinD],
-      propTypes: {
-        value: componentPropValidator,
-      },
-      render: function() {
-        return <div />;
-      },
-    });
-  });
-
-  it('should support merging propTypes and statics', () => {
-    var listener = jest.fn();
-    var instance = <TestComponent listener={listener} />;
-    instance = ReactTestUtils.renderIntoDocument(instance);
-
-    var instancePropTypes = instance.constructor.propTypes;
-
-    expect('propA' in instancePropTypes).toBe(true);
-    expect('propB' in instancePropTypes).toBe(true);
-    expect('propComponent' in instancePropTypes).toBe(true);
-
-    expect('staticC' in TestComponent).toBe(true);
-    expect('staticComponent' in TestComponent).toBe(true);
-  });
-
-  it('should support chaining delegate functions', () => {
-    var listener = jest.fn();
-    var instance = <TestComponent listener={listener} />;
-    ReactTestUtils.renderIntoDocument(instance);
-
-    expect(listener.mock.calls).toEqual([
-      ['MixinA didMount'],
-      ['MixinB didMount'],
-      ['MixinC didMount'],
-      ['Component didMount'],
-    ]);
-  });
-
-  it('should chain functions regardless of spec property order', () => {
-    var listener = jest.fn();
-    var instance = <TestComponentWithReverseSpec listener={listener} />;
-    ReactTestUtils.renderIntoDocument(instance);
-
-    expect(listener.mock.calls).toEqual([
-      ['MixinA didMount'],
-      ['MixinBWithReverseSpec didMount'],
-      ['MixinC didMount'],
-      ['Component didMount'],
-    ]);
-  });
-
-  it('should validate prop types via mixins', () => {
-    expect(TestComponent.propTypes).toBeDefined();
-    expect(TestComponent.propTypes.value).toBe(mixinPropValidator);
-  });
-
-  it('should override mixin prop types with class prop types', () => {
-    // Sanity check...
-    expect(componentPropValidator).not.toBe(mixinPropValidator);
-    // Actually check...
-    expect(TestComponentWithPropTypes.propTypes).toBeDefined();
-    expect(TestComponentWithPropTypes.propTypes.value).not.toBe(
-      mixinPropValidator,
-    );
-    expect(TestComponentWithPropTypes.propTypes.value).toBe(
-      componentPropValidator,
-    );
-  });
-
-  it('should support mixins with getInitialState()', () => {
-    var Mixin = {
-      getInitialState: function() {
-        return {mixin: true};
-      },
-    };
-    var Component = React.createClass({
-      mixins: [Mixin],
-      getInitialState: function() {
-        return {component: true};
-      },
-      render: function() {
-        return <span />;
-      },
-    });
-    var instance = ReactTestUtils.renderIntoDocument(<Component />);
-    expect(instance.state.component).toBe(true);
-    expect(instance.state.mixin).toBe(true);
-  });
-
-  it('should throw with conflicting getInitialState() methods', () => {
-    var Mixin = {
-      getInitialState: function() {
-        return {x: true};
-      },
-    };
-    var Component = React.createClass({
-      mixins: [Mixin],
-      getInitialState: function() {
-        return {x: true};
-      },
-      render: function() {
-        return <span />;
-      },
-    });
-    expect(function() {
-      ReactTestUtils.renderIntoDocument(<Component />);
-    }).toThrowError(
-      'mergeIntoWithNoDuplicateKeys(): Tried to merge two objects with the ' +
-        'same key: `x`. This conflict may be due to a mixin; in particular, ' +
-        'this may be caused by two getInitialState() or getDefaultProps() ' +
-        'methods returning objects with clashing keys.',
-    );
-  });
-
-  it('should not mutate objects returned by getInitialState()', () => {
-    var Mixin = {
-      getInitialState: function() {
-        return Object.freeze({mixin: true});
-      },
-    };
-    var Component = React.createClass({
-      mixins: [Mixin],
-      getInitialState: function() {
-        return Object.freeze({component: true});
-      },
-      render: function() {
-        return <span />;
-      },
-    });
-    expect(() => {
-      ReactTestUtils.renderIntoDocument(<Component />);
-    }).not.toThrow();
-  });
-
-  it('should support statics in mixins', () => {
-    var Mixin = {
-      statics: {
-        foo: 'bar',
-      },
-    };
-    var Component = React.createClass({
-      mixins: [Mixin],
-
-      statics: {
-        abc: 'def',
-      },
-
-      render: function() {
-        return <span />;
-      },
-    });
-    var instance = <Component />;
-    instance = ReactTestUtils.renderIntoDocument(instance);
-    expect(instance.constructor.foo).toBe('bar');
-    expect(Component.foo).toBe('bar');
-    expect(instance.constructor.abc).toBe('def');
-    expect(Component.abc).toBe('def');
-  });
-
-  it("should throw if mixins override each others' statics", () => {
-    expect(function() {
-      var Mixin = {
-        statics: {
-          abc: 'foo',
-        },
-      };
-      React.createClass({
-        mixins: [Mixin],
-
-        statics: {
-          abc: 'bar',
-        },
-
-        render: function() {
-          return <span />;
-        },
-      });
-    }).toThrowError(
-      'ReactClass: You are attempting to define `abc` on your component more ' +
-        'than once. This conflict may be due to a mixin.',
-    );
-  });
-
-  it('should throw if mixins override functions in statics', () => {
-    expect(function() {
-      var Mixin = {
-        statics: {
-          abc: function() {
-            console.log('foo');
-          },
-        },
-      };
-      React.createClass({
-        mixins: [Mixin],
-
-        statics: {
-          abc: function() {
-            console.log('bar');
-          },
-        },
-
-        render: function() {
-          return <span />;
-        },
-      });
-    }).toThrowError(
-      'ReactClass: You are attempting to define `abc` on your component ' +
-        'more than once. This conflict may be due to a mixin.',
-    );
-  });
-
-  it('should warn if the mixin is undefined', () => {
-    spyOn(console, 'error');
-
-    React.createClass({
-      mixins: [undefined],
-
-      render: function() {
-        return <span />;
-      },
-    });
-
-    expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toBe(
-      "Warning: ReactClass: You're attempting to include a mixin that is " +
-        'either null or not an object. Check the mixins included by the ' +
-        'component, as well as any mixins they include themselves. ' +
-        'Expected object but got undefined.',
-    );
-  });
-
-  it('should warn if the mixin is null', () => {
-    spyOn(console, 'error');
-
-    React.createClass({
-      mixins: [null],
-
-      render: function() {
-        return <span />;
-      },
-    });
-
-    expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toBe(
-      "Warning: ReactClass: You're attempting to include a mixin that is " +
-        'either null or not an object. Check the mixins included by the ' +
-        'component, as well as any mixins they include themselves. ' +
-        'Expected object but got null.',
-    );
-  });
-
-  it('should warn if an undefined mixin is included in another mixin', () => {
-    spyOn(console, 'error');
-
-    var mixinA = {
-      mixins: [undefined],
-    };
-
-    React.createClass({
-      mixins: [mixinA],
-
-      render: function() {
-        return <span />;
-      },
-    });
-
-    expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toBe(
-      "Warning: ReactClass: You're attempting to include a mixin that is " +
-        'either null or not an object. Check the mixins included by the ' +
-        'component, as well as any mixins they include themselves. ' +
-        'Expected object but got undefined.',
-    );
-  });
-
-  it('should warn if a null mixin is included in another mixin', () => {
-    spyOn(console, 'error');
-
-    var mixinA = {
-      mixins: [null],
-    };
-
-    React.createClass({
-      mixins: [mixinA],
-
-      render: function() {
-        return <span />;
-      },
-    });
-
-    expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toBe(
-      "Warning: ReactClass: You're attempting to include a mixin that is " +
-        'either null or not an object. Check the mixins included by the ' +
-        'component, as well as any mixins they include themselves. ' +
-        'Expected object but got null.',
-    );
-  });
-
-  it('should throw if the mixin is a React component', () => {
-    expect(function() {
-      React.createClass({
-        mixins: [<div />],
-
-        render: function() {
-          return <span />;
-        },
-      });
-    }).toThrowError(
-      "ReactClass: You're attempting to use a component as a mixin. " +
-        'Instead, just use a regular object.',
-    );
-  });
-
-  it('should throw if the mixin is a React component class', () => {
-    expect(function() {
-      var Component = React.createClass({
-        render: function() {
-          return <span />;
-        },
-      });
-
-      React.createClass({
-        mixins: [Component],
-
-        render: function() {
-          return <span />;
-        },
-      });
-    }).toThrowError(
-      "ReactClass: You're attempting to use a component class or function " +
-        'as a mixin. Instead, just use a regular object.',
-    );
-  });
-
-  it('should have bound the mixin methods to the component', () => {
-    var mixin = {
-      mixinFunc: function() {
-        return this;
-      },
-    };
-
-    var Component = React.createClass({
-      mixins: [mixin],
-      componentDidMount: function() {
-        expect(this.mixinFunc()).toBe(this);
-      },
-      render: function() {
-        return <span />;
-      },
-    });
-    ReactTestUtils.renderIntoDocument(<Component />);
-  });
-
-  it('should include the mixin keys in even if their values are falsy', () => {
-    var mixin = {
-      keyWithNullValue: null,
-      randomCounter: 0,
-    };
-
-    var Component = React.createClass({
-      mixins: [mixin],
-      componentDidMount: function() {
-        expect(this.randomCounter).toBe(0);
-        expect(this.keyWithNullValue).toBeNull();
-      },
-      render: function() {
-        return <span />;
-      },
-    });
-    ReactTestUtils.renderIntoDocument(<Component />);
-  });
-
-  it('should work with a null getInitialState return value and a mixin', () => {
-    var Component;
-    var instance;
-
-    var Mixin = {
-      getInitialState: function() {
-        return {foo: 'bar'};
-      },
-    };
-    Component = React.createClass({
-      mixins: [Mixin],
-      getInitialState: function() {
-        return null;
-      },
-      render: function() {
-        return <span />;
-      },
-    });
-    expect(() =>
-      ReactTestUtils.renderIntoDocument(<Component />)).not.toThrow();
-
-    instance = ReactTestUtils.renderIntoDocument(<Component />);
-    expect(instance.state).toEqual({foo: 'bar'});
-
-    // Also the other way round should work
-    var Mixin2 = {
-      getInitialState: function() {
-        return null;
-      },
-    };
-    Component = React.createClass({
-      mixins: [Mixin2],
-      getInitialState: function() {
-        return {foo: 'bar'};
-      },
-      render: function() {
-        return <span />;
-      },
-    });
-    expect(() =>
-      ReactTestUtils.renderIntoDocument(<Component />)).not.toThrow();
-
-    instance = ReactTestUtils.renderIntoDocument(<Component />);
-    expect(instance.state).toEqual({foo: 'bar'});
-
-    // Multiple mixins should be fine too
-    Component = React.createClass({
-      mixins: [Mixin, Mixin2],
-      getInitialState: function() {
-        return {x: true};
-      },
-      render: function() {
-        return <span />;
-      },
-    });
-    expect(() =>
-      ReactTestUtils.renderIntoDocument(<Component />)).not.toThrow();
-
-    instance = ReactTestUtils.renderIntoDocument(<Component />);
-    expect(instance.state).toEqual({foo: 'bar', x: true});
-  });
-});

From 087fe88f20102454ec2581368dfb152abf3d7c20 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Tue, 21 Mar 2017 18:37:16 -0700
Subject: [PATCH 077/153] Rewrite Stack implementation of ReactART using plain
 classes

instead of createClass
---
 src/renderers/art/ReactARTStack.js | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/renderers/art/ReactARTStack.js b/src/renderers/art/ReactARTStack.js
index db1d22a885e86..26e3ff92e82f6 100644
--- a/src/renderers/art/ReactARTStack.js
+++ b/src/renderers/art/ReactARTStack.js
@@ -170,12 +170,8 @@ const ContainerMixin = Object.assign({}, ReactMultiChild, {
 // Surface is a React DOM Component, not an ART component. It serves as the
 // entry point into the ART reconciler.
 
-const Surface = React.createClass({
-  displayName: 'Surface',
-
-  mixins: [ContainerMixin],
-
-  componentDidMount: function() {
+class Surface extends React.Component {
+  componentDidMount() {
     const domNode = ReactDOM.findDOMNode(this);
 
     this.node = Mode.Surface(+this.props.width, +this.props.height, domNode);
@@ -189,9 +185,9 @@ const Surface = React.createClass({
       ReactInstanceMap.get(this)._context,
     );
     ReactUpdates.ReactReconcileTransaction.release(transaction);
-  },
+  }
 
-  componentDidUpdate: function(oldProps) {
+  componentDidUpdate(oldProps) {
     const node = this.node;
     if (
       this.props.width != oldProps.width || this.props.height != oldProps.height
@@ -220,13 +216,13 @@ const Surface = React.createClass({
     if (node.render) {
       node.render();
     }
-  },
+  }
 
-  componentWillUnmount: function() {
+  componentWillUnmount() {
     this.unmountChildren();
-  },
+  }
 
-  render: function() {
+  render() {
     // This is going to be a placeholder because we don't know what it will
     // actually resolve to because ART may render canvas, vml or svg tags here.
     // We only allow a subset of properties since others might conflict with
@@ -246,8 +242,10 @@ const Surface = React.createClass({
         title={props.title}
       />
     );
-  },
-});
+  }
+}
+Surface.displayName = 'Surface';
+Object.assign(Surface.prototype, ContainerMixin);
 
 // Various nodes that can go into a surface
 

From c76a4eaa2aab1a10825c51f8e9c7baccc54ef56b Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Tue, 21 Mar 2017 18:38:15 -0700
Subject: [PATCH 078/153] Update tests to use plain JavaScript classes

Tests that rely on replaceState or isMounted use
updater.enqueueReplaceState and updater.isMounted instead.
---
 mocks/ReactElementTestChild.js                |   8 +-
 mocks/ReactMockedComponentTestComponent.js    |  21 +-
 scripts/fiber/tests-passing.txt               |  61 +----
 .../__tests__/ReactContextValidator-test.js   | 215 +++++++++---------
 .../element/__tests__/ReactElement-test.js    | 214 ++++++-----------
 .../__tests__/ReactElementClone-test.js       | 191 ++++++++--------
 .../__tests__/ReactElementValidator-test.js   | 187 +++++++--------
 .../ReactPropTypesProduction-test.js          |  11 +-
 .../__tests__/ReactComponentLifeCycle-test.js | 137 ++++++-----
 .../__tests__/ReactComponentTreeHook-test.js  |  11 +-
 .../__tests__/ReactCompositeComponent-test.js |  95 ++------
 .../ReactCompositeComponentState-test.js      |  66 +++---
 .../__tests__/ReactMultiChild-test.js         |  50 ++--
 src/renderers/__tests__/ReactPerf-test.js     |  20 +-
 .../__tests__/ReactStatelessComponent-test.js |  19 +-
 src/renderers/__tests__/ReactUpdates-test.js  |  95 ++------
 .../__tests__/ReactDOMComponent-test.js       |  42 ++--
 .../dom/shared/__tests__/ReactMount-test.js   |  12 +-
 .../__tests__/ReactServerRendering-test.js    |  26 ---
 .../__tests__/BeforeInputEventPlugin-test.js  |   8 +-
 .../fiber/__tests__/ReactIncremental-test.js  |  14 +-
 .../ReactIncrementalReflection-test.js        |  44 ++--
 .../__tests__/ReactIncrementalUpdates-test.js |  46 ++--
 src/test/__tests__/ReactTestUtils-test.js     |  10 +-
 24 files changed, 663 insertions(+), 940 deletions(-)

diff --git a/mocks/ReactElementTestChild.js b/mocks/ReactElementTestChild.js
index f2c94d5dd6885..2e9d076933047 100644
--- a/mocks/ReactElementTestChild.js
+++ b/mocks/ReactElementTestChild.js
@@ -13,10 +13,10 @@
 
 var React = require('React');
 
-var Child = React.createClass({
-  render: function() {
+class Child extends React.Component {
+  render() {
     return React.createElement('div');
-  },
-});
+  }
+}
 
 module.exports = Child;
diff --git a/mocks/ReactMockedComponentTestComponent.js b/mocks/ReactMockedComponentTestComponent.js
index 903006487374f..285265df14876 100644
--- a/mocks/ReactMockedComponentTestComponent.js
+++ b/mocks/ReactMockedComponentTestComponent.js
@@ -13,23 +13,18 @@
 
 var React = require('React');
 
-var ReactMockedComponentTestComponent = React.createClass({
-  getDefaultProps: function() {
-    return {bar: 'baz'};
-  },
+class ReactMockedComponentTestComponent extends React.Component {
+  state = {foo: 'bar'};
 
-  getInitialState: function() {
-    return {foo: 'bar'};
-  },
-
-  hasCustomMethod: function() {
+  hasCustomMethod() {
     return true;
-  },
+  }
 
-  render: function() {
+  render() {
     return <span />;
-  },
+  }
 
-});
+}
+ReactMockedComponentTestComponent.defaultProps = {bar: 'baz'};
 
 module.exports = ReactMockedComponentTestComponent;
diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index 0c658781d6468..cf40f4bb6cd81 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -89,64 +89,10 @@ src/isomorphic/classic/__tests__/ReactContextValidator-test.js
 * should warn (but not error) if getChildContext method is missing
 * should pass parent context if getChildContext method is missing
 
-src/isomorphic/classic/class/__tests__/ReactBind-test.js
-* Holds reference to instance
-* works with mixins
-* warns if you try to bind to this
-* does not warn if you pass an auto-bound method to setState
-
-src/isomorphic/classic/class/__tests__/ReactBindOptout-test.js
-* should work with manual binding
-* should not hold reference to instance
-* works with mixins that have not opted out of autobinding
-* works with mixins that have opted out of autobinding
-* does not warn if you try to bind to this
-* does not warn if you pass an manually bound method to setState
-
-src/isomorphic/classic/class/__tests__/ReactClass-test.js
-* should throw when `render` is not specified
-* should copy `displayName` onto the Constructor
-* should copy prop types onto the Constructor
-* should warn on invalid prop types
-* should warn on invalid context types
-* should throw on invalid child context types
-* should warn when mispelling shouldComponentUpdate
-* should warn when mispelling componentWillReceiveProps
-* should throw if a reserved property is in statics
-* should support statics
-* should work with object getInitialState() return values
-* renders based on context getInitialState
-* should throw with non-object getInitialState() return values
-* should work with a null getInitialState() return value
-* should throw when using legacy factories
-
-src/isomorphic/classic/class/__tests__/ReactClassMixin-test.js
-* should support merging propTypes and statics
-* should support chaining delegate functions
-* should chain functions regardless of spec property order
-* should validate prop types via mixins
-* should override mixin prop types with class prop types
-* should support mixins with getInitialState()
-* should throw with conflicting getInitialState() methods
-* should not mutate objects returned by getInitialState()
-* should support statics in mixins
-* should throw if mixins override each others' statics
-* should throw if mixins override functions in statics
-* should warn if the mixin is undefined
-* should warn if the mixin is null
-* should warn if an undefined mixin is included in another mixin
-* should warn if a null mixin is included in another mixin
-* should throw if the mixin is a React component
-* should throw if the mixin is a React component class
-* should have bound the mixin methods to the component
-* should include the mixin keys in even if their values are falsy
-* should work with a null getInitialState return value and a mixin
-
 src/isomorphic/classic/element/__tests__/ReactElement-test.js
 * uses the fallback value when in an environment without Symbol
 * returns a complete element according to spec
-* should warn when `key` is being accessed on createClass element
-* should warn when `key` is being accessed on ES class element
+* should warn when `key` is being accessed on composite element
 * should warn when `key` is being accessed on a host element
 * should warn when `ref` is being accessed
 * allows a string to be passed as the type
@@ -165,7 +111,6 @@ src/isomorphic/classic/element/__tests__/ReactElement-test.js
 * merges rest arguments onto the children prop in an array
 * allows static methods to be called using the type property
 * identifies valid elements
-* allows the use of PropTypes validators in statics
 * is indistinguishable from a plain object
 * should use default prop value when removing a prop
 * should normalize props with default values
@@ -495,8 +440,6 @@ src/renderers/__tests__/ReactCompositeComponent-test.js
 * should react to state changes from callbacks
 * should rewire refs when rendering to different child types
 * should not cache old DOM nodes when switching constructors
-* should auto bind methods and values correctly
-* should not pass this to getDefaultProps
 * should use default values for undefined props
 * should not mutate passed-in props object
 * should warn about `forceUpdate` on unmounted components
@@ -718,7 +661,6 @@ src/renderers/__tests__/ReactUpdates-test.js
 * does not call render after a component as been deleted
 * marks top-level updates
 * throws in setState if the update callback is not a function
-* throws in replaceState if the update callback is not a function
 * throws in forceUpdate if the update callback is not a function
 * does not update one component twice in a batch (#2410)
 * does not update one component twice in a batch (#6371)
@@ -1299,7 +1241,6 @@ src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
 * allows setState in componentWillMount without using DOM
 * renders components with different batching strategies
 * warns with a no-op when an async setState is triggered
-* warns with a no-op when an async replaceState is triggered
 * warns with a no-op when an async forceUpdate is triggered
 * should warn when children are mutated during render
 
diff --git a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
index dfd0f21809005..c05c6a305ca7f 100644
--- a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
+++ b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
@@ -38,33 +38,31 @@ describe('ReactContextValidator', () => {
   // ensure that this is not required for ES6 classes with Flow.
 
   it('should filter out context not in contextTypes', () => {
-    var Component = React.createClass({
-      contextTypes: {
-        foo: React.PropTypes.string,
-      },
-
-      render: function() {
+    class Component extends React.Component {
+      render() {
         return <div />;
-      },
-    });
-
-    var ComponentInFooBarContext = React.createClass({
-      childContextTypes: {
-        foo: React.PropTypes.string,
-        bar: React.PropTypes.number,
-      },
+      }
+    }
+    Component.contextTypes = {
+      foo: React.PropTypes.string,
+    };
 
-      getChildContext: function() {
+    class ComponentInFooBarContext extends React.Component {
+      getChildContext() {
         return {
           foo: 'abc',
           bar: 123,
         };
-      },
+      }
 
-      render: function() {
+      render() {
         return <Component ref="child" />;
-      },
-    });
+      }
+    }
+    ComponentInFooBarContext.childContextTypes = {
+      foo: React.PropTypes.string,
+      bar: React.PropTypes.number,
+    };
 
     var instance = ReactTestUtils.renderIntoDocument(
       <ComponentInFooBarContext />,
@@ -77,47 +75,45 @@ describe('ReactContextValidator', () => {
     var actualShouldComponentUpdate;
     var actualComponentWillUpdate;
 
-    var Parent = React.createClass({
-      childContextTypes: {
-        foo: React.PropTypes.string.isRequired,
-        bar: React.PropTypes.string.isRequired,
-      },
-
-      getChildContext: function() {
+    class Parent extends React.Component {
+      getChildContext() {
         return {
           foo: this.props.foo,
           bar: 'bar',
         };
-      },
+      }
 
-      render: function() {
+      render() {
         return <Component />;
-      },
-    });
-
-    var Component = React.createClass({
-      contextTypes: {
-        foo: React.PropTypes.string,
-      },
+      }
+    }
+    Parent.childContextTypes = {
+      foo: React.PropTypes.string.isRequired,
+      bar: React.PropTypes.string.isRequired,
+    };
 
-      componentWillReceiveProps: function(nextProps, nextContext) {
+    class Component extends React.Component {
+      componentWillReceiveProps(nextProps, nextContext) {
         actualComponentWillReceiveProps = nextContext;
         return true;
-      },
+      }
 
-      shouldComponentUpdate: function(nextProps, nextState, nextContext) {
+      shouldComponentUpdate(nextProps, nextState, nextContext) {
         actualShouldComponentUpdate = nextContext;
         return true;
-      },
+      }
 
-      componentWillUpdate: function(nextProps, nextState, nextContext) {
+      componentWillUpdate(nextProps, nextState, nextContext) {
         actualComponentWillUpdate = nextContext;
-      },
+      }
 
-      render: function() {
+      render() {
         return <div />;
-      },
-    });
+      }
+    }
+    Component.contextTypes = {
+      foo: React.PropTypes.string,
+    };
 
     var container = document.createElement('div');
     ReactDOM.render(<Parent foo="abc" />, container);
@@ -130,37 +126,36 @@ describe('ReactContextValidator', () => {
   it('should pass previous context to lifecycles', () => {
     var actualComponentDidUpdate;
 
-    var Parent = React.createClass({
-      childContextTypes: {
-        foo: React.PropTypes.string.isRequired,
-        bar: React.PropTypes.string.isRequired,
-      },
-
-      getChildContext: function() {
+    class Parent extends React.Component {
+      getChildContext() {
         return {
           foo: this.props.foo,
           bar: 'bar',
         };
-      },
+      }
 
-      render: function() {
+      render() {
         return <Component />;
-      },
-    });
-
-    var Component = React.createClass({
-      contextTypes: {
-        foo: React.PropTypes.string,
-      },
+      }
+    }
+    Parent.childContextTypes = {
+      foo: React.PropTypes.string.isRequired,
+      bar: React.PropTypes.string.isRequired,
+    };
 
-      componentDidUpdate: function(prevProps, prevState, prevContext) {
+    class Component extends React.Component {
+      componentDidUpdate(prevProps, prevState, prevContext) {
         actualComponentDidUpdate = prevContext;
-      },
+      }
 
-      render: function() {
+      render() {
         return <div />;
-      },
-    });
+      }
+    }
+    Component.contextTypes = {
+      foo: React.PropTypes.string,
+    };
+
 
     var container = document.createElement('div');
     ReactDOM.render(<Parent foo="abc" />, container);
@@ -171,15 +166,14 @@ describe('ReactContextValidator', () => {
   it('should check context types', () => {
     spyOn(console, 'error');
 
-    var Component = React.createClass({
-      contextTypes: {
-        foo: React.PropTypes.string.isRequired,
-      },
-
-      render: function() {
+    class Component extends React.Component {
+      render() {
         return <div />;
-      },
-    });
+      }
+    }
+    Component.contextTypes = {
+      foo: React.PropTypes.string.isRequired,
+    };
 
     ReactTestUtils.renderIntoDocument(<Component />);
 
@@ -191,21 +185,20 @@ describe('ReactContextValidator', () => {
         '    in Component (at **)',
     );
 
-    var ComponentInFooStringContext = React.createClass({
-      childContextTypes: {
-        foo: React.PropTypes.string,
-      },
-
-      getChildContext: function() {
+    class ComponentInFooStringContext extends React.Component {
+      getChildContext() {
         return {
           foo: this.props.fooValue,
         };
-      },
+      }
 
-      render: function() {
+      render() {
         return <Component />;
-      },
-    });
+      }
+    }
+    ComponentInFooStringContext.childContextTypes = {
+      foo: React.PropTypes.string,
+    };
 
     ReactTestUtils.renderIntoDocument(
       <ComponentInFooStringContext fooValue={'bar'} />,
@@ -214,21 +207,20 @@ describe('ReactContextValidator', () => {
     // Previous call should not error
     expectDev(console.error.calls.count()).toBe(1);
 
-    var ComponentInFooNumberContext = React.createClass({
-      childContextTypes: {
-        foo: React.PropTypes.number,
-      },
-
-      getChildContext: function() {
+    class ComponentInFooNumberContext extends React.Component {
+      getChildContext() {
         return {
           foo: this.props.fooValue,
         };
-      },
+      }
 
-      render: function() {
+      render() {
         return <Component />;
-      },
-    });
+      }
+    }
+    ComponentInFooNumberContext.childContextTypes = {
+      foo: React.PropTypes.number,
+    };
 
     ReactTestUtils.renderIntoDocument(
       <ComponentInFooNumberContext fooValue={123} />,
@@ -247,20 +239,19 @@ describe('ReactContextValidator', () => {
   it('should check child context types', () => {
     spyOn(console, 'error');
 
-    var Component = React.createClass({
-      childContextTypes: {
-        foo: React.PropTypes.string.isRequired,
-        bar: React.PropTypes.number,
-      },
-
-      getChildContext: function() {
+    class Component extends React.Component {
+      getChildContext() {
         return this.props.testContext;
-      },
+      }
 
-      render: function() {
+      render() {
         return <div />;
-      },
-    });
+      }
+    }
+    Component.childContextTypes = {
+      foo: React.PropTypes.string.isRequired,
+      bar: React.PropTypes.number,
+    };
 
     ReactTestUtils.renderIntoDocument(<Component testContext={{bar: 123}} />);
     expectDev(console.error.calls.count()).toBe(1);
@@ -362,16 +353,16 @@ describe('ReactContextValidator', () => {
     }
 
     var childContext;
-    var ChildContextConsumer = React.createClass({
-      contextTypes: {
-        bar: React.PropTypes.string.isRequired,
-        foo: React.PropTypes.string.isRequired,
-      },
-      render: function() {
+    class ChildContextConsumer extends React.Component {
+      render() {
         childContext = this.context;
         return <div />;
-      },
-    });
+      }
+    }
+    ChildContextConsumer.contextTypes = {
+      bar: React.PropTypes.string.isRequired,
+      foo: React.PropTypes.string.isRequired,
+    };
 
     ReactTestUtils.renderIntoDocument(<ParentContextProvider />);
     expect(childContext.bar).toBeUndefined();
diff --git a/src/isomorphic/classic/element/__tests__/ReactElement-test.js b/src/isomorphic/classic/element/__tests__/ReactElement-test.js
index 27bd222be8ffd..d03f176ba6ba0 100644
--- a/src/isomorphic/classic/element/__tests__/ReactElement-test.js
+++ b/src/isomorphic/classic/element/__tests__/ReactElement-test.js
@@ -34,11 +34,11 @@ describe('ReactElement', () => {
     ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
     // NOTE: We're explicitly not using JSX here. This is intended to test
     // classic JS without JSX.
-    ComponentClass = React.createClass({
-      render: function() {
+    ComponentClass = class extends React.Component {
+      render() {
         return React.createElement('div');
-      },
-    });
+      }
+    };
   });
 
   afterEach(() => {
@@ -59,37 +59,7 @@ describe('ReactElement', () => {
     expect(element.props).toEqual({});
   });
 
-  it('should warn when `key` is being accessed on createClass element', () => {
-    spyOn(console, 'error');
-    var container = document.createElement('div');
-    var Child = React.createClass({
-      render: function() {
-        return <div> {this.props.key} </div>;
-      },
-    });
-    var Parent = React.createClass({
-      render: function() {
-        return (
-          <div>
-            <Child key="0" />
-            <Child key="1" />
-            <Child key="2" />
-          </div>
-        );
-      },
-    });
-    expectDev(console.error.calls.count()).toBe(0);
-    ReactDOM.render(<Parent />, container);
-    expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'Child: `key` is not a prop. Trying to access it will result ' +
-        'in `undefined` being returned. If you need to access the same ' +
-        'value within the child component, you should pass it as a different ' +
-        'prop. (https://fb.me/react-special-props)',
-    );
-  });
-
-  it('should warn when `key` is being accessed on ES class element', () => {
+  it('should warn when `key` is being accessed on composite element', () => {
     spyOn(console, 'error');
     var container = document.createElement('div');
     class Child extends React.Component {
@@ -97,8 +67,8 @@ describe('ReactElement', () => {
         return <div> {this.props.key} </div>;
       }
     }
-    var Parent = React.createClass({
-      render: function() {
+    class Parent extends React.Component {
+      render() {
         return (
           <div>
             <Child key="0" />
@@ -106,9 +76,9 @@ describe('ReactElement', () => {
             <Child key="2" />
           </div>
         );
-      },
-    });
-    expectDev(console.error.calls.count()).toBe(0);
+      }
+    }
+    expect(console.error.calls.count()).toBe(0);
     ReactDOM.render(<Parent />, container);
     expectDev(console.error.calls.count()).toBe(1);
     expectDev(console.error.calls.argsFor(0)[0]).toContain(
@@ -136,21 +106,21 @@ describe('ReactElement', () => {
   it('should warn when `ref` is being accessed', () => {
     spyOn(console, 'error');
     var container = document.createElement('div');
-    var Child = React.createClass({
-      render: function() {
+    class Child extends React.Component {
+      render() {
         return <div> {this.props.ref} </div>;
-      },
-    });
-    var Parent = React.createClass({
-      render: function() {
+      }
+    }
+    class Parent extends React.Component {
+      render() {
         return (
           <div>
             <Child ref="childElement" />
           </div>
         );
-      },
-    });
-    expectDev(console.error.calls.count()).toBe(0);
+      }
+    }
+    expect(console.error.calls.count()).toBe(0);
     ReactDOM.render(<Parent />, container);
     expectDev(console.error.calls.count()).toBe(1);
     expectDev(console.error.calls.argsFor(0)[0]).toContain(
@@ -257,12 +227,12 @@ describe('ReactElement', () => {
     var Component = React.createFactory(ComponentClass);
     var element;
 
-    var Wrapper = React.createClass({
-      render: function() {
+    class Wrapper extends React.Component {
+      render() {
         element = Component();
         return element;
-      },
-    });
+      }
+    }
 
     var instance = ReactTestUtils.renderIntoDocument(
       React.createElement(Wrapper),
@@ -324,19 +294,12 @@ describe('ReactElement', () => {
   it('allows static methods to be called using the type property', () => {
     spyOn(console, 'error');
 
-    var StaticMethodComponentClass = React.createClass({
-      statics: {
-        someStaticMethod: function() {
-          return 'someReturnValue';
-        },
-      },
-      getInitialState: function() {
-        return {valueToReturn: 'hi'};
-      },
-      render: function() {
+    class StaticMethodComponentClass extends React.Component {
+      render() {
         return React.createElement('div');
-      },
-    });
+      }
+    }
+    StaticMethodComponentClass.someStaticMethod = () => 'someReturnValue';
 
     var element = React.createElement(StaticMethodComponentClass);
     expect(element.type.someStaticMethod()).toBe('someReturnValue');
@@ -346,11 +309,11 @@ describe('ReactElement', () => {
   // NOTE: We're explicitly not using JSX here. This is intended to test
   // classic JS without JSX.
   it('identifies valid elements', () => {
-    var Component = React.createClass({
-      render: function() {
+    class Component extends React.Component {
+      render() {
         return React.createElement('div');
-      },
-    });
+      }
+    }
 
     expect(React.isValidElement(React.createElement('div'))).toEqual(true);
     expect(React.isValidElement(React.createElement(Component))).toEqual(true);
@@ -367,21 +330,6 @@ describe('ReactElement', () => {
     expect(React.isValidElement(JSON.parse(jsonElement))).toBe(true);
   });
 
-  it('allows the use of PropTypes validators in statics', () => {
-    // TODO: This test was added to cover a special case where we proxied
-    // methods. However, we don't do that any more so this test can probably
-    // be removed. Leaving it in classic as a safety precaution.
-    var Component = React.createClass({
-      render: () => null,
-      statics: {
-        specialType: React.PropTypes.shape({monkey: React.PropTypes.any}),
-      },
-    });
-
-    expect(typeof Component.specialType).toBe('function');
-    expect(typeof Component.specialType.isRequired).toBe('function');
-  });
-
   // NOTE: We're explicitly not using JSX here. This is intended to test
   // classic JS without JSX.
   it('is indistinguishable from a plain object', () => {
@@ -393,14 +341,12 @@ describe('ReactElement', () => {
   // NOTE: We're explicitly not using JSX here. This is intended to test
   // classic JS without JSX.
   it('should use default prop value when removing a prop', () => {
-    var Component = React.createClass({
-      getDefaultProps: function() {
-        return {fruit: 'persimmon'};
-      },
-      render: function() {
+    class Component extends React.Component {
+      render() {
         return React.createElement('span');
-      },
-    });
+      }
+    }
+    Component.defaultProps = {fruit: 'persimmon'};
 
     var container = document.createElement('div');
     var instance = ReactDOM.render(
@@ -416,14 +362,12 @@ describe('ReactElement', () => {
   // NOTE: We're explicitly not using JSX here. This is intended to test
   // classic JS without JSX.
   it('should normalize props with default values', () => {
-    var Component = React.createClass({
-      getDefaultProps: function() {
-        return {prop: 'testKey'};
-      },
-      render: function() {
+    class Component extends React.Component {
+      render() {
         return React.createElement('span', null, this.props.prop);
-      },
-    });
+      }
+    }
+    Component.defaultProps = {prop: 'testKey'};
 
     var instance = ReactTestUtils.renderIntoDocument(
       React.createElement(Component),
@@ -437,8 +381,8 @@ describe('ReactElement', () => {
   });
 
   it('throws when changing a prop (in dev) after element creation', () => {
-    var Outer = React.createClass({
-      render: function() {
+    class Outer extends React.Component {
+      render() {
         var el = <div className="moo" />;
 
         expect(function() {
@@ -447,17 +391,16 @@ describe('ReactElement', () => {
         expect(el.props.className).toBe('moo');
 
         return el;
-      },
-    });
+      }
+    }
     var outer = ReactTestUtils.renderIntoDocument(<Outer color="orange" />);
     expect(ReactDOM.findDOMNode(outer).className).toBe('moo');
   });
 
   it('throws when adding a prop (in dev) after element creation', () => {
     var container = document.createElement('div');
-    var Outer = React.createClass({
-      getDefaultProps: () => ({sound: 'meow'}),
-      render: function() {
+    class Outer extends React.Component {
+      render() {
         var el = <div>{this.props.sound}</div>;
 
         expect(function() {
@@ -467,8 +410,9 @@ describe('ReactElement', () => {
         expect(el.props.className).toBe(undefined);
 
         return el;
-      },
-    });
+      }
+    }
+    Outer.defaultProps = {sound: 'meow'};
     var outer = ReactDOM.render(<Outer />, container);
     expect(ReactDOM.findDOMNode(outer).textContent).toBe('meow');
     expect(ReactDOM.findDOMNode(outer).className).toBe('');
@@ -476,11 +420,11 @@ describe('ReactElement', () => {
 
   it('does not warn for NaN props', () => {
     spyOn(console, 'error');
-    var Test = React.createClass({
-      render: function() {
+    class Test extends React.Component {
+      render() {
         return <div />;
-      },
-    });
+      }
+    }
     var test = ReactTestUtils.renderIntoDocument(<Test value={+undefined} />);
     expect(test.props.value).toBeNaN();
     expectDev(console.error.calls.count()).toBe(0);
@@ -508,11 +452,11 @@ describe('ReactElement', () => {
 
     React = require('react');
 
-    var Component = React.createClass({
-      render: function() {
+    class Component extends React.Component {
+      render() {
         return React.createElement('div');
-      },
-    });
+      }
+    }
 
     expect(React.isValidElement(React.createElement('div'))).toEqual(true);
     expect(React.isValidElement(React.createElement(Component))).toEqual(true);
@@ -544,16 +488,16 @@ describe('comparing jsx vs .createFactory() vs .createElement()', () => {
   describe('when using jsx only', () => {
     var Parent, instance;
     beforeEach(() => {
-      Parent = React.createClass({
-        render: function() {
+      Parent = class extends React.Component {
+        render() {
           return (
             <div>
               <Child ref="child" foo="foo value">children value</Child>
             </div>
           );
-        },
-      });
-      instance = ReactTestUtils.renderIntoDocument(<Parent />);
+        }
+      };
+      instance = ReactTestUtils.renderIntoDocument(<Parent/>);
     });
 
     it('should scry children but cannot', () => {
@@ -580,14 +524,11 @@ describe('comparing jsx vs .createFactory() vs .createElement()', () => {
     var factory, instance;
     beforeEach(() => {
       var childFactory = React.createFactory(Child);
-      var Parent = React.createClass({
-        render: function() {
-          return React.DOM.div(
-            {},
-            childFactory({ref: 'child', foo: 'foo value'}, 'children value'),
-          );
-        },
-      });
+      class Parent extends React.Component {
+        render() {
+          return React.DOM.div({}, childFactory({ ref: 'child', foo: 'foo value' }, 'children value'));
+        }
+      }
       factory = React.createFactory(Parent);
       instance = ReactTestUtils.renderIntoDocument(factory());
     });
@@ -615,18 +556,11 @@ describe('comparing jsx vs .createFactory() vs .createElement()', () => {
   describe('when using parent that uses .createElement()', () => {
     var factory, instance;
     beforeEach(() => {
-      var Parent = React.createClass({
-        render: function() {
-          return React.DOM.div(
-            {},
-            React.createElement(
-              Child,
-              {ref: 'child', foo: 'foo value'},
-              'children value',
-            ),
-          );
-        },
-      });
+      class Parent extends React.Component {
+        render() {
+          return React.DOM.div({}, React.createElement(Child, { ref: 'child', foo: 'foo value' }, 'children value'));
+        }
+      }
       factory = React.createFactory(Parent);
       instance = ReactTestUtils.renderIntoDocument(factory());
     });
diff --git a/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js b/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js
index b4eaaa0765ef7..f1baac684c376 100644
--- a/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js
+++ b/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js
@@ -25,52 +25,52 @@ describe('ReactElementClone', () => {
 
     // NOTE: We're explicitly not using JSX here. This is intended to test
     // classic JS without JSX.
-    ComponentClass = React.createClass({
-      render: function() {
+    ComponentClass = class extends React.Component {
+      render() {
         return React.createElement('div');
-      },
-    });
+      }
+    };
   });
 
   it('should clone a DOM component with new props', () => {
-    var Grandparent = React.createClass({
-      render: function() {
+    class Grandparent extends React.Component {
+      render() {
         return <Parent child={<div className="child" />} />;
-      },
-    });
-    var Parent = React.createClass({
-      render: function() {
+      }
+    }
+    class Parent extends React.Component {
+      render() {
         return (
           <div className="parent">
             {React.cloneElement(this.props.child, {className: 'xyz'})}
           </div>
         );
-      },
-    });
+      }
+    }
     var component = ReactTestUtils.renderIntoDocument(<Grandparent />);
     expect(ReactDOM.findDOMNode(component).childNodes[0].className).toBe('xyz');
   });
 
   it('should clone a composite component with new props', () => {
-    var Child = React.createClass({
-      render: function() {
+    class Child extends React.Component {
+      render() {
         return <div className={this.props.className} />;
-      },
-    });
-    var Grandparent = React.createClass({
-      render: function() {
+      }
+    }
+    class Grandparent extends React.Component {
+      render() {
         return <Parent child={<Child className="child" />} />;
-      },
-    });
-    var Parent = React.createClass({
-      render: function() {
+      }
+    }
+    class Parent extends React.Component {
+      render() {
         return (
           <div className="parent">
             {React.cloneElement(this.props.child, {className: 'xyz'})}
           </div>
         );
-      },
-    });
+      }
+    }
     var component = ReactTestUtils.renderIntoDocument(<Grandparent />);
     expect(ReactDOM.findDOMNode(component).childNodes[0].className).toBe('xyz');
   });
@@ -81,43 +81,43 @@ describe('ReactElementClone', () => {
   });
 
   it('should keep the original ref if it is not overridden', () => {
-    var Grandparent = React.createClass({
-      render: function() {
+    class Grandparent extends React.Component {
+      render() {
         return <Parent child={<div ref="yolo" />} />;
-      },
-    });
+      }
+    }
 
-    var Parent = React.createClass({
-      render: function() {
+    class Parent extends React.Component {
+      render() {
         return (
           <div>
             {React.cloneElement(this.props.child, {className: 'xyz'})}
           </div>
         );
-      },
-    });
+      }
+    }
 
     var component = ReactTestUtils.renderIntoDocument(<Grandparent />);
     expect(component.refs.yolo.tagName).toBe('DIV');
   });
 
   it('should transfer the key property', () => {
-    var Component = React.createClass({
-      render: function() {
+    class Component extends React.Component {
+      render() {
         return null;
-      },
-    });
+      }
+    }
     var clone = React.cloneElement(<Component />, {key: 'xyz'});
     expect(clone.key).toBe('xyz');
   });
 
   it('should transfer children', () => {
-    var Component = React.createClass({
-      render: function() {
+    class Component extends React.Component {
+      render() {
         expect(this.props.children).toBe('xyz');
         return <div />;
-      },
-    });
+      }
+    }
 
     ReactTestUtils.renderIntoDocument(
       React.cloneElement(<Component />, {children: 'xyz'}),
@@ -125,12 +125,12 @@ describe('ReactElementClone', () => {
   });
 
   it('should shallow clone children', () => {
-    var Component = React.createClass({
-      render: function() {
+    class Component extends React.Component {
+      render() {
         expect(this.props.children).toBe('xyz');
         return <div />;
-      },
-    });
+      }
+    }
 
     ReactTestUtils.renderIntoDocument(
       React.cloneElement(<Component>xyz</Component>, {}),
@@ -138,11 +138,11 @@ describe('ReactElementClone', () => {
   });
 
   it('should accept children as rest arguments', () => {
-    var Component = React.createClass({
-      render: function() {
+    class Component extends React.Component {
+      render() {
         return null;
-      },
-    });
+      }
+    }
 
     var clone = React.cloneElement(
       <Component>xyz</Component>,
@@ -175,41 +175,39 @@ describe('ReactElementClone', () => {
   });
 
   it('should support keys and refs', () => {
-    var Parent = React.createClass({
-      render: function() {
-        var clone = React.cloneElement(this.props.children, {
-          key: 'xyz',
-          ref: 'xyz',
-        });
+    class Parent extends React.Component {
+      render() {
+        var clone =
+          React.cloneElement(this.props.children, {key: 'xyz', ref: 'xyz'});
         expect(clone.key).toBe('xyz');
         expect(clone.ref).toBe('xyz');
         return <div>{clone}</div>;
-      },
-    });
+      }
+    }
 
-    var Grandparent = React.createClass({
-      render: function() {
+    class Grandparent extends React.Component {
+      render() {
         return <Parent ref="parent"><span key="abc" /></Parent>;
-      },
-    });
+      }
+    }
 
     var component = ReactTestUtils.renderIntoDocument(<Grandparent />);
     expect(component.refs.parent.refs.xyz.tagName).toBe('SPAN');
   });
 
   it('should steal the ref if a new ref is specified', () => {
-    var Parent = React.createClass({
-      render: function() {
+    class Parent extends React.Component {
+      render() {
         var clone = React.cloneElement(this.props.children, {ref: 'xyz'});
         return <div>{clone}</div>;
-      },
-    });
+      }
+    }
 
-    var Grandparent = React.createClass({
-      render: function() {
+    class Grandparent extends React.Component {
+      render() {
         return <Parent ref="parent"><span ref="child" /></Parent>;
-      },
-    });
+      }
+    }
 
     var component = ReactTestUtils.renderIntoDocument(<Grandparent />);
     expect(component.refs.child).toBeUndefined();
@@ -217,12 +215,12 @@ describe('ReactElementClone', () => {
   });
 
   it('should overwrite props', () => {
-    var Component = React.createClass({
-      render: function() {
+    class Component extends React.Component {
+      render() {
         expect(this.props.myprop).toBe('xyz');
         return <div />;
-      },
-    });
+      }
+    }
 
     ReactTestUtils.renderIntoDocument(
       React.cloneElement(<Component myprop="abc" />, {myprop: 'xyz'}),
@@ -230,14 +228,12 @@ describe('ReactElementClone', () => {
   });
 
   it('should normalize props with default values', () => {
-    var Component = React.createClass({
-      getDefaultProps: function() {
-        return {prop: 'testKey'};
-      },
-      render: function() {
+    class Component extends React.Component {
+      render() {
         return <span />;
-      },
-    });
+      }
+    }
+    Component.defaultProps = {prop: 'testKey'};
 
     var instance = React.createElement(Component);
     var clonedInstance = React.cloneElement(instance, {prop: undefined});
@@ -289,26 +285,27 @@ describe('ReactElementClone', () => {
 
   it('should check declared prop types after clone', () => {
     spyOn(console, 'error');
-    var Component = React.createClass({
-      propTypes: {
-        color: React.PropTypes.string.isRequired,
-      },
-      render: function() {
+    class Component extends React.Component {
+      render() {
         return React.createElement('div', null, 'My color is ' + this.color);
-      },
-    });
-    var Parent = React.createClass({
-      render: function() {
+      }
+    }
+    Component.propTypes = {
+      color: React.PropTypes.string.isRequired,
+    };
+    class Parent extends React.Component {
+      render() {
         return React.cloneElement(this.props.child, {color: 123});
-      },
-    });
-    var GrandParent = React.createClass({
-      render: function() {
-        return React.createElement(Parent, {
-          child: React.createElement(Component, {color: 'red'}),
-        });
-      },
-    });
+      }
+    }
+    class GrandParent extends React.Component {
+      render() {
+        return React.createElement(
+          Parent,
+          { child: React.createElement(Component, {color: 'red'}) }
+        );
+      }
+    }
     ReactTestUtils.renderIntoDocument(React.createElement(GrandParent));
     expectDev(console.error.calls.count()).toBe(1);
     expectDev(console.error.calls.argsFor(0)[0]).toBe(
diff --git a/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js b/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
index c9dbf7cc8f8ed..8b88e5a44dcd6 100644
--- a/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
+++ b/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
@@ -31,11 +31,11 @@ describe('ReactElementValidator', () => {
     React = require('react');
     ReactDOM = require('react-dom');
     ReactTestUtils = require('ReactTestUtils');
-    ComponentClass = React.createClass({
-      render: function() {
+    ComponentClass = class extends React.Component {
+      render() {
         return React.createElement('div');
-      },
-    });
+      }
+    };
   });
 
   it('warns for keys for arrays of elements in rest args', () => {
@@ -54,21 +54,19 @@ describe('ReactElementValidator', () => {
     spyOn(console, 'error');
     var Component = React.createFactory(ComponentClass);
 
-    var InnerClass = React.createClass({
-      displayName: 'InnerClass',
-      render: function() {
+    class InnerClass extends React.Component {
+      render() {
         return Component(null, this.props.childSet);
-      },
-    });
+      }
+    }
 
     var InnerComponent = React.createFactory(InnerClass);
 
-    var ComponentWrapper = React.createClass({
-      displayName: 'ComponentWrapper',
-      render: function() {
-        return InnerComponent({childSet: [Component(), Component()]});
-      },
-    });
+    class ComponentWrapper extends React.Component {
+      render() {
+        return InnerComponent({childSet: [Component(), Component()] });
+      }
+    }
 
     ReactTestUtils.renderIntoDocument(React.createElement(ComponentWrapper));
 
@@ -83,12 +81,10 @@ describe('ReactElementValidator', () => {
   it('warns for keys for arrays with no owner or parent info', () => {
     spyOn(console, 'error');
 
-    var Anonymous = React.createClass({
-      displayName: undefined,
-      render: function() {
-        return <div />;
-      },
-    });
+    function Anonymous() {
+      return <div />;
+    }
+    Object.defineProperty(Anonymous, 'name', { value: undefined });
 
     var divs = [<div />, <div />];
     ReactTestUtils.renderIntoDocument(<Anonymous>{divs}</Anonymous>);
@@ -119,23 +115,17 @@ describe('ReactElementValidator', () => {
   it('warns for keys with component stack info', () => {
     spyOn(console, 'error');
 
-    var Component = React.createClass({
-      render: function() {
-        return <div>{[<div />, <div />]}</div>;
-      },
-    });
+    function Component() {
+      return <div>{[<div />, <div />]}</div>;
+    }
 
-    var Parent = React.createClass({
-      render: function() {
-        return React.cloneElement(this.props.child);
-      },
-    });
+    function Parent(props) {
+      return React.cloneElement(props.child);
+    }
 
-    var GrandParent = React.createClass({
-      render: function() {
-        return <Parent child={<Component />} />;
-      },
-    });
+    function GrandParent() {
+      return <Parent child={<Component />} />;
+    }
 
     ReactTestUtils.renderIntoDocument(<GrandParent />);
 
@@ -154,16 +144,14 @@ describe('ReactElementValidator', () => {
   it('does not warn for keys when passing children down', () => {
     spyOn(console, 'error');
 
-    var Wrapper = React.createClass({
-      render: function() {
-        return (
-          <div>
-            {this.props.children}
-            <footer />
-          </div>
-        );
-      },
-    });
+    function Wrapper(props) {
+      return (
+        <div>
+          {props.children}
+          <footer />
+        </div>
+      );
+    }
 
     ReactTestUtils.renderIntoDocument(
       <Wrapper>
@@ -255,19 +243,15 @@ describe('ReactElementValidator', () => {
     // component, we give a small hint as to which parent instantiated that
     // component as per warnings about key usage in ReactElementValidator.
     spyOn(console, 'error');
-    var MyComp = React.createClass({
-      propTypes: {
-        color: React.PropTypes.string,
-      },
-      render: function() {
-        return React.createElement('div', null, 'My color is ' + this.color);
-      },
-    });
-    var ParentComp = React.createClass({
-      render: function() {
-        return React.createElement(MyComp, {color: 123});
-      },
-    });
+    function MyComp(props) {
+      return React.createElement('div', null, 'My color is ' + props.color);
+    }
+    MyComp.propTypes = {
+      color: React.PropTypes.string,
+    };
+    function ParentComp() {
+      return React.createElement(MyComp, {color: 123});
+    }
     ReactTestUtils.renderIntoDocument(React.createElement(ParentComp));
     expectDev(console.error.calls.argsFor(0)[0]).toBe(
       'Warning: Failed prop type: ' +
@@ -325,11 +309,9 @@ describe('ReactElementValidator', () => {
 
   it('includes the owner name when passing null, undefined, boolean, or number', () => {
     spyOn(console, 'error');
-    var ParentComp = React.createClass({
-      render: function() {
-        return React.createElement(null);
-      },
-    });
+    function ParentComp() {
+      return React.createElement(null);
+    }
     expect(function() {
       ReactTestUtils.renderIntoDocument(React.createElement(ParentComp));
     }).toThrowError(
@@ -349,15 +331,13 @@ describe('ReactElementValidator', () => {
   it('should check default prop values', () => {
     spyOn(console, 'error');
 
-    var Component = React.createClass({
-      propTypes: {prop: React.PropTypes.string.isRequired},
-      getDefaultProps: function() {
-        return {prop: null};
-      },
-      render: function() {
+    class Component extends React.Component {
+      render() {
         return React.createElement('span', null, this.props.prop);
-      },
-    });
+      }
+    }
+    Component.propTypes = {prop: React.PropTypes.string.isRequired};
+    Component.defaultProps = {prop: null};
 
     ReactTestUtils.renderIntoDocument(React.createElement(Component));
 
@@ -372,15 +352,13 @@ describe('ReactElementValidator', () => {
   it('should not check the default for explicit null', () => {
     spyOn(console, 'error');
 
-    var Component = React.createClass({
-      propTypes: {prop: React.PropTypes.string.isRequired},
-      getDefaultProps: function() {
-        return {prop: 'text'};
-      },
-      render: function() {
+    class Component extends React.Component {
+      render() {
         return React.createElement('span', null, this.props.prop);
-      },
-    });
+      }
+    }
+    Component.propTypes = {prop: React.PropTypes.string.isRequired};
+    Component.defaultProps = {prop: 'text'};
 
     ReactTestUtils.renderIntoDocument(
       React.createElement(Component, {prop: null}),
@@ -397,14 +375,14 @@ describe('ReactElementValidator', () => {
   it('should check declared prop types', () => {
     spyOn(console, 'error');
 
-    var Component = React.createClass({
-      propTypes: {
-        prop: React.PropTypes.string.isRequired,
-      },
-      render: function() {
+    class Component extends React.Component {
+      render() {
         return React.createElement('span', null, this.props.prop);
-      },
-    });
+      }
+    }
+    Component.propTypes = {
+      prop: React.PropTypes.string.isRequired,
+    };
 
     ReactTestUtils.renderIntoDocument(React.createElement(Component));
     ReactTestUtils.renderIntoDocument(
@@ -437,14 +415,15 @@ describe('ReactElementValidator', () => {
   it('should warn if a PropType creator is used as a PropType', () => {
     spyOn(console, 'error');
 
-    var Component = React.createClass({
-      propTypes: {
-        myProp: React.PropTypes.shape,
-      },
-      render: function() {
+    class Component extends React.Component {
+      render() {
         return React.createElement('span', null, this.props.myProp.value);
-      },
-    });
+
+      }
+    }
+    Component.propTypes = {
+      myProp: React.PropTypes.shape,
+    };
 
     ReactTestUtils.renderIntoDocument(
       React.createElement(Component, {myProp: {value: 'hi'}}),
@@ -462,11 +441,9 @@ describe('ReactElementValidator', () => {
 
   it('should warn when accessing .type on an element factory', () => {
     spyOn(console, 'error');
-    var TestComponent = React.createClass({
-      render: function() {
-        return <div />;
-      },
-    });
+    function TestComponent() {
+      return <div />;
+    }
     var TestFactory = React.createFactory(TestComponent);
     expect(TestFactory.type).toBe(TestComponent);
     expectDev(console.error.calls.count()).toBe(1);
@@ -481,14 +458,14 @@ describe('ReactElementValidator', () => {
 
   it('does not warn when using DOM node as children', () => {
     spyOn(console, 'error');
-    var DOMContainer = React.createClass({
-      render: function() {
+    class DOMContainer extends React.Component {
+      render() {
         return <div />;
-      },
-      componentDidMount: function() {
+      }
+      componentDidMount() {
         ReactDOM.findDOMNode(this).appendChild(this.props.children);
-      },
-    });
+      }
+    }
 
     var node = document.createElement('div');
     // This shouldn't cause a stack overflow or any other problems (#3883)
diff --git a/src/isomorphic/classic/types/__tests__/ReactPropTypesProduction-test.js b/src/isomorphic/classic/types/__tests__/ReactPropTypesProduction-test.js
index 22d0ba1996477..33ccb85bd86a7 100644
--- a/src/isomorphic/classic/types/__tests__/ReactPropTypesProduction-test.js
+++ b/src/isomorphic/classic/types/__tests__/ReactPropTypesProduction-test.js
@@ -205,13 +205,10 @@ describe('ReactPropTypesProduction', function() {
 
     it('should not have been called', function() {
       var spy = jest.fn();
-      var Component = React.createClass({
-        propTypes: {num: spy},
-
-        render: function() {
-          return <div />;
-        },
-      });
+      function Component() {
+        return <div />;
+      }
+      Component.propTypes = {num: spy};
 
       var instance = <Component num={5} />;
       ReactTestUtils.renderIntoDocument(instance);
diff --git a/src/renderers/__tests__/ReactComponentLifeCycle-test.js b/src/renderers/__tests__/ReactComponentLifeCycle-test.js
index e65acdfbd139c..ab13a65b44c32 100644
--- a/src/renderers/__tests__/ReactComponentLifeCycle-test.js
+++ b/src/renderers/__tests__/ReactComponentLifeCycle-test.js
@@ -225,23 +225,28 @@ describe('ReactComponentLifeCycle', () => {
 
   it('should correctly determine if a component is mounted', () => {
     spyOn(console, 'error');
-    var Component = React.createClass({
-      componentWillMount: function() {
-        expect(this.isMounted()).toBeFalsy();
-      },
-      componentDidMount: function() {
-        expect(this.isMounted()).toBeTruthy();
-      },
-      render: function() {
-        expect(this.isMounted()).toBeFalsy();
-        return <div />;
-      },
-    });
+    class Component extends React.Component {
+      _isMounted() {
+        // No longer a public API, but we can test that it works internally by
+        // reaching into the updater.
+        return this.updater.isMounted(this);
+      }
+      componentWillMount() {
+        expect(this._isMounted()).toBeFalsy();
+      }
+      componentDidMount() {
+        expect(this._isMounted()).toBeTruthy();
+      }
+      render() {
+        expect(this._isMounted()).toBeFalsy();
+        return <div/>;
+      }
+    }
 
     var element = <Component />;
 
     var instance = ReactTestUtils.renderIntoDocument(element);
-    expect(instance.isMounted()).toBeTruthy();
+    expect(instance._isMounted()).toBeTruthy();
 
     expectDev(console.error.calls.count()).toBe(1);
     expectDev(console.error.calls.argsFor(0)[0]).toContain(
@@ -251,23 +256,28 @@ describe('ReactComponentLifeCycle', () => {
 
   it('should correctly determine if a null component is mounted', () => {
     spyOn(console, 'error');
-    var Component = React.createClass({
-      componentWillMount: function() {
-        expect(this.isMounted()).toBeFalsy();
-      },
-      componentDidMount: function() {
-        expect(this.isMounted()).toBeTruthy();
-      },
-      render: function() {
-        expect(this.isMounted()).toBeFalsy();
+    class Component extends React.Component {
+      _isMounted() {
+        // No longer a public API, but we can test that it works internally by
+        // reaching into the updater.
+        return this.updater.isMounted(this);
+      }
+      componentWillMount() {
+        expect(this._isMounted()).toBeFalsy();
+      }
+      componentDidMount() {
+        expect(this._isMounted()).toBeTruthy();
+      }
+      render() {
+        expect(this._isMounted()).toBeFalsy();
         return null;
-      },
-    });
+      }
+    }
 
     var element = <Component />;
 
     var instance = ReactTestUtils.renderIntoDocument(element);
-    expect(instance.isMounted()).toBeTruthy();
+    expect(instance._isMounted()).toBeTruthy();
 
     expectDev(console.error.calls.count()).toBe(1);
     expectDev(console.error.calls.argsFor(0)[0]).toContain(
@@ -276,38 +286,38 @@ describe('ReactComponentLifeCycle', () => {
   });
 
   it('isMounted should return false when unmounted', () => {
-    var Component = React.createClass({
-      render: function() {
-        return <div />;
-      },
-    });
+    class Component extends React.Component {
+      render() {
+        return <div/>;
+      }
+    }
 
     var container = document.createElement('div');
     var instance = ReactDOM.render(<Component />, container);
 
-    expect(instance.isMounted()).toBe(true);
+    // No longer a public API, but we can test that it works internally by
+    // reaching into the updater.
+    expect(instance.updater.isMounted(instance)).toBe(true);
 
     ReactDOM.unmountComponentAtNode(container);
 
-    expect(instance.isMounted()).toBe(false);
+    expect(instance.updater.isMounted(instance)).toBe(false);
   });
 
   it('warns if findDOMNode is used inside render', () => {
     spyOn(console, 'error');
-    var Component = React.createClass({
-      getInitialState: function() {
-        return {isMounted: false};
-      },
-      componentDidMount: function() {
+    class Component extends React.Component {
+      state = {isMounted: false};
+      componentDidMount() {
         this.setState({isMounted: true});
-      },
-      render: function() {
+      }
+      render() {
         if (this.state.isMounted) {
           expect(ReactDOM.findDOMNode(this).tagName).toBe('DIV');
         }
         return <div />;
-      },
-    });
+      }
+    }
 
     ReactTestUtils.renderIntoDocument(<Component />);
     expectDev(console.error.calls.count()).toBe(1);
@@ -513,30 +523,31 @@ describe('ReactComponentLifeCycle', () => {
         return true;
       };
     };
-    var Outer = React.createClass({
-      render: function() {
+    class Outer extends React.Component {
+      componentWillMount = logger('outer componentWillMount');
+      componentDidMount = logger('outer componentDidMount');
+      componentWillReceiveProps = logger('outer componentWillReceiveProps');
+      shouldComponentUpdate = logger('outer shouldComponentUpdate');
+      componentWillUpdate = logger('outer componentWillUpdate');
+      componentDidUpdate = logger('outer componentDidUpdate');
+      componentWillUnmount = logger('outer componentWillUnmount');
+      render() {
         return <div><Inner x={this.props.x} /></div>;
-      },
-      componentWillMount: logger('outer componentWillMount'),
-      componentDidMount: logger('outer componentDidMount'),
-      componentWillReceiveProps: logger('outer componentWillReceiveProps'),
-      shouldComponentUpdate: logger('outer shouldComponentUpdate'),
-      componentWillUpdate: logger('outer componentWillUpdate'),
-      componentDidUpdate: logger('outer componentDidUpdate'),
-      componentWillUnmount: logger('outer componentWillUnmount'),
-    });
-    var Inner = React.createClass({
-      render: function() {
+      }
+    }
+
+    class Inner extends React.Component {
+      componentWillMount = logger('inner componentWillMount');
+      componentDidMount = logger('inner componentDidMount');
+      componentWillReceiveProps = logger('inner componentWillReceiveProps');
+      shouldComponentUpdate = logger('inner shouldComponentUpdate');
+      componentWillUpdate = logger('inner componentWillUpdate');
+      componentDidUpdate = logger('inner componentDidUpdate');
+      componentWillUnmount = logger('inner componentWillUnmount');
+      render() {
         return <span>{this.props.x}</span>;
-      },
-      componentWillMount: logger('inner componentWillMount'),
-      componentDidMount: logger('inner componentDidMount'),
-      componentWillReceiveProps: logger('inner componentWillReceiveProps'),
-      shouldComponentUpdate: logger('inner shouldComponentUpdate'),
-      componentWillUpdate: logger('inner componentWillUpdate'),
-      componentDidUpdate: logger('inner componentDidUpdate'),
-      componentWillUnmount: logger('inner componentWillUnmount'),
-    });
+      }
+    }
 
     var container = document.createElement('div');
     log = [];
diff --git a/src/renderers/__tests__/ReactComponentTreeHook-test.js b/src/renderers/__tests__/ReactComponentTreeHook-test.js
index 2182aabf38c95..1ae443f731fea 100644
--- a/src/renderers/__tests__/ReactComponentTreeHook-test.js
+++ b/src/renderers/__tests__/ReactComponentTreeHook-test.js
@@ -41,8 +41,15 @@ describe('ReactComponentTreeHook', () => {
         return addendum.replace(/\(at .+?:\d+\)/g, '(at **)');
       }
 
-      var Anon = React.createClass({displayName: null, render: () => null});
-      var Orange = React.createClass({render: () => null});
+      function Anon() {
+        return null;
+      }
+      Object.defineProperty(Anon, 'name', {
+        value: null,
+      });
+      function Orange() {
+        return null;
+      }
 
       expectDev(getAddendum()).toBe('');
       expectDev(getAddendum(<div />)).toBe('\n    in div (at **)');
diff --git a/src/renderers/__tests__/ReactCompositeComponent-test.js b/src/renderers/__tests__/ReactCompositeComponent-test.js
index 7a7be1a0d1926..d3ead32dc5906 100644
--- a/src/renderers/__tests__/ReactCompositeComponent-test.js
+++ b/src/renderers/__tests__/ReactCompositeComponent-test.js
@@ -166,64 +166,6 @@ describe('ReactCompositeComponent', () => {
     expect(instance.getAnchor().className).toBe('');
   });
 
-  it('should auto bind methods and values correctly', () => {
-    spyOn(console, 'error');
-
-    var ComponentClass = React.createClass({
-      getInitialState: function() {
-        return {valueToReturn: 'hi'};
-      },
-      methodToBeExplicitlyBound: function() {
-        return this;
-      },
-      methodAutoBound: function() {
-        return this;
-      },
-      render: function() {
-        return <div />;
-      },
-    });
-    var instance = <ComponentClass />;
-
-    // Next, prove that once mounted, the scope is bound correctly to the actual
-    // component.
-    var mountedInstance = ReactTestUtils.renderIntoDocument(instance);
-
-    expect(function() {
-      mountedInstance.methodToBeExplicitlyBound.bind(instance)();
-    }).not.toThrow();
-    expect(function() {
-      mountedInstance.methodAutoBound();
-    }).not.toThrow();
-
-    expectDev(console.error.calls.count()).toBe(1);
-    var explicitlyBound = mountedInstance.methodToBeExplicitlyBound.bind(
-      mountedInstance,
-    );
-    expectDev(console.error.calls.count()).toBe(2);
-    var autoBound = mountedInstance.methodAutoBound;
-
-    var context = {};
-    expect(explicitlyBound.call(context)).toBe(mountedInstance);
-    expect(autoBound.call(context)).toBe(mountedInstance);
-
-    expect(explicitlyBound.call(mountedInstance)).toBe(mountedInstance);
-    expect(autoBound.call(mountedInstance)).toBe(mountedInstance);
-  });
-
-  it('should not pass this to getDefaultProps', () => {
-    var Component = React.createClass({
-      getDefaultProps: function() {
-        expect(this.render).not.toBeDefined();
-        return {};
-      },
-      render: function() {
-        return <div />;
-      },
-    });
-    ReactTestUtils.renderIntoDocument(<Component />);
-  });
-
   it('should use default values for undefined props', () => {
     class Component extends React.Component {
       static defaultProps = {prop: 'testKey'};
@@ -1204,17 +1146,17 @@ describe('ReactCompositeComponent', () => {
   });
 
   it('should replace state', () => {
-    var Moo = React.createClass({
-      getInitialState: function() {
-        return {x: 1};
-      },
-      render: function() {
+    class Moo extends React.Component {
+      state = {x: 1};
+      render() {
         return <div />;
-      },
-    });
+      }
+    }
 
     var moo = ReactTestUtils.renderIntoDocument(<Moo />);
-    moo.replaceState({y: 2});
+    // No longer a public API, but we can test that it works internally by
+    // reaching into the updater.
+    moo.updater.enqueueReplaceState(moo, {y: 2});
     expect('x' in moo.state).toBe(false);
     expect(moo.state.y).toBe(2);
   });
@@ -1226,21 +1168,22 @@ describe('ReactCompositeComponent', () => {
     NotActuallyImmutable.prototype.amIImmutable = function() {
       return true;
     };
-    var Moo = React.createClass({
-      getInitialState: function() {
-        return new NotActuallyImmutable('first');
-      },
-      render: function() {
+    class Moo extends React.Component {
+      state = new NotActuallyImmutable('first');
+      // No longer a public API, but we can test that it works internally by
+      // reaching into the updater.
+      _replaceState = update => this.updater.enqueueReplaceState(this, update);
+      render() {
         return <div />;
-      },
-    });
+      }
+    }
 
     var moo = ReactTestUtils.renderIntoDocument(<Moo />);
     expect(moo.state.str).toBe('first');
     expect(moo.state.amIImmutable()).toBe(true);
 
     var secondState = new NotActuallyImmutable('second');
-    moo.replaceState(secondState);
+    moo._replaceState(secondState);
     expect(moo.state.str).toBe('second');
     expect(moo.state.amIImmutable()).toBe(true);
     expect(moo.state).toBe(secondState);
@@ -1254,14 +1197,14 @@ describe('ReactCompositeComponent', () => {
     var fifthState = new NotActuallyImmutable('fifth');
     ReactDOM.unstable_batchedUpdates(function() {
       moo.setState({str: 'fourth'});
-      moo.replaceState(fifthState);
+      moo._replaceState(fifthState);
     });
     expect(moo.state).toBe(fifthState);
 
     // When more than one state update is enqueued, we have the same behavior
     var sixthState = new NotActuallyImmutable('sixth');
     ReactDOM.unstable_batchedUpdates(function() {
-      moo.replaceState(sixthState);
+      moo._replaceState(sixthState);
       moo.setState({str: 'seventh'});
     });
     expect(moo.state.str).toBe('seventh');
diff --git a/src/renderers/__tests__/ReactCompositeComponentState-test.js b/src/renderers/__tests__/ReactCompositeComponentState-test.js
index 6bed124cfd919..ca88e476736e8 100644
--- a/src/renderers/__tests__/ReactCompositeComponentState-test.js
+++ b/src/renderers/__tests__/ReactCompositeComponentState-test.js
@@ -24,34 +24,34 @@ describe('ReactCompositeComponent-state', () => {
     ReactDOM = require('react-dom');
     ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
 
-    TestComponent = React.createClass({
-      peekAtState: function(from, state) {
-        state = state || this.state;
-        this.props.stateListener(from, state && state.color);
-      },
+    TestComponent = class extends React.Component {
+      constructor(props) {
+        super(props);
+        this.peekAtState('getInitialState', undefined, props);
+        this.state = {color: 'red'};
+      }
+
+      peekAtState = (from, state = this.state, props = this.props) => {
+        props.stateListener(from, state && state.color);
+      }
 
-      peekAtCallback: function(from) {
+      peekAtCallback = from => {
         return () => this.peekAtState(from);
-      },
+      }
 
-      setFavoriteColor: function(nextColor) {
+      setFavoriteColor(nextColor) {
         this.setState(
           {color: nextColor},
           this.peekAtCallback('setFavoriteColor'),
         );
-      },
-
-      getInitialState: function() {
-        this.peekAtState('getInitialState');
-        return {color: 'red'};
-      },
+      }
 
-      render: function() {
+      render() {
         this.peekAtState('render');
         return <div>{this.state.color}</div>;
-      },
+      }
 
-      componentWillMount: function() {
+      componentWillMount() {
         this.peekAtState('componentWillMount-start');
         this.setState(function(state) {
           this.peekAtState('before-setState-sunrise', state);
@@ -72,25 +72,27 @@ describe('ReactCompositeComponent-state', () => {
           this.peekAtState('after-setState-orange', state);
         });
         this.peekAtState('componentWillMount-end');
-      },
+      }
 
-      componentDidMount: function() {
+      componentDidMount() {
         this.peekAtState('componentDidMount-start');
         this.setState(
           {color: 'yellow'},
           this.peekAtCallback('setState-yellow'),
         );
         this.peekAtState('componentDidMount-end');
-      },
+      }
 
-      componentWillReceiveProps: function(newProps) {
+      componentWillReceiveProps(newProps) {
         this.peekAtState('componentWillReceiveProps-start');
         if (newProps.nextColor) {
           this.setState(function(state) {
             this.peekAtState('before-setState-receiveProps', state);
             return {color: newProps.nextColor};
           });
-          this.replaceState({color: undefined});
+          // No longer a public API, but we can test that it works internally by
+          // reaching into the updater.
+          this.updater.enqueueReplaceState(this, {color: undefined});
           this.setState(
             function(state) {
               this.peekAtState('before-setState-again-receiveProps', state);
@@ -103,28 +105,28 @@ describe('ReactCompositeComponent-state', () => {
           });
         }
         this.peekAtState('componentWillReceiveProps-end');
-      },
+      }
 
-      shouldComponentUpdate: function(nextProps, nextState) {
+      shouldComponentUpdate(nextProps, nextState) {
         this.peekAtState('shouldComponentUpdate-currentState');
         this.peekAtState('shouldComponentUpdate-nextState', nextState);
         return true;
-      },
+      }
 
-      componentWillUpdate: function(nextProps, nextState) {
+      componentWillUpdate(nextProps, nextState) {
         this.peekAtState('componentWillUpdate-currentState');
         this.peekAtState('componentWillUpdate-nextState', nextState);
-      },
+      }
 
-      componentDidUpdate: function(prevProps, prevState) {
+      componentDidUpdate(prevProps, prevState) {
         this.peekAtState('componentDidUpdate-currentState');
         this.peekAtState('componentDidUpdate-prevState', prevState);
-      },
+      }
 
-      componentWillUnmount: function() {
+      componentWillUnmount() {
         this.peekAtState('componentWillUnmount');
-      },
-    });
+      }
+    };
   });
 
   it('should support setting state', () => {
diff --git a/src/renderers/__tests__/ReactMultiChild-test.js b/src/renderers/__tests__/ReactMultiChild-test.js
index 2a78651a4dcd7..d3c408f7ac203 100644
--- a/src/renderers/__tests__/ReactMultiChild-test.js
+++ b/src/renderers/__tests__/ReactMultiChild-test.js
@@ -35,14 +35,14 @@ describe('ReactMultiChild', () => {
       var mockUpdate = jest.fn();
       var mockUnmount = jest.fn();
 
-      var MockComponent = React.createClass({
-        componentDidMount: mockMount,
-        componentDidUpdate: mockUpdate,
-        componentWillUnmount: mockUnmount,
-        render: function() {
+      class MockComponent extends React.Component {
+        componentDidMount = mockMount;
+        componentDidUpdate = mockUpdate;
+        componentWillUnmount = mockUnmount;
+        render() {
           return <span />;
-        },
-      });
+        }
+      }
 
       expect(mockMount.mock.calls.length).toBe(0);
       expect(mockUpdate.mock.calls.length).toBe(0);
@@ -67,13 +67,13 @@ describe('ReactMultiChild', () => {
       var mockMount = jest.fn();
       var mockUnmount = jest.fn();
 
-      var MockComponent = React.createClass({
-        componentDidMount: mockMount,
-        componentWillUnmount: mockUnmount,
-        render: function() {
+      class MockComponent extends React.Component {
+        componentDidMount = mockMount;
+        componentWillUnmount = mockUnmount;
+        render() {
           return <span />;
-        },
-      });
+        }
+      }
 
       expect(mockMount.mock.calls.length).toBe(0);
       expect(mockUnmount.mock.calls.length).toBe(0);
@@ -95,13 +95,13 @@ describe('ReactMultiChild', () => {
       var mockMount = jest.fn();
       var mockUnmount = jest.fn();
 
-      var MockComponent = React.createClass({
-        componentDidMount: mockMount,
-        componentWillUnmount: mockUnmount,
-        render: function() {
+      class MockComponent extends React.Component {
+        componentDidMount = mockMount;
+        componentWillUnmount = mockUnmount;
+        render() {
           return <span />;
-        },
-      });
+        }
+      }
 
       class WrapperComponent extends React.Component {
         render() {
@@ -132,13 +132,13 @@ describe('ReactMultiChild', () => {
       var mockMount = jest.fn();
       var mockUnmount = jest.fn();
 
-      var MockComponent = React.createClass({
-        componentDidMount: mockMount,
-        componentWillUnmount: mockUnmount,
-        render: function() {
+      class MockComponent extends React.Component {
+        componentDidMount = mockMount;
+        componentWillUnmount = mockUnmount;
+        render() {
           return <span />;
-        },
-      });
+        }
+      }
 
       expect(mockMount.mock.calls.length).toBe(0);
       expect(mockUnmount.mock.calls.length).toBe(0);
diff --git a/src/renderers/__tests__/ReactPerf-test.js b/src/renderers/__tests__/ReactPerf-test.js
index f01b3193d0fdb..a610e9523d497 100644
--- a/src/renderers/__tests__/ReactPerf-test.js
+++ b/src/renderers/__tests__/ReactPerf-test.js
@@ -64,16 +64,16 @@ describeStack('ReactPerf', () => {
       }
     };
 
-    LifeCycle = React.createClass({
-      shouldComponentUpdate: emptyFunction.thatReturnsTrue,
-      componentWillMount: emptyFunction,
-      componentDidMount: emptyFunction,
-      componentWillReceiveProps: emptyFunction,
-      componentWillUpdate: emptyFunction,
-      componentDidUpdate: emptyFunction,
-      componentWillUnmount: emptyFunction,
-      render: emptyFunction.thatReturnsNull,
-    });
+    LifeCycle = class extends React.Component {
+      shouldComponentUpdate = emptyFunction.thatReturnsTrue;
+      componentWillMount = emptyFunction;
+      componentDidMount = emptyFunction;
+      componentWillReceiveProps = emptyFunction;
+      componentWillUpdate = emptyFunction;
+      componentDidUpdate = emptyFunction;
+      componentWillUnmount = emptyFunction;
+      render = emptyFunction.thatReturnsNull;
+    };
   });
 
   afterEach(() => {
diff --git a/src/renderers/__tests__/ReactStatelessComponent-test.js b/src/renderers/__tests__/ReactStatelessComponent-test.js
index b3cacfbf09ec6..b1cc7ba9d0838 100644
--- a/src/renderers/__tests__/ReactStatelessComponent-test.js
+++ b/src/renderers/__tests__/ReactStatelessComponent-test.js
@@ -249,15 +249,14 @@ describe('ReactStatelessComponent', () => {
   it('deduplicates ref warnings based on element or owner', () => {
     spyOn(console, 'error');
 
-    // Prevent the Babel transform adding a displayName.
-    var createClassWithoutDisplayName = React.createClass;
-
     // When owner uses JSX, we can use exact line location to dedupe warnings
-    var AnonymousParentUsingJSX = createClassWithoutDisplayName({
+    class AnonymousParentUsingJSX extends React.Component {
       render() {
         return <StatelessComponent name="A" ref={() => {}} />;
-      },
-    });
+      }
+    }
+    Object.defineProperty(AnonymousParentUsingJSX, 'name', {value: undefined});
+
     const instance1 = ReactTestUtils.renderIntoDocument(
       <AnonymousParentUsingJSX />,
     );
@@ -273,14 +272,16 @@ describe('ReactStatelessComponent', () => {
     console.error.calls.reset();
 
     // When owner doesn't use JSX, and is anonymous, we warn once per internal instance.
-    var AnonymousParentNotUsingJSX = createClassWithoutDisplayName({
+    class AnonymousParentNotUsingJSX extends React.Component {
       render() {
         return React.createElement(StatelessComponent, {
           name: 'A',
           ref: () => {},
         });
-      },
-    });
+      }
+    }
+    Object.defineProperty(AnonymousParentNotUsingJSX, 'name', {value: undefined});
+
     const instance2 = ReactTestUtils.renderIntoDocument(
       <AnonymousParentNotUsingJSX />,
     );
diff --git a/src/renderers/__tests__/ReactUpdates-test.js b/src/renderers/__tests__/ReactUpdates-test.js
index 982881b52181e..bba996cbc65c4 100644
--- a/src/renderers/__tests__/ReactUpdates-test.js
+++ b/src/renderers/__tests__/ReactUpdates-test.js
@@ -391,30 +391,23 @@ describe('ReactUpdates', () => {
       },
     };
 
-    var Box = React.createClass({
-      mixins: [UpdateLoggingMixin],
-
-      render: function() {
+    class Box extends React.Component {
+      render() {
         return <div ref="boxDiv">{this.props.children}</div>;
-      },
-    });
-
-    var Child = React.createClass({
-      mixins: [UpdateLoggingMixin],
+      }
+    }
+    Object.assign(Box.prototype, UpdateLoggingMixin);
 
-      render: function() {
+    class Child extends React.Component {
+      render() {
         return <span ref="span">child</span>;
-      },
-    });
-
-    var Switcher = React.createClass({
-      mixins: [UpdateLoggingMixin],
-
-      getInitialState: function() {
-        return {tabKey: 'hello'};
-      },
+      }
+    }
+    Object.assign(Child.prototype, UpdateLoggingMixin);
 
-      render: function() {
+    class Switcher extends React.Component {
+      state = {tabKey: 'hello'};
+      render() {
         var child = this.props.children;
 
         return (
@@ -428,20 +421,20 @@ describe('ReactUpdates', () => {
             </div>
           </Box>
         );
-      },
-    });
-
-    var App = React.createClass({
-      mixins: [UpdateLoggingMixin],
+      }
+    }
+    Object.assign(Switcher.prototype, UpdateLoggingMixin);
 
-      render: function() {
+    class App extends React.Component {
+      render() {
         return (
           <Switcher ref="switcher">
             <Child key="hello" ref="child" />
           </Switcher>
         );
-      },
-    });
+      }
+    }
+    Object.assign(App.prototype, UpdateLoggingMixin);
 
     var root = <App />;
     root = ReactTestUtils.renderIntoDocument(root);
@@ -913,52 +906,6 @@ describe('ReactUpdates', () => {
     expect(console.error.calls.count()).toBe(3);
   });
 
-  it('throws in replaceState if the update callback is not a function', () => {
-    spyOn(console, 'error');
-
-    function Foo() {
-      this.a = 1;
-      this.b = 2;
-    }
-    var A = React.createClass({
-      getInitialState: function() {
-        return {};
-      },
-      render: function() {
-        return <div />;
-      },
-    });
-    var component = ReactTestUtils.renderIntoDocument(<A />);
-
-    expect(() => component.replaceState({}, 'no')).toThrowError(
-      'Invalid argument passed as callback. Expected a function. Instead ' +
-        'received: no',
-    );
-    expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'replaceState(...): Expected the last optional `callback` argument to be ' +
-        'a function. Instead received: no.',
-    );
-    component = ReactTestUtils.renderIntoDocument(<A />);
-    expect(() => component.replaceState({}, {foo: 'bar'})).toThrowError(
-      'Invalid argument passed as callback. Expected a function. Instead ' +
-        'received: [object Object]',
-    );
-    expectDev(console.error.calls.argsFor(1)[0]).toContain(
-      'replaceState(...): Expected the last optional `callback` argument to be ' +
-        'a function. Instead received: [object Object].',
-    );
-    component = ReactTestUtils.renderIntoDocument(<A />);
-    expect(() => component.replaceState({}, new Foo())).toThrowError(
-      'Invalid argument passed as callback. Expected a function. Instead ' +
-        'received: [object Object]',
-    );
-    expectDev(console.error.calls.argsFor(2)[0]).toContain(
-      'replaceState(...): Expected the last optional `callback` argument to be ' +
-        'a function. Instead received: [object Object].',
-    );
-    expect(console.error.calls.count()).toBe(3);
-  });
-
   it('throws in forceUpdate if the update callback is not a function', () => {
     spyOn(console, 'error');
 
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
index 7a8c73ddc79e7..34f03e5be0dac 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
@@ -868,11 +868,11 @@ describe('ReactDOMComponent', () => {
             container.shadyRoot = {};
             return container;
           };
-          var ShadyComponent = React.createClass({
+          class ShadyComponent extends React.Component {
             render() {
               return <polymer-component />;
-            },
-          });
+            }
+          }
           var node = document.createElement('div');
           ReactDOM.render(<ShadyComponent />, node);
           expectDev(console.error.calls.count()).toBe(1);
@@ -1350,12 +1350,12 @@ describe('ReactDOMComponent', () => {
 
     it('gives useful context in warnings', () => {
       spyOn(console, 'error');
-      var Row = React.createClass({
-        render: () => <tr />,
-      });
-      var FancyRow = React.createClass({
-        render: () => <Row />,
-      });
+      function Row() {
+        return <tr />;
+      }
+      function FancyRow() {
+        return <Row />;
+      }
 
       class Table extends React.Component {
         render() {
@@ -1369,12 +1369,12 @@ describe('ReactDOMComponent', () => {
         }
       }
 
-      var Viz1 = React.createClass({
-        render: () => <table><FancyRow /></table>,
-      });
-      var App1 = React.createClass({
-        render: () => <Viz1 />,
-      });
+      function Viz1() {
+        return <table><FancyRow /></table>;
+      }
+      function App1() {
+        return <Viz1 />;
+      }
       ReactTestUtils.renderIntoDocument(<App1 />);
       expectDev(console.error.calls.count()).toBe(1);
       expectDev(
@@ -1389,12 +1389,12 @@ describe('ReactDOMComponent', () => {
           : 'See Viz1 > table > FancyRow > Row > tr.',
       );
 
-      var Viz2 = React.createClass({
-        render: () => <FancyTable><FancyRow /></FancyTable>,
-      });
-      var App2 = React.createClass({
-        render: () => <Viz2 />,
-      });
+      function Viz2() {
+        return <FancyTable><FancyRow /></FancyTable>;
+      }
+      function App2() {
+        return <Viz2 />;
+      }
       ReactTestUtils.renderIntoDocument(<App2 />);
       expectDev(console.error.calls.count()).toBe(2);
       expectDev(
diff --git a/src/renderers/dom/shared/__tests__/ReactMount-test.js b/src/renderers/dom/shared/__tests__/ReactMount-test.js
index 3f49f1845657c..fb942d15b8aec 100644
--- a/src/renderers/dom/shared/__tests__/ReactMount-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactMount-test.js
@@ -89,13 +89,13 @@ describe('ReactMount', () => {
     var mockMount = jest.fn();
     var mockUnmount = jest.fn();
 
-    var Component = React.createClass({
-      componentDidMount: mockMount,
-      componentWillUnmount: mockUnmount,
-      render: function() {
+    class Component extends React.Component {
+      componentDidMount = mockMount;
+      componentWillUnmount = mockUnmount;
+      render() {
         return <span>{this.props.text}</span>;
-      },
-    });
+      }
+    }
 
     expect(mockMount.mock.calls.length).toBe(0);
     expect(mockUnmount.mock.calls.length).toBe(0);
diff --git a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
index 93f291c2b0783..889356a1f135b 100644
--- a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
@@ -490,32 +490,6 @@ describe('ReactDOMServer', () => {
     expect(markup).toBe('<div>hello</div>');
   });
 
-  it('warns with a no-op when an async replaceState is triggered', () => {
-    var Bar = React.createClass({
-      componentWillMount: function() {
-        this.replaceState({text: 'hello'});
-        setTimeout(() => {
-          this.replaceState({text: 'error'});
-        });
-      },
-      render: function() {
-        return <div onClick={() => {}}>{this.state.text}</div>;
-      },
-    });
-
-    spyOn(console, 'error');
-    ReactDOMServer.renderToString(<Bar />);
-    jest.runOnlyPendingTimers();
-    expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.mostRecent().args[0]).toBe(
-      'Warning: replaceState(...): Can only update a mounting component. ' +
-        'This usually means you called replaceState() outside componentWillMount() on the server. ' +
-        'This is a no-op.\n\nPlease check the code for the Bar component.',
-    );
-    var markup = ReactDOMServer.renderToStaticMarkup(<Bar />);
-    expect(markup).toBe('<div>hello</div>');
-  });
-
   it('warns with a no-op when an async forceUpdate is triggered', () => {
     class Baz extends React.Component {
       componentWillMount() {
diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js
index cc99a00dbca33..5007116a6ea09 100644
--- a/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js
+++ b/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js
@@ -207,9 +207,11 @@ describe('BeforeInputEventPlugin', function() {
   function TestEditableReactComponent(Emulator, Scenario, ExpectedResult) {
     ModuleCache = new initialize(Emulator);
 
-    var EditableDiv = React.createClass({
-      render: () => <div contentEditable="true" />,
-    });
+    class EditableDiv extends React.Component {
+      render() {
+        return <div contentEditable="true" />;
+      }
+    }
     var rendered = ReactTestUtils.renderIntoDocument(<EditableDiv />);
 
     var node = ModuleCache.ReactDOM.findDOMNode(rendered);
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js b/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
index 96a3f032e5f9d..f0da503be5e12 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
@@ -873,15 +873,13 @@ describe('ReactIncremental', () => {
 
   it('can replaceState', () => {
     let instance;
-    const Bar = React.createClass({
-      getInitialState() {
-        instance = this;
-        return {a: 'a'};
-      },
+    class Bar extends React.Component {
+      state = {a: 'a'};
       render() {
+        instance = this;
         return <div>{this.props.children}</div>;
-      },
-    });
+      }
+    }
 
     function Foo() {
       return (
@@ -895,7 +893,7 @@ describe('ReactIncremental', () => {
     ReactNoop.flush();
     instance.setState({b: 'b'});
     instance.setState({c: 'c'});
-    instance.replaceState({d: 'd'});
+    instance.updater.enqueueReplaceState(instance, {d: 'd'});
     ReactNoop.flush();
     expect(instance.state).toEqual({d: 'd'});
   });
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
index bae5b1e35fdb6..f19d1d3593e28 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
@@ -29,18 +29,23 @@ describe('ReactIncrementalReflection', () => {
 
     const instances = [];
 
-    const Component = React.createClass({
+    class Component extends React.Component {
+      _isMounted() {
+        // No longer a public API, but we can test that it works internally by
+        // reaching into the updater.
+        return this.updater.isMounted(this);
+      }
       componentWillMount() {
         instances.push(this);
-        ops.push('componentWillMount', this.isMounted());
-      },
+        ops.push('componentWillMount', this._isMounted());
+      }
       componentDidMount() {
-        ops.push('componentDidMount', this.isMounted());
-      },
+        ops.push('componentDidMount', this._isMounted());
+      }
       render() {
         return <span />;
-      },
-    });
+      }
+    }
 
     function Foo() {
       return <Component />;
@@ -53,7 +58,7 @@ describe('ReactIncrementalReflection', () => {
 
     expect(ops).toEqual(['componentWillMount', false]);
 
-    expect(instances[0].isMounted()).toBe(false);
+    expect(instances[0]._isMounted()).toBe(false);
 
     ops = [];
 
@@ -62,7 +67,7 @@ describe('ReactIncrementalReflection', () => {
 
     expect(ops).toEqual(['componentDidMount', true]);
 
-    expect(instances[0].isMounted()).toBe(true);
+    expect(instances[0]._isMounted()).toBe(true);
   });
 
   it('handles isMounted when an unmount is deferred', () => {
@@ -70,18 +75,21 @@ describe('ReactIncrementalReflection', () => {
 
     const instances = [];
 
-    const Component = React.createClass({
+    class Component extends React.Component {
+      _isMounted() {
+        return this.updater.isMounted(this);
+      }
       componentWillMount() {
         instances.push(this);
-      },
+      }
       componentWillUnmount() {
-        ops.push('componentWillUnmount', this.isMounted());
-      },
+        ops.push('componentWillUnmount', this._isMounted());
+      }
       render() {
         ops.push('Component');
         return <span />;
-      },
-    });
+      }
+    }
 
     function Other() {
       ops.push('Other');
@@ -98,7 +106,7 @@ describe('ReactIncrementalReflection', () => {
     expect(ops).toEqual(['Component']);
     ops = [];
 
-    expect(instances[0].isMounted()).toBe(true);
+    expect(instances[0]._isMounted()).toBe(true);
 
     ReactNoop.render(<Foo mount={false} />);
     // Render part way through but don't yet commit the updates so it is not
@@ -108,14 +116,14 @@ describe('ReactIncrementalReflection', () => {
     expect(ops).toEqual(['Other']);
     ops = [];
 
-    expect(instances[0].isMounted()).toBe(true);
+    expect(instances[0]._isMounted()).toBe(true);
 
     // Finish flushing the unmount.
     ReactNoop.flush();
 
     expect(ops).toEqual(['componentWillUnmount', true]);
 
-    expect(instances[0].isMounted()).toBe(false);
+    expect(instances[0]._isMounted()).toBe(false);
   });
 
   it('finds no node before insertion and correct node before deletion', () => {
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js
index b55d7a3196267..69cfe35360115 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js
@@ -74,22 +74,20 @@ describe('ReactIncrementalUpdates', () => {
   it('only drops updates with equal or lesser priority when replaceState is called', () => {
     let instance;
     let ops = [];
-    const Foo = React.createClass({
-      getInitialState() {
-        return {};
-      },
+    class Foo extends React.Component {
+      state = {};
       componentDidMount() {
         ops.push('componentDidMount');
-      },
+      }
       componentDidUpdate() {
         ops.push('componentDidUpdate');
-      },
+      }
       render() {
         ops.push('render');
         instance = this;
         return <div />;
-      },
-    });
+      }
+    }
 
     ReactNoop.render(<Foo />);
     ReactNoop.flush();
@@ -100,7 +98,7 @@ describe('ReactIncrementalUpdates', () => {
       instance.setState({a: 'a'});
       instance.setState({b: 'b'});
     });
-    instance.replaceState({c: 'c'});
+    instance.updater.enqueueReplaceState(instance, {c: 'c'});
     instance.setState({d: 'd'});
 
     ReactNoop.flushAnimationPri();
@@ -201,19 +199,17 @@ describe('ReactIncrementalUpdates', () => {
   it('can abort an update, schedule a replaceState, and resume', () => {
     let instance;
     let ops = [];
-    const Foo = React.createClass({
-      getInitialState() {
-        return {};
-      },
+    class Foo extends React.Component {
+      state = {};
       componentDidUpdate() {
         ops.push('componentDidUpdate');
-      },
+      }
       render() {
         ops.push('render');
         instance = this;
         return <span />;
-      },
-    });
+      }
+    }
 
     ReactNoop.render(<Foo />);
     ReactNoop.flush();
@@ -245,7 +241,9 @@ describe('ReactIncrementalUpdates', () => {
     instance.setState(createUpdate('f'));
     ReactNoop.performAnimationWork(() => {
       instance.setState(createUpdate('d'));
-      instance.replaceState(createUpdate('e'));
+      // No longer a public API, but we can test that it works internally by
+      // reaching into the updater.
+      instance.updater.enqueueReplaceState(instance, createUpdate('e'));
     });
     instance.setState(createUpdate('g'));
 
@@ -256,21 +254,21 @@ describe('ReactIncrementalUpdates', () => {
 
   it('passes accumulation of previous updates to replaceState updater function', () => {
     let instance;
-    const Foo = React.createClass({
-      getInitialState() {
-        return {};
-      },
+    class Foo extends React.Component {
+      state = {};
       render() {
         instance = this;
         return <span />;
-      },
-    });
+      }
+    }
     ReactNoop.render(<Foo />);
     ReactNoop.flush();
 
     instance.setState({a: 'a'});
     instance.setState({b: 'b'});
-    instance.replaceState(previousState => ({previousState}));
+    // No longer a public API, but we can test that it works internally by
+    // reaching into the updater.
+    instance.updater.enqueueReplaceState(instance, previousState => ({previousState}));
     ReactNoop.flush();
     expect(instance.state).toEqual({previousState: {a: 'a', b: 'b'}});
   });
diff --git a/src/test/__tests__/ReactTestUtils-test.js b/src/test/__tests__/ReactTestUtils-test.js
index a196a0b116570..68c489cfb8f3d 100644
--- a/src/test/__tests__/ReactTestUtils-test.js
+++ b/src/test/__tests__/ReactTestUtils-test.js
@@ -90,12 +90,12 @@ describe('ReactTestUtils', () => {
   it('should have shallow unmounting', () => {
     var componentWillUnmount = jest.fn();
 
-    var SomeComponent = React.createClass({
-      render: function() {
+    class SomeComponent extends React.Component {
+      componentWillUnmount = componentWillUnmount;
+      render() {
         return <div />;
-      },
-      componentWillUnmount,
-    });
+      }
+    }
 
     var shallowRenderer = ReactTestUtils.createRenderer();
     shallowRenderer.render(<SomeComponent />);

From 194b25f7099f2bdc85917e26a0a490f942f2553b Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Tue, 21 Mar 2017 18:39:18 -0700
Subject: [PATCH 079/153] Run prettier

---
 .../__tests__/ReactContextValidator-test.js      |  1 -
 .../element/__tests__/ReactElement-test.js       | 16 +++++++++++++---
 .../element/__tests__/ReactElementClone-test.js  | 13 +++++++------
 .../__tests__/ReactElementValidator-test.js      |  5 ++---
 .../__tests__/ReactComponentLifeCycle-test.js    |  4 ++--
 .../ReactCompositeComponentState-test.js         |  4 ++--
 .../__tests__/ReactStatelessComponent-test.js    |  4 +++-
 .../__tests__/ReactIncrementalUpdates-test.js    |  4 +++-
 8 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
index c05c6a305ca7f..84a220877f8cb 100644
--- a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
+++ b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
@@ -156,7 +156,6 @@ describe('ReactContextValidator', () => {
       foo: React.PropTypes.string,
     };
 
-
     var container = document.createElement('div');
     ReactDOM.render(<Parent foo="abc" />, container);
     ReactDOM.render(<Parent foo="def" />, container);
diff --git a/src/isomorphic/classic/element/__tests__/ReactElement-test.js b/src/isomorphic/classic/element/__tests__/ReactElement-test.js
index d03f176ba6ba0..30a74615feb3c 100644
--- a/src/isomorphic/classic/element/__tests__/ReactElement-test.js
+++ b/src/isomorphic/classic/element/__tests__/ReactElement-test.js
@@ -497,7 +497,7 @@ describe('comparing jsx vs .createFactory() vs .createElement()', () => {
           );
         }
       };
-      instance = ReactTestUtils.renderIntoDocument(<Parent/>);
+      instance = ReactTestUtils.renderIntoDocument(<Parent />);
     });
 
     it('should scry children but cannot', () => {
@@ -526,7 +526,10 @@ describe('comparing jsx vs .createFactory() vs .createElement()', () => {
       var childFactory = React.createFactory(Child);
       class Parent extends React.Component {
         render() {
-          return React.DOM.div({}, childFactory({ ref: 'child', foo: 'foo value' }, 'children value'));
+          return React.DOM.div(
+            {},
+            childFactory({ref: 'child', foo: 'foo value'}, 'children value'),
+          );
         }
       }
       factory = React.createFactory(Parent);
@@ -558,7 +561,14 @@ describe('comparing jsx vs .createFactory() vs .createElement()', () => {
     beforeEach(() => {
       class Parent extends React.Component {
         render() {
-          return React.DOM.div({}, React.createElement(Child, { ref: 'child', foo: 'foo value' }, 'children value'));
+          return React.DOM.div(
+            {},
+            React.createElement(
+              Child,
+              {ref: 'child', foo: 'foo value'},
+              'children value',
+            ),
+          );
         }
       }
       factory = React.createFactory(Parent);
diff --git a/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js b/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js
index f1baac684c376..827509b196ea4 100644
--- a/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js
+++ b/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js
@@ -177,8 +177,10 @@ describe('ReactElementClone', () => {
   it('should support keys and refs', () => {
     class Parent extends React.Component {
       render() {
-        var clone =
-          React.cloneElement(this.props.children, {key: 'xyz', ref: 'xyz'});
+        var clone = React.cloneElement(this.props.children, {
+          key: 'xyz',
+          ref: 'xyz',
+        });
         expect(clone.key).toBe('xyz');
         expect(clone.ref).toBe('xyz');
         return <div>{clone}</div>;
@@ -300,10 +302,9 @@ describe('ReactElementClone', () => {
     }
     class GrandParent extends React.Component {
       render() {
-        return React.createElement(
-          Parent,
-          { child: React.createElement(Component, {color: 'red'}) }
-        );
+        return React.createElement(Parent, {
+          child: React.createElement(Component, {color: 'red'}),
+        });
       }
     }
     ReactTestUtils.renderIntoDocument(React.createElement(GrandParent));
diff --git a/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js b/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
index 8b88e5a44dcd6..ada2bb20fa7ec 100644
--- a/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
+++ b/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
@@ -64,7 +64,7 @@ describe('ReactElementValidator', () => {
 
     class ComponentWrapper extends React.Component {
       render() {
-        return InnerComponent({childSet: [Component(), Component()] });
+        return InnerComponent({childSet: [Component(), Component()]});
       }
     }
 
@@ -84,7 +84,7 @@ describe('ReactElementValidator', () => {
     function Anonymous() {
       return <div />;
     }
-    Object.defineProperty(Anonymous, 'name', { value: undefined });
+    Object.defineProperty(Anonymous, 'name', {value: undefined});
 
     var divs = [<div />, <div />];
     ReactTestUtils.renderIntoDocument(<Anonymous>{divs}</Anonymous>);
@@ -418,7 +418,6 @@ describe('ReactElementValidator', () => {
     class Component extends React.Component {
       render() {
         return React.createElement('span', null, this.props.myProp.value);
-
       }
     }
     Component.propTypes = {
diff --git a/src/renderers/__tests__/ReactComponentLifeCycle-test.js b/src/renderers/__tests__/ReactComponentLifeCycle-test.js
index ab13a65b44c32..b9231571bb733 100644
--- a/src/renderers/__tests__/ReactComponentLifeCycle-test.js
+++ b/src/renderers/__tests__/ReactComponentLifeCycle-test.js
@@ -239,7 +239,7 @@ describe('ReactComponentLifeCycle', () => {
       }
       render() {
         expect(this._isMounted()).toBeFalsy();
-        return <div/>;
+        return <div />;
       }
     }
 
@@ -288,7 +288,7 @@ describe('ReactComponentLifeCycle', () => {
   it('isMounted should return false when unmounted', () => {
     class Component extends React.Component {
       render() {
-        return <div/>;
+        return <div />;
       }
     }
 
diff --git a/src/renderers/__tests__/ReactCompositeComponentState-test.js b/src/renderers/__tests__/ReactCompositeComponentState-test.js
index ca88e476736e8..958d40692daac 100644
--- a/src/renderers/__tests__/ReactCompositeComponentState-test.js
+++ b/src/renderers/__tests__/ReactCompositeComponentState-test.js
@@ -33,11 +33,11 @@ describe('ReactCompositeComponent-state', () => {
 
       peekAtState = (from, state = this.state, props = this.props) => {
         props.stateListener(from, state && state.color);
-      }
+      };
 
       peekAtCallback = from => {
         return () => this.peekAtState(from);
-      }
+      };
 
       setFavoriteColor(nextColor) {
         this.setState(
diff --git a/src/renderers/__tests__/ReactStatelessComponent-test.js b/src/renderers/__tests__/ReactStatelessComponent-test.js
index b1cc7ba9d0838..3f11bf438e15e 100644
--- a/src/renderers/__tests__/ReactStatelessComponent-test.js
+++ b/src/renderers/__tests__/ReactStatelessComponent-test.js
@@ -280,7 +280,9 @@ describe('ReactStatelessComponent', () => {
         });
       }
     }
-    Object.defineProperty(AnonymousParentNotUsingJSX, 'name', {value: undefined});
+    Object.defineProperty(AnonymousParentNotUsingJSX, 'name', {
+      value: undefined,
+    });
 
     const instance2 = ReactTestUtils.renderIntoDocument(
       <AnonymousParentNotUsingJSX />,
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js
index 69cfe35360115..2483732fc1465 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalUpdates-test.js
@@ -268,7 +268,9 @@ describe('ReactIncrementalUpdates', () => {
     instance.setState({b: 'b'});
     // No longer a public API, but we can test that it works internally by
     // reaching into the updater.
-    instance.updater.enqueueReplaceState(instance, previousState => ({previousState}));
+    instance.updater.enqueueReplaceState(instance, previousState => ({
+      previousState,
+    }));
     ReactNoop.flush();
     expect(instance.state).toEqual({previousState: {a: 'a', b: 'b'}});
   });

From 646e7863348a427e1ed9163a9a96fa759112f102 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Tue, 21 Mar 2017 19:09:32 -0700
Subject: [PATCH 080/153] Warn once when attempting to access React.createClass

Should still be undefined.
---
 scripts/fiber/tests-passing.txt        |  1 +
 src/isomorphic/React.js                | 46 +++++++++++++++++---------
 src/isomorphic/__tests__/React-test.js | 14 ++++++++
 3 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index cf40f4bb6cd81..ca26fd1a00928 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -44,6 +44,7 @@ scripts/shared/__tests__/evalToString-test.js
 
 src/isomorphic/__tests__/React-test.js
 * should log a deprecation warning once when using React.createMixin
+* should warn once when attempting to access React.createClass
 
 src/isomorphic/children/__tests__/ReactChildren-test.js
 * should support identity for simple
diff --git a/src/isomorphic/React.js b/src/isomorphic/React.js
index a37649a3197b6..402f02c7c88db 100644
--- a/src/isomorphic/React.js
+++ b/src/isomorphic/React.js
@@ -19,7 +19,6 @@ var ReactPropTypes = require('ReactPropTypes');
 var ReactVersion = require('ReactVersion');
 
 var onlyChild = require('onlyChild');
-var warning = require('fbjs/lib/warning');
 var checkPropTypes = require('checkPropTypes');
 
 var createElement = ReactElement.createElement;
@@ -27,6 +26,8 @@ var createFactory = ReactElement.createFactory;
 var cloneElement = ReactElement.cloneElement;
 
 if (__DEV__) {
+  var warning = require('fbjs/lib/warning');
+  var canDefineProperty = require('canDefineProperty');
   var ReactElementValidator = require('ReactElementValidator');
   createElement = ReactElementValidator.createElement;
   createFactory = ReactElementValidator.createFactory;
@@ -37,20 +38,6 @@ var createMixin = function(mixin) {
   return mixin;
 };
 
-if (__DEV__) {
-  var warnedForCreateMixin = false;
-
-  createMixin = function(mixin) {
-    warning(
-      warnedForCreateMixin,
-      'React.createMixin is deprecated and should not be used. You ' +
-        'can use this mixin directly instead.',
-    );
-    warnedForCreateMixin = true;
-    return mixin;
-  };
-}
-
 var React = {
   // Modern
 
@@ -94,6 +81,35 @@ if (__DEV__) {
     ReactComponentTreeHook: require('ReactComponentTreeHook'),
     ReactDebugCurrentFrame: require('ReactDebugCurrentFrame'),
   });
+
+  let warnedForCreateMixin = false;
+  let warnedForCreateClass = false;
+
+  React.createMixin = function(mixin) {
+    warning(
+      warnedForCreateMixin,
+      'React.createMixin is deprecated and should not be used. You ' +
+        'can use this mixin directly instead.',
+    );
+    warnedForCreateMixin = true;
+    return mixin;
+  };
+
+  if (canDefineProperty) {
+    Object.defineProperty(React, 'createClass', {
+      get: function() {
+        warning(
+          warnedForCreateClass,
+          'React.createClass is no longer supported. Use a plain JavaScript ' +
+            "class instead. If you're not yet ready to migrate, " +
+            'react-create-class is available on npm as a temporary, ' +
+            'drop-in replacement.',
+        );
+        warnedForCreateClass = true;
+        return undefined;
+      },
+    });
+  }
 }
 
 module.exports = React;
diff --git a/src/isomorphic/__tests__/React-test.js b/src/isomorphic/__tests__/React-test.js
index ec007f16a32b5..4b9c4960abca8 100644
--- a/src/isomorphic/__tests__/React-test.js
+++ b/src/isomorphic/__tests__/React-test.js
@@ -27,4 +27,18 @@ describe('React', () => {
       'React.createMixin is deprecated and should not be used',
     );
   });
+
+  it('should warn once when attempting to access React.createClass', () => {
+    spyOn(console, 'error');
+    let createClass = React.createClass;
+    createClass = React.createClass;
+    expect(createClass).toBe(undefined);
+    expectDev(console.error.calls.count()).toBe(1);
+    expectDev(console.error.calls.argsFor(0)[0]).toContain(
+      'React.createClass is no longer supported. Use a plain ' +
+        "JavaScript class instead. If you're not yet ready to migrate, " +
+        'react-create-class is available on npm as a temporary, ' +
+        'drop-in replacement.',
+    );
+  });
 });

From 6b539f280d8b0ec4874671bae9c6bed80b788006 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Mon, 27 Mar 2017 16:33:08 -0700
Subject: [PATCH 081/153] Convert createClass caller

This snuck in after rebasing
---
 .../wrappers/__tests__/ReactDOMInput-test.js  | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
index 62df49a453262..102acc241800c 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
@@ -1119,22 +1119,20 @@ describe('ReactDOMInput', () => {
 
   describe('assigning the value attribute on controlled inputs', function() {
     function getTestInput() {
-      return React.createClass({
-        getInitialState: function() {
-          return {
-            value: this.props.value == null ? '' : this.props.value,
-          };
-        },
-        onChange: function(event) {
+      return class extends React.Component {
+        state = {
+          value: this.props.value == null ? '' : this.props.value,
+        };
+        onChange = event => {
           this.setState({value: event.target.value});
-        },
-        render: function() {
+        };
+        render() {
           var type = this.props.type;
           var value = this.state.value;
 
           return <input type={type} value={value} onChange={this.onChange} />;
-        },
-      });
+        }
+      };
     }
 
     it('always sets the attribute when values change on text inputs', function() {

From ce489262a1ee34340440e55a0b99ea6918e19e7a Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Mon, 27 Mar 2017 16:34:23 -0700
Subject: [PATCH 082/153] Add react-create-class integration tests

These are mostly copied from the old ReactClass-test module.
---
 scripts/fiber/tests-passing.txt               |  18 +
 .../react-create-class-integration-test.js    | 436 ++++++++++++++++++
 yarn.lock                                     |   6 +
 3 files changed, 460 insertions(+)
 create mode 100644 src/isomorphic/classic/class/__tests__/react-create-class-integration-test.js

diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index ca26fd1a00928..7cf4d1ff0bff4 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -90,6 +90,24 @@ src/isomorphic/classic/__tests__/ReactContextValidator-test.js
 * should warn (but not error) if getChildContext method is missing
 * should pass parent context if getChildContext method is missing
 
+src/isomorphic/classic/class/__tests__/react-create-class-integration-test.js
+* should throw when `render` is not specified
+* should copy prop types onto the Constructor
+* should warn on invalid prop types
+* should warn on invalid context types
+* should throw on invalid child context types
+* should warn when mispelling shouldComponentUpdate
+* should warn when mispelling componentWillReceiveProps
+* should throw if a reserved property is in statics
+* should support statics
+* should work with object getInitialState() return values
+* renders based on context getInitialState
+* should throw with non-object getInitialState() return values
+* should work with a null getInitialState() return value
+* should throw when using legacy factories
+* replaceState and callback works
+* isMounted works
+
 src/isomorphic/classic/element/__tests__/ReactElement-test.js
 * uses the fallback value when in an environment without Symbol
 * returns a complete element according to spec
diff --git a/src/isomorphic/classic/class/__tests__/react-create-class-integration-test.js b/src/isomorphic/classic/class/__tests__/react-create-class-integration-test.js
new file mode 100644
index 0000000000000..cbcb1a2a43cfb
--- /dev/null
+++ b/src/isomorphic/classic/class/__tests__/react-create-class-integration-test.js
@@ -0,0 +1,436 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @emails react-core
+ */
+
+'use strict';
+
+var React;
+var ReactDOM;
+var ReactTestUtils;
+var ReactCreateClass;
+
+describe('react-create-class-integration', () => {
+  beforeEach(() => {
+    React = require('React');
+    ReactDOM = require('ReactDOM');
+    ReactTestUtils = require('ReactTestUtils');
+    var ReactCreateClassFactory = require('react-create-class/factory');
+    ReactCreateClass = ReactCreateClassFactory(
+      React.Component,
+      React.isValidElement,
+      require('ReactNoopUpdateQueue'),
+    );
+  });
+
+  it('should throw when `render` is not specified', () => {
+    expect(function() {
+      ReactCreateClass({});
+    }).toThrowError(
+      'createClass(...): Class specification must implement a `render` method.',
+    );
+  });
+
+  // TODO: Update babel-plugin-transform-react-display-name
+  xit('should copy `displayName` onto the Constructor', () => {
+    var TestComponent = ReactCreateClass({
+      render: function() {
+        return <div />;
+      },
+    });
+
+    expect(TestComponent.displayName).toBe('TestComponent');
+  });
+
+  it('should copy prop types onto the Constructor', () => {
+    var propValidator = jest.fn();
+    var TestComponent = ReactCreateClass({
+      propTypes: {
+        value: propValidator,
+      },
+      render: function() {
+        return <div />;
+      },
+    });
+
+    expect(TestComponent.propTypes).toBeDefined();
+    expect(TestComponent.propTypes.value).toBe(propValidator);
+  });
+
+  it('should warn on invalid prop types', () => {
+    spyOn(console, 'error');
+    ReactCreateClass({
+      displayName: 'Component',
+      propTypes: {
+        prop: null,
+      },
+      render: function() {
+        return <span>{this.props.prop}</span>;
+      },
+    });
+    expect(console.error.calls.count()).toBe(1);
+    expect(console.error.calls.argsFor(0)[0]).toBe(
+      'Warning: Component: prop type `prop` is invalid; ' +
+        'it must be a function, usually from React.PropTypes.',
+    );
+  });
+
+  it('should warn on invalid context types', () => {
+    spyOn(console, 'error');
+    ReactCreateClass({
+      displayName: 'Component',
+      contextTypes: {
+        prop: null,
+      },
+      render: function() {
+        return <span>{this.props.prop}</span>;
+      },
+    });
+    expect(console.error.calls.count()).toBe(1);
+    expect(console.error.calls.argsFor(0)[0]).toBe(
+      'Warning: Component: context type `prop` is invalid; ' +
+        'it must be a function, usually from React.PropTypes.',
+    );
+  });
+
+  it('should throw on invalid child context types', () => {
+    spyOn(console, 'error');
+    ReactCreateClass({
+      displayName: 'Component',
+      childContextTypes: {
+        prop: null,
+      },
+      render: function() {
+        return <span>{this.props.prop}</span>;
+      },
+    });
+    expect(console.error.calls.count()).toBe(1);
+    expect(console.error.calls.argsFor(0)[0]).toBe(
+      'Warning: Component: child context type `prop` is invalid; ' +
+        'it must be a function, usually from React.PropTypes.',
+    );
+  });
+
+  it('should warn when mispelling shouldComponentUpdate', () => {
+    spyOn(console, 'error');
+
+    ReactCreateClass({
+      componentShouldUpdate: function() {
+        return false;
+      },
+      render: function() {
+        return <div />;
+      },
+    });
+    expect(console.error.calls.count()).toBe(1);
+    expect(console.error.calls.argsFor(0)[0]).toBe(
+      'Warning: A component has a method called componentShouldUpdate(). Did you ' +
+        'mean shouldComponentUpdate()? The name is phrased as a question ' +
+        'because the function is expected to return a value.',
+    );
+
+    ReactCreateClass({
+      displayName: 'NamedComponent',
+      componentShouldUpdate: function() {
+        return false;
+      },
+      render: function() {
+        return <div />;
+      },
+    });
+    expect(console.error.calls.count()).toBe(2);
+    expect(console.error.calls.argsFor(1)[0]).toBe(
+      'Warning: NamedComponent has a method called componentShouldUpdate(). Did you ' +
+        'mean shouldComponentUpdate()? The name is phrased as a question ' +
+        'because the function is expected to return a value.',
+    );
+  });
+
+  it('should warn when mispelling componentWillReceiveProps', () => {
+    spyOn(console, 'error');
+    ReactCreateClass({
+      componentWillRecieveProps: function() {
+        return false;
+      },
+      render: function() {
+        return <div />;
+      },
+    });
+    expect(console.error.calls.count()).toBe(1);
+    expect(console.error.calls.argsFor(0)[0]).toBe(
+      'Warning: A component has a method called componentWillRecieveProps(). Did you ' +
+        'mean componentWillReceiveProps()?',
+    );
+  });
+
+  it('should throw if a reserved property is in statics', () => {
+    expect(function() {
+      ReactCreateClass({
+        statics: {
+          getDefaultProps: function() {
+            return {
+              foo: 0,
+            };
+          },
+        },
+
+        render: function() {
+          return <span />;
+        },
+      });
+    }).toThrowError(
+      'ReactClass: You are attempting to define a reserved property, ' +
+        '`getDefaultProps`, that shouldn\'t be on the "statics" key. Define ' +
+        'it as an instance property instead; it will still be accessible on ' +
+        'the constructor.',
+    );
+  });
+
+  // TODO: Consider actually moving these to statics or drop this unit test.
+
+  xit('should warn when using deprecated non-static spec keys', () => {
+    spyOn(console, 'error');
+    ReactCreateClass({
+      mixins: [{}],
+      propTypes: {
+        foo: React.PropTypes.string,
+      },
+      contextTypes: {
+        foo: React.PropTypes.string,
+      },
+      childContextTypes: {
+        foo: React.PropTypes.string,
+      },
+      render: function() {
+        return <div />;
+      },
+    });
+    expect(console.error.calls.count()).toBe(4);
+    expect(console.error.calls.argsFor(0)[0]).toBe(
+      'createClass(...): `mixins` is now a static property and should ' +
+        'be defined inside "statics".',
+    );
+    expect(console.error.calls.argsFor(1)[0]).toBe(
+      'createClass(...): `propTypes` is now a static property and should ' +
+        'be defined inside "statics".',
+    );
+    expect(console.error.calls.argsFor(2)[0]).toBe(
+      'createClass(...): `contextTypes` is now a static property and ' +
+        'should be defined inside "statics".',
+    );
+    expect(console.error.calls.argsFor(3)[0]).toBe(
+      'createClass(...): `childContextTypes` is now a static property and ' +
+        'should be defined inside "statics".',
+    );
+  });
+
+  it('should support statics', () => {
+    var Component = ReactCreateClass({
+      statics: {
+        abc: 'def',
+        def: 0,
+        ghi: null,
+        jkl: 'mno',
+        pqr: function() {
+          return this;
+        },
+      },
+
+      render: function() {
+        return <span />;
+      },
+    });
+    var instance = <Component />;
+    instance = ReactTestUtils.renderIntoDocument(instance);
+    expect(instance.constructor.abc).toBe('def');
+    expect(Component.abc).toBe('def');
+    expect(instance.constructor.def).toBe(0);
+    expect(Component.def).toBe(0);
+    expect(instance.constructor.ghi).toBe(null);
+    expect(Component.ghi).toBe(null);
+    expect(instance.constructor.jkl).toBe('mno');
+    expect(Component.jkl).toBe('mno');
+    expect(instance.constructor.pqr()).toBe(Component);
+    expect(Component.pqr()).toBe(Component);
+  });
+
+  it('should work with object getInitialState() return values', () => {
+    var Component = ReactCreateClass({
+      getInitialState: function() {
+        return {
+          occupation: 'clown',
+        };
+      },
+      render: function() {
+        return <span />;
+      },
+    });
+    var instance = <Component />;
+    instance = ReactTestUtils.renderIntoDocument(instance);
+    expect(instance.state.occupation).toEqual('clown');
+  });
+
+  it('renders based on context getInitialState', () => {
+    var Foo = ReactCreateClass({
+      contextTypes: {
+        className: React.PropTypes.string,
+      },
+      getInitialState() {
+        return {className: this.context.className};
+      },
+      render() {
+        return <span className={this.state.className} />;
+      },
+    });
+
+    var Outer = ReactCreateClass({
+      childContextTypes: {
+        className: React.PropTypes.string,
+      },
+      getChildContext() {
+        return {className: 'foo'};
+      },
+      render() {
+        return <Foo />;
+      },
+    });
+
+    var container = document.createElement('div');
+    ReactDOM.render(<Outer />, container);
+    expect(container.firstChild.className).toBe('foo');
+  });
+
+  it('should throw with non-object getInitialState() return values', () => {
+    [['an array'], 'a string', 1234].forEach(function(state) {
+      var Component = ReactCreateClass({
+        getInitialState: function() {
+          return state;
+        },
+        render: function() {
+          return <span />;
+        },
+      });
+      var instance = <Component />;
+      expect(function() {
+        instance = ReactTestUtils.renderIntoDocument(instance);
+      }).toThrowError(
+        'Component.getInitialState(): must return an object or null',
+      );
+    });
+  });
+
+  it('should work with a null getInitialState() return value', () => {
+    var Component = ReactCreateClass({
+      getInitialState: function() {
+        return null;
+      },
+      render: function() {
+        return <span />;
+      },
+    });
+    expect(() =>
+      ReactTestUtils.renderIntoDocument(<Component />)).not.toThrow();
+  });
+
+  it('should throw when using legacy factories', () => {
+    spyOn(console, 'error');
+    var Component = ReactCreateClass({
+      render() {
+        return <div />;
+      },
+    });
+
+    expect(() => Component()).toThrow();
+    expect(console.error.calls.count()).toBe(1);
+    expect(console.error.calls.argsFor(0)[0]).toBe(
+      'Warning: Something is calling a React component directly. Use a ' +
+        'factory or JSX instead. See: https://fb.me/react-legacyfactory',
+    );
+  });
+
+  it('replaceState and callback works', () => {
+    var ops = [];
+    var Component = ReactCreateClass({
+      getInitialState() {
+        return {step: 0};
+      },
+      render() {
+        ops.push('Render: ' + this.state.step);
+        return <div />;
+      },
+    });
+
+    var instance = ReactTestUtils.renderIntoDocument(<Component />);
+    instance.replaceState({step: 1}, () => {
+      ops.push('Callback: ' + instance.state.step);
+    });
+    expect(ops).toEqual(['Render: 0', 'Render: 1', 'Callback: 1']);
+  });
+
+  it('isMounted works', () => {
+    spyOn(console, 'error');
+
+    var ops = [];
+    var instance;
+    var Component = ReactCreateClass({
+      displayName: 'MyComponent',
+      log(name) {
+        ops.push(`${name}: ${this.isMounted()}`);
+      },
+      getInitialState() {
+        this.log('getInitialState');
+        return {};
+      },
+      componentWillMount() {
+        this.log('componentWillMount');
+      },
+      componentDidMount() {
+        this.log('componentDidMount');
+      },
+      componentWillUpdate() {
+        this.log('componentWillUpdate');
+      },
+      componentDidUpdate() {
+        this.log('componentDidUpdate');
+      },
+      componentWillUnmount() {
+        this.log('componentWillUnmount');
+      },
+      render() {
+        instance = this;
+        this.log('render');
+        return <div />;
+      },
+    });
+
+    var container = document.createElement('div');
+    ReactDOM.render(<Component />, container);
+    ReactDOM.render(<Component />, container);
+    ReactDOM.unmountComponentAtNode(container);
+    instance.log('after unmount');
+    expect(ops).toEqual([
+      'getInitialState: false',
+      'componentWillMount: false',
+      'render: false',
+      'componentDidMount: true',
+      'componentWillUpdate: true',
+      'render: true',
+      'componentDidUpdate: true',
+      'componentWillUnmount: false',
+      'after unmount: false',
+    ]);
+
+    expect(console.error.calls.count()).toBe(1);
+    expect(console.error.calls.argsFor(0)[0]).toEqual(
+      'Warning: MyComponent: isMounted is deprecated. Instead, make sure to ' +
+        'clean up subscriptions and pending requests in componentWillUnmount ' +
+        'to prevent memory leaks.',
+    );
+  });
+});
diff --git a/yarn.lock b/yarn.lock
index 0314dfbc94221..a48ed072bcdf5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4004,6 +4004,12 @@ rc@^1.1.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+react-create-class@15.5.0-alpha.7:
+  version "15.5.0-alpha.7"
+  resolved "https://registry.yarnpkg.com/react-create-class/-/react-create-class-15.5.0-alpha.7.tgz#a2bf8846ab0f0e86799e8a2c2346d7a87941a350"
+  dependencies:
+    fbjs "^0.8.9"
+
 read-only-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0"

From 957fbc92b123030c389bf8b4b874522bdf2db72c Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Fri, 7 Apr 2017 15:17:15 -0700
Subject: [PATCH 083/153] react-create-class -> create-react-class

---
 package.json                                  |  1 +
 scripts/fiber/tests-passing.txt               |  2 +-
 src/isomorphic/React.js                       |  2 +-
 src/isomorphic/__tests__/React-test.js        |  2 +-
 ...=> create-react-class-integration-test.js} | 57 ++++++++-----------
 yarn.lock                                     | 12 ++--
 6 files changed, 33 insertions(+), 43 deletions(-)
 rename src/isomorphic/classic/class/__tests__/{react-create-class-integration-test.js => create-react-class-integration-test.js} (91%)

diff --git a/package.json b/package.json
index 80b6c1d734d89..35589b84c6e68 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
     "coffee-script": "^1.8.0",
     "core-js": "^2.2.1",
     "coveralls": "^2.11.6",
+    "create-react-class": "^15.5.0",
     "del": "^2.0.2",
     "derequire": "^2.0.3",
     "escape-string-regexp": "^1.0.5",
diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index 7cf4d1ff0bff4..89dc4c89febb1 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -90,7 +90,7 @@ src/isomorphic/classic/__tests__/ReactContextValidator-test.js
 * should warn (but not error) if getChildContext method is missing
 * should pass parent context if getChildContext method is missing
 
-src/isomorphic/classic/class/__tests__/react-create-class-integration-test.js
+src/isomorphic/classic/class/__tests__/create-react-class-integration-test.js
 * should throw when `render` is not specified
 * should copy prop types onto the Constructor
 * should warn on invalid prop types
diff --git a/src/isomorphic/React.js b/src/isomorphic/React.js
index 402f02c7c88db..ccc351225edb8 100644
--- a/src/isomorphic/React.js
+++ b/src/isomorphic/React.js
@@ -102,7 +102,7 @@ if (__DEV__) {
           warnedForCreateClass,
           'React.createClass is no longer supported. Use a plain JavaScript ' +
             "class instead. If you're not yet ready to migrate, " +
-            'react-create-class is available on npm as a temporary, ' +
+            'create-react-class is available on npm as a temporary, ' +
             'drop-in replacement.',
         );
         warnedForCreateClass = true;
diff --git a/src/isomorphic/__tests__/React-test.js b/src/isomorphic/__tests__/React-test.js
index 4b9c4960abca8..f2ea926dd9a08 100644
--- a/src/isomorphic/__tests__/React-test.js
+++ b/src/isomorphic/__tests__/React-test.js
@@ -37,7 +37,7 @@ describe('React', () => {
     expectDev(console.error.calls.argsFor(0)[0]).toContain(
       'React.createClass is no longer supported. Use a plain ' +
         "JavaScript class instead. If you're not yet ready to migrate, " +
-        'react-create-class is available on npm as a temporary, ' +
+        'create-react-class is available on npm as a temporary, ' +
         'drop-in replacement.',
     );
   });
diff --git a/src/isomorphic/classic/class/__tests__/react-create-class-integration-test.js b/src/isomorphic/classic/class/__tests__/create-react-class-integration-test.js
similarity index 91%
rename from src/isomorphic/classic/class/__tests__/react-create-class-integration-test.js
rename to src/isomorphic/classic/class/__tests__/create-react-class-integration-test.js
index cbcb1a2a43cfb..3eddc9730524c 100644
--- a/src/isomorphic/classic/class/__tests__/react-create-class-integration-test.js
+++ b/src/isomorphic/classic/class/__tests__/create-react-class-integration-test.js
@@ -14,15 +14,15 @@
 var React;
 var ReactDOM;
 var ReactTestUtils;
-var ReactCreateClass;
+var createReactClass;
 
-describe('react-create-class-integration', () => {
+describe('create-react-class-integration', () => {
   beforeEach(() => {
     React = require('React');
     ReactDOM = require('ReactDOM');
     ReactTestUtils = require('ReactTestUtils');
-    var ReactCreateClassFactory = require('react-create-class/factory');
-    ReactCreateClass = ReactCreateClassFactory(
+    var createReactClassFactory = require('create-react-class/factory');
+    createReactClass = createReactClassFactory(
       React.Component,
       React.isValidElement,
       require('ReactNoopUpdateQueue'),
@@ -31,26 +31,15 @@ describe('react-create-class-integration', () => {
 
   it('should throw when `render` is not specified', () => {
     expect(function() {
-      ReactCreateClass({});
+      createReactClass({});
     }).toThrowError(
       'createClass(...): Class specification must implement a `render` method.',
     );
   });
 
-  // TODO: Update babel-plugin-transform-react-display-name
-  xit('should copy `displayName` onto the Constructor', () => {
-    var TestComponent = ReactCreateClass({
-      render: function() {
-        return <div />;
-      },
-    });
-
-    expect(TestComponent.displayName).toBe('TestComponent');
-  });
-
   it('should copy prop types onto the Constructor', () => {
     var propValidator = jest.fn();
-    var TestComponent = ReactCreateClass({
+    var TestComponent = createReactClass({
       propTypes: {
         value: propValidator,
       },
@@ -65,7 +54,7 @@ describe('react-create-class-integration', () => {
 
   it('should warn on invalid prop types', () => {
     spyOn(console, 'error');
-    ReactCreateClass({
+    createReactClass({
       displayName: 'Component',
       propTypes: {
         prop: null,
@@ -83,7 +72,7 @@ describe('react-create-class-integration', () => {
 
   it('should warn on invalid context types', () => {
     spyOn(console, 'error');
-    ReactCreateClass({
+    createReactClass({
       displayName: 'Component',
       contextTypes: {
         prop: null,
@@ -101,7 +90,7 @@ describe('react-create-class-integration', () => {
 
   it('should throw on invalid child context types', () => {
     spyOn(console, 'error');
-    ReactCreateClass({
+    createReactClass({
       displayName: 'Component',
       childContextTypes: {
         prop: null,
@@ -120,7 +109,7 @@ describe('react-create-class-integration', () => {
   it('should warn when mispelling shouldComponentUpdate', () => {
     spyOn(console, 'error');
 
-    ReactCreateClass({
+    createReactClass({
       componentShouldUpdate: function() {
         return false;
       },
@@ -135,7 +124,7 @@ describe('react-create-class-integration', () => {
         'because the function is expected to return a value.',
     );
 
-    ReactCreateClass({
+    createReactClass({
       displayName: 'NamedComponent',
       componentShouldUpdate: function() {
         return false;
@@ -154,7 +143,7 @@ describe('react-create-class-integration', () => {
 
   it('should warn when mispelling componentWillReceiveProps', () => {
     spyOn(console, 'error');
-    ReactCreateClass({
+    createReactClass({
       componentWillRecieveProps: function() {
         return false;
       },
@@ -171,7 +160,7 @@ describe('react-create-class-integration', () => {
 
   it('should throw if a reserved property is in statics', () => {
     expect(function() {
-      ReactCreateClass({
+      createReactClass({
         statics: {
           getDefaultProps: function() {
             return {
@@ -196,7 +185,7 @@ describe('react-create-class-integration', () => {
 
   xit('should warn when using deprecated non-static spec keys', () => {
     spyOn(console, 'error');
-    ReactCreateClass({
+    createReactClass({
       mixins: [{}],
       propTypes: {
         foo: React.PropTypes.string,
@@ -231,7 +220,7 @@ describe('react-create-class-integration', () => {
   });
 
   it('should support statics', () => {
-    var Component = ReactCreateClass({
+    var Component = createReactClass({
       statics: {
         abc: 'def',
         def: 0,
@@ -261,7 +250,7 @@ describe('react-create-class-integration', () => {
   });
 
   it('should work with object getInitialState() return values', () => {
-    var Component = ReactCreateClass({
+    var Component = createReactClass({
       getInitialState: function() {
         return {
           occupation: 'clown',
@@ -277,7 +266,7 @@ describe('react-create-class-integration', () => {
   });
 
   it('renders based on context getInitialState', () => {
-    var Foo = ReactCreateClass({
+    var Foo = createReactClass({
       contextTypes: {
         className: React.PropTypes.string,
       },
@@ -289,7 +278,7 @@ describe('react-create-class-integration', () => {
       },
     });
 
-    var Outer = ReactCreateClass({
+    var Outer = createReactClass({
       childContextTypes: {
         className: React.PropTypes.string,
       },
@@ -308,7 +297,7 @@ describe('react-create-class-integration', () => {
 
   it('should throw with non-object getInitialState() return values', () => {
     [['an array'], 'a string', 1234].forEach(function(state) {
-      var Component = ReactCreateClass({
+      var Component = createReactClass({
         getInitialState: function() {
           return state;
         },
@@ -326,7 +315,7 @@ describe('react-create-class-integration', () => {
   });
 
   it('should work with a null getInitialState() return value', () => {
-    var Component = ReactCreateClass({
+    var Component = createReactClass({
       getInitialState: function() {
         return null;
       },
@@ -340,7 +329,7 @@ describe('react-create-class-integration', () => {
 
   it('should throw when using legacy factories', () => {
     spyOn(console, 'error');
-    var Component = ReactCreateClass({
+    var Component = createReactClass({
       render() {
         return <div />;
       },
@@ -356,7 +345,7 @@ describe('react-create-class-integration', () => {
 
   it('replaceState and callback works', () => {
     var ops = [];
-    var Component = ReactCreateClass({
+    var Component = createReactClass({
       getInitialState() {
         return {step: 0};
       },
@@ -378,7 +367,7 @@ describe('react-create-class-integration', () => {
 
     var ops = [];
     var instance;
-    var Component = ReactCreateClass({
+    var Component = createReactClass({
       displayName: 'MyComponent',
       log(name) {
         ops.push(`${name}: ${this.isMounted()}`);
diff --git a/yarn.lock b/yarn.lock
index a48ed072bcdf5..681679cb60642 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1438,6 +1438,12 @@ create-hmac@^1.1.0, create-hmac@^1.1.2:
     create-hash "^1.1.0"
     inherits "^2.0.1"
 
+create-react-class@^15.5.0:
+  version "15.5.0"
+  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.5.0.tgz#7508ffcad56a0804fb244d6ff70b07648abfe5fb"
+  dependencies:
+    fbjs "^0.8.9"
+
 cross-spawn-async@^2.2.2:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc"
@@ -4004,12 +4010,6 @@ rc@^1.1.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-create-class@15.5.0-alpha.7:
-  version "15.5.0-alpha.7"
-  resolved "https://registry.yarnpkg.com/react-create-class/-/react-create-class-15.5.0-alpha.7.tgz#a2bf8846ab0f0e86799e8a2c2346d7a87941a350"
-  dependencies:
-    fbjs "^0.8.9"
-
 read-only-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-only-stream/-/read-only-stream-2.0.0.tgz#2724fd6a8113d73764ac288d4386270c1dbf17f0"

From b1a06bd9456ea81184be0c15108cd3a3ed18084f Mon Sep 17 00:00:00 2001
From: Ben Alpert <ben@benalpert.com>
Date: Tue, 11 Apr 2017 13:58:14 -0700
Subject: [PATCH 084/153] Fix ignore patterns in package.json (#9409)

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 35589b84c6e68..c8cf86911ae0a 100644
--- a/package.json
+++ b/package.json
@@ -110,8 +110,8 @@
   "jest": {
     "modulePathIgnorePatterns": [
       "/.module-cache/",
-      "/react/build/",
-      "/react/scripts/rollup/shims/"
+      "<rootDir>/build/",
+      "<rootDir>/scripts/rollup/shims/"
     ],
     "rootDir": "",
     "transform": {

From cec9b074024b8f1c897a22f9b12ec9a0301967b3 Mon Sep 17 00:00:00 2001
From: Denis Pismenny <dpismenny@users.noreply.github.com>
Date: Wed, 12 Apr 2017 00:03:53 +0300
Subject: [PATCH 085/153] Fix minor typo in lifting-state-up.md (#9408)

---
 docs/docs/lifting-state-up.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/lifting-state-up.md b/docs/docs/lifting-state-up.md
index 60931231cbc23..17b4406720518 100644
--- a/docs/docs/lifting-state-up.md
+++ b/docs/docs/lifting-state-up.md
@@ -302,7 +302,7 @@ Let's recap what happens when you edit an input:
 
 * React calls the function specified as `onChange` on the DOM `<input>`. In our case, this is the `handleChange` method in `TemperatureInput` component.
 * The `handleChange` method in the `TemperatureInput` component calls `this.props.onTemperatureChange()` with the new desired value. Its props, including `onTemperatureChange`, were provided by its parent component, the `Calculator`.
-* When it previously rendered, the `Calculator` has specified that `onTemperatureChange` of the Celsius `TemperatureInput` is the `Calculator`'s `handleCelsiusChange` method, and `onTemperatureChange` of the Fahrenheit `TemperatureInput` is the `Calculator`'s `handleFahrehnheitChange` method. So either of these two `Calculator` methods gets called depending on which input we edited.
+* When it previously rendered, the `Calculator` has specified that `onTemperatureChange` of the Celsius `TemperatureInput` is the `Calculator`'s `handleCelsiusChange` method, and `onTemperatureChange` of the Fahrenheit `TemperatureInput` is the `Calculator`'s `handleFahrenheitChange` method. So either of these two `Calculator` methods gets called depending on which input we edited.
 * Inside these methods, the `Calculator` component asks React to re-render itself by calling `this.setState()` with the new input value and the current scale of the input we just edited.
 * React calls the `Calculator` component's `render` method to learn what the UI should look like. The values of both inputs are recomputed based on the current temperature and the active scale. The temperature conversion is performed here.
 * React calls the `render` methods of the individual `TemperatureInput` components with their new props specified by the `Calculator`. It learns what their UI should look like.

From aa1f8687d7c93a00c07d63237bcd54b23b4f50af Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 11 Apr 2017 22:02:43 +0100
Subject: [PATCH 086/153] Use caret range in blog instructions

The release was a bit broken.
---
 docs/_posts/2017-04-07-react-v15.5.0.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/_posts/2017-04-07-react-v15.5.0.md b/docs/_posts/2017-04-07-react-v15.5.0.md
index 050c304442c4d..7c38475c1a483 100644
--- a/docs/_posts/2017-04-07-react-v15.5.0.md
+++ b/docs/_posts/2017-04-07-react-v15.5.0.md
@@ -164,13 +164,13 @@ We recommend using [Yarn](https://yarnpkg.com/) or [npm](https://www.npmjs.com/)
 To install React with Yarn, run:
 
 ```bash
-yarn add react@15.5.0 react-dom@15.5.0
+yarn add react@^15.5.0 react-dom@^15.5.0
 ```
 
 To install React with npm, run:
 
 ```bash
-npm install --save react@15.5.0 react-dom@15.5.0
+npm install --save react@^15.5.0 react-dom@^15.5.0
 ```
 
 We recommend using a bundler like [webpack](https://webpack.js.org/) or [Browserify](http://browserify.org/) so you can write modular code and bundle it together into small packages to optimize load time.

From 2beec2f308e27dbe902a8d68e1fc9f3d70ee9372 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Tue, 11 Apr 2017 14:28:03 -0700
Subject: [PATCH 087/153] createClass + PropTypes + checkPropTypes warnings
 (#9399)

(Temporarily) re-adds getters with deprecation warnings for React.PropTypes, React.checkPropTypes, and React.createClass.

* 08bd020: Replace all references to React.PropTypes with prop-types to avoid triggering our own warning message.
* ef5b5c6: Removed several references to React.createClass that appeared after rebasing this branch. (reviewed by @flarnie)
* 524ce20: Added getters for createClass and PropTypes to the main React isomorphic object, behind one-time warning messages. (reviewed by @spicyj)
* db48f54: Fixed Rollup bundles to inline 'prop-types' and 'create-react-class' for UMD builds only. (reviewed by @spicyj, @trueadm )
* cf49cfd: Updated tests-passing.txt to remove tests that were deleted in this branch.
* d34109a: Responses to PR feedback from @spicyj. (Added package.json dependencies to packages/react and packages/react-dom. Renamed a var. Expanded on an inline comment.)
* 488c8d2: Added warning for moved package to React.checkPropTypes accessor too and updated build script.
* 83bcb29: Wordsmithing for deprecation notices (added fb.me links).
* afdc9d2: Tweaked legacy module inlining to remove order-of-deps constraint
* d1348b9: Removed $FlowFixMe.
* 7dbc3e7: More wordsmithing of deprecation notices based on Dan's feedback.
---
 fixtures/art/VectorWidget.js                  |  36 +-
 fixtures/dom/package.json                     |   1 +
 fixtures/dom/public/index.html                |   1 +
 fixtures/dom/src/components/App.js            |  20 +-
 fixtures/dom/src/components/Fixture.js        |   3 +-
 fixtures/dom/src/components/FixtureSet.js     |   5 +-
 fixtures/dom/src/components/Header.js         |  19 +-
 fixtures/dom/src/components/TestCase.js       |   9 +-
 .../src/components/fixtures/buttons/index.js  |   2 +-
 fixtures/dom/src/components/fixtures/index.js |  46 +-
 .../fixtures/number-inputs/NumberTestCase.js  |  14 +-
 .../fixtures/number-inputs/index.js           | 314 +++++-----
 .../password-inputs/PasswordTestCase.js       |  14 +-
 .../fixtures/password-inputs/index.js         |  44 +-
 .../components/fixtures/range-inputs/index.js |  14 +-
 .../src/components/fixtures/selects/index.js  |  14 +-
 .../components/fixtures/text-inputs/index.js  |  22 +-
 .../components/fixtures/textareas/index.js    |  14 +-
 fixtures/dom/src/components/propTypes.js      |   5 +-
 fixtures/dom/yarn.lock                        |   6 +
 package.json                                  |   3 +-
 packages/react-dom/package.json               |   3 +-
 packages/react/package.json                   |   4 +-
 scripts/fiber/tests-passing.txt               |  15 +-
 scripts/jest/ts-preprocessor.js               |   2 +-
 scripts/rollup/bundles.js                     |  29 +-
 scripts/rollup/modules.js                     |  34 +-
 scripts/rollup/results.json                   | 128 ++--
 src/isomorphic/React.js                       |  44 +-
 src/isomorphic/__tests__/React-test.js        |  40 +-
 .../__tests__/ReactContextValidator-test.js   |  42 +-
 .../create-react-class-integration-test.js    |  16 +-
 src/isomorphic/classic/class/createClass.js   |  19 +
 .../__tests__/ReactElementClone-test.js       |   8 +-
 .../__tests__/ReactElementValidator-test.js   |  24 +-
 .../classic/types/ReactPropTypes.js           | 547 +-----------------
 .../ReactPropTypesProduction-test.js          | 219 -------
 .../classic/types/checkPropTypes.js           |  82 +--
 src/isomorphic/modern/class/PropTypes.d.ts    |  19 +
 .../ReactCoffeeScriptClass-test.coffee        |  14 +-
 .../class/__tests__/ReactES6Class-test.js     |  14 +-
 .../__tests__/ReactTypeScriptClass-test.ts    |  14 +-
 .../ReactJSXElementValidator-test.js          |   8 +-
 .../__tests__/ReactComponentLifeCycle-test.js |   6 +-
 .../ReactComponentTreeHook-test.native.js     |   4 +-
 .../__tests__/ReactErrorBoundaries-test.js    |   6 +-
 .../__tests__/ReactStatelessComponent-test.js |  14 +-
 .../dom/fiber/__tests__/ReactDOMFiber-test.js |  21 +-
 .../ReactDOMServerIntegration-test.js         |  30 +-
 .../renderSubtreeIntoContainer-test.js        |  33 +-
 .../utils/ReactControlledValuePropTypes.js    |   4 +-
 .../__tests__/ReactNativeEvents-test.js       |   4 +-
 .../shared/fiber/ReactFiberContext.js         |   8 +-
 .../fiber/__tests__/ReactIncremental-test.js  |  34 +-
 .../ReactIncrementalErrorHandling-test.js     |   8 +-
 .../__tests__/ReactIncrementalPerf-test.js    |   4 +-
 .../reconciler/ReactCompositeComponent.js     |   3 +-
 src/test/__tests__/ReactTestUtils-test.js     |   8 +-
 yarn.lock                                     |  13 +-
 59 files changed, 734 insertions(+), 1397 deletions(-)
 create mode 100644 src/isomorphic/classic/class/createClass.js
 delete mode 100644 src/isomorphic/classic/types/__tests__/ReactPropTypesProduction-test.js
 create mode 100644 src/isomorphic/modern/class/PropTypes.d.ts

diff --git a/fixtures/art/VectorWidget.js b/fixtures/art/VectorWidget.js
index dda64bee188db..da5cde9e4be3f 100644
--- a/fixtures/art/VectorWidget.js
+++ b/fixtures/art/VectorWidget.js
@@ -24,13 +24,11 @@ var BASE_VEL = 0.15;
 /**
  * An animated SVG component.
  */
-var VectorWidget = React.createClass({
+class VectorWidget extends React.Component {
   /**
    * Initialize state members.
    */
-  getInitialState: function() {
-    return {degrees: 0, velocity: 0, drag: MOUSE_UP_DRAG};
-  },
+  state = {degrees: 0, velocity: 0, drag: MOUSE_UP_DRAG};
 
   /**
    * When the component is mounted into the document - this is similar to a
@@ -39,40 +37,40 @@ var VectorWidget = React.createClass({
    * method. Binding of `this.onTick` is not needed because all React methods
    * are automatically bound before being mounted.
    */
-  componentDidMount: function() {
+  componentDidMount() {
     this._interval = window.setInterval(this.onTick, 20);
-  },
+  }
 
-  componentWillUnmount: function() {
+  componentWillUnmount() {
     window.clearInterval(this._interval);
-  },
+  }
 
-  onTick: function() {
+  onTick = () => {
     var nextDegrees = this.state.degrees + BASE_VEL + this.state.velocity;
     var nextVelocity = this.state.velocity * this.state.drag;
     this.setState({degrees: nextDegrees, velocity: nextVelocity});
-  },
+  };
 
   /**
    * When mousing down, we increase the friction down the velocity.
    */
-  handleMouseDown: function() {
+  handleMouseDown = () => {
     this.setState({drag: MOUSE_DOWN_DRAG});
-  },
+  };
 
   /**
    * Cause the rotation to "spring".
    */
-  handleMouseUp: function() {
+  handleMouseUp = () => {
     var nextVelocity = Math.min(this.state.velocity + CLICK_ACCEL, MAX_VEL);
     this.setState({velocity: nextVelocity, drag: MOUSE_UP_DRAG});
-  },
+  };
 
   /**
    * This is the "main" method for any component. The React API allows you to
    * describe the structure of your UI component at *any* point in time.
    */
-  render: function() {
+  render() {
     return (
       <Surface
         width={700}
@@ -81,12 +79,12 @@ var VectorWidget = React.createClass({
         {this.renderGraphic(this.state.degrees)}
       </Surface>
     );
-  },
+  }
 
   /**
    * Better SVG support for React coming soon.
    */
-  renderGraphic: function(rotation) {
+  renderGraphic = (rotation) => {
 
     return (
       <Group
@@ -112,8 +110,8 @@ var VectorWidget = React.createClass({
         </Group>
       </Group>
     );
-  }
-});
+  };
+}
 
 var BORDER_PATH = "M3.00191459,4 C1.34400294,4 0,5.34785514 0,7.00550479 L0,220.994495 C0,222.65439 1.34239483,224 3.00191459,224 L276.998085,224 C278.655997,224 280,222.652145 280,220.994495 L280,7.00550479 C280,5.34561033 278.657605,4 276.998085,4 L3.00191459,4 Z M3.00191459,4";
 var BG_PATH = "M3.00191459,1 C1.34400294,1 0,2.34785514 0,4.00550479 L0,217.994495 C0,219.65439 1.34239483,221 3.00191459,221 L276.998085,221 C278.655997,221 280,219.652145 280,217.994495 L280,4.00550479 C280,2.34561033 278.657605,1 276.998085,1 L3.00191459,1 Z M3.00191459,1";
diff --git a/fixtures/dom/package.json b/fixtures/dom/package.json
index 07a70c4dc1d74..214de66fb73a6 100644
--- a/fixtures/dom/package.json
+++ b/fixtures/dom/package.json
@@ -8,6 +8,7 @@
   "dependencies": {
     "classnames": "^2.2.5",
     "query-string": "^4.2.3",
+    "prop-types": "^15.5.6",
     "react": "^15.4.1",
     "react-dom": "^15.4.1",
     "semver": "^5.3.0"
diff --git a/fixtures/dom/public/index.html b/fixtures/dom/public/index.html
index a131a92882520..ed1922517a1b9 100644
--- a/fixtures/dom/public/index.html
+++ b/fixtures/dom/public/index.html
@@ -14,6 +14,7 @@
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
     <title>React App</title>
+    <script src="https://unpkg.com/prop-types@15.5.6/prop-types.js"></script>
     <script src="react-loader.js"></script>
   </head>
   <body>
diff --git a/fixtures/dom/src/components/App.js b/fixtures/dom/src/components/App.js
index 92550c638cff9..a22b1d918c4f6 100644
--- a/fixtures/dom/src/components/App.js
+++ b/fixtures/dom/src/components/App.js
@@ -4,17 +4,15 @@ import Fixtures from './fixtures';
 
 import '../style.css';
 
-const App = React.createClass({
-  render() {
-    return (
-      <div>
-        <Header />
-        <div className="container" >
-          <Fixtures />
-        </div>
+function App () {
+  return (
+    <div>
+      <Header />
+      <div className="container" >
+        <Fixtures />
       </div>
-    );
-  },
-});
+    </div>
+  );
+}
 
 export default App;
diff --git a/fixtures/dom/src/components/Fixture.js b/fixtures/dom/src/components/Fixture.js
index 1f6ef9ba09997..6074fa7d44c4e 100644
--- a/fixtures/dom/src/components/Fixture.js
+++ b/fixtures/dom/src/components/Fixture.js
@@ -1,7 +1,8 @@
+const PropTypes = window.PropTypes;
 const React = window.React;
 
 const propTypes = {
-  children: React.PropTypes.node.isRequired,
+  children: PropTypes.node.isRequired,
 };
 
 class Fixture extends React.Component {
diff --git a/fixtures/dom/src/components/FixtureSet.js b/fixtures/dom/src/components/FixtureSet.js
index 9c6e8581eba4b..ff98b2884c1bb 100644
--- a/fixtures/dom/src/components/FixtureSet.js
+++ b/fixtures/dom/src/components/FixtureSet.js
@@ -1,8 +1,9 @@
 import React from 'react';
+import PropTypes from 'prop-types';
 
 const propTypes = {
-  title: React.PropTypes.node.isRequired,
-  description: React.PropTypes.node.isRequired,
+  title: PropTypes.node.isRequired,
+  description: PropTypes.node.isRequired,
 };
 
 class FixtureSet extends React.Component {
diff --git a/fixtures/dom/src/components/Header.js b/fixtures/dom/src/components/Header.js
index d9732165c4248..6d1b32599fa8a 100644
--- a/fixtures/dom/src/components/Header.js
+++ b/fixtures/dom/src/components/Header.js
@@ -2,13 +2,14 @@ import { parse, stringify } from 'query-string';
 import getVersionTags from '../tags';
 const React = window.React;
 
-const Header = React.createClass({
-  getInitialState() {
+class Header extends React.Component {
+  constructor(props, context) {
+    super(props, context);
     const query = parse(window.location.search);
     const version = query.version || 'local';
     const versions = [version];
-    return { version, versions };
-  },
+    this.state = { version, versions };
+  }
   componentWillMount() {
     getVersionTags()
       .then(tags => {
@@ -16,7 +17,7 @@ const Header = React.createClass({
         versions = [`local`, ...versions];
         this.setState({ versions });
       })
-  },
+  }
   handleVersionChange(event) {
     const query = parse(window.location.search);
     query.version = event.target.value;
@@ -24,10 +25,10 @@ const Header = React.createClass({
       delete query.version;
     }
     window.location.search = stringify(query);
-  },
+  }
   handleFixtureChange(event) {
     window.location.pathname = event.target.value;
-  },
+  }
   render() {
     return (
     <header className="header">
@@ -66,7 +67,7 @@ const Header = React.createClass({
       </div>
     </header>
     );
-  },
-});
+  }
+}
 
 export default Header;
diff --git a/fixtures/dom/src/components/TestCase.js b/fixtures/dom/src/components/TestCase.js
index 79c46a975afbc..053eac9467884 100644
--- a/fixtures/dom/src/components/TestCase.js
+++ b/fixtures/dom/src/components/TestCase.js
@@ -1,14 +1,15 @@
 import cn from 'classnames';
 import semver from 'semver';
 import React from 'react';
+import PropTypes from 'prop-types';
 import { parse } from 'query-string';
-import { semverString } from './propTypes'
+import { semverString } from './propTypes';
 
 const propTypes = {
-  children: React.PropTypes.node.isRequired,
-  title: React.PropTypes.node.isRequired,
+  children: PropTypes.node.isRequired,
+  title: PropTypes.node.isRequired,
   resolvedIn: semverString,
-  resolvedBy: React.PropTypes.string
+  resolvedBy: PropTypes.string
 };
 
 class TestCase extends React.Component {
diff --git a/fixtures/dom/src/components/fixtures/buttons/index.js b/fixtures/dom/src/components/fixtures/buttons/index.js
index 4991f4e4d8c6b..e7182280d637b 100644
--- a/fixtures/dom/src/components/fixtures/buttons/index.js
+++ b/fixtures/dom/src/components/fixtures/buttons/index.js
@@ -10,7 +10,7 @@ function onButtonClick() {
 export default class ButtonTestCases extends React.Component {
   render() {
     return (
-      <FixtureSet title="Buttons">
+      <FixtureSet title="Buttons" description="">
         <TestCase
           title="onClick with disabled buttons"
           description="The onClick event handler should not be invoked when clicking on a disabled buyaton">
diff --git a/fixtures/dom/src/components/fixtures/index.js b/fixtures/dom/src/components/fixtures/index.js
index adc5a3d16208e..27be0fe24f284 100644
--- a/fixtures/dom/src/components/fixtures/index.js
+++ b/fixtures/dom/src/components/fixtures/index.js
@@ -12,29 +12,27 @@ import ButtonFixtures from './buttons';
  * A simple routing component that renders the appropriate
  * fixture based on the location pathname.
  */
-const FixturesPage = React.createClass({
-  render() {
-    switch (window.location.pathname) {
-      case '/text-inputs':
-        return <TextInputFixtures />;
-      case '/range-inputs':
-        return <RangeInputFixtures />;
-      case '/selects':
-        return <SelectFixtures />;
-      case '/textareas':
-        return <TextAreaFixtures />;
-      case '/input-change-events':
-        return <InputChangeEvents />;
-      case '/number-inputs':
-        return <NumberInputFixtures />;
-      case '/password-inputs':
-        return <PasswordInputFixtures />;
-      case '/buttons':
-        return <ButtonFixtures />
-      default:
-        return <p>Please select a test fixture.</p>;
-    }
-  },
-});
+function FixturesPage() {
+  switch (window.location.pathname) {
+    case '/text-inputs':
+      return <TextInputFixtures />;
+    case '/range-inputs':
+      return <RangeInputFixtures />;
+    case '/selects':
+      return <SelectFixtures />;
+    case '/textareas':
+      return <TextAreaFixtures />;
+    case '/input-change-events':
+      return <InputChangeEvents />;
+    case '/number-inputs':
+      return <NumberInputFixtures />;
+    case '/password-inputs':
+      return <PasswordInputFixtures />;
+    case '/buttons':
+      return <ButtonFixtures />
+    default:
+      return <p>Please select a test fixture.</p>;
+  }
+}
 
 module.exports = FixturesPage;
diff --git a/fixtures/dom/src/components/fixtures/number-inputs/NumberTestCase.js b/fixtures/dom/src/components/fixtures/number-inputs/NumberTestCase.js
index 2c072d478ebe4..1a3025c49323b 100644
--- a/fixtures/dom/src/components/fixtures/number-inputs/NumberTestCase.js
+++ b/fixtures/dom/src/components/fixtures/number-inputs/NumberTestCase.js
@@ -2,16 +2,14 @@ const React = window.React;
 
 import Fixture from '../../Fixture';
 
-const NumberTestCase = React.createClass({
-  getInitialState() {
-    return { value: '' };
-  },
-  onChange(event) {
+class NumberTestCase extends React.Component {
+  state = { value: '' };
+  onChange = (event) => {
     const parsed = parseFloat(event.target.value, 10)
     const value = isNaN(parsed) ? '' : parsed
 
     this.setState({ value })
-  },
+  }
   render() {
     return (
       <Fixture>
@@ -31,7 +29,7 @@ const NumberTestCase = React.createClass({
         </div>
       </Fixture>
     );
-  },
-});
+  }
+}
 
 export default NumberTestCase;
diff --git a/fixtures/dom/src/components/fixtures/number-inputs/index.js b/fixtures/dom/src/components/fixtures/number-inputs/index.js
index 2c88c333edeb3..7900bd8594345 100644
--- a/fixtures/dom/src/components/fixtures/number-inputs/index.js
+++ b/fixtures/dom/src/components/fixtures/number-inputs/index.js
@@ -4,164 +4,162 @@ import FixtureSet from '../../FixtureSet';
 import TestCase from '../../TestCase';
 import NumberTestCase from './NumberTestCase';
 
-const NumberInputs = React.createClass({
-  render() {
-    return (
-      <FixtureSet
-          title="Number inputs"
-          description="Number inputs inconsistently assign and report the value
-                       property depending on the browser."
+function NumberInputs() {
+  return (
+    <FixtureSet
+        title="Number inputs"
+        description="Number inputs inconsistently assign and report the value
+                     property depending on the browser."
+    >
+      <TestCase
+          title="Backspacing"
+          description="The decimal place should not be lost"
       >
-        <TestCase
-            title="Backspacing"
-            description="The decimal place should not be lost"
-        >
-          <TestCase.Steps>
-            <li>Type "3.1"</li>
-            <li>Press backspace, eliminating the "1"</li>
-          </TestCase.Steps>
-
-          <TestCase.ExpectedResult>
-            The field should read "3.", preserving the decimal place
-          </TestCase.ExpectedResult>
-
-          <NumberTestCase />
-
-          <p className="footnote">
-            <b>Notes:</b> Chrome and Safari clear trailing
-            decimals on blur. React makes this concession so that the
-            value attribute remains in sync with the value property.
-          </p>
-        </TestCase>
-
-        <TestCase
-            title="Decimal precision"
-            description="Supports decimal precision greater than 2 places"
-        >
-          <TestCase.Steps>
-            <li>Type "0.01"</li>
-          </TestCase.Steps>
-
-          <TestCase.ExpectedResult>
-            The field should read "0.01"
-          </TestCase.ExpectedResult>
-
-          <NumberTestCase />
-        </TestCase>
-
-        <TestCase
-            title="Exponent form"
-            description="Supports exponent form ('2e4')"
-        >
-          <TestCase.Steps>
-            <li>Type "2e"</li>
-            <li>Type 4, to read "2e4"</li>
-          </TestCase.Steps>
-
-          <TestCase.ExpectedResult>
-            The field should read "2e4". The parsed value should read "20000"
-          </TestCase.ExpectedResult>
-
-          <NumberTestCase />
-        </TestCase>
-
-        <TestCase
-            title="Exponent Form"
-            description="Pressing 'e' at the end"
-        >
-          <TestCase.Steps>
-            <li>Type "3.14"</li>
-            <li>Press "e", so that the input reads "3.14e"</li>
-          </TestCase.Steps>
-
-          <TestCase.ExpectedResult>
-            The field should read "3.14e", the parsed value should be empty
-          </TestCase.ExpectedResult>
-
-          <NumberTestCase />
-        </TestCase>
-
-        <TestCase
-            title="Exponent Form"
-            description="Supports pressing 'ee' in the middle of a number"
-        >
-          <TestCase.Steps>
-            <li>Type "3.14"</li>
-            <li>Move the text cursor to after the decimal place</li>
-            <li>Press "e" twice, so that the value reads "3.ee14"</li>
-          </TestCase.Steps>
-
-          <TestCase.ExpectedResult>
-            The field should read "3.ee14"
-          </TestCase.ExpectedResult>
-
-          <NumberTestCase />
-        </TestCase>
-
-        <TestCase
-            title="Trailing Zeroes"
-            description="Typing '3.0' preserves the trailing zero"
-        >
-          <TestCase.Steps>
-            <li>Type "3.0"</li>
-          </TestCase.Steps>
-
-          <TestCase.ExpectedResult>
-            The field should read "3.0"
-          </TestCase.ExpectedResult>
-
-          <NumberTestCase />
-        </TestCase>
-
-        <TestCase
-            title="Inserting decimals precision"
-            description="Inserting '.' in to '300' maintains the trailing zeroes"
-        >
-          <TestCase.Steps>
-            <li>Type "300"</li>
-            <li>Move the cursor to after the "3"</li>
-            <li>Type "."</li>
-          </TestCase.Steps>
-
-          <TestCase.ExpectedResult>
-            The field should read "3.00", not "3"
-          </TestCase.ExpectedResult>
-          <NumberTestCase />
-        </TestCase>
-
-        <TestCase
-            title="Replacing numbers with -"
-            description="Replacing a number with the '-' sign should not clear the value"
-        >
-          <TestCase.Steps>
-            <li>Type "3"</li>
-            <li>Select the entire value"</li>
-            <li>Type '-' to replace '3' with '-'</li>
-          </TestCase.Steps>
-
-          <TestCase.ExpectedResult>
-            The field should read "-", not be blank.
-          </TestCase.ExpectedResult>
-          <NumberTestCase />
-        </TestCase>
-
-        <TestCase
-            title="Negative numbers"
-            description="Typing minus when inserting a negative number should work"
-        >
-          <TestCase.Steps>
-            <li>Type "-"</li>
-            <li>Type '3'</li>
-          </TestCase.Steps>
-
-          <TestCase.ExpectedResult>
-            The field should read "-3".
-          </TestCase.ExpectedResult>
-          <NumberTestCase />
-        </TestCase>
-      </FixtureSet>
-    );
-  },
-});
+        <TestCase.Steps>
+          <li>Type "3.1"</li>
+          <li>Press backspace, eliminating the "1"</li>
+        </TestCase.Steps>
+
+        <TestCase.ExpectedResult>
+          The field should read "3.", preserving the decimal place
+        </TestCase.ExpectedResult>
+
+        <NumberTestCase />
+
+        <p className="footnote">
+          <b>Notes:</b> Chrome and Safari clear trailing
+          decimals on blur. React makes this concession so that the
+          value attribute remains in sync with the value property.
+        </p>
+      </TestCase>
+
+      <TestCase
+          title="Decimal precision"
+          description="Supports decimal precision greater than 2 places"
+      >
+        <TestCase.Steps>
+          <li>Type "0.01"</li>
+        </TestCase.Steps>
+
+        <TestCase.ExpectedResult>
+          The field should read "0.01"
+        </TestCase.ExpectedResult>
+
+        <NumberTestCase />
+      </TestCase>
+
+      <TestCase
+          title="Exponent form"
+          description="Supports exponent form ('2e4')"
+      >
+        <TestCase.Steps>
+          <li>Type "2e"</li>
+          <li>Type 4, to read "2e4"</li>
+        </TestCase.Steps>
+
+        <TestCase.ExpectedResult>
+          The field should read "2e4". The parsed value should read "20000"
+        </TestCase.ExpectedResult>
+
+        <NumberTestCase />
+      </TestCase>
+
+      <TestCase
+          title="Exponent Form"
+          description="Pressing 'e' at the end"
+      >
+        <TestCase.Steps>
+          <li>Type "3.14"</li>
+          <li>Press "e", so that the input reads "3.14e"</li>
+        </TestCase.Steps>
+
+        <TestCase.ExpectedResult>
+          The field should read "3.14e", the parsed value should be empty
+        </TestCase.ExpectedResult>
+
+        <NumberTestCase />
+      </TestCase>
+
+      <TestCase
+          title="Exponent Form"
+          description="Supports pressing 'ee' in the middle of a number"
+      >
+        <TestCase.Steps>
+          <li>Type "3.14"</li>
+          <li>Move the text cursor to after the decimal place</li>
+          <li>Press "e" twice, so that the value reads "3.ee14"</li>
+        </TestCase.Steps>
+
+        <TestCase.ExpectedResult>
+          The field should read "3.ee14"
+        </TestCase.ExpectedResult>
+
+        <NumberTestCase />
+      </TestCase>
+
+      <TestCase
+          title="Trailing Zeroes"
+          description="Typing '3.0' preserves the trailing zero"
+      >
+        <TestCase.Steps>
+          <li>Type "3.0"</li>
+        </TestCase.Steps>
+
+        <TestCase.ExpectedResult>
+          The field should read "3.0"
+        </TestCase.ExpectedResult>
+
+        <NumberTestCase />
+      </TestCase>
+
+      <TestCase
+          title="Inserting decimals precision"
+          description="Inserting '.' in to '300' maintains the trailing zeroes"
+      >
+        <TestCase.Steps>
+          <li>Type "300"</li>
+          <li>Move the cursor to after the "3"</li>
+          <li>Type "."</li>
+        </TestCase.Steps>
+
+        <TestCase.ExpectedResult>
+          The field should read "3.00", not "3"
+        </TestCase.ExpectedResult>
+        <NumberTestCase />
+      </TestCase>
+
+      <TestCase
+          title="Replacing numbers with -"
+          description="Replacing a number with the '-' sign should not clear the value"
+      >
+        <TestCase.Steps>
+          <li>Type "3"</li>
+          <li>Select the entire value"</li>
+          <li>Type '-' to replace '3' with '-'</li>
+        </TestCase.Steps>
+
+        <TestCase.ExpectedResult>
+          The field should read "-", not be blank.
+        </TestCase.ExpectedResult>
+        <NumberTestCase />
+      </TestCase>
+
+      <TestCase
+          title="Negative numbers"
+          description="Typing minus when inserting a negative number should work"
+      >
+        <TestCase.Steps>
+          <li>Type "-"</li>
+          <li>Type '3'</li>
+        </TestCase.Steps>
+
+        <TestCase.ExpectedResult>
+          The field should read "-3".
+        </TestCase.ExpectedResult>
+        <NumberTestCase />
+      </TestCase>
+    </FixtureSet>
+  );
+}
 
 export default NumberInputs;
diff --git a/fixtures/dom/src/components/fixtures/password-inputs/PasswordTestCase.js b/fixtures/dom/src/components/fixtures/password-inputs/PasswordTestCase.js
index 76f511776369d..085ff760b646b 100644
--- a/fixtures/dom/src/components/fixtures/password-inputs/PasswordTestCase.js
+++ b/fixtures/dom/src/components/fixtures/password-inputs/PasswordTestCase.js
@@ -2,13 +2,11 @@ const React = window.React;
 
 import Fixture from '../../Fixture';
 
-const PasswordTestCase = React.createClass({
-  getInitialState() {
-    return { value: '' };
-  },
-  onChange(event) {
+class PasswordTestCase extends React.Component {
+  state = { value: '' };
+  onChange = (event) => {
     this.setState({ value: event.target.value })
-  },
+  }
   render() {
     return (
       <Fixture>
@@ -28,7 +26,7 @@ const PasswordTestCase = React.createClass({
         </div>
       </Fixture>
     );
-  },
-});
+  }
+}
 
 export default PasswordTestCase;
diff --git a/fixtures/dom/src/components/fixtures/password-inputs/index.js b/fixtures/dom/src/components/fixtures/password-inputs/index.js
index 7c4094534bdad..bec39919781bf 100644
--- a/fixtures/dom/src/components/fixtures/password-inputs/index.js
+++ b/fixtures/dom/src/components/fixtures/password-inputs/index.js
@@ -4,30 +4,28 @@ import FixtureSet from '../../FixtureSet';
 import TestCase from '../../TestCase';
 import PasswordTestCase from './PasswordTestCase'
 
-const NumberInputs = React.createClass({
-  render() {
-    return (
-      <FixtureSet title="Password inputs" description="">
-        <TestCase
-          title="The show password icon"
-          description={`
-            Some browsers have an unmask password icon that React accidentally
-            prevents the display of.
-          `}
-          affectedBrowsers="IE Edge, IE 11">
-          <TestCase.Steps>
-            <li>Type any string (not an actual password</li>
-          </TestCase.Steps>
+function NumberInputs() {
+  return (
+    <FixtureSet title="Password inputs" description="">
+      <TestCase
+        title="The show password icon"
+        description={`
+          Some browsers have an unmask password icon that React accidentally
+          prevents the display of.
+        `}
+        affectedBrowsers="IE Edge, IE 11">
+        <TestCase.Steps>
+          <li>Type any string (not an actual password</li>
+        </TestCase.Steps>
 
-          <TestCase.ExpectedResult>
-            The field should include the "unmasking password" icon.
-          </TestCase.ExpectedResult>
+        <TestCase.ExpectedResult>
+          The field should include the "unmasking password" icon.
+        </TestCase.ExpectedResult>
 
-          <PasswordTestCase />
-        </TestCase>
-      </FixtureSet>
-    );
-  },
-});
+        <PasswordTestCase />
+      </TestCase>
+    </FixtureSet>
+  );
+}
 
 export default NumberInputs;
diff --git a/fixtures/dom/src/components/fixtures/range-inputs/index.js b/fixtures/dom/src/components/fixtures/range-inputs/index.js
index e3be8ad2ce546..bea61f453e15b 100644
--- a/fixtures/dom/src/components/fixtures/range-inputs/index.js
+++ b/fixtures/dom/src/components/fixtures/range-inputs/index.js
@@ -1,12 +1,10 @@
 const React = window.React;
 
-const RangeInputs = React.createClass({
-  getInitialState() {
-    return { value: 0.5 };
-  },
-  onChange(event) {
+class RangeInputs extends React.Component {
+  state = { value: 0.5 };
+  onChange = (event) => {
     this.setState({ value: event.target.value });
-  },
+  }
   render() {
     return (
       <form>
@@ -22,7 +20,7 @@ const RangeInputs = React.createClass({
         </fieldset>
       </form>
     );
-  },
-});
+  }
+}
 
 export default RangeInputs;
diff --git a/fixtures/dom/src/components/fixtures/selects/index.js b/fixtures/dom/src/components/fixtures/selects/index.js
index c991da7ce381f..a520e40c3b92f 100644
--- a/fixtures/dom/src/components/fixtures/selects/index.js
+++ b/fixtures/dom/src/components/fixtures/selects/index.js
@@ -1,12 +1,10 @@
 const React = window.React;
 
-const SelectFixture = React.createClass({
-  getInitialState() {
-    return { value: '' };
-  },
-  onChange(event) {
+class SelectFixture extends React.Component {
+  state = { value: '' };
+  onChange = (event) => {
     this.setState({ value: event.target.value });
-  },
+  }
   render() {
     return (
       <form>
@@ -31,7 +29,7 @@ const SelectFixture = React.createClass({
         </fieldset>
       </form>
     );
-  },
-});
+  }
+}
 
 export default SelectFixture;
diff --git a/fixtures/dom/src/components/fixtures/text-inputs/index.js b/fixtures/dom/src/components/fixtures/text-inputs/index.js
index 2db132bcb1032..a1683672ce66b 100644
--- a/fixtures/dom/src/components/fixtures/text-inputs/index.js
+++ b/fixtures/dom/src/components/fixtures/text-inputs/index.js
@@ -1,13 +1,11 @@
 const React = window.React;
 
-const TextInputFixtures = React.createClass({
-  getInitialState() {
-    return {
-      color: '#ffaaee',
-    };
-  },
+class TextInputFixtures extends React.Component {
+  state = {
+    color: '#ffaaee',
+  };
 
-  renderControlled(type) {
+  renderControlled = (type) => {
     let id = `controlled_${type}`;
 
     let onChange = e => {
@@ -29,9 +27,9 @@ const TextInputFixtures = React.createClass({
         &nbsp; &rarr; {JSON.stringify(state)}
       </div>
     );
-  },
+  }
 
-  renderUncontrolled(type) {
+  renderUncontrolled = (type) => {
     let id = `uncontrolled_${type}`;
     return (
       <div key={type} className="field">
@@ -39,7 +37,7 @@ const TextInputFixtures = React.createClass({
         <input id={id} type={type} />
       </div>
     );
-  },
+  }
 
   render() {
     // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input
@@ -60,7 +58,7 @@ const TextInputFixtures = React.createClass({
         </fieldset>
       </form>
     );
-  },
-});
+  }
+}
 
 module.exports = TextInputFixtures;
diff --git a/fixtures/dom/src/components/fixtures/textareas/index.js b/fixtures/dom/src/components/fixtures/textareas/index.js
index e39b2e2abf7f7..e2508f32b52c5 100644
--- a/fixtures/dom/src/components/fixtures/textareas/index.js
+++ b/fixtures/dom/src/components/fixtures/textareas/index.js
@@ -1,12 +1,10 @@
 const React = window.React;
 
-const TextAreaFixtures = React.createClass({
-  getInitialState() {
-    return { value: '' };
-  },
-  onChange(event) {
+class TextAreaFixtures extends React.Component {
+  state = { value: '' };
+  onChange = (event) => {
     this.setState({ value: event.target.value });
-  },
+  }
   render() {
     return (
       <div>
@@ -30,7 +28,7 @@ const TextAreaFixtures = React.createClass({
         </div>
       </div>
     );
-  },
-});
+  }
+}
 
 module.exports = TextAreaFixtures;
diff --git a/fixtures/dom/src/components/propTypes.js b/fixtures/dom/src/components/propTypes.js
index 42f4f4cf3ae27..dfb80d0a99b81 100644
--- a/fixtures/dom/src/components/propTypes.js
+++ b/fixtures/dom/src/components/propTypes.js
@@ -1,11 +1,10 @@
+import PropTypes from 'prop-types';
 import semver from 'semver';
 
-const React = window.React;
-
 export function semverString (props, propName, componentName) {
   let version = props[propName];
 
-  let error = React.PropTypes.string(...arguments);
+  let error = PropTypes.string(...arguments);
   if (!error && version != null && !semver.valid(version))
     error = new Error(
       `\`${propName}\` should be a valid "semantic version" matching ` +
diff --git a/fixtures/dom/yarn.lock b/fixtures/dom/yarn.lock
index e45c4a70540d7..762b52cfc093b 100644
--- a/fixtures/dom/yarn.lock
+++ b/fixtures/dom/yarn.lock
@@ -4239,6 +4239,12 @@ promise@7.1.1, promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
+prop-types@^15.5.6:
+  version "15.5.6"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.6.tgz#797a915b1714b645ebb7c5d6cc690346205bd2aa"
+  dependencies:
+    fbjs "^0.8.9"
+
 proxy-addr@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-1.1.2.tgz#b4cc5f22610d9535824c123aef9d3cf73c40ba37"
diff --git a/package.json b/package.json
index c8cf86911ae0a..c8c55229203dc 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
     "coffee-script": "^1.8.0",
     "core-js": "^2.2.1",
     "coveralls": "^2.11.6",
-    "create-react-class": "^15.5.0",
+    "create-react-class": "^15.5.2",
     "del": "^2.0.2",
     "derequire": "^2.0.3",
     "escape-string-regexp": "^1.0.5",
@@ -73,6 +73,7 @@
     "object-assign": "^4.1.1",
     "platform": "^1.1.0",
     "prettier": "^0.22.0",
+    "prop-types": "^15.5.6",
     "rimraf": "^2.6.1",
     "rollup": "^0.41.6",
     "rollup-plugin-alias": "^1.2.1",
diff --git a/packages/react-dom/package.json b/packages/react-dom/package.json
index a4a7f48e9a93e..0dae9585dfe72 100644
--- a/packages/react-dom/package.json
+++ b/packages/react-dom/package.json
@@ -15,7 +15,8 @@
   "dependencies": {
     "fbjs": "^0.8.9",
     "loose-envify": "^1.1.0",
-    "object-assign": "^4.1.0"
+    "object-assign": "^4.1.0",
+    "prop-types": "^15.5.6"
   },
   "peerDependencies": {
     "react": "^16.0.0-alpha.8"
diff --git a/packages/react/package.json b/packages/react/package.json
index 1fc717340ef0f..134466884dc89 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -22,9 +22,11 @@
     "node": ">=0.10.0"
   },
   "dependencies": {
+    "create-react-class": "^15.5.2",
     "fbjs": "^0.8.9",
     "loose-envify": "^1.1.0",
-    "object-assign": "^4.1.0"
+    "object-assign": "^4.1.0",
+    "prop-types": "^15.5.6"
   },
   "browserify": {
     "transform": [
diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index 89dc4c89febb1..485f3921f4f45 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -45,6 +45,8 @@ scripts/shared/__tests__/evalToString-test.js
 src/isomorphic/__tests__/React-test.js
 * should log a deprecation warning once when using React.createMixin
 * should warn once when attempting to access React.createClass
+* should warn once when attempting to access React.PropTypes
+* should warn once when attempting to access React.checkPropTypes
 
 src/isomorphic/children/__tests__/ReactChildren-test.js
 * should support identity for simple
@@ -278,19 +280,6 @@ src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
 * should have received the validator's return value
 * should not warn if the validator returned null
 
-src/isomorphic/classic/types/__tests__/ReactPropTypesProduction-test.js
-* should be a no-op
-* should be a no-op
-* should be a no-op
-* should be a no-op
-* should be a no-op
-* should be a no-op
-* should be a no-op
-* should be a no-op
-* should be a no-op
-* should be a no-op
-* should not have been called
-
 src/isomorphic/modern/class/__tests__/ReactClassEquivalence-test.js
 * tests the same thing for es6 classes and CoffeeScript
 * tests the same thing for es6 classes and TypeScript
diff --git a/scripts/jest/ts-preprocessor.js b/scripts/jest/ts-preprocessor.js
index b4fe74552c40f..29ad307a9a392 100644
--- a/scripts/jest/ts-preprocessor.js
+++ b/scripts/jest/ts-preprocessor.js
@@ -23,7 +23,7 @@ function compile(content, contentFilename) {
     getSourceFile(filename, languageVersion) {
       var source;
       var jestRegex = /jest\.d\.ts/;
-      var reactRegex = /(?:React|ReactDOM)(?:\.d)?\.ts$/;
+      var reactRegex = /(?:React|ReactDOM|PropTypes)(?:\.d)?\.ts$/;
 
       // `path.normalize` is used to turn forward slashes in
       // the file path into backslashes on Windows.
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index 69b04f0b73d0f..cc33df8d123e8 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -45,7 +45,12 @@ const bundles = [
       sourceMap: false,
     },
     entry: 'src/isomorphic/React.js',
-    externals: [],
+    externals: [
+      'create-react-class/factory',
+      'prop-types',
+      'prop-types/checkPropTypes',
+      'prop-types/factory',
+    ],
     fbEntry: 'src/fb/ReactFBEntry.js',
     hasteName: 'React',
     isRenderer: false,
@@ -74,7 +79,7 @@ const bundles = [
       sourceMap: false,
     },
     entry: 'src/renderers/dom/ReactDOM.js',
-    externals: [],
+    externals: ['prop-types', 'prop-types/checkPropTypes'],
     fbEntry: 'src/fb/ReactDOMFBEntry.js',
     hasteName: 'ReactDOMStack',
     isRenderer: true,
@@ -86,6 +91,7 @@ const bundles = [
       'src/renderers/shared/**/*.js',
       'src/test/**/*.js', // ReactTestUtils is currently very coupled to DOM.
 
+      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
@@ -102,7 +108,7 @@ const bundles = [
       sourceMap: false,
     },
     entry: 'src/renderers/dom/fiber/ReactDOMFiber.js',
-    externals: [],
+    externals: ['prop-types', 'prop-types/checkPropTypes'],
     fbEntry: 'src/fb/ReactDOMFiberFBEntry.js',
     hasteName: 'ReactDOMFiber',
     isRenderer: true,
@@ -114,6 +120,7 @@ const bundles = [
       'src/renderers/shared/**/*.js',
       'src/test/**/*.js', // ReactTestUtils is currently very coupled to DOM.
 
+      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
@@ -133,7 +140,7 @@ const bundles = [
       sourceMap: false,
     },
     entry: 'src/renderers/dom/ReactDOMServer.js',
-    externals: [],
+    externals: ['prop-types', 'prop-types/checkPropTypes'],
     fbEntry: 'src/renderers/dom/ReactDOMServer.js',
     hasteName: 'ReactDOMServerStack',
     isRenderer: true,
@@ -144,6 +151,7 @@ const bundles = [
       'src/renderers/dom/**/*.js',
       'src/renderers/shared/**/*.js',
 
+      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
@@ -169,6 +177,7 @@ const bundles = [
       'art/modes/current',
       'art/modes/fast-noSideEffects',
       'art/core/transform',
+      'prop-types/checkPropTypes',
       'react-dom',
     ],
     fbEntry: 'src/renderers/art/ReactARTStack.js',
@@ -181,6 +190,7 @@ const bundles = [
       'src/renderers/art/**/*.js',
       'src/renderers/shared/**/*.js',
 
+      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
@@ -203,6 +213,7 @@ const bundles = [
       'art/modes/current',
       'art/modes/fast-noSideEffects',
       'art/core/transform',
+      'prop-types/checkPropTypes',
       'react-dom',
     ],
     fbEntry: 'src/renderers/art/ReactARTFiber.js',
@@ -215,6 +226,7 @@ const bundles = [
       'src/renderers/art/**/*.js',
       'src/renderers/shared/**/*.js',
 
+      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
@@ -304,7 +316,7 @@ const bundles = [
       sourceMap: false,
     },
     entry: 'src/renderers/testing/ReactTestRendererFiber',
-    externals: [],
+    externals: ['prop-types/checkPropTypes'],
     fbEntry: 'src/renderers/testing/ReactTestRendererFiber',
     hasteName: 'ReactTestRendererFiber',
     isRenderer: true,
@@ -316,6 +328,7 @@ const bundles = [
       'src/renderers/shared/**/*.js',
       'src/renderers/testing/**/*.js',
 
+      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
@@ -330,7 +343,7 @@ const bundles = [
       sourceMap: false,
     },
     entry: 'src/renderers/testing/stack/ReactTestRendererStack',
-    externals: [],
+    externals: ['prop-types/checkPropTypes'],
     fbEntry: 'src/renderers/testing/stack/ReactTestRendererStack',
     hasteName: 'ReactTestRendererStack',
     isRenderer: true,
@@ -342,6 +355,7 @@ const bundles = [
       'src/renderers/shared/**/*.js',
       'src/renderers/testing/**/*.js',
 
+      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
@@ -360,7 +374,7 @@ const bundles = [
       sourceMap: false,
     },
     entry: 'src/renderers/noop/ReactNoop.js',
-    externals: [],
+    externals: ['prop-types/checkPropTypes'],
     isRenderer: true,
     label: 'noop-fiber',
     manglePropertiesOnProd: false,
@@ -369,6 +383,7 @@ const bundles = [
       'src/renderers/noop/**/*.js',
       'src/renderers/shared/**/*.js',
 
+      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
diff --git a/scripts/rollup/modules.js b/scripts/rollup/modules.js
index 801b94e3c4f43..985fe8869087a 100644
--- a/scripts/rollup/modules.js
+++ b/scripts/rollup/modules.js
@@ -52,6 +52,14 @@ const devOnlyFilesToStubOut = [
   "'ReactTestUtils'",
 ];
 
+const legacyModules = [
+  'create-react-class',
+  'create-react-class/factory',
+  'prop-types',
+  'prop-types/checkPropTypes',
+  'prop-types/factory',
+];
+
 // this function builds up a very niave Haste-like moduleMap
 // that works to create up an alias map for modules to link
 // up to their actual disk location so Rollup can properly
@@ -230,6 +238,29 @@ function replaceDevOnlyStubbedModules(bundleType) {
   }
 }
 
+function replaceLegacyModuleAliases(bundleType) {
+  switch (bundleType) {
+    case UMD_DEV:
+    case UMD_PROD:
+      const modulesAlias = {};
+      legacyModules.forEach(legacyModule => {
+        const modulePath = legacyModule.includes('/')
+          ? legacyModule
+          : `${legacyModule}/index`;
+        const resolvedPath = resolve(`./node_modules/${modulePath}`);
+        modulesAlias[`'${legacyModule}'`] = `'${resolvedPath}'`;
+      });
+      return modulesAlias;
+    case NODE_DEV:
+    case NODE_PROD:
+    case FB_DEV:
+    case FB_PROD:
+    case RN_DEV:
+    case RN_PROD:
+      return {};
+  }
+}
+
 function getAliases(paths, bundleType, isRenderer, extractErrors) {
   return Object.assign(
     createModuleMap(
@@ -247,7 +278,8 @@ function getDefaultReplaceModules(bundleType) {
   return Object.assign(
     {},
     replaceFbjsModuleAliases(bundleType),
-    replaceDevOnlyStubbedModules(bundleType)
+    replaceDevOnlyStubbedModules(bundleType),
+    replaceLegacyModuleAliases(bundleType)
   );
 }
 
diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
index 88406fe9dfaaf..d676282dc3bff 100644
--- a/scripts/rollup/results.json
+++ b/scripts/rollup/results.json
@@ -1,117 +1,117 @@
 {
-  "branch": "bundle-fixes",
+  "branch": "prop-types",
   "bundleSizes": {
     "react.development.js (UMD_DEV)": {
-      "size": 116098,
-      "gzip": 29520
+      "size": 121474,
+      "gzip": 30524
     },
     "react.production.min.js (UMD_PROD)": {
-      "size": 13707,
-      "gzip": 5073
+      "size": 15685,
+      "gzip": 5765
     },
     "react-dom.development.js (UMD_DEV)": {
-      "size": 563844,
-      "gzip": 130190
+      "size": 583352,
+      "gzip": 134572
     },
     "react-dom.production.min.js (UMD_PROD)": {
-      "size": 120191,
-      "gzip": 37860
+      "size": 120740,
+      "gzip": 38092
     },
     "react-dom-server.development.js (UMD_DEV)": {
-      "size": 476049,
-      "gzip": 115267
+      "size": 495558,
+      "gzip": 119685
     },
     "react-dom-server.production.min.js (UMD_PROD)": {
-      "size": 106489,
-      "gzip": 33035
+      "size": 107033,
+      "gzip": 33273
     },
     "react-art.development.js (UMD_DEV)": {
-      "size": 339929,
-      "gzip": 76018
+      "size": 342770,
+      "gzip": 76828
     },
     "react-art.production.min.js (UMD_PROD)": {
       "size": 95013,
-      "gzip": 28991
+      "gzip": 28990
     },
     "react.development.js (NODE_DEV)": {
-      "size": 109110,
-      "gzip": 27479
+      "size": 70286,
+      "gzip": 17600
     },
     "react.production.min.js (NODE_PROD)": {
-      "size": 12598,
-      "gzip": 4649
+      "size": 9226,
+      "gzip": 3626
     },
     "React-dev.js (FB_DEV)": {
-      "size": 110875,
-      "gzip": 28140
+      "size": 72143,
+      "gzip": 18236
     },
     "React-prod.js (FB_PROD)": {
-      "size": 56406,
-      "gzip": 14416
+      "size": 36643,
+      "gzip": 9256
     },
     "ReactDOMStack-dev.js (FB_DEV)": {
-      "size": 522626,
-      "gzip": 124708
+      "size": 522763,
+      "gzip": 124727
     },
     "ReactDOMStack-prod.js (FB_PROD)": {
-      "size": 352708,
-      "gzip": 84660
+      "size": 352776,
+      "gzip": 84675
     },
     "react-dom.development.js (NODE_DEV)": {
-      "size": 542218,
-      "gzip": 125162
+      "size": 542350,
+      "gzip": 125199
     },
     "react-dom.production.min.js (NODE_PROD)": {
-      "size": 116858,
-      "gzip": 36717
+      "size": 116925,
+      "gzip": 36732
     },
     "ReactDOMFiber-dev.js (FB_DEV)": {
-      "size": 797268,
-      "gzip": 184134
+      "size": 797397,
+      "gzip": 184161
     },
     "ReactDOMFiber-prod.js (FB_PROD)": {
-      "size": 407540,
-      "gzip": 93567
+      "size": 407613,
+      "gzip": 93586
     },
     "react-dom-server.development.js (NODE_DEV)": {
-      "size": 445452,
-      "gzip": 107574
+      "size": 445589,
+      "gzip": 107597
     },
     "react-dom-server.production.min.js (NODE_PROD)": {
-      "size": 101344,
-      "gzip": 31273
+      "size": 101411,
+      "gzip": 31292
     },
     "ReactDOMServerStack-dev.js (FB_DEV)": {
-      "size": 444144,
-      "gzip": 107423
+      "size": 444281,
+      "gzip": 107443
     },
     "ReactDOMServerStack-prod.js (FB_PROD)": {
-      "size": 333744,
-      "gzip": 80424
+      "size": 334166,
+      "gzip": 80444
     },
     "ReactARTStack-dev.js (FB_DEV)": {
-      "size": 141589,
-      "gzip": 32280
+      "size": 142986,
+      "gzip": 32714
     },
     "ReactARTStack-prod.js (FB_PROD)": {
-      "size": 99762,
-      "gzip": 22576
+      "size": 101143,
+      "gzip": 22993
     },
     "react-art.development.js (NODE_DEV)": {
-      "size": 265123,
-      "gzip": 56951
+      "size": 265214,
+      "gzip": 56974
     },
     "react-art.production.min.js (NODE_PROD)": {
-      "size": 56591,
-      "gzip": 17132
+      "size": 56628,
+      "gzip": 17152
     },
     "ReactARTFiber-dev.js (FB_DEV)": {
-      "size": 264301,
-      "gzip": 56758
+      "size": 264392,
+      "gzip": 56780
     },
     "ReactARTFiber-prod.js (FB_PROD)": {
-      "size": 205292,
-      "gzip": 43132
+      "size": 205336,
+      "gzip": 43154
     },
     "ReactNativeStack.js (RN)": {
       "size": 233993,
@@ -122,20 +122,20 @@
       "gzip": 84001
     },
     "ReactTestRendererFiber-dev.js (FB_DEV)": {
-      "size": 262210,
-      "gzip": 55722
+      "size": 262301,
+      "gzip": 55747
     },
     "ReactTestRendererStack-dev.js (FB_DEV)": {
-      "size": 151425,
-      "gzip": 34728
+      "size": 151521,
+      "gzip": 34765
     },
     "react-noop-renderer.development.js (NODE_DEV)": {
-      "size": 254207,
-      "gzip": 53701
+      "size": 254298,
+      "gzip": 53728
     },
     "react-test-renderer.development.js (NODE_DEV)": {
-      "size": 263041,
-      "gzip": 55919
+      "size": 263132,
+      "gzip": 55938
     }
   }
 }
\ No newline at end of file
diff --git a/src/isomorphic/React.js b/src/isomorphic/React.js
index ccc351225edb8..807a1c369f4f5 100644
--- a/src/isomorphic/React.js
+++ b/src/isomorphic/React.js
@@ -20,6 +20,7 @@ var ReactVersion = require('ReactVersion');
 
 var onlyChild = require('onlyChild');
 var checkPropTypes = require('checkPropTypes');
+var createReactClass = require('createClass');
 
 var createElement = ReactElement.createElement;
 var createFactory = ReactElement.createFactory;
@@ -56,11 +57,13 @@ var React = {
   cloneElement: cloneElement,
   isValidElement: ReactElement.isValidElement,
 
+  // TODO (bvaughn) Remove these getters in 16.0.0-alpha.10
+  PropTypes: ReactPropTypes,
   checkPropTypes: checkPropTypes,
+  createClass: createReactClass,
 
   // Classic
 
-  PropTypes: ReactPropTypes,
   createFactory: createFactory,
   createMixin: createMixin,
 
@@ -82,8 +85,10 @@ if (__DEV__) {
     ReactDebugCurrentFrame: require('ReactDebugCurrentFrame'),
   });
 
+  let warnedForCheckPropTypes = false;
   let warnedForCreateMixin = false;
   let warnedForCreateClass = false;
+  let warnedForPropTypes = false;
 
   React.createMixin = function(mixin) {
     warning(
@@ -95,18 +100,49 @@ if (__DEV__) {
     return mixin;
   };
 
+  // TODO (bvaughn) Remove both of these deprecation warnings in 16.0.0-alpha.10
   if (canDefineProperty) {
+    Object.defineProperty(React, 'checkPropTypes', {
+      get() {
+        warning(
+          warnedForCheckPropTypes,
+          'checkPropTypes has been moved to a separate package. ' +
+            'Accessing React.checkPropTypes is no longer supported ' +
+            'and will be removed completely in React 16. ' +
+            'Use the prop-types package on npm instead. ' +
+            '(https://fb.me/migrating-from-react-proptypes)',
+        );
+        warnedForCheckPropTypes = true;
+        return ReactPropTypes;
+      },
+    });
+
     Object.defineProperty(React, 'createClass', {
       get: function() {
         warning(
           warnedForCreateClass,
           'React.createClass is no longer supported. Use a plain JavaScript ' +
             "class instead. If you're not yet ready to migrate, " +
-            'create-react-class is available on npm as a temporary, ' +
-            'drop-in replacement.',
+            'create-react-class is available on npm as a drop-in replacement. ' +
+            '(https://fb.me/migrating-from-react-create-class)',
         );
         warnedForCreateClass = true;
-        return undefined;
+        return createReactClass;
+      },
+    });
+
+    Object.defineProperty(React, 'PropTypes', {
+      get() {
+        warning(
+          warnedForPropTypes,
+          'PropTypes has been moved to a separate package. ' +
+            'Accessing React.PropTypes is no longer supported ' +
+            'and will be removed completely in React 16. ' +
+            'Use the prop-types package on npm instead. ' +
+            '(https://fb.me/migrating-from-react-proptypes)',
+        );
+        warnedForPropTypes = true;
+        return ReactPropTypes;
       },
     });
   }
diff --git a/src/isomorphic/__tests__/React-test.js b/src/isomorphic/__tests__/React-test.js
index f2ea926dd9a08..bd5d5bc1aaa4b 100644
--- a/src/isomorphic/__tests__/React-test.js
+++ b/src/isomorphic/__tests__/React-test.js
@@ -32,13 +32,43 @@ describe('React', () => {
     spyOn(console, 'error');
     let createClass = React.createClass;
     createClass = React.createClass;
-    expect(createClass).toBe(undefined);
+    expect(createClass).not.toBe(undefined);
     expectDev(console.error.calls.count()).toBe(1);
     expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'React.createClass is no longer supported. Use a plain ' +
-        "JavaScript class instead. If you're not yet ready to migrate, " +
-        'create-react-class is available on npm as a temporary, ' +
-        'drop-in replacement.',
+      'React.createClass is no longer supported. Use a plain JavaScript ' +
+        "class instead. If you're not yet ready to migrate, " +
+        'create-react-class is available on npm as a drop-in replacement. ' +
+        '(https://fb.me/migrating-from-react-create-class)',
+    );
+  });
+
+  it('should warn once when attempting to access React.PropTypes', () => {
+    spyOn(console, 'error');
+    let PropTypes = React.PropTypes;
+    PropTypes = React.PropTypes;
+    expect(PropTypes).not.toBe(undefined);
+    expectDev(console.error.calls.count()).toBe(1);
+    expectDev(console.error.calls.argsFor(0)[0]).toContain(
+      'PropTypes has been moved to a separate package. ' +
+        'Accessing React.PropTypes is no longer supported ' +
+        'and will be removed completely in React 16. ' +
+        'Use the prop-types package on npm instead. ' +
+        '(https://fb.me/migrating-from-react-proptypes)',
+    );
+  });
+
+  it('should warn once when attempting to access React.checkPropTypes', () => {
+    spyOn(console, 'error');
+    let checkPropTypes = React.checkPropTypes;
+    checkPropTypes = React.checkPropTypes;
+    expect(checkPropTypes).not.toBe(undefined);
+    expectDev(console.error.calls.count()).toBe(1);
+    expectDev(console.error.calls.argsFor(0)[0]).toContain(
+      'checkPropTypes has been moved to a separate package. ' +
+        'Accessing React.checkPropTypes is no longer supported ' +
+        'and will be removed completely in React 16. ' +
+        'Use the prop-types package on npm instead. ' +
+        '(https://fb.me/migrating-from-react-proptypes)',
     );
   });
 });
diff --git a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
index 84a220877f8cb..0630f588cc7a2 100644
--- a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
+++ b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
@@ -17,6 +17,7 @@
 
 'use strict';
 
+var PropTypes;
 var React;
 var ReactDOM;
 var ReactTestUtils;
@@ -29,6 +30,7 @@ describe('ReactContextValidator', () => {
   beforeEach(() => {
     jest.resetModules();
 
+    PropTypes = require('prop-types');
     React = require('react');
     ReactDOM = require('react-dom');
     ReactTestUtils = require('ReactTestUtils');
@@ -44,7 +46,7 @@ describe('ReactContextValidator', () => {
       }
     }
     Component.contextTypes = {
-      foo: React.PropTypes.string,
+      foo: PropTypes.string,
     };
 
     class ComponentInFooBarContext extends React.Component {
@@ -60,8 +62,8 @@ describe('ReactContextValidator', () => {
       }
     }
     ComponentInFooBarContext.childContextTypes = {
-      foo: React.PropTypes.string,
-      bar: React.PropTypes.number,
+      foo: PropTypes.string,
+      bar: PropTypes.number,
     };
 
     var instance = ReactTestUtils.renderIntoDocument(
@@ -88,8 +90,8 @@ describe('ReactContextValidator', () => {
       }
     }
     Parent.childContextTypes = {
-      foo: React.PropTypes.string.isRequired,
-      bar: React.PropTypes.string.isRequired,
+      foo: PropTypes.string.isRequired,
+      bar: PropTypes.string.isRequired,
     };
 
     class Component extends React.Component {
@@ -112,7 +114,7 @@ describe('ReactContextValidator', () => {
       }
     }
     Component.contextTypes = {
-      foo: React.PropTypes.string,
+      foo: PropTypes.string,
     };
 
     var container = document.createElement('div');
@@ -139,8 +141,8 @@ describe('ReactContextValidator', () => {
       }
     }
     Parent.childContextTypes = {
-      foo: React.PropTypes.string.isRequired,
-      bar: React.PropTypes.string.isRequired,
+      foo: PropTypes.string.isRequired,
+      bar: PropTypes.string.isRequired,
     };
 
     class Component extends React.Component {
@@ -153,7 +155,7 @@ describe('ReactContextValidator', () => {
       }
     }
     Component.contextTypes = {
-      foo: React.PropTypes.string,
+      foo: PropTypes.string,
     };
 
     var container = document.createElement('div');
@@ -171,7 +173,7 @@ describe('ReactContextValidator', () => {
       }
     }
     Component.contextTypes = {
-      foo: React.PropTypes.string.isRequired,
+      foo: PropTypes.string.isRequired,
     };
 
     ReactTestUtils.renderIntoDocument(<Component />);
@@ -196,7 +198,7 @@ describe('ReactContextValidator', () => {
       }
     }
     ComponentInFooStringContext.childContextTypes = {
-      foo: React.PropTypes.string,
+      foo: PropTypes.string,
     };
 
     ReactTestUtils.renderIntoDocument(
@@ -218,7 +220,7 @@ describe('ReactContextValidator', () => {
       }
     }
     ComponentInFooNumberContext.childContextTypes = {
-      foo: React.PropTypes.number,
+      foo: PropTypes.number,
     };
 
     ReactTestUtils.renderIntoDocument(
@@ -248,8 +250,8 @@ describe('ReactContextValidator', () => {
       }
     }
     Component.childContextTypes = {
-      foo: React.PropTypes.string.isRequired,
-      bar: React.PropTypes.number,
+      foo: PropTypes.string.isRequired,
+      bar: PropTypes.number,
     };
 
     ReactTestUtils.renderIntoDocument(<Component testContext={{bar: 123}} />);
@@ -288,7 +290,7 @@ describe('ReactContextValidator', () => {
 
     class ComponentA extends React.Component {
       static childContextTypes = {
-        foo: React.PropTypes.string.isRequired,
+        foo: PropTypes.string.isRequired,
       };
       render() {
         return <div />;
@@ -296,7 +298,7 @@ describe('ReactContextValidator', () => {
     }
     class ComponentB extends React.Component {
       static childContextTypes = {
-        foo: React.PropTypes.string.isRequired,
+        foo: PropTypes.string.isRequired,
       };
       render() {
         return <div />;
@@ -330,7 +332,7 @@ describe('ReactContextValidator', () => {
 
     class ParentContextProvider extends React.Component {
       static childContextTypes = {
-        foo: React.PropTypes.number,
+        foo: PropTypes.number,
       };
       getChildContext() {
         return {
@@ -344,7 +346,7 @@ describe('ReactContextValidator', () => {
 
     class MiddleMissingContext extends React.Component {
       static childContextTypes = {
-        bar: React.PropTypes.string.isRequired,
+        bar: PropTypes.string.isRequired,
       };
       render() {
         return <ChildContextConsumer />;
@@ -359,8 +361,8 @@ describe('ReactContextValidator', () => {
       }
     }
     ChildContextConsumer.contextTypes = {
-      bar: React.PropTypes.string.isRequired,
-      foo: React.PropTypes.string.isRequired,
+      bar: PropTypes.string.isRequired,
+      foo: PropTypes.string.isRequired,
     };
 
     ReactTestUtils.renderIntoDocument(<ParentContextProvider />);
diff --git a/src/isomorphic/classic/class/__tests__/create-react-class-integration-test.js b/src/isomorphic/classic/class/__tests__/create-react-class-integration-test.js
index 3eddc9730524c..55fb8c1ed8a49 100644
--- a/src/isomorphic/classic/class/__tests__/create-react-class-integration-test.js
+++ b/src/isomorphic/classic/class/__tests__/create-react-class-integration-test.js
@@ -11,6 +11,7 @@
 
 'use strict';
 
+var PropTypes;
 var React;
 var ReactDOM;
 var ReactTestUtils;
@@ -18,8 +19,9 @@ var createReactClass;
 
 describe('create-react-class-integration', () => {
   beforeEach(() => {
-    React = require('React');
-    ReactDOM = require('ReactDOM');
+    PropTypes = require('prop-types');
+    React = require('react');
+    ReactDOM = require('react-dom');
     ReactTestUtils = require('ReactTestUtils');
     var createReactClassFactory = require('create-react-class/factory');
     createReactClass = createReactClassFactory(
@@ -188,13 +190,13 @@ describe('create-react-class-integration', () => {
     createReactClass({
       mixins: [{}],
       propTypes: {
-        foo: React.PropTypes.string,
+        foo: PropTypes.string,
       },
       contextTypes: {
-        foo: React.PropTypes.string,
+        foo: PropTypes.string,
       },
       childContextTypes: {
-        foo: React.PropTypes.string,
+        foo: PropTypes.string,
       },
       render: function() {
         return <div />;
@@ -268,7 +270,7 @@ describe('create-react-class-integration', () => {
   it('renders based on context getInitialState', () => {
     var Foo = createReactClass({
       contextTypes: {
-        className: React.PropTypes.string,
+        className: PropTypes.string,
       },
       getInitialState() {
         return {className: this.context.className};
@@ -280,7 +282,7 @@ describe('create-react-class-integration', () => {
 
     var Outer = createReactClass({
       childContextTypes: {
-        className: React.PropTypes.string,
+        className: PropTypes.string,
       },
       getChildContext() {
         return {className: 'foo'};
diff --git a/src/isomorphic/classic/class/createClass.js b/src/isomorphic/classic/class/createClass.js
new file mode 100644
index 0000000000000..3791e5392dc0a
--- /dev/null
+++ b/src/isomorphic/classic/class/createClass.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule createClass
+ */
+
+'use strict';
+
+var {Component} = require('ReactBaseClasses');
+var {isValidElement} = require('ReactElement');
+var ReactNoopUpdateQueue = require('ReactNoopUpdateQueue');
+var factory = require('create-react-class/factory');
+
+module.exports = factory(Component, isValidElement, ReactNoopUpdateQueue);
diff --git a/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js b/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js
index 827509b196ea4..365b187d24391 100644
--- a/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js
+++ b/src/isomorphic/classic/element/__tests__/ReactElementClone-test.js
@@ -11,6 +11,7 @@
 
 'use strict';
 
+var PropTypes;
 var React;
 var ReactDOM;
 var ReactTestUtils;
@@ -19,6 +20,7 @@ describe('ReactElementClone', () => {
   var ComponentClass;
 
   beforeEach(() => {
+    PropTypes = require('prop-types');
     React = require('react');
     ReactDOM = require('react-dom');
     ReactTestUtils = require('ReactTestUtils');
@@ -288,13 +290,13 @@ describe('ReactElementClone', () => {
   it('should check declared prop types after clone', () => {
     spyOn(console, 'error');
     class Component extends React.Component {
+      static propTypes = {
+        color: PropTypes.string.isRequired,
+      };
       render() {
         return React.createElement('div', null, 'My color is ' + this.color);
       }
     }
-    Component.propTypes = {
-      color: React.PropTypes.string.isRequired,
-    };
     class Parent extends React.Component {
       render() {
         return React.cloneElement(this.props.child, {color: 123});
diff --git a/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js b/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
index ada2bb20fa7ec..69bb8fd512b8d 100644
--- a/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
+++ b/src/isomorphic/classic/element/__tests__/ReactElementValidator-test.js
@@ -14,6 +14,7 @@
 // NOTE: We're explicitly not using JSX in this file. This is intended to test
 // classic JS without JSX.
 
+var PropTypes;
 var React;
 var ReactDOM;
 var ReactTestUtils;
@@ -28,6 +29,7 @@ describe('ReactElementValidator', () => {
   beforeEach(() => {
     jest.resetModules();
 
+    PropTypes = require('prop-types');
     React = require('react');
     ReactDOM = require('react-dom');
     ReactTestUtils = require('ReactTestUtils');
@@ -247,7 +249,7 @@ describe('ReactElementValidator', () => {
       return React.createElement('div', null, 'My color is ' + props.color);
     }
     MyComp.propTypes = {
-      color: React.PropTypes.string,
+      color: PropTypes.string,
     };
     function ParentComp() {
       return React.createElement(MyComp, {color: 123});
@@ -332,12 +334,12 @@ describe('ReactElementValidator', () => {
     spyOn(console, 'error');
 
     class Component extends React.Component {
+      static propTypes = {prop: PropTypes.string.isRequired};
+      static defaultProps = {prop: null};
       render() {
         return React.createElement('span', null, this.props.prop);
       }
     }
-    Component.propTypes = {prop: React.PropTypes.string.isRequired};
-    Component.defaultProps = {prop: null};
 
     ReactTestUtils.renderIntoDocument(React.createElement(Component));
 
@@ -353,12 +355,12 @@ describe('ReactElementValidator', () => {
     spyOn(console, 'error');
 
     class Component extends React.Component {
+      static propTypes = {prop: PropTypes.string.isRequired};
+      static defaultProps = {prop: 'text'};
       render() {
         return React.createElement('span', null, this.props.prop);
       }
     }
-    Component.propTypes = {prop: React.PropTypes.string.isRequired};
-    Component.defaultProps = {prop: 'text'};
 
     ReactTestUtils.renderIntoDocument(
       React.createElement(Component, {prop: null}),
@@ -376,13 +378,13 @@ describe('ReactElementValidator', () => {
     spyOn(console, 'error');
 
     class Component extends React.Component {
+      static propTypes = {
+        prop: PropTypes.string.isRequired,
+      };
       render() {
         return React.createElement('span', null, this.props.prop);
       }
     }
-    Component.propTypes = {
-      prop: React.PropTypes.string.isRequired,
-    };
 
     ReactTestUtils.renderIntoDocument(React.createElement(Component));
     ReactTestUtils.renderIntoDocument(
@@ -416,13 +418,13 @@ describe('ReactElementValidator', () => {
     spyOn(console, 'error');
 
     class Component extends React.Component {
+      static propTypes = {
+        myProp: PropTypes.shape,
+      };
       render() {
         return React.createElement('span', null, this.props.myProp.value);
       }
     }
-    Component.propTypes = {
-      myProp: React.PropTypes.shape,
-    };
 
     ReactTestUtils.renderIntoDocument(
       React.createElement(Component, {myProp: {value: 'hi'}}),
diff --git a/src/isomorphic/classic/types/ReactPropTypes.js b/src/isomorphic/classic/types/ReactPropTypes.js
index 01710a0086694..5c0ca77351039 100644
--- a/src/isomorphic/classic/types/ReactPropTypes.js
+++ b/src/isomorphic/classic/types/ReactPropTypes.js
@@ -11,548 +11,7 @@
 
 'use strict';
 
-var ReactElement = require('ReactElement');
-var ReactPropTypesSecret = require('ReactPropTypesSecret');
+var {isValidElement} = require('ReactElement');
+var factory = require('prop-types/factory');
 
-var emptyFunction = require('fbjs/lib/emptyFunction');
-var getIteratorFn = require('getIteratorFn');
-var invariant = require('fbjs/lib/invariant');
-var warning = require('fbjs/lib/warning');
-
-/**
- * Collection of methods that allow declaration and validation of props that are
- * supplied to React components. Example usage:
- *
- *   var Props = require('ReactPropTypes');
- *   var MyArticle = React.createClass({
- *     propTypes: {
- *       // An optional string prop named "description".
- *       description: Props.string,
- *
- *       // A required enum prop named "category".
- *       category: Props.oneOf(['News','Photos']).isRequired,
- *
- *       // A prop named "dialog" that requires an instance of Dialog.
- *       dialog: Props.instanceOf(Dialog).isRequired
- *     },
- *     render: function() { ... }
- *   });
- *
- * A more formal specification of how these methods are used:
- *
- *   type := array|bool|func|object|number|string|oneOf([...])|instanceOf(...)
- *   decl := ReactPropTypes.{type}(.isRequired)?
- *
- * Each and every declaration produces a function with the same signature. This
- * allows the creation of custom validation functions. For example:
- *
- *  var MyLink = React.createClass({
- *    propTypes: {
- *      // An optional string or URI prop named "href".
- *      href: function(props, propName, componentName) {
- *        var propValue = props[propName];
- *        if (propValue != null && typeof propValue !== 'string' &&
- *            !(propValue instanceof URI)) {
- *          return new Error(
- *            'Expected a string or an URI for ' + propName + ' in ' +
- *            componentName
- *          );
- *        }
- *      }
- *    },
- *    render: function() {...}
- *  });
- *
- * @internal
- */
-
-var ANONYMOUS = '<<anonymous>>';
-
-var ReactPropTypes;
-
-if (__DEV__) {
-  // Keep in sync with production version below
-  ReactPropTypes = {
-    array: createPrimitiveTypeChecker('array'),
-    bool: createPrimitiveTypeChecker('boolean'),
-    func: createPrimitiveTypeChecker('function'),
-    number: createPrimitiveTypeChecker('number'),
-    object: createPrimitiveTypeChecker('object'),
-    string: createPrimitiveTypeChecker('string'),
-    symbol: createPrimitiveTypeChecker('symbol'),
-
-    any: createAnyTypeChecker(),
-    arrayOf: createArrayOfTypeChecker,
-    element: createElementTypeChecker(),
-    instanceOf: createInstanceTypeChecker,
-    node: createNodeChecker(),
-    objectOf: createObjectOfTypeChecker,
-    oneOf: createEnumTypeChecker,
-    oneOfType: createUnionTypeChecker,
-    shape: createShapeTypeChecker,
-  };
-} else {
-  var productionTypeChecker = function() {
-    invariant(
-      false,
-      'React.PropTypes type checking code is stripped in production.',
-    );
-  };
-  productionTypeChecker.isRequired = productionTypeChecker;
-  var getProductionTypeChecker = () => productionTypeChecker;
-  // Keep in sync with development version above
-  ReactPropTypes = {
-    array: productionTypeChecker,
-    bool: productionTypeChecker,
-    func: productionTypeChecker,
-    number: productionTypeChecker,
-    object: productionTypeChecker,
-    string: productionTypeChecker,
-    symbol: productionTypeChecker,
-
-    any: productionTypeChecker,
-    arrayOf: getProductionTypeChecker,
-    element: productionTypeChecker,
-    instanceOf: getProductionTypeChecker,
-    node: productionTypeChecker,
-    objectOf: getProductionTypeChecker,
-    oneOf: getProductionTypeChecker,
-    oneOfType: getProductionTypeChecker,
-    shape: getProductionTypeChecker,
-  };
-}
-
-/**
- * inlined Object.is polyfill to avoid requiring consumers ship their own
- * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is
- */
-/*eslint-disable no-self-compare*/
-function is(x, y) {
-  // SameValue algorithm
-  if (x === y) {
-    // Steps 1-5, 7-10
-    // Steps 6.b-6.e: +0 != -0
-    return x !== 0 || 1 / x === 1 / y;
-  } else {
-    // Step 6.a: NaN == NaN
-    return x !== x && y !== y;
-  }
-}
-/*eslint-enable no-self-compare*/
-
-/**
- * We use an Error-like object for backward compatibility as people may call
- * PropTypes directly and inspect their output. However, we don't use real
- * Errors anymore. We don't inspect their stack anyway, and creating them
- * is prohibitively expensive if they are created too often, such as what
- * happens in oneOfType() for any type before the one that matched.
- */
-function PropTypeError(message) {
-  this.message = message;
-  this.stack = '';
-}
-// Make `instanceof Error` still work for returned errors.
-PropTypeError.prototype = Error.prototype;
-
-function createChainableTypeChecker(validate) {
-  if (__DEV__) {
-    var manualPropTypeCallCache = {};
-  }
-  function checkType(
-    isRequired,
-    props,
-    propName,
-    componentName,
-    location,
-    propFullName,
-    secret,
-  ) {
-    componentName = componentName || ANONYMOUS;
-    propFullName = propFullName || propName;
-    if (__DEV__) {
-      if (secret !== ReactPropTypesSecret && typeof console !== 'undefined') {
-        var cacheKey = `${componentName}:${propName}`;
-        if (!manualPropTypeCallCache[cacheKey]) {
-          warning(
-            false,
-            'You are manually calling a React.PropTypes validation ' +
-              'function for the `%s` prop on `%s`. This is deprecated ' +
-              'and will not work in production with the next major version. ' +
-              'You may be seeing this warning due to a third-party PropTypes ' +
-              'library. See https://fb.me/react-warning-dont-call-proptypes ' +
-              'for details.',
-            propFullName,
-            componentName,
-          );
-          manualPropTypeCallCache[cacheKey] = true;
-        }
-      }
-    }
-    if (props[propName] == null) {
-      if (isRequired) {
-        if (props[propName] === null) {
-          return new PropTypeError(
-            `The ${location} \`${propFullName}\` is marked as required ` +
-              `in \`${componentName}\`, but its value is \`null\`.`,
-          );
-        }
-        return new PropTypeError(
-          `The ${location} \`${propFullName}\` is marked as required in ` +
-            `\`${componentName}\`, but its value is \`undefined\`.`,
-        );
-      }
-      return null;
-    } else {
-      return validate(props, propName, componentName, location, propFullName);
-    }
-  }
-
-  var chainedCheckType = checkType.bind(null, false);
-  chainedCheckType.isRequired = checkType.bind(null, true);
-
-  return chainedCheckType;
-}
-
-function createPrimitiveTypeChecker(expectedType) {
-  function validate(
-    props,
-    propName,
-    componentName,
-    location,
-    propFullName,
-    secret,
-  ) {
-    var propValue = props[propName];
-    var propType = getPropType(propValue);
-    if (propType !== expectedType) {
-      // `propValue` being instance of, say, date/regexp, pass the 'object'
-      // check, but we can offer a more precise error message here rather than
-      // 'of type `object`'.
-      var preciseType = getPreciseType(propValue);
-
-      return new PropTypeError(
-        `Invalid ${location} \`${propFullName}\` of type ` +
-          `\`${preciseType}\` supplied to \`${componentName}\`, expected ` +
-          `\`${expectedType}\`.`,
-      );
-    }
-    return null;
-  }
-  return createChainableTypeChecker(validate);
-}
-
-function createAnyTypeChecker() {
-  return createChainableTypeChecker(emptyFunction.thatReturnsNull);
-}
-
-function createArrayOfTypeChecker(typeChecker) {
-  function validate(props, propName, componentName, location, propFullName) {
-    if (typeof typeChecker !== 'function') {
-      return new PropTypeError(
-        `Property \`${propFullName}\` of component \`${componentName}\` has invalid PropType notation inside arrayOf.`,
-      );
-    }
-    var propValue = props[propName];
-    if (!Array.isArray(propValue)) {
-      var propType = getPropType(propValue);
-      return new PropTypeError(
-        `Invalid ${location} \`${propFullName}\` of type ` +
-          `\`${propType}\` supplied to \`${componentName}\`, expected an array.`,
-      );
-    }
-    for (var i = 0; i < propValue.length; i++) {
-      var error = typeChecker(
-        propValue,
-        i,
-        componentName,
-        location,
-        `${propFullName}[${i}]`,
-        ReactPropTypesSecret,
-      );
-      if (error instanceof Error) {
-        return error;
-      }
-    }
-    return null;
-  }
-  return createChainableTypeChecker(validate);
-}
-
-function createElementTypeChecker() {
-  function validate(props, propName, componentName, location, propFullName) {
-    var propValue = props[propName];
-    if (!ReactElement.isValidElement(propValue)) {
-      var propType = getPropType(propValue);
-      return new PropTypeError(
-        `Invalid ${location} \`${propFullName}\` of type ` +
-          `\`${propType}\` supplied to \`${componentName}\`, expected a single ReactElement.`,
-      );
-    }
-    return null;
-  }
-  return createChainableTypeChecker(validate);
-}
-
-function createInstanceTypeChecker(expectedClass) {
-  function validate(props, propName, componentName, location, propFullName) {
-    if (!(props[propName] instanceof expectedClass)) {
-      var expectedClassName = expectedClass.name || ANONYMOUS;
-      var actualClassName = getClassName(props[propName]);
-      return new PropTypeError(
-        `Invalid ${location} \`${propFullName}\` of type ` +
-          `\`${actualClassName}\` supplied to \`${componentName}\`, expected ` +
-          `instance of \`${expectedClassName}\`.`,
-      );
-    }
-    return null;
-  }
-  return createChainableTypeChecker(validate);
-}
-
-function createEnumTypeChecker(expectedValues) {
-  if (!Array.isArray(expectedValues)) {
-    warning(
-      false,
-      'Invalid argument supplied to oneOf, expected an instance of array.',
-    );
-    return emptyFunction.thatReturnsNull;
-  }
-
-  function validate(props, propName, componentName, location, propFullName) {
-    var propValue = props[propName];
-    for (var i = 0; i < expectedValues.length; i++) {
-      if (is(propValue, expectedValues[i])) {
-        return null;
-      }
-    }
-
-    var valuesString = JSON.stringify(expectedValues);
-    return new PropTypeError(
-      `Invalid ${location} \`${propFullName}\` of value \`${propValue}\` ` +
-        `supplied to \`${componentName}\`, expected one of ${valuesString}.`,
-    );
-  }
-  return createChainableTypeChecker(validate);
-}
-
-function createObjectOfTypeChecker(typeChecker) {
-  function validate(props, propName, componentName, location, propFullName) {
-    if (typeof typeChecker !== 'function') {
-      return new PropTypeError(
-        `Property \`${propFullName}\` of component \`${componentName}\` has invalid PropType notation inside objectOf.`,
-      );
-    }
-    var propValue = props[propName];
-    var propType = getPropType(propValue);
-    if (propType !== 'object') {
-      return new PropTypeError(
-        `Invalid ${location} \`${propFullName}\` of type ` +
-          `\`${propType}\` supplied to \`${componentName}\`, expected an object.`,
-      );
-    }
-    for (var key in propValue) {
-      if (propValue.hasOwnProperty(key)) {
-        var error = typeChecker(
-          propValue,
-          key,
-          componentName,
-          location,
-          `${propFullName}.${key}`,
-          ReactPropTypesSecret,
-        );
-        if (error instanceof Error) {
-          return error;
-        }
-      }
-    }
-    return null;
-  }
-  return createChainableTypeChecker(validate);
-}
-
-function createUnionTypeChecker(arrayOfTypeCheckers) {
-  if (!Array.isArray(arrayOfTypeCheckers)) {
-    warning(
-      false,
-      'Invalid argument supplied to oneOfType, expected an instance of array.',
-    );
-    return emptyFunction.thatReturnsNull;
-  }
-
-  function validate(props, propName, componentName, location, propFullName) {
-    for (var i = 0; i < arrayOfTypeCheckers.length; i++) {
-      var checker = arrayOfTypeCheckers[i];
-      if (
-        checker(
-          props,
-          propName,
-          componentName,
-          location,
-          propFullName,
-          ReactPropTypesSecret,
-        ) == null
-      ) {
-        return null;
-      }
-    }
-
-    return new PropTypeError(
-      `Invalid ${location} \`${propFullName}\` supplied to ` +
-        `\`${componentName}\`.`,
-    );
-  }
-  return createChainableTypeChecker(validate);
-}
-
-function createNodeChecker() {
-  function validate(props, propName, componentName, location, propFullName) {
-    if (!isNode(props[propName])) {
-      return new PropTypeError(
-        `Invalid ${location} \`${propFullName}\` supplied to ` +
-          `\`${componentName}\`, expected a ReactNode.`,
-      );
-    }
-    return null;
-  }
-  return createChainableTypeChecker(validate);
-}
-
-function createShapeTypeChecker(shapeTypes) {
-  function validate(props, propName, componentName, location, propFullName) {
-    var propValue = props[propName];
-    var propType = getPropType(propValue);
-    if (propType !== 'object') {
-      return new PropTypeError(
-        `Invalid ${location} \`${propFullName}\` of type \`${propType}\` ` +
-          `supplied to \`${componentName}\`, expected \`object\`.`,
-      );
-    }
-    for (var key in shapeTypes) {
-      var checker = shapeTypes[key];
-      if (!checker) {
-        continue;
-      }
-      var error = checker(
-        propValue,
-        key,
-        componentName,
-        location,
-        `${propFullName}.${key}`,
-        ReactPropTypesSecret,
-      );
-      if (error) {
-        return error;
-      }
-    }
-    return null;
-  }
-  return createChainableTypeChecker(validate);
-}
-
-function isNode(propValue) {
-  switch (typeof propValue) {
-    case 'number':
-    case 'string':
-    case 'undefined':
-      return true;
-    case 'boolean':
-      return !propValue;
-    case 'object':
-      if (Array.isArray(propValue)) {
-        return propValue.every(isNode);
-      }
-      if (propValue === null || ReactElement.isValidElement(propValue)) {
-        return true;
-      }
-
-      var iteratorFn = getIteratorFn(propValue);
-      if (iteratorFn) {
-        var iterator = iteratorFn.call(propValue);
-        var step;
-        if (iteratorFn !== propValue.entries) {
-          while (!(step = iterator.next()).done) {
-            if (!isNode(step.value)) {
-              return false;
-            }
-          }
-        } else {
-          // Iterator will provide entry [k,v] tuples rather than values.
-          while (!(step = iterator.next()).done) {
-            var entry = step.value;
-            if (entry) {
-              if (!isNode(entry[1])) {
-                return false;
-              }
-            }
-          }
-        }
-      } else {
-        return false;
-      }
-
-      return true;
-    default:
-      return false;
-  }
-}
-
-function isSymbol(propType, propValue) {
-  // Native Symbol.
-  if (propType === 'symbol') {
-    return true;
-  }
-
-  // 19.4.3.5 Symbol.prototype[@@toStringTag] === 'Symbol'
-  if (propValue['@@toStringTag'] === 'Symbol') {
-    return true;
-  }
-
-  // Fallback for non-spec compliant Symbols which are polyfilled.
-  if (typeof Symbol === 'function' && propValue instanceof Symbol) {
-    return true;
-  }
-
-  return false;
-}
-
-// Equivalent of `typeof` but with special handling for array and regexp.
-function getPropType(propValue) {
-  var propType = typeof propValue;
-  if (Array.isArray(propValue)) {
-    return 'array';
-  }
-  if (propValue instanceof RegExp) {
-    // Old webkits (at least until Android 4.0) return 'function' rather than
-    // 'object' for typeof a RegExp. We'll normalize this here so that /bla/
-    // passes PropTypes.object.
-    return 'object';
-  }
-  if (isSymbol(propType, propValue)) {
-    return 'symbol';
-  }
-  return propType;
-}
-
-// This handles more types than `getPropType`. Only used for error messages.
-// See `createPrimitiveTypeChecker`.
-function getPreciseType(propValue) {
-  var propType = getPropType(propValue);
-  if (propType === 'object') {
-    if (propValue instanceof Date) {
-      return 'date';
-    } else if (propValue instanceof RegExp) {
-      return 'regexp';
-    }
-  }
-  return propType;
-}
-
-// Returns class name of the object, if any.
-function getClassName(propValue) {
-  if (!propValue.constructor || !propValue.constructor.name) {
-    return ANONYMOUS;
-  }
-  return propValue.constructor.name;
-}
-
-module.exports = ReactPropTypes;
+module.exports = factory(isValidElement);
diff --git a/src/isomorphic/classic/types/__tests__/ReactPropTypesProduction-test.js b/src/isomorphic/classic/types/__tests__/ReactPropTypesProduction-test.js
deleted file mode 100644
index 33ccb85bd86a7..0000000000000
--- a/src/isomorphic/classic/types/__tests__/ReactPropTypesProduction-test.js
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @emails react-core
- */
-
-'use strict';
-
-describe('ReactPropTypesProduction', function() {
-  var PropTypes;
-  var React;
-  var ReactTestUtils;
-  var oldProcess;
-
-  beforeEach(function() {
-    __DEV__ = false;
-
-    // Mutating process.env.NODE_ENV would cause our babel plugins to do the
-    // wrong thing. If you change this, make sure to test with jest --no-cache.
-    oldProcess = process;
-    global.process = {
-      ...process,
-      env: {...process.env, NODE_ENV: 'production'},
-    };
-
-    jest.resetModules();
-    PropTypes = require('ReactPropTypes');
-    React = require('react');
-    ReactTestUtils = require('ReactTestUtils');
-  });
-
-  afterEach(function() {
-    __DEV__ = true;
-    global.process = oldProcess;
-  });
-
-  function expectThrowsInProduction(declaration, value) {
-    var props = {testProp: value};
-    expect(() => {
-      declaration(props, 'testProp', 'testComponent', 'prop');
-    }).toThrowError('Minified React error #144');
-  }
-
-  describe('Primitive Types', function() {
-    it('should be a no-op', function() {
-      expectThrowsInProduction(PropTypes.array, /please/);
-      expectThrowsInProduction(PropTypes.array.isRequired, /please/);
-      expectThrowsInProduction(PropTypes.array.isRequired, null);
-      expectThrowsInProduction(PropTypes.array.isRequired, undefined);
-      expectThrowsInProduction(PropTypes.bool, []);
-      expectThrowsInProduction(PropTypes.bool.isRequired, []);
-      expectThrowsInProduction(PropTypes.bool.isRequired, null);
-      expectThrowsInProduction(PropTypes.bool.isRequired, undefined);
-      expectThrowsInProduction(PropTypes.func, false);
-      expectThrowsInProduction(PropTypes.func.isRequired, false);
-      expectThrowsInProduction(PropTypes.func.isRequired, null);
-      expectThrowsInProduction(PropTypes.func.isRequired, undefined);
-      expectThrowsInProduction(PropTypes.number, function() {});
-      expectThrowsInProduction(PropTypes.number.isRequired, function() {});
-      expectThrowsInProduction(PropTypes.number.isRequired, null);
-      expectThrowsInProduction(PropTypes.number.isRequired, undefined);
-      expectThrowsInProduction(PropTypes.string, 0);
-      expectThrowsInProduction(PropTypes.string.isRequired, 0);
-      expectThrowsInProduction(PropTypes.string.isRequired, null);
-      expectThrowsInProduction(PropTypes.string.isRequired, undefined);
-      expectThrowsInProduction(PropTypes.symbol, 0);
-      expectThrowsInProduction(PropTypes.symbol.isRequired, 0);
-      expectThrowsInProduction(PropTypes.symbol.isRequired, null);
-      expectThrowsInProduction(PropTypes.symbol.isRequired, undefined);
-      expectThrowsInProduction(PropTypes.object, '');
-      expectThrowsInProduction(PropTypes.object.isRequired, '');
-      expectThrowsInProduction(PropTypes.object.isRequired, null);
-      expectThrowsInProduction(PropTypes.object.isRequired, undefined);
-    });
-  });
-
-  describe('Any Type', function() {
-    it('should be a no-op', function() {
-      expectThrowsInProduction(PropTypes.any, null);
-      expectThrowsInProduction(PropTypes.any.isRequired, null);
-      expectThrowsInProduction(PropTypes.any.isRequired, undefined);
-    });
-  });
-
-  describe('ArrayOf Type', function() {
-    it('should be a no-op', function() {
-      expectThrowsInProduction(PropTypes.arrayOf({foo: PropTypes.string}), {
-        foo: 'bar',
-      });
-      expectThrowsInProduction(PropTypes.arrayOf(PropTypes.number), [
-        1,
-        2,
-        'b',
-      ]);
-      expectThrowsInProduction(PropTypes.arrayOf(PropTypes.number), {
-        '0': 'maybe-array',
-        length: 1,
-      });
-      expectThrowsInProduction(
-        PropTypes.arrayOf(PropTypes.number).isRequired,
-        null,
-      );
-      expectThrowsInProduction(
-        PropTypes.arrayOf(PropTypes.number).isRequired,
-        undefined,
-      );
-    });
-  });
-
-  describe('Component Type', function() {
-    it('should be a no-op', function() {
-      expectThrowsInProduction(PropTypes.element, [<div />, <div />]);
-      expectThrowsInProduction(PropTypes.element, 123);
-      expectThrowsInProduction(PropTypes.element, 'foo');
-      expectThrowsInProduction(PropTypes.element, false);
-      expectThrowsInProduction(PropTypes.element.isRequired, null);
-      expectThrowsInProduction(PropTypes.element.isRequired, undefined);
-    });
-  });
-
-  describe('Instance Types', function() {
-    it('should be a no-op', function() {
-      expectThrowsInProduction(PropTypes.instanceOf(Date), {});
-      expectThrowsInProduction(PropTypes.instanceOf(Date).isRequired, {});
-    });
-  });
-
-  describe('React Component Types', function() {
-    it('should be a no-op', function() {
-      expectThrowsInProduction(PropTypes.node, {});
-      expectThrowsInProduction(PropTypes.node.isRequired, null);
-      expectThrowsInProduction(PropTypes.node.isRequired, undefined);
-    });
-  });
-
-  describe('ObjectOf Type', function() {
-    it('should be a no-op', function() {
-      expectThrowsInProduction(PropTypes.objectOf({foo: PropTypes.string}), {
-        foo: 'bar',
-      });
-      expectThrowsInProduction(PropTypes.objectOf(PropTypes.number), {
-        a: 1,
-        b: 2,
-        c: 'b',
-      });
-      expectThrowsInProduction(PropTypes.objectOf(PropTypes.number), [1, 2]);
-      expectThrowsInProduction(PropTypes.objectOf(PropTypes.number), null);
-      expectThrowsInProduction(PropTypes.objectOf(PropTypes.number), undefined);
-    });
-  });
-
-  describe('OneOf Types', function() {
-    it('should be a no-op', function() {
-      expectThrowsInProduction(PropTypes.oneOf('red', 'blue'), 'red');
-      expectThrowsInProduction(PropTypes.oneOf(['red', 'blue']), true);
-      expectThrowsInProduction(PropTypes.oneOf(['red', 'blue']), null);
-      expectThrowsInProduction(PropTypes.oneOf(['red', 'blue']), undefined);
-    });
-  });
-
-  describe('Union Types', function() {
-    it('should be a no-op', function() {
-      expectThrowsInProduction(
-        PropTypes.oneOfType(PropTypes.string, PropTypes.number),
-        'red',
-      );
-      expectThrowsInProduction(
-        PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-        [],
-      );
-      expectThrowsInProduction(
-        PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-        null,
-      );
-      expectThrowsInProduction(
-        PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-        undefined,
-      );
-    });
-  });
-
-  describe('Shape Types', function() {
-    it('should be a no-op', function() {
-      expectThrowsInProduction(PropTypes.shape({}), 'some string');
-      expectThrowsInProduction(
-        PropTypes.shape({key: PropTypes.number}).isRequired,
-        null,
-      );
-      expectThrowsInProduction(
-        PropTypes.shape({key: PropTypes.number}).isRequired,
-        undefined,
-      );
-    });
-  });
-
-  describe('Custom validator', function() {
-    beforeEach(function() {
-      jest.resetModules();
-    });
-
-    it('should not have been called', function() {
-      var spy = jest.fn();
-      function Component() {
-        return <div />;
-      }
-      Component.propTypes = {num: spy};
-
-      var instance = <Component num={5} />;
-      ReactTestUtils.renderIntoDocument(instance);
-
-      expect(spy).not.toBeCalled();
-    });
-  });
-});
diff --git a/src/isomorphic/classic/types/checkPropTypes.js b/src/isomorphic/classic/types/checkPropTypes.js
index 5168efd9c001f..32d9ecc677497 100644
--- a/src/isomorphic/classic/types/checkPropTypes.js
+++ b/src/isomorphic/classic/types/checkPropTypes.js
@@ -11,84 +11,4 @@
 
 'use strict';
 
-var ReactPropTypesSecret = require('ReactPropTypesSecret');
-
-var invariant = require('fbjs/lib/invariant');
-var warning = require('fbjs/lib/warning');
-
-var loggedTypeFailures = {};
-
-/**
- * Assert that the values match with the type specs.
- * Error messages are memorized and will only be shown once.
- *
- * @param {object} typeSpecs Map of name to a ReactPropType
- * @param {object} values Runtime values that need to be type-checked
- * @param {string} location e.g. "prop", "context", "child context"
- * @param {string} componentName Name of the component for error messages.
- * @param {?Function} getStack Returns the component stack.
- * @private
- */
-function checkPropTypes(typeSpecs, values, location, componentName, getStack) {
-  if (__DEV__) {
-    for (var typeSpecName in typeSpecs) {
-      if (typeSpecs.hasOwnProperty(typeSpecName)) {
-        var error;
-        // Prop type validation may throw. In case they do, we don't want to
-        // fail the render phase where it didn't fail before. So we log it.
-        // After these have been cleaned up, we'll let them throw.
-        try {
-          // This is intentionally an invariant that gets caught. It's the same
-          // behavior as without this statement except with a better message.
-          invariant(
-            typeof typeSpecs[typeSpecName] === 'function',
-            '%s: %s type `%s` is invalid; it must be a function, usually from ' +
-              'React.PropTypes.',
-            componentName || 'React class',
-            location,
-            typeSpecName,
-          );
-          error = typeSpecs[typeSpecName](
-            values,
-            typeSpecName,
-            componentName,
-            location,
-            null,
-            ReactPropTypesSecret,
-          );
-        } catch (ex) {
-          error = ex;
-        }
-        warning(
-          !error || error instanceof Error,
-          '%s: type specification of %s `%s` is invalid; the type checker ' +
-            'function must return `null` or an `Error` but returned a %s. ' +
-            'You may have forgotten to pass an argument to the type checker ' +
-            'creator (arrayOf, instanceOf, objectOf, oneOf, oneOfType, and ' +
-            'shape all require an argument).',
-          componentName || 'React class',
-          location,
-          typeSpecName,
-          typeof error,
-        );
-        if (error instanceof Error && !(error.message in loggedTypeFailures)) {
-          // Only monitor this failure once because there tends to be a lot of the
-          // same error.
-          loggedTypeFailures[error.message] = true;
-
-          var stack = getStack ? getStack() : '';
-
-          warning(
-            false,
-            'Failed %s type: %s%s',
-            location,
-            error.message,
-            stack != null ? stack : '',
-          );
-        }
-      }
-    }
-  }
-}
-
-module.exports = checkPropTypes;
+module.exports = require('prop-types/checkPropTypes');
diff --git a/src/isomorphic/modern/class/PropTypes.d.ts b/src/isomorphic/modern/class/PropTypes.d.ts
new file mode 100644
index 0000000000000..a8802e66fe859
--- /dev/null
+++ b/src/isomorphic/modern/class/PropTypes.d.ts
@@ -0,0 +1,19 @@
+/*!
+ * Copyright 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+/**
+ * TypeScript Definition File for React.
+ *
+ * Full type definitions are not yet officially supported. These are mostly
+ * just helpers for the unit test.
+ */
+
+declare module 'prop-types' {
+  export var string : any;
+}
diff --git a/src/isomorphic/modern/class/__tests__/ReactCoffeeScriptClass-test.coffee b/src/isomorphic/modern/class/__tests__/ReactCoffeeScriptClass-test.coffee
index 1880a3dc6efaf..15f5e46eab758 100644
--- a/src/isomorphic/modern/class/__tests__/ReactCoffeeScriptClass-test.coffee
+++ b/src/isomorphic/modern/class/__tests__/ReactCoffeeScriptClass-test.coffee
@@ -9,6 +9,7 @@ of patent rights can be found in the PATENTS file in the same directory.
 
 React = null
 ReactDOM = null
+PropTypes = null
 
 describe 'ReactCoffeeScriptClass', ->
   div = null
@@ -21,6 +22,7 @@ describe 'ReactCoffeeScriptClass', ->
   beforeEach ->
     React = require 'react'
     ReactDOM = require 'react-dom'
+    PropTypes = require 'prop-types'
     container = document.createElement 'div'
     attachedListener = null
     renderedName = null
@@ -102,8 +104,8 @@ describe 'ReactCoffeeScriptClass', ->
   it 'renders based on context in the constructor', ->
     class Foo extends React.Component
       @contextTypes:
-        tag: React.PropTypes.string
-        className: React.PropTypes.string
+        tag: PropTypes.string
+        className: PropTypes.string
 
       constructor: (props, context) ->
         super props, context
@@ -118,8 +120,8 @@ describe 'ReactCoffeeScriptClass', ->
 
     class Outer extends React.Component
       @childContextTypes:
-        tag: React.PropTypes.string
-        className: React.PropTypes.string
+        tag: PropTypes.string
+        className: PropTypes.string
 
       getChildContext: ->
         tag: 'span'
@@ -393,13 +395,13 @@ describe 'ReactCoffeeScriptClass', ->
   it 'supports this.context passed via getChildContext', ->
     class Bar extends React.Component
       @contextTypes:
-        bar: React.PropTypes.string
+        bar: PropTypes.string
       render: ->
         div className: @context.bar
 
     class Foo extends React.Component
       @childContextTypes:
-        bar: React.PropTypes.string
+        bar: PropTypes.string
       getChildContext: ->
         bar: 'bar-through-context'
       render: ->
diff --git a/src/isomorphic/modern/class/__tests__/ReactES6Class-test.js b/src/isomorphic/modern/class/__tests__/ReactES6Class-test.js
index a6ec313d5c105..f634e1d1c58d4 100644
--- a/src/isomorphic/modern/class/__tests__/ReactES6Class-test.js
+++ b/src/isomorphic/modern/class/__tests__/ReactES6Class-test.js
@@ -11,6 +11,7 @@
 
 'use strict';
 
+var PropTypes;
 var React;
 var ReactDOM;
 
@@ -25,6 +26,7 @@ describe('ReactES6Class', () => {
   var renderedName = null;
 
   beforeEach(() => {
+    PropTypes = require('prop-types');
     React = require('react');
     ReactDOM = require('react-dom');
     container = document.createElement('div');
@@ -123,8 +125,8 @@ describe('ReactES6Class', () => {
       }
     }
     Foo.contextTypes = {
-      tag: React.PropTypes.string,
-      className: React.PropTypes.string,
+      tag: PropTypes.string,
+      className: PropTypes.string,
     };
 
     class Outer extends React.Component {
@@ -136,8 +138,8 @@ describe('ReactES6Class', () => {
       }
     }
     Outer.childContextTypes = {
-      tag: React.PropTypes.string,
-      className: React.PropTypes.string,
+      tag: PropTypes.string,
+      className: PropTypes.string,
     };
     test(<Outer />, 'SPAN', 'foo');
   });
@@ -419,7 +421,7 @@ describe('ReactES6Class', () => {
         return <div className={this.context.bar} />;
       }
     }
-    Bar.contextTypes = {bar: React.PropTypes.string};
+    Bar.contextTypes = {bar: PropTypes.string};
     class Foo extends React.Component {
       getChildContext() {
         return {bar: 'bar-through-context'};
@@ -428,7 +430,7 @@ describe('ReactES6Class', () => {
         return <Bar />;
       }
     }
-    Foo.childContextTypes = {bar: React.PropTypes.string};
+    Foo.childContextTypes = {bar: PropTypes.string};
     test(<Foo />, 'DIV', 'bar-through-context');
   });
 
diff --git a/src/isomorphic/modern/class/__tests__/ReactTypeScriptClass-test.ts b/src/isomorphic/modern/class/__tests__/ReactTypeScriptClass-test.ts
index 921474d3affbc..33085c89d9213 100644
--- a/src/isomorphic/modern/class/__tests__/ReactTypeScriptClass-test.ts
+++ b/src/isomorphic/modern/class/__tests__/ReactTypeScriptClass-test.ts
@@ -1,3 +1,4 @@
+/// <reference path="../PropTypes.d.ts" />
 /// <reference path="../React.d.ts" />
 /// <reference path="../ReactDOM.d.ts" />
 
@@ -12,6 +13,7 @@
 
 import React = require('react');
 import ReactDOM = require('react-dom');
+import PropTypes = require('prop-types');
 
 // Before Each
 
@@ -85,8 +87,8 @@ class StateBasedOnProps extends React.Component {
 // it renders based on context in the constructor
 class StateBasedOnContext extends React.Component {
   static contextTypes = {
-    tag: React.PropTypes.string,
-    className: React.PropTypes.string
+    tag: PropTypes.string,
+    className: PropTypes.string
   };
   state = {
     tag: this.context.tag,
@@ -100,8 +102,8 @@ class StateBasedOnContext extends React.Component {
 
 class ProvideChildContextTypes extends React.Component {
   static childContextTypes = {
-    tag: React.PropTypes.string,
-    className: React.PropTypes.string
+    tag: PropTypes.string,
+    className: PropTypes.string
   };
   getChildContext() {
     return { tag: 'span', className: 'foo' };
@@ -278,13 +280,13 @@ class MisspelledComponent2 extends React.Component {
 
 // it supports this.context passed via getChildContext
 class ReadContext extends React.Component {
-  static contextTypes = { bar: React.PropTypes.string };
+  static contextTypes = { bar: PropTypes.string };
   render() {
     return React.createElement('div', { className: this.context.bar });
   }
 }
 class ProvideContext extends React.Component {
-  static childContextTypes = { bar: React.PropTypes.string };
+  static childContextTypes = { bar: PropTypes.string };
   getChildContext() {
     return { bar: 'bar-through-context' };
   }
diff --git a/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js b/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js
index 5074097dfa47f..ff1ff2e7c8e6d 100644
--- a/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js
+++ b/src/isomorphic/modern/element/__tests__/ReactJSXElementValidator-test.js
@@ -17,6 +17,7 @@
 var React;
 var ReactDOM;
 var ReactTestUtils;
+var PropTypes;
 
 describe('ReactJSXElementValidator', () => {
   function normalizeCodeLocInfo(str) {
@@ -29,6 +30,7 @@ describe('ReactJSXElementValidator', () => {
   beforeEach(() => {
     jest.resetModules();
 
+    PropTypes = require('prop-types');
     React = require('react');
     ReactDOM = require('react-dom');
     ReactTestUtils = require('ReactTestUtils');
@@ -45,7 +47,7 @@ describe('ReactJSXElementValidator', () => {
       }
     };
     RequiredPropComponent.displayName = 'RequiredPropComponent';
-    RequiredPropComponent.propTypes = {prop: React.PropTypes.string.isRequired};
+    RequiredPropComponent.propTypes = {prop: PropTypes.string.isRequired};
   });
 
   it('warns for keys for arrays of elements in children position', () => {
@@ -188,7 +190,7 @@ describe('ReactJSXElementValidator', () => {
       }
     }
     MyComp.propTypes = {
-      color: React.PropTypes.string,
+      color: PropTypes.string,
     };
     class ParentComp extends React.Component {
       render() {
@@ -211,7 +213,7 @@ describe('ReactJSXElementValidator', () => {
       return null;
     }
     MyComp.propTypes = {
-      color: React.PropTypes.string,
+      color: PropTypes.string,
     };
     function MiddleComp(props) {
       return <MyComp color={props.color} />;
diff --git a/src/renderers/__tests__/ReactComponentLifeCycle-test.js b/src/renderers/__tests__/ReactComponentLifeCycle-test.js
index b9231571bb733..af575d153071c 100644
--- a/src/renderers/__tests__/ReactComponentLifeCycle-test.js
+++ b/src/renderers/__tests__/ReactComponentLifeCycle-test.js
@@ -14,6 +14,7 @@
 var React;
 var ReactDOM;
 var ReactTestUtils;
+var PropTypes;
 
 var clone = function(o) {
   return JSON.parse(JSON.stringify(o));
@@ -91,6 +92,7 @@ describe('ReactComponentLifeCycle', () => {
     React = require('react');
     ReactDOM = require('react-dom');
     ReactTestUtils = require('ReactTestUtils');
+    PropTypes = require('prop-types');
   });
 
   it('should not reuse an instance when it has been unmounted', () => {
@@ -605,14 +607,14 @@ describe('ReactComponentLifeCycle', () => {
       };
     }
     Parent.childContextTypes = {
-      x: React.PropTypes.number,
+      x: PropTypes.number,
     };
     function Child(props, context) {
       expect(context.x).toBe(2);
       return <div />;
     }
     Child.contextTypes = {
-      x: React.PropTypes.number,
+      x: PropTypes.number,
     };
 
     const div = document.createElement('div');
diff --git a/src/renderers/__tests__/ReactComponentTreeHook-test.native.js b/src/renderers/__tests__/ReactComponentTreeHook-test.native.js
index dd7be7d7014ce..ff458d64a4d6d 100644
--- a/src/renderers/__tests__/ReactComponentTreeHook-test.native.js
+++ b/src/renderers/__tests__/ReactComponentTreeHook-test.native.js
@@ -29,10 +29,12 @@ describeStack('ReactComponentTreeHook', () => {
   var View;
   var Image;
   var Text;
+  var PropTypes;
 
   beforeEach(() => {
     jest.resetModules();
 
+    PropTypes = require('prop-types');
     React = require('react');
     ReactNative = require('ReactNative');
     ReactInstanceMap = require('ReactInstanceMap');
@@ -50,7 +52,7 @@ describeStack('ReactComponentTreeHook', () => {
     });
     Text = class extends React.Component {
       static childContextTypes = {
-        isInAParentText: React.PropTypes.bool,
+        isInAParentText: PropTypes.bool,
       };
 
       getChildContext() {
diff --git a/src/renderers/__tests__/ReactErrorBoundaries-test.js b/src/renderers/__tests__/ReactErrorBoundaries-test.js
index d9a34dc5e6f84..49e9a1273dc28 100644
--- a/src/renderers/__tests__/ReactErrorBoundaries-test.js
+++ b/src/renderers/__tests__/ReactErrorBoundaries-test.js
@@ -13,6 +13,7 @@
 
 var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
 
+var PropTypes;
 var React;
 var ReactDOM;
 
@@ -37,6 +38,7 @@ describe('ReactErrorBoundaries', () => {
   var Normal;
 
   beforeEach(() => {
+    PropTypes = require('prop-types');
     ReactDOM = require('react-dom');
     React = require('react');
 
@@ -737,7 +739,7 @@ describe('ReactErrorBoundaries', () => {
 
   it('renders an error state if context provider throws in componentWillMount', () => {
     class BrokenComponentWillMountWithContext extends React.Component {
-      static childContextTypes = {foo: React.PropTypes.number};
+      static childContextTypes = {foo: PropTypes.number};
       getChildContext() {
         return {foo: 42};
       }
@@ -774,7 +776,7 @@ describe('ReactErrorBoundaries', () => {
       };
     }
     BrokenComponentWillMountWithContext.childContextTypes = {
-      foo: React.PropTypes.number,
+      foo: PropTypes.number,
     };
 
     var container = document.createElement('div');
diff --git a/src/renderers/__tests__/ReactStatelessComponent-test.js b/src/renderers/__tests__/ReactStatelessComponent-test.js
index 3f11bf438e15e..0792eded59464 100644
--- a/src/renderers/__tests__/ReactStatelessComponent-test.js
+++ b/src/renderers/__tests__/ReactStatelessComponent-test.js
@@ -11,6 +11,7 @@
 
 'use strict';
 
+var PropTypes;
 var React;
 var ReactDOM;
 var ReactTestUtils;
@@ -28,6 +29,7 @@ describe('ReactStatelessComponent', () => {
 
   beforeEach(() => {
     jest.resetModuleRegistry();
+    PropTypes = require('prop-types');
     React = require('react');
     ReactDOM = require('react-dom');
     ReactTestUtils = require('ReactTestUtils');
@@ -68,7 +70,7 @@ describe('ReactStatelessComponent', () => {
   it('should pass context thru stateless component', () => {
     class Child extends React.Component {
       static contextTypes = {
-        test: React.PropTypes.string.isRequired,
+        test: PropTypes.string.isRequired,
       };
 
       render() {
@@ -82,7 +84,7 @@ describe('ReactStatelessComponent', () => {
 
     class GrandParent extends React.Component {
       static childContextTypes = {
-        test: React.PropTypes.string.isRequired,
+        test: PropTypes.string.isRequired,
       };
 
       getChildContext() {
@@ -111,7 +113,7 @@ describe('ReactStatelessComponent', () => {
     }
 
     StatelessComponentWithChildContext.childContextTypes = {
-      foo: React.PropTypes.string,
+      foo: PropTypes.string,
     };
 
     var container = document.createElement('div');
@@ -355,7 +357,7 @@ describe('ReactStatelessComponent', () => {
       return <div>{props.test}</div>;
     }
     Child.defaultProps = {test: 2};
-    Child.propTypes = {test: React.PropTypes.string};
+    Child.propTypes = {test: PropTypes.string};
 
     spyOn(console, 'error');
     ReactTestUtils.renderIntoDocument(<Child />);
@@ -372,7 +374,7 @@ describe('ReactStatelessComponent', () => {
   it('should receive context', () => {
     class Parent extends React.Component {
       static childContextTypes = {
-        lang: React.PropTypes.string,
+        lang: PropTypes.string,
       };
 
       getChildContext() {
@@ -387,7 +389,7 @@ describe('ReactStatelessComponent', () => {
     function Child(props, context) {
       return <div>{context.lang}</div>;
     }
-    Child.contextTypes = {lang: React.PropTypes.string};
+    Child.contextTypes = {lang: PropTypes.string};
 
     var el = document.createElement('div');
     ReactDOM.render(<Parent />, el);
diff --git a/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js b/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js
index a2280be28f1f2..026fa910355a5 100644
--- a/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js
+++ b/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js
@@ -15,6 +15,7 @@ var React = require('react');
 var ReactDOM = require('react-dom');
 var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
 var ReactTestUtils = require('ReactTestUtils');
+var PropTypes = require('prop-types');
 
 describe('ReactDOMFiber', () => {
   var container;
@@ -683,7 +684,7 @@ describe('ReactDOMFiber', () => {
 
       class Component extends React.Component {
         static contextTypes = {
-          foo: React.PropTypes.string.isRequired,
+          foo: PropTypes.string.isRequired,
         };
 
         render() {
@@ -693,7 +694,7 @@ describe('ReactDOMFiber', () => {
 
       class Parent extends React.Component {
         static childContextTypes = {
-          foo: React.PropTypes.string.isRequired,
+          foo: PropTypes.string.isRequired,
         };
 
         getChildContext() {
@@ -717,8 +718,8 @@ describe('ReactDOMFiber', () => {
 
       class Component extends React.Component {
         static contextTypes = {
-          foo: React.PropTypes.string.isRequired,
-          getFoo: React.PropTypes.func.isRequired,
+          foo: PropTypes.string.isRequired,
+          getFoo: PropTypes.func.isRequired,
         };
 
         render() {
@@ -728,8 +729,8 @@ describe('ReactDOMFiber', () => {
 
       class Parent extends React.Component {
         static childContextTypes = {
-          foo: React.PropTypes.string.isRequired,
-          getFoo: React.PropTypes.func.isRequired,
+          foo: PropTypes.string.isRequired,
+          getFoo: PropTypes.func.isRequired,
         };
 
         state = {
@@ -761,8 +762,8 @@ describe('ReactDOMFiber', () => {
 
       class Component extends React.Component {
         static contextTypes = {
-          foo: React.PropTypes.string.isRequired,
-          getFoo: React.PropTypes.func.isRequired,
+          foo: PropTypes.string.isRequired,
+          getFoo: PropTypes.func.isRequired,
         };
 
         render() {
@@ -772,8 +773,8 @@ describe('ReactDOMFiber', () => {
 
       class Parent extends React.Component {
         static childContextTypes = {
-          foo: React.PropTypes.string.isRequired,
-          getFoo: React.PropTypes.func.isRequired,
+          foo: PropTypes.string.isRequired,
+          getFoo: PropTypes.func.isRequired,
         };
 
         getChildContext() {
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js b/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
index af29b8d5ac882..0381ec8fb82aa 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
@@ -12,6 +12,7 @@
 'use strict';
 
 let ExecutionEnvironment;
+let PropTypes;
 let React;
 let ReactDOM;
 let ReactDOMServer;
@@ -206,6 +207,7 @@ function expectMarkupMismatch(serverElement, clientElement) {
 // To get around this, we must reload React modules in between server and client render.
 function resetModules() {
   jest.resetModuleRegistry();
+  PropTypes = require('prop-types');
   React = require('React');
   ReactDOM = require('ReactDOM');
   ReactDOMServer = require('ReactDOMServer');
@@ -1585,7 +1587,7 @@ describe('ReactDOMServerIntegration', () => {
           return this.props.children;
         }
       }
-      Parent.childContextTypes = {text: React.PropTypes.string};
+      Parent.childContextTypes = {text: PropTypes.string};
 
       PurpleContext = props => <Parent text="purple">{props.children}</Parent>;
       RedContext = props => <Parent text="red">{props.children}</Parent>;
@@ -1597,7 +1599,7 @@ describe('ReactDOMServerIntegration', () => {
           return <div>{this.context.text}</div>;
         }
       }
-      ClassChildWithContext.contextTypes = {text: React.PropTypes.string};
+      ClassChildWithContext.contextTypes = {text: PropTypes.string};
 
       const e = await render(
         <PurpleContext><ClassChildWithContext /></PurpleContext>,
@@ -1609,7 +1611,7 @@ describe('ReactDOMServerIntegration', () => {
       function StatelessChildWithContext(props, context) {
         return <div>{context.text}</div>;
       }
-      StatelessChildWithContext.contextTypes = {text: React.PropTypes.string};
+      StatelessChildWithContext.contextTypes = {text: PropTypes.string};
 
       const e = await render(
         <PurpleContext><StatelessChildWithContext /></PurpleContext>,
@@ -1650,7 +1652,7 @@ describe('ReactDOMServerIntegration', () => {
           return <div id="classWrongChild">{this.context.text}</div>;
         }
       }
-      ClassChildWithWrongContext.contextTypes = {foo: React.PropTypes.string};
+      ClassChildWithWrongContext.contextTypes = {foo: PropTypes.string};
 
       const e = await render(
         <PurpleContext><ClassChildWithWrongContext /></PurpleContext>,
@@ -1664,7 +1666,7 @@ describe('ReactDOMServerIntegration', () => {
         return <div id="statelessWrongChild">{context.text}</div>;
       }
       StatelessChildWithWrongContext.contextTypes = {
-        foo: React.PropTypes.string,
+        foo: PropTypes.string,
       };
 
       const e = await render(
@@ -1677,7 +1679,7 @@ describe('ReactDOMServerIntegration', () => {
       function Grandchild(props, context) {
         return <div>{context.text}</div>;
       }
-      Grandchild.contextTypes = {text: React.PropTypes.string};
+      Grandchild.contextTypes = {text: PropTypes.string};
 
       const Child = props => <Grandchild />;
 
@@ -1689,7 +1691,7 @@ describe('ReactDOMServerIntegration', () => {
       const Grandchild = (props, context) => {
         return <div>{context.text}</div>;
       };
-      Grandchild.contextTypes = {text: React.PropTypes.string};
+      Grandchild.contextTypes = {text: PropTypes.string};
 
       const e = await render(
         <PurpleContext><RedContext><Grandchild /></RedContext></PurpleContext>,
@@ -1706,7 +1708,7 @@ describe('ReactDOMServerIntegration', () => {
           return <Child />;
         }
       }
-      Parent.childContextTypes = {text1: React.PropTypes.string};
+      Parent.childContextTypes = {text1: PropTypes.string};
 
       class Child extends React.Component {
         getChildContext() {
@@ -1716,7 +1718,7 @@ describe('ReactDOMServerIntegration', () => {
           return <Grandchild />;
         }
       }
-      Child.childContextTypes = {text2: React.PropTypes.string};
+      Child.childContextTypes = {text2: PropTypes.string};
 
       const Grandchild = (props, context) => {
         return (
@@ -1727,8 +1729,8 @@ describe('ReactDOMServerIntegration', () => {
         );
       };
       Grandchild.contextTypes = {
-        text1: React.PropTypes.string,
-        text2: React.PropTypes.string,
+        text1: PropTypes.string,
+        text2: PropTypes.string,
       };
 
       const e = await render(<Parent />);
@@ -1750,12 +1752,12 @@ describe('ReactDOMServerIntegration', () => {
             return <Child />;
           }
         }
-        WillMountContext.childContextTypes = {text: React.PropTypes.string};
+        WillMountContext.childContextTypes = {text: PropTypes.string};
 
         const Child = (props, context) => {
           return <div>{context.text}</div>;
         };
-        Child.contextTypes = {text: React.PropTypes.string};
+        Child.contextTypes = {text: PropTypes.string};
 
         const e = await render(<WillMountContext />);
         expect(e.textContent).toBe('foo');
@@ -1788,7 +1790,7 @@ describe('ReactDOMServerIntegration', () => {
             return {value1: 'foo', value2: 'bar'};
           }
         }
-        Component.childContextTypes = {value1: React.PropTypes.string};
+        Component.childContextTypes = {value1: PropTypes.string};
         return render(<Component />);
       },
     );
diff --git a/src/renderers/dom/shared/__tests__/renderSubtreeIntoContainer-test.js b/src/renderers/dom/shared/__tests__/renderSubtreeIntoContainer-test.js
index 30e617480b1fa..a0a30dfe8d726 100644
--- a/src/renderers/dom/shared/__tests__/renderSubtreeIntoContainer-test.js
+++ b/src/renderers/dom/shared/__tests__/renderSubtreeIntoContainer-test.js
@@ -12,6 +12,7 @@
 'use strict';
 
 var React = require('react');
+var PropTypes = require('prop-types');
 var ReactDOM = require('react-dom');
 var ReactTestUtils = require('ReactTestUtils');
 var renderSubtreeIntoContainer = require('renderSubtreeIntoContainer');
@@ -22,7 +23,7 @@ describe('renderSubtreeIntoContainer', () => {
 
     class Component extends React.Component {
       static contextTypes = {
-        foo: React.PropTypes.string.isRequired,
+        foo: PropTypes.string.isRequired,
       };
 
       render() {
@@ -32,7 +33,7 @@ describe('renderSubtreeIntoContainer', () => {
 
     class Parent extends React.Component {
       static childContextTypes = {
-        foo: React.PropTypes.string.isRequired,
+        foo: PropTypes.string.isRequired,
       };
 
       getChildContext() {
@@ -63,7 +64,7 @@ describe('renderSubtreeIntoContainer', () => {
 
     class Component extends React.Component {
       static contextTypes = {
-        foo: React.PropTypes.string.isRequired,
+        foo: PropTypes.string.isRequired,
       };
 
       render() {
@@ -76,7 +77,7 @@ describe('renderSubtreeIntoContainer', () => {
     // eslint-disable-next-line no-unused-vars
     class Parent extends React.Component {
       static childContextTypes = {
-        foo: React.PropTypes.string.isRequired,
+        foo: PropTypes.string.isRequired,
       };
 
       getChildContext() {
@@ -104,8 +105,8 @@ describe('renderSubtreeIntoContainer', () => {
 
     class Component extends React.Component {
       static contextTypes = {
-        foo: React.PropTypes.string.isRequired,
-        getFoo: React.PropTypes.func.isRequired,
+        foo: PropTypes.string.isRequired,
+        getFoo: PropTypes.func.isRequired,
       };
 
       render() {
@@ -115,8 +116,8 @@ describe('renderSubtreeIntoContainer', () => {
 
     class Parent extends React.Component {
       static childContextTypes = {
-        foo: React.PropTypes.string.isRequired,
-        getFoo: React.PropTypes.func.isRequired,
+        foo: PropTypes.string.isRequired,
+        getFoo: PropTypes.func.isRequired,
       };
 
       state = {
@@ -156,8 +157,8 @@ describe('renderSubtreeIntoContainer', () => {
 
     class Component extends React.Component {
       static contextTypes = {
-        foo: React.PropTypes.string.isRequired,
-        getFoo: React.PropTypes.func.isRequired,
+        foo: PropTypes.string.isRequired,
+        getFoo: PropTypes.func.isRequired,
       };
 
       render() {
@@ -167,8 +168,8 @@ describe('renderSubtreeIntoContainer', () => {
 
     class Parent extends React.Component {
       static childContextTypes = {
-        foo: React.PropTypes.string.isRequired,
-        getFoo: React.PropTypes.func.isRequired,
+        foo: PropTypes.string.isRequired,
+        getFoo: PropTypes.func.isRequired,
       };
 
       getChildContext() {
@@ -229,7 +230,7 @@ describe('renderSubtreeIntoContainer', () => {
         return {value: this.props.value};
       }
       static childContextTypes = {
-        value: React.PropTypes.string.isRequired,
+        value: PropTypes.string.isRequired,
       };
     }
 
@@ -244,7 +245,7 @@ describe('renderSubtreeIntoContainer', () => {
 
     class Child extends React.Component {
       static contextTypes = {
-        value: React.PropTypes.string.isRequired,
+        value: PropTypes.string.isRequired,
       };
       render() {
         return <div>{this.context.value}</div>;
@@ -272,7 +273,7 @@ describe('renderSubtreeIntoContainer', () => {
         renderSubtreeIntoContainer(this, <Middle />, portal1);
       }
       static childContextTypes = {
-        value: React.PropTypes.string.isRequired,
+        value: PropTypes.string.isRequired,
       };
     }
 
@@ -287,7 +288,7 @@ describe('renderSubtreeIntoContainer', () => {
 
     class Child extends React.Component {
       static contextTypes = {
-        value: React.PropTypes.string.isRequired,
+        value: PropTypes.string.isRequired,
       };
       render() {
         return <div>{this.context.value}</div>;
diff --git a/src/renderers/dom/shared/utils/ReactControlledValuePropTypes.js b/src/renderers/dom/shared/utils/ReactControlledValuePropTypes.js
index e0cdedf22f5c7..0f8b44bc81e4d 100644
--- a/src/renderers/dom/shared/utils/ReactControlledValuePropTypes.js
+++ b/src/renderers/dom/shared/utils/ReactControlledValuePropTypes.js
@@ -11,7 +11,7 @@
 
 'use strict';
 
-var React = require('react');
+var PropTypes = require('prop-types');
 var ReactPropTypesSecret = require('ReactPropTypesSecret');
 
 var warning = require('fbjs/lib/warning');
@@ -57,7 +57,7 @@ var propTypes = {
         'set either `onChange` or `readOnly`.',
     );
   },
-  onChange: React.PropTypes.func,
+  onChange: PropTypes.func,
 };
 
 var loggedTypeFailures = {};
diff --git a/src/renderers/native/__tests__/ReactNativeEvents-test.js b/src/renderers/native/__tests__/ReactNativeEvents-test.js
index 56206149a75e0..9efa5f05e097b 100644
--- a/src/renderers/native/__tests__/ReactNativeEvents-test.js
+++ b/src/renderers/native/__tests__/ReactNativeEvents-test.js
@@ -11,6 +11,7 @@
 
 'use strict';
 
+var PropTypes;
 var RCTEventEmitter;
 var React;
 var ReactNative;
@@ -21,6 +22,7 @@ var createReactNativeComponentClass;
 beforeEach(() => {
   jest.resetModules();
 
+  PropTypes = require('prop-types');
   RCTEventEmitter = require('RCTEventEmitter');
   React = require('react');
   ReactNative = require('ReactNative');
@@ -97,7 +99,7 @@ it('handles events on text nodes', () => {
   });
 
   class ContextHack extends React.Component {
-    static childContextTypes = {isInAParentText: React.PropTypes.bool};
+    static childContextTypes = {isInAParentText: PropTypes.bool};
     getChildContext() {
       return {isInAParentText: true};
     }
diff --git a/src/renderers/shared/fiber/ReactFiberContext.js b/src/renderers/shared/fiber/ReactFiberContext.js
index e60fdd850eb16..b2104d19e9039 100644
--- a/src/renderers/shared/fiber/ReactFiberContext.js
+++ b/src/renderers/shared/fiber/ReactFiberContext.js
@@ -15,7 +15,7 @@
 import type {Fiber} from 'ReactFiber';
 import type {StackCursor} from 'ReactFiberStack';
 
-var React = require('react');
+var checkPropTypes = require('checkPropTypes');
 var emptyObject = require('fbjs/lib/emptyObject');
 var getComponentName = require('getComponentName');
 var invariant = require('fbjs/lib/invariant');
@@ -105,8 +105,7 @@ exports.getMaskedContext = function(
   if (__DEV__) {
     const name = getComponentName(workInProgress) || 'Unknown';
     ReactDebugCurrentFrame.current = workInProgress;
-    // $FlowFixMe - We know this export exists now, need to wait for Flow update
-    React.checkPropTypes(
+    checkPropTypes(
       contextTypes,
       context,
       'context',
@@ -219,8 +218,7 @@ function processChildContext(
     // TODO: remove this hack when we delete unstable_renderSubtree in Fiber.
     const workInProgress = isReconciling ? fiber : null;
     ReactDebugCurrentFrame.current = workInProgress;
-    // $FlowFixMe - We know this export exists now, need to wait for Flow update
-    React.checkPropTypes(
+    checkPropTypes(
       childContextTypes,
       childContext,
       'child context',
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js b/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
index f0da503be5e12..b66151f38e2aa 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
@@ -14,12 +14,14 @@
 var React;
 var ReactNoop;
 var ReactFeatureFlags;
+var PropTypes;
 
 describe('ReactIncremental', () => {
   beforeEach(() => {
     jest.resetModules();
     React = require('react');
     ReactNoop = require('ReactNoop');
+    PropTypes = require('prop-types');
 
     ReactFeatureFlags = require('ReactFeatureFlags');
     ReactFeatureFlags.disableNewFiberFeatures = false;
@@ -1592,7 +1594,7 @@ describe('ReactIncremental', () => {
 
     class Intl extends React.Component {
       static childContextTypes = {
-        locale: React.PropTypes.string,
+        locale: PropTypes.string,
       };
       getChildContext() {
         return {
@@ -1607,7 +1609,7 @@ describe('ReactIncremental', () => {
 
     class Router extends React.Component {
       static childContextTypes = {
-        route: React.PropTypes.string,
+        route: PropTypes.string,
       };
       getChildContext() {
         return {
@@ -1622,7 +1624,7 @@ describe('ReactIncremental', () => {
 
     class ShowLocale extends React.Component {
       static contextTypes = {
-        locale: React.PropTypes.string,
+        locale: PropTypes.string,
       };
       render() {
         ops.push('ShowLocale ' + JSON.stringify(this.context));
@@ -1632,7 +1634,7 @@ describe('ReactIncremental', () => {
 
     class ShowRoute extends React.Component {
       static contextTypes = {
-        route: React.PropTypes.string,
+        route: PropTypes.string,
       };
       render() {
         ops.push('ShowRoute ' + JSON.stringify(this.context));
@@ -1645,8 +1647,8 @@ describe('ReactIncremental', () => {
       return `${context.route} in ${context.locale}`;
     }
     ShowBoth.contextTypes = {
-      locale: React.PropTypes.string,
-      route: React.PropTypes.string,
+      locale: PropTypes.string,
+      route: PropTypes.string,
     };
 
     class ShowNeither extends React.Component {
@@ -1745,10 +1747,10 @@ describe('ReactIncremental', () => {
     var ops = [];
     class Recurse extends React.Component {
       static contextTypes = {
-        n: React.PropTypes.number,
+        n: PropTypes.number,
       };
       static childContextTypes = {
-        n: React.PropTypes.number,
+        n: PropTypes.number,
       };
       getChildContext() {
         return {n: (this.context.n || 3) - 1};
@@ -1777,7 +1779,7 @@ describe('ReactIncremental', () => {
 
     class Intl extends React.Component {
       static childContextTypes = {
-        locale: React.PropTypes.string,
+        locale: PropTypes.string,
       };
       getChildContext() {
         return {
@@ -1792,7 +1794,7 @@ describe('ReactIncremental', () => {
 
     class ShowLocale extends React.Component {
       static contextTypes = {
-        locale: React.PropTypes.string,
+        locale: PropTypes.string,
       };
       render() {
         ops.push('ShowLocale ' + JSON.stringify(this.context));
@@ -1835,7 +1837,7 @@ describe('ReactIncremental', () => {
 
     class Intl extends React.Component {
       static childContextTypes = {
-        locale: React.PropTypes.string,
+        locale: PropTypes.string,
       };
       getChildContext() {
         const childContext = {
@@ -1852,7 +1854,7 @@ describe('ReactIncremental', () => {
 
     class ShowLocaleClass extends React.Component {
       static contextTypes = {
-        locale: React.PropTypes.string,
+        locale: PropTypes.string,
       };
       render() {
         ops.push('ShowLocaleClass:read ' + JSON.stringify(this.context));
@@ -1865,7 +1867,7 @@ describe('ReactIncremental', () => {
       return context.locale;
     }
     ShowLocaleFn.contextTypes = {
-      locale: React.PropTypes.string,
+      locale: PropTypes.string,
     };
 
     class Stateful extends React.Component {
@@ -1925,7 +1927,7 @@ describe('ReactIncremental', () => {
 
     class Intl extends React.Component {
       static childContextTypes = {
-        locale: React.PropTypes.string,
+        locale: PropTypes.string,
       };
       getChildContext() {
         const childContext = {
@@ -1942,7 +1944,7 @@ describe('ReactIncremental', () => {
 
     class ShowLocaleClass extends React.Component {
       static contextTypes = {
-        locale: React.PropTypes.string,
+        locale: PropTypes.string,
       };
       render() {
         ops.push('ShowLocaleClass:read ' + JSON.stringify(this.context));
@@ -1955,7 +1957,7 @@ describe('ReactIncremental', () => {
       return context.locale;
     }
     ShowLocaleFn.contextTypes = {
-      locale: React.PropTypes.string,
+      locale: PropTypes.string,
     };
 
     function IndirectionFn(props, context) {
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
index 4b4b415cc7173..b4c9098e8f4cf 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
@@ -11,6 +11,7 @@
 
 'use strict';
 
+var PropTypes;
 var React;
 var ReactNoop;
 var ReactFeatureFlags;
@@ -18,6 +19,7 @@ var ReactFeatureFlags;
 describe('ReactIncrementalErrorHandling', () => {
   beforeEach(() => {
     jest.resetModules();
+    PropTypes = require('prop-types');
     React = require('react');
     ReactNoop = require('ReactNoop');
     ReactFeatureFlags = require('ReactFeatureFlags');
@@ -679,8 +681,8 @@ describe('ReactIncrementalErrorHandling', () => {
 
   it('unwinds the context stack correctly on error', () => {
     class Provider extends React.Component {
-      static childContextTypes = {message: React.PropTypes.string};
-      static contextTypes = {message: React.PropTypes.string};
+      static childContextTypes = {message: PropTypes.string};
+      static contextTypes = {message: PropTypes.string};
       getChildContext() {
         return {
           message: (this.context.message || '') + this.props.message,
@@ -696,7 +698,7 @@ describe('ReactIncrementalErrorHandling', () => {
     }
 
     Connector.contextTypes = {
-      message: React.PropTypes.string,
+      message: PropTypes.string,
     };
 
     function BadRender() {
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js
index b4a47480039fd..56fa122245c1d 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js
@@ -17,6 +17,7 @@ describe('ReactDebugFiberPerf', () => {
   let ReactFeatureFlags;
   let ReactNoop;
   let ReactPortal;
+  let PropTypes;
 
   let root;
   let activeMeasure;
@@ -119,6 +120,7 @@ describe('ReactDebugFiberPerf', () => {
     ReactNoop = require('ReactNoop');
     ReactPortal = require('ReactPortal');
     ReactFeatureFlags.disableNewFiberFeatures = false;
+    PropTypes = require('prop-types');
   });
 
   afterEach(() => {
@@ -245,7 +247,7 @@ describe('ReactDebugFiberPerf', () => {
   it('captures all lifecycles', () => {
     class AllLifecycles extends React.Component {
       static childContextTypes = {
-        foo: React.PropTypes.any,
+        foo: PropTypes.any,
       };
       shouldComponentUpdate() {
         return true;
diff --git a/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js b/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
index 6649dffaf64b5..2ad0d4b40316b 100644
--- a/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
+++ b/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
@@ -27,6 +27,7 @@ if (__DEV__) {
   var warningAboutMissingGetChildContext = {};
 }
 
+var checkPropTypes = require('checkPropTypes');
 var emptyObject = require('fbjs/lib/emptyObject');
 var invariant = require('fbjs/lib/invariant');
 var shallowEqual = require('fbjs/lib/shallowEqual');
@@ -729,7 +730,7 @@ var ReactCompositeComponent = {
   _checkContextTypes: function(typeSpecs, values, location: string) {
     if (__DEV__) {
       ReactDebugCurrentFrame.current = this._debugID;
-      React.checkPropTypes(
+      checkPropTypes(
         typeSpecs,
         values,
         location,
diff --git a/src/test/__tests__/ReactTestUtils-test.js b/src/test/__tests__/ReactTestUtils-test.js
index 68c489cfb8f3d..cd1b2a5dc8a5c 100644
--- a/src/test/__tests__/ReactTestUtils-test.js
+++ b/src/test/__tests__/ReactTestUtils-test.js
@@ -11,6 +11,7 @@
 
 'use strict';
 
+var PropTypes;
 var React;
 var ReactDOM;
 var ReactDOMServer;
@@ -18,6 +19,7 @@ var ReactTestUtils;
 
 describe('ReactTestUtils', () => {
   beforeEach(() => {
+    PropTypes = require('prop-types');
     React = require('react');
     ReactDOM = require('react-dom');
     ReactDOMServer = require('react-dom/server');
@@ -195,7 +197,7 @@ describe('ReactTestUtils', () => {
   it('can shallowly render components with contextTypes', () => {
     class SimpleComponent extends React.Component {
       static contextTypes = {
-        name: React.PropTypes.string,
+        name: PropTypes.string,
       };
 
       render() {
@@ -258,7 +260,7 @@ describe('ReactTestUtils', () => {
   it('can pass context when shallowly rendering', () => {
     class SimpleComponent extends React.Component {
       static contextTypes = {
-        name: React.PropTypes.string,
+        name: PropTypes.string,
       };
 
       render() {
@@ -278,7 +280,7 @@ describe('ReactTestUtils', () => {
 
     class SimpleComponent extends React.Component {
       static contextTypes = {
-        name: React.PropTypes.string.isRequired,
+        name: PropTypes.string.isRequired,
       };
 
       render() {
diff --git a/yarn.lock b/yarn.lock
index 681679cb60642..bd8f7924ce013 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1438,11 +1438,12 @@ create-hmac@^1.1.0, create-hmac@^1.1.2:
     create-hash "^1.1.0"
     inherits "^2.0.1"
 
-create-react-class@^15.5.0:
-  version "15.5.0"
-  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.5.0.tgz#7508ffcad56a0804fb244d6ff70b07648abfe5fb"
+create-react-class@^15.5.2:
+  version "15.5.2"
+  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.5.2.tgz#6a8758348df660b88326a0e764d569f274aad681"
   dependencies:
     fbjs "^0.8.9"
+    object-assign "^4.1.1"
 
 cross-spawn-async@^2.2.2:
   version "2.2.5"
@@ -3929,6 +3930,12 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
+prop-types@^15.5.6:
+  version "15.5.6"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.6.tgz#797a915b1714b645ebb7c5d6cc690346205bd2aa"
+  dependencies:
+    fbjs "^0.8.9"
+
 prr@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"

From 6cd7618bd7ed5a52aaf576a3fe5fb71f594c38a1 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Tue, 11 Apr 2017 14:40:56 -0700
Subject: [PATCH 088/153] Bumped versions for 16.0.0-alpha.9 and re-built

---
 package.json                              |  2 +-
 packages/react-art/package.json           |  4 +-
 packages/react-dom/package.json           |  4 +-
 packages/react-noop-renderer/package.json |  2 +-
 packages/react-test-renderer/package.json |  4 +-
 packages/react/package.json               |  2 +-
 scripts/rollup/results.json               | 56 +++++++++++------------
 src/ReactVersion.js                       |  2 +-
 8 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/package.json b/package.json
index c8c55229203dc..7dba9499b1739 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-build",
   "private": true,
-  "version": "16.0.0-alpha.8",
+  "version": "16.0.0-alpha.9",
   "devDependencies": {
     "aliasify": "^2.0.0",
     "art": "^0.10.1",
diff --git a/packages/react-art/package.json b/packages/react-art/package.json
index 8f9ddca085cd5..5f14174fa795e 100644
--- a/packages/react-art/package.json
+++ b/packages/react-art/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-art",
-  "version": "16.0.0-alpha.8",
+  "version": "16.0.0-alpha.9",
   "description": "React ART is a JavaScript library for drawing vector graphics using React. It provides declarative and reactive bindings to the ART library. Using the same declarative API you can render the output to either Canvas, SVG or VML (IE8).",
   "main": "index.js",
   "repository": "facebook/react",
@@ -23,7 +23,7 @@
     "object-assign": "^4.1.0"
   },
   "peerDependencies": {
-    "react": "^16.0.0-alpha.8"
+    "react": "^16.0.0-alpha.9"
   },
   "files": [
     "LICENSE",
diff --git a/packages/react-dom/package.json b/packages/react-dom/package.json
index 0dae9585dfe72..52070cd964734 100644
--- a/packages/react-dom/package.json
+++ b/packages/react-dom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-dom",
-  "version": "16.0.0-alpha.8",
+  "version": "16.0.0-alpha.9",
   "description": "React package for working with the DOM.",
   "main": "index.js",
   "repository": "facebook/react",
@@ -19,7 +19,7 @@
     "prop-types": "^15.5.6"
   },
   "peerDependencies": {
-    "react": "^16.0.0-alpha.8"
+    "react": "^16.0.0-alpha.9"
   },
   "files": [
     "LICENSE",
diff --git a/packages/react-noop-renderer/package.json b/packages/react-noop-renderer/package.json
index dd0906e193462..bfe1749a0ccf4 100644
--- a/packages/react-noop-renderer/package.json
+++ b/packages/react-noop-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-noop-renderer",
-  "version": "16.0.0-alpha.8",
+  "version": "16.0.0-alpha.9",
   "private": true,
   "description": "React package for testing the Fiber reconciler.",
   "main": "index.js",
diff --git a/packages/react-test-renderer/package.json b/packages/react-test-renderer/package.json
index ef15cc2e25361..a9cedf4ce70d9 100644
--- a/packages/react-test-renderer/package.json
+++ b/packages/react-test-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-test-renderer",
-  "version": "16.0.0-alpha.8",
+  "version": "16.0.0-alpha.9",
   "description": "React package for snapshot testing.",
   "main": "index.js",
   "repository": "facebook/react",
@@ -19,7 +19,7 @@
     "object-assign": "^4.1.0"
   },
   "peerDependencies": {
-    "react": "^16.0.0-alpha.8"
+    "react": "^16.0.0-alpha.9"
   },
   "files": [
     "LICENSE",
diff --git a/packages/react/package.json b/packages/react/package.json
index 134466884dc89..4df2dac46893d 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react",
   "description": "React is a JavaScript library for building user interfaces.",
-  "version": "16.0.0-alpha.8",
+  "version": "16.0.0-alpha.9",
   "keywords": [
     "react"
   ],
diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
index d676282dc3bff..01bee146eedc6 100644
--- a/scripts/rollup/results.json
+++ b/scripts/rollup/results.json
@@ -1,21 +1,21 @@
 {
-  "branch": "prop-types",
+  "branch": "master",
   "bundleSizes": {
     "react.development.js (UMD_DEV)": {
-      "size": 121474,
-      "gzip": 30524
+      "size": 121454,
+      "gzip": 30515
     },
     "react.production.min.js (UMD_PROD)": {
       "size": 15685,
       "gzip": 5765
     },
     "react-dom.development.js (UMD_DEV)": {
-      "size": 583352,
-      "gzip": 134572
+      "size": 583190,
+      "gzip": 134534
     },
     "react-dom.production.min.js (UMD_PROD)": {
       "size": 120740,
-      "gzip": 38092
+      "gzip": 38094
     },
     "react-dom-server.development.js (UMD_DEV)": {
       "size": 495558,
@@ -26,24 +26,24 @@
       "gzip": 33273
     },
     "react-art.development.js (UMD_DEV)": {
-      "size": 342770,
-      "gzip": 76828
+      "size": 342608,
+      "gzip": 76782
     },
     "react-art.production.min.js (UMD_PROD)": {
       "size": 95013,
-      "gzip": 28990
+      "gzip": 28991
     },
     "react.development.js (NODE_DEV)": {
-      "size": 70286,
-      "gzip": 17600
+      "size": 70266,
+      "gzip": 17594
     },
     "react.production.min.js (NODE_PROD)": {
       "size": 9226,
-      "gzip": 3626
+      "gzip": 3628
     },
     "React-dev.js (FB_DEV)": {
-      "size": 72143,
-      "gzip": 18236
+      "size": 72123,
+      "gzip": 18231
     },
     "React-prod.js (FB_PROD)": {
       "size": 36643,
@@ -58,16 +58,16 @@
       "gzip": 84675
     },
     "react-dom.development.js (NODE_DEV)": {
-      "size": 542350,
-      "gzip": 125199
+      "size": 542188,
+      "gzip": 125158
     },
     "react-dom.production.min.js (NODE_PROD)": {
       "size": 116925,
       "gzip": 36732
     },
     "ReactDOMFiber-dev.js (FB_DEV)": {
-      "size": 797397,
-      "gzip": 184161
+      "size": 797235,
+      "gzip": 184122
     },
     "ReactDOMFiber-prod.js (FB_PROD)": {
       "size": 407613,
@@ -98,16 +98,16 @@
       "gzip": 22993
     },
     "react-art.development.js (NODE_DEV)": {
-      "size": 265214,
-      "gzip": 56974
+      "size": 265052,
+      "gzip": 56927
     },
     "react-art.production.min.js (NODE_PROD)": {
       "size": 56628,
       "gzip": 17152
     },
     "ReactARTFiber-dev.js (FB_DEV)": {
-      "size": 264392,
-      "gzip": 56780
+      "size": 264230,
+      "gzip": 56736
     },
     "ReactARTFiber-prod.js (FB_PROD)": {
       "size": 205336,
@@ -122,20 +122,20 @@
       "gzip": 84001
     },
     "ReactTestRendererFiber-dev.js (FB_DEV)": {
-      "size": 262301,
-      "gzip": 55747
+      "size": 262139,
+      "gzip": 55704
     },
     "ReactTestRendererStack-dev.js (FB_DEV)": {
       "size": 151521,
       "gzip": 34765
     },
     "react-noop-renderer.development.js (NODE_DEV)": {
-      "size": 254298,
-      "gzip": 53728
+      "size": 254136,
+      "gzip": 53682
     },
     "react-test-renderer.development.js (NODE_DEV)": {
-      "size": 263132,
-      "gzip": 55938
+      "size": 262970,
+      "gzip": 55891
     }
   }
 }
\ No newline at end of file
diff --git a/src/ReactVersion.js b/src/ReactVersion.js
index d6ec94ed53dee..fd32524d89f46 100644
--- a/src/ReactVersion.js
+++ b/src/ReactVersion.js
@@ -11,4 +11,4 @@
 
 'use strict';
 
-module.exports = '16.0.0-alpha.8';
+module.exports = '16.0.0-alpha.9';

From 446f186279f3b5197d098c2f145ca809dd090d24 Mon Sep 17 00:00:00 2001
From: Dominic Gannaway <trueadm@users.noreply.github.com>
Date: Wed, 12 Apr 2017 00:04:38 +0100
Subject: [PATCH 089/153] Update typechecking-with-proptypes.md (#9392)

* Update typechecking-with-proptypes.md

* Update typechecking-with-proptypes.md

* Use consistent style for PropTypes import
---
 docs/docs/typechecking-with-proptypes.md | 62 +++++++++++++-----------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/docs/docs/typechecking-with-proptypes.md b/docs/docs/typechecking-with-proptypes.md
index ce5e0aedee977..85c128d3a909f 100644
--- a/docs/docs/typechecking-with-proptypes.md
+++ b/docs/docs/typechecking-with-proptypes.md
@@ -12,6 +12,8 @@ redirect_from:
 As your app grows, you can catch a lot of bugs with typechecking. For some applications, you can use JavaScript extensions like [Flow](https://flowtype.org/) or [TypeScript](https://www.typescriptlang.org/) to typecheck your whole application. But even if you don't use those, React has some built-in typechecking abilities. To run typechecking on the props for a component, you can assign the special `propTypes` property:
 
 ```javascript
+import PropTypes from 'prop-types';
+
 class Greeting extends React.Component {
   render() {
     return (
@@ -21,68 +23,70 @@ class Greeting extends React.Component {
 }
 
 Greeting.propTypes = {
-  name: React.PropTypes.string
+  name: PropTypes.string
 };
 ```
 
-`React.PropTypes` exports a range of validators that can be used to make sure the data you receive is valid. In this example, we're using `React.PropTypes.string`. When an invalid value is provided for a prop, a warning will be shown in the JavaScript console. For performance reasons, `propTypes` is only checked in development mode.
+`PropTypes` exports a range of validators that can be used to make sure the data you receive is valid. In this example, we're using `PropTypes.string`. When an invalid value is provided for a prop, a warning will be shown in the JavaScript console. For performance reasons, `propTypes` is only checked in development mode.
 
-### React.PropTypes
+### PropTypes
 
 Here is an example documenting the different validators provided:
 
 ```javascript
+import PropTypes from 'prop-types';
+
 MyComponent.propTypes = {
   // You can declare that a prop is a specific JS primitive. By default, these
   // are all optional.
-  optionalArray: React.PropTypes.array,
-  optionalBool: React.PropTypes.bool,
-  optionalFunc: React.PropTypes.func,
-  optionalNumber: React.PropTypes.number,
-  optionalObject: React.PropTypes.object,
-  optionalString: React.PropTypes.string,
-  optionalSymbol: React.PropTypes.symbol,
+  optionalArray: PropTypes.array,
+  optionalBool: PropTypes.bool,
+  optionalFunc: PropTypes.func,
+  optionalNumber: PropTypes.number,
+  optionalObject: PropTypes.object,
+  optionalString: PropTypes.string,
+  optionalSymbol: PropTypes.symbol,
 
   // Anything that can be rendered: numbers, strings, elements or an array
   // (or fragment) containing these types.
-  optionalNode: React.PropTypes.node,
+  optionalNode: PropTypes.node,
 
   // A React element.
-  optionalElement: React.PropTypes.element,
+  optionalElement: PropTypes.element,
 
   // You can also declare that a prop is an instance of a class. This uses
   // JS's instanceof operator.
-  optionalMessage: React.PropTypes.instanceOf(Message),
+  optionalMessage: PropTypes.instanceOf(Message),
 
   // You can ensure that your prop is limited to specific values by treating
   // it as an enum.
-  optionalEnum: React.PropTypes.oneOf(['News', 'Photos']),
+  optionalEnum: PropTypes.oneOf(['News', 'Photos']),
 
   // An object that could be one of many types
-  optionalUnion: React.PropTypes.oneOfType([
-    React.PropTypes.string,
-    React.PropTypes.number,
-    React.PropTypes.instanceOf(Message)
+  optionalUnion: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.number,
+    PropTypes.instanceOf(Message)
   ]),
 
   // An array of a certain type
-  optionalArrayOf: React.PropTypes.arrayOf(React.PropTypes.number),
+  optionalArrayOf: PropTypes.arrayOf(PropTypes.number),
 
   // An object with property values of a certain type
-  optionalObjectOf: React.PropTypes.objectOf(React.PropTypes.number),
+  optionalObjectOf: PropTypes.objectOf(PropTypes.number),
 
   // An object taking on a particular shape
-  optionalObjectWithShape: React.PropTypes.shape({
-    color: React.PropTypes.string,
-    fontSize: React.PropTypes.number
+  optionalObjectWithShape: PropTypes.shape({
+    color: PropTypes.string,
+    fontSize: PropTypes.number
   }),
 
   // You can chain any of the above with `isRequired` to make sure a warning
   // is shown if the prop isn't provided.
-  requiredFunc: React.PropTypes.func.isRequired,
+  requiredFunc: PropTypes.func.isRequired,
 
   // A value of any data type
-  requiredAny: React.PropTypes.any.isRequired,
+  requiredAny: PropTypes.any.isRequired,
 
   // You can also specify a custom validator. It should return an Error
   // object if the validation fails. Don't `console.warn` or throw, as this
@@ -101,7 +105,7 @@ MyComponent.propTypes = {
   // will be called for each key in the array or object. The first two
   // arguments of the validator are the array or object itself, and the
   // current item's key.
-  customArrayProp: React.PropTypes.arrayOf(function(propValue, key, componentName, location, propFullName) {
+  customArrayProp: PropTypes.arrayOf(function(propValue, key, componentName, location, propFullName) {
     if (!/matchme/.test(propValue[key])) {
       return new Error(
         'Invalid prop `' + propFullName + '` supplied to' +
@@ -114,9 +118,11 @@ MyComponent.propTypes = {
 
 ### Requiring Single Child
 
-With `React.PropTypes.element` you can specify that only a single child can be passed to a component as children.
+With `PropTypes.element` you can specify that only a single child can be passed to a component as children.
 
 ```javascript
+import PropTypes from 'prop-types';
+
 class MyComponent extends React.Component {
   render() {
     // This must be exactly one element or it will warn.
@@ -130,7 +136,7 @@ class MyComponent extends React.Component {
 }
 
 MyComponent.propTypes = {
-  children: React.PropTypes.element.isRequired
+  children: PropTypes.element.isRequired
 };
 ```
 

From 5cd44d21e9eb1e5014b9ae2109268600ce1c360f Mon Sep 17 00:00:00 2001
From: hanumanthan <hanu.sas@gmail.com>
Date: Thu, 13 Apr 2017 05:26:22 +0530
Subject: [PATCH 090/153] Refractor docs to indicate that state set to props in
 constructor will not recieve the updated props (#9404)

---
 docs/docs/reference-react-component.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/docs/reference-react-component.md b/docs/docs/reference-react-component.md
index d8c2be7302fec..03c3bcba2d0de 100644
--- a/docs/docs/reference-react-component.md
+++ b/docs/docs/reference-react-component.md
@@ -113,7 +113,7 @@ The constructor for a React component is called before it is mounted. When imple
 
 The constructor is the right place to initialize state. If you don't initialize state and you don't bind methods, you don't need to implement a constructor for your React component.
 
-It's okay to initialize state based on props if you know what you're doing. Here's an example of a valid `React.Component` subclass constructor:
+It's okay to initialize state based on props. This effectively "forks" the props and sets the state with the initial props. Here's an example of a valid `React.Component` subclass constructor:
 
 ```js
 constructor(props) {
@@ -124,7 +124,7 @@ constructor(props) {
 }
 ```
 
-Beware of this pattern, as it effectively "forks" the props and can lead to bugs. Instead of syncing props to state, you often want to [lift the state up](/react/docs/lifting-state-up.html).
+Beware of this pattern, as state won't be up-to-date with any props update. Instead of syncing props to state, you often want to [lift the state up](/react/docs/lifting-state-up.html).
 
 If you "fork" props by using them for state, you might also want to implement [`componentWillReceiveProps(nextProps)`](#componentwillreceiveprops) to keep the state up-to-date with them. But lifting state up is often easier and less bug-prone.
 

From 22655d5759235a783546405763db2c9f9bace29d Mon Sep 17 00:00:00 2001
From: Gabriel Lett Viviani <gm.lett@gmail.com>
Date: Thu, 13 Apr 2017 11:15:34 -0300
Subject: [PATCH 091/153] Fix the proptypes deprecation warning url on the
 "Don't Call PropTypes Warning" doc page (#9419)

* Use the same prop-types link on the warning docs page as the main proptypes doc page

* Link to repo instead
---
 docs/warnings/dont-call-proptypes.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/warnings/dont-call-proptypes.md b/docs/warnings/dont-call-proptypes.md
index bc468689af3ba..05da5c04c73ec 100644
--- a/docs/warnings/dont-call-proptypes.md
+++ b/docs/warnings/dont-call-proptypes.md
@@ -5,7 +5,7 @@ permalink: warnings/dont-call-proptypes.html
 ---
 
 > Note:
-> `React.PropTypes` is deprecated as of React v15.5. Please use [the `prop-types` library instead](https://github.com/aackerman/PropTypes).
+> `React.PropTypes` is deprecated as of React v15.5. Please use [the `prop-types` library instead](https://github.com/reactjs/prop-types).
 
 In a future major release of React, the code that implements PropType validation functions will be stripped in production. Once this happens, any code that calls these functions manually (that isn't stripped in production) will throw an error.
 

From 4e0c57315afc2769fe13bbbb4235b0aa47343ca7 Mon Sep 17 00:00:00 2001
From: Jack <jack@jackmarchant.com>
Date: Fri, 14 Apr 2017 03:11:23 +1000
Subject: [PATCH 092/153] Update proptypes doc (#9391)

* Update proptypes doc

* Removed note
---
 docs/contributing/codebase-overview.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/contributing/codebase-overview.md b/docs/contributing/codebase-overview.md
index 637c4893241ec..b9be535b416bc 100644
--- a/docs/contributing/codebase-overview.md
+++ b/docs/contributing/codebase-overview.md
@@ -301,10 +301,8 @@ While the code is separated in the source tree, the exact package boundaries are
 The "core" of React includes all the [top-level `React` APIs](/react/docs/top-level-api.html#react), for example:
 
 * `React.createElement()`
-* `React.createClass()`
 * `React.Component`
 * `React.Children`
-* `React.PropTypes`
 
 **React core only includes the APIs necessary to define components.** It does not include the [reconciliation](/react/docs/reconciliation.html) algorithm or any platform-specific code. It is used both by React DOM and React Native components.
 

From 30d6c598c6fa06e087ffa2ff32356a66917c68de Mon Sep 17 00:00:00 2001
From: Eric Elliott <support@paralleldrive.com>
Date: Thu, 13 Apr 2017 08:13:55 -1000
Subject: [PATCH 093/153] Docs: Clarification of setState() behavior (#9329)

* Clarification of setState() behavior

`setState()` is a frequent source of confusion for people new to React, and I believe part of that is due to minimization of the impact of the asynchronous behavior of `setState()` in the documentation. This revision is an attempt to clarify that behavior. For motivation and justification, see [setState Gate](https://medium.com/javascript-scene/setstate-gate-abc10a9b2d82).

* Update reference-react-component.md

* Signature fix

* Update to address @acdlite concerns

* Add more details
---
 docs/docs/reference-react-component.md | 55 ++++++++++++++++++++------
 1 file changed, 44 insertions(+), 11 deletions(-)

diff --git a/docs/docs/reference-react-component.md b/docs/docs/reference-react-component.md
index 03c3bcba2d0de..67efaae6a74f1 100644
--- a/docs/docs/reference-react-component.md
+++ b/docs/docs/reference-react-component.md
@@ -229,34 +229,67 @@ componentWillUnmount()
 ### `setState()`
 
 ```javascript
-setState(nextState, callback)
+setState(updater, [callback])
 ```
 
-Performs a shallow merge of nextState into current state. This is the primary method you use to trigger UI updates from event handlers and server request callbacks.
+`setState()` enqueues changes to the component state and tells React that this component and its children need to be re-rendered with the updated state. This is the primary method you use to update the user interface in response to event handlers and server responses.
 
-The first argument can be an object (containing zero or more keys to update) or a function (of state and props) that returns an object containing keys to update.
+Think of `setState()` as a *request* rather than an immediate command to update the component. For better perceived performance, React may delay it, and then update several components in a single pass. React does not guarantee that the state changes are applied immediately.
 
-Here is the simple object usage:
+`setState()` does not always immediately update the component. It may batch or defer the update until later. This makes reading `this.state` right after calling `setState()` a potential pitfall. Instead, use `componentDidUpdate` or a `setState` callback (`setState(updater, callback)`), either of which are guaranteed to fire after the update has been applied. If you need to set the state based on the previous state, read about the `updater` argument below.
+
+`setState()` will always lead to a re-render unless `shouldComponentUpdate()` returns `false`. If mutable objects are being used and conditional rendering logic cannot be implemented in `shouldComponentUpdate()`, calling `setState()` only when the new state differs from the previous state will avoid unnecessary re-renders.
+
+The first argument is an `updater` function with the signature:
 
 ```javascript
-this.setState({mykey: 'my new value'});
+(prevState, props) => nextState
 ```
 
-It's also possible to pass a function with the signature `function(state, props) => newState`. This enqueues an atomic update that consults the previous value of state and props before setting any values. For instance, suppose we wanted to increment a value in state by `props.step`:
+`prevState` is a reference to the previous state. It should not be directly mutated. Instead, changes should be represented by building a new state object based on the input from `prevState` and `props`. For instance, suppose we wanted to increment a value in state by `props.step`:
 
 ```javascript
 this.setState((prevState, props) => {
-  return {myInteger: prevState.myInteger + props.step};
+  return {counter: prevState.counter + props.step};
 });
 ```
 
-The second parameter is an optional callback function that will be executed once `setState` is completed and the component is re-rendered. Generally we recommend using `componentDidUpdate()` for such logic instead.
+Both `prevState` and `props` received by the updater function are guaranteed to be up-to-date.
 
-`setState()` does not immediately mutate `this.state` but creates a pending state transition. Accessing `this.state` after calling this method can potentially return the existing value.
+The second parameter to `setState()` is an optional callback function that will be executed once `setState` is completed and the component is re-rendered. Generally we recommend using `componentDidUpdate()` for such logic instead.
 
-There is no guarantee of synchronous operation of calls to `setState` and calls may be batched for performance gains.
+You may optionally pass an object as the first argument to `setState()` instead of a function:
 
-`setState()` will always lead to a re-render unless `shouldComponentUpdate()` returns `false`. If mutable objects are being used and conditional rendering logic cannot be implemented in `shouldComponentUpdate()`, calling `setState()` only when the new state differs from the previous state will avoid unnecessary re-renders.
+```javascript
+setState(stateChange, [callback])
+```
+
+This performs a shallow merge of `stateChange` into the new state, e.g., to adjust a shopping cart item quantity:
+
+```javascript
+this.setState({quantity: 2})
+```
+
+This form of `setState()` is also asynchronous, and multiple calls during the same cycle may be batched together. For example, if you attempt to increment an item quantity more than once in the same cycle, that will result in the equivalent of:
+
+```javaScript
+Object.assign(
+  previousState,
+  {quantity: state.quantity + 1},
+  {quantity: state.quantity + 1},
+  ...
+)
+```
+
+Subsequent calls will override values from previous calls in the same cycle, so the quantity will only be incremented once. If the next state depends on the previous state, we recommend using the updater function form, instead:
+
+```js
+this.setState((prevState) => {
+  return {counter: prevState.quantity + 1};
+});
+```
+
+For more detail, see the [State and Lifecycle guide](/react/docs/state-and-lifecycle.html).
 
 * * *
 

From 855b8d3526a55e690108e8ede9091c14b6f62466 Mon Sep 17 00:00:00 2001
From: Marks Polakovs <marks@markspolakovs.me>
Date: Thu, 13 Apr 2017 21:54:12 +0200
Subject: [PATCH 094/153] Add tabs to installation page (#9275, #9277) (#9401)

* Add tabs to installation page (#9275, #9277)

This adds tabs for create-react-app and existing apps to the installation section of the docs. The tab implementation is a simplified version of React Native's installation page.

Fixes #9275.

* Use classList instead of className

* Use same implementation as in RN
---
 docs/docs/installation.md | 94 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 90 insertions(+), 4 deletions(-)

diff --git a/docs/docs/installation.md b/docs/docs/installation.md
index d4ee06ae54422..8f583117ef408 100644
--- a/docs/docs/installation.md
+++ b/docs/docs/installation.md
@@ -11,27 +11,86 @@ redirect_from:
   - "docs/environments.html"
 next: hello-world.html
 ---
+<style>
+.tab-hidden {
+    display: none;
+}
+.toggler a {
+    display: inline-block;
+    padding: 10px 5px;
+    margin: 2px;
+    border: 1px solid #05A5D1;
+    border-radius: 3px;
+    text-decoration: none !important;
+  }
+</style>
 
 React is flexible and can be used in a variety of projects. You can create new apps with it, but you can also gradually introduce it into an existing codebase without doing a rewrite.
 
+<div class="toggler">
+  <style>
+    .toggler a {
+      display: inline-block;
+      padding: 10px 5px;
+      margin: 2px;
+      border: 1px solid #05A5D1;
+      border-radius: 3px;
+      text-decoration: none !important;
+      color: #05A5D1;
+    }
+    .display-target-fiddle .toggler .button-fiddle,
+    .display-target-newapp .toggler .button-newapp,
+    .display-target-existingapp .toggler .button-existingapp {
+      background-color: #05A5D1;
+      color: white;
+    }
+    block {
+      display: none;
+    }
+    .display-target-fiddle .fiddle,
+    .display-target-newapp .newapp,
+    .display-target-existingapp .existingapp {
+      display: block;
+    }
+  </style>
+  <script>
+    document.querySelector('.toggler').parentElement.className += ' display-target-fiddle';
+  </script>
+  <span>Which of these options best describes what you want to do?</span>
+  <br />
+  <br />
+  <a href="javascript:void(0);" class="button-fiddle" onclick="display('target', 'fiddle')">Try React</a>
+  <a href="javascript:void(0);" class="button-newapp" onclick="display('target', 'newapp')">Create a New App</a>
+  <a href="javascript:void(0);" class="button-existingapp" onclick="display('target', 'existingapp')">Add React to an Existing App</a>
+</div>
+
+<block class="fiddle" />
+
 ## Trying Out React
 
 If you're just interested in playing around with React, you can use CodePen. Try starting from [this Hello World example code](http://codepen.io/gaearon/pen/rrpgNB?editors=0010). You don't need to install anything; you can just modify the code and see if it works.
 
 If you prefer to use your own text editor, you can also <a href="/react/downloads/single-file-example.html" download="hello.html">download this HTML file</a>, edit it, and open it from the local filesystem in your browser. It does a slow runtime code transformation, so don't use it in production.
 
-## Creating a Single Page Application
+If you want to use it for a full application, there are two popular ways to get started with React: using Create React App, or adding it to an existing application.
+
+<block class="newapp" />
+
+## Creating a New Application
 
 [Create React App](http://github.com/facebookincubator/create-react-app) is the best way to start building a new React single page application. It sets up your development environment so that you can use the latest JavaScript features, provides a nice developer experience, and optimizes your app for production.
 
 ```bash
 npm install -g create-react-app
-create-react-app hello-world
-cd hello-world
+create-react-app my-app
+
+cd my-app
 npm start
 ```
 
-Create React App doesn't handle backend logic or databases; it just creates a frontend build pipeline, so you can use it with any backend you want. It uses [webpack](https://webpack.js.org/), [Babel](http://babeljs.io/) and [ESLint](http://eslint.org/) under the hood, but configures them for you.
+Create React App doesn't handle backend logic or databases; it just creates a frontend build pipeline, so you can use it with any backend you want. It uses build tools like Babel and webpack under the hood, but works with zero configuration.
+
+<block class="existingapp" />
 
 ## Adding React to an Existing Application
 
@@ -134,3 +193,30 @@ The versions above are only meant for development, and are not suitable for prod
 To load a specific version of `react` and `react-dom`, replace `15` with the version number.
 
 If you use Bower, React is available via the `react` package.
+
+<script>
+// Convert <div>...<span><block /></span>...</div>
+// Into <div>...<block />...</div>
+var blocks = document.getElementsByTagName('block');
+for (var i = 0; i < blocks.length; ++i) {
+  var block = blocks[i];
+  var span = blocks[i].parentNode;
+  var container = span.parentNode;
+  container.insertBefore(block, span);
+  container.removeChild(span);
+}
+// Convert <div>...<block />content<block />...</div>
+// Into <div>...<block>content</block><block />...</div>
+blocks = document.getElementsByTagName('block');
+for (var i = 0; i < blocks.length; ++i) {
+  var block = blocks[i];
+  while (block.nextSibling && block.nextSibling.tagName !== 'BLOCK') {
+    block.appendChild(block.nextSibling);
+  }
+}
+function display(type, value) {
+  var container = document.getElementsByTagName('block')[0].parentNode;
+  container.className = 'display-' + type + '-' + value + ' ' +
+    container.className.replace(RegExp('display-' + type + '-[a-z]+ ?'), '');
+}
+</script>
\ No newline at end of file

From 4c8c5debac5074427d5e6ce19896d4062e078a83 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Thu, 13 Apr 2017 21:51:19 +0100
Subject: [PATCH 095/153] Switch Installation to a tab when hash is present
 (#9422)

---
 docs/docs/installation.md | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/docs/docs/installation.md b/docs/docs/installation.md
index 8f583117ef408..3072d7768e7eb 100644
--- a/docs/docs/installation.md
+++ b/docs/docs/installation.md
@@ -195,6 +195,10 @@ To load a specific version of `react` and `react-dom`, replace `15` with the ver
 If you use Bower, React is available via the `react` package.
 
 <script>
+/**
+ * The code below is based on a snippet from React Native Getting Started page.
+ */
+
 // Convert <div>...<span><block /></span>...</div>
 // Into <div>...<block />...</div>
 var blocks = document.getElementsByTagName('block');
@@ -219,4 +223,39 @@ function display(type, value) {
   container.className = 'display-' + type + '-' + value + ' ' +
     container.className.replace(RegExp('display-' + type + '-[a-z]+ ?'), '');
 }
+
+// If we are coming to the page with a hash in it (i.e. from a search, for example), try to get
+// us as close as possible to the correct platform and dev os using the hashtag and block walk up.
+var foundHash = false;
+if (window.location.hash !== '' && window.location.hash !== 'content') { // content is default
+  // Hash links are added a bit later so we wait for them.
+  window.addEventListener('DOMContentLoaded', selectTabForHashLink);
+}
+
+function selectTabForHashLink() {
+  var hashLinks = document.querySelectorAll('a.hash-link');
+  for (var i = 0; i < hashLinks.length && !foundHash; ++i) {
+    if (hashLinks[i].hash === window.location.hash) {
+      var parent = hashLinks[i].parentElement;
+      while (parent) {
+        if (parent.tagName === 'BLOCK') {
+          var target = null;
+          if (parent.className.indexOf('fiddle') > -1) {
+            target = 'fiddle';
+          } else if (parent.className.indexOf('newapp') > -1) {
+            target = 'newapp';
+          } else if (parent.className.indexOf('existingapp') > -1) {
+            target = 'existingapp';
+          } else {
+            break; // assume we don't have anything.
+          }
+          display('target', target);
+          foundHash = true;
+          break;
+        }
+        parent = parent.parentElement;
+      }
+    }
+  }
+}
 </script>
\ No newline at end of file

From a95e1d8ffcbfaaa2eda98d1bf914d1b750c402c8 Mon Sep 17 00:00:00 2001
From: Abhay Nikam <nikam.abhay1@gmail.com>
Date: Fri, 14 Apr 2017 03:45:13 +0530
Subject: [PATCH 096/153] Updated recommended links for installation in readme
 (#9425)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index df717360fee9a..e22b705c1eb9c 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ React is flexible and can be used in a variety of projects. You can create new a
 The recommended way to install React depends on your project. Here you can find short guides for the most common scenarios:
 
 * [Trying Out React](https://facebook.github.io/react/docs/installation.html#trying-out-react)
-* [Creating a Single Page Application](https://facebook.github.io/react/docs/installation.html#creating-a-single-page-application)
+* [Creating a New Application](https://facebook.github.io/react/docs/installation.html#creating-a-new-application)
 * [Adding React to an Existing Application](https://facebook.github.io/react/docs/installation.html#adding-react-to-an-existing-application)
 
 ## Contributing

From db989c0f63e1b4700ad33a64c776d1b34bd206f7 Mon Sep 17 00:00:00 2001
From: Vikash Agrawal <vikashagrawal1990@gmail.com>
Date: Fri, 14 Apr 2017 21:26:38 +0530
Subject: [PATCH 097/153] Updated link for good first bug's in README.md
 (#9273)

* Updated link for good first bug's in README.md

* Changed text for beginner friendly bugs

* update beginner friendly bugs section title
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e22b705c1eb9c..2ae261c6994a9 100644
--- a/README.md
+++ b/README.md
@@ -53,9 +53,9 @@ Facebook has adopted a Code of Conduct that we expect project participants to ad
 
 Read our [contributing guide](https://facebook.github.io/react/contributing/how-to-contribute.html) to learn about our development process, how to propose bugfixes and improvements, and how to build and test your changes to React.
 
-### Good First Bug
+### Beginner Friendly Bugs
 
-To help you get your feet wet and get you familiar with our contribution process, we have a list of [good first bugs](https://github.com/facebook/react/labels/good%20first%20bug) that contain bugs which are fairly easy to fix. This is a great place to get started.
+To help you get your feet wet and get you familiar with our contribution process, we have a list of [beginner friendly bugs](https://github.com/facebook/react/labels/Difficulty%3A%20beginner) that contain bugs which are fairly easy to fix. This is a great place to get started.
 
 ### License
 

From 36c935ca8f9df7e19b5051997f4eb381402113ac Mon Sep 17 00:00:00 2001
From: Abhay Nikam <nikam.abhay1@gmail.com>
Date: Fri, 14 Apr 2017 21:32:07 +0530
Subject: [PATCH 098/153] Updated the Good First Bug section in readme (#9429)

* Updated the Good First Bug section in readme

* Inconsistent use of quotes. Prefered single quotes instead of double quotes

* Updated Good first bug link in how_to_contribute doc.

* Undo JSX attribute quote change

* don't capitalize "beginner friendly issue"
---
 docs/contributing/how-to-contribute.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contributing/how-to-contribute.md b/docs/contributing/how-to-contribute.md
index 5b2c6c5031171..b45eb1798b949 100644
--- a/docs/contributing/how-to-contribute.md
+++ b/docs/contributing/how-to-contribute.md
@@ -64,7 +64,7 @@ Working on your first Pull Request? You can learn how from this free video serie
 
 **[How to Contribute to an Open Source Project on GitHub](https://egghead.io/series/how-to-contribute-to-an-open-source-project-on-github)**
 
-To help you get your feet wet and get you familiar with our contribution process, we have a list of **[good first bugs](https://github.com/facebook/react/labels/good%20first%20bug)** that contain bugs which are fairly easy to fix. This is a great place to get started.
+To help you get your feet wet and get you familiar with our contribution process, we have a list of **[beginner friendly issues](https://github.com/facebook/react/issues?q=is%3Aopen+is%3Aissue+label%3A%22Difficulty%3A+beginner%22)** that contain bugs which are fairly easy to fix. This is a great place to get started.
 
 If you decide to fix an issue, please be sure to check the comment thread in case somebody is already working on a fix. If nobody is working on it at the moment, please leave a comment stating that you intend to work on it so other people don't accidentally duplicate your effort.
 
@@ -101,7 +101,7 @@ In order to accept your pull request, we need you to submit a CLA. You only need
 
 ### Development Workflow
 
-After cloning React, run `npm install` to fetch its dependencies.  
+After cloning React, run `npm install` to fetch its dependencies.
 Then, you can run several commands:
 
 * `npm run lint` checks the code style.

From f54fdd544198ba7f76aafb9e5f4e4a8be137ac4c Mon Sep 17 00:00:00 2001
From: Arshabh Kumar Agarwal <arshabh.agarwal.it@gmail.com>
Date: Fri, 14 Apr 2017 22:00:38 +0530
Subject: [PATCH 099/153] Add warning if rendering and HTMLUnknownElement
 (#9163)

* Add warning if rendering and HTMLUnknownElement

* Records fiber tests

* Fixes linting and server render tests

* Incorporates review comments

* Uses ownerDocument instead of document

* uses el instead of creating a new element

* Removes warning check of voidElementTags

* Add missing space to unknown element warning

* Only call isCustomComponent once

* Spy on console in menuitem test

Since menuitem is treated as an unknown element in jsdom it triggers the unknown element warning.

* Add unknown element warning to Fiber

* Replace instanceof with toString check

It is more resilient.

* Record tests
---
 scripts/fiber/tests-passing.txt               |  1 +
 .../dom/fiber/ReactDOMFiberComponent.js       | 19 ++++++++-
 .../__tests__/ReactDOMComponent-test.js       | 28 +++++++++++++
 .../dom/stack/client/ReactDOMComponent.js     | 40 +++++++++++++------
 4 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index 485f3921f4f45..0cf8d024093b5 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -874,6 +874,7 @@ src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
 * should work error event on <source> element
 * should not duplicate uppercased selfclosing tags
 * should warn on upper case HTML tags, not SVG nor custom tags
+* should warn if the tag is unrecognized
 * should warn against children for void elements
 * should warn against dangerouslySetInnerHTML for void elements
 * should include owner rather than parent in warnings
diff --git a/src/renderers/dom/fiber/ReactDOMFiberComponent.js b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
index bea2bf0ca5a0c..7aea3c569735a 100644
--- a/src/renderers/dom/fiber/ReactDOMFiberComponent.js
+++ b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
@@ -418,10 +418,13 @@ var ReactDOMFiberComponent = {
     if (namespaceURI === HTML_NAMESPACE) {
       namespaceURI = getIntrinsicNamespace(type);
     }
+    if (__DEV__) {
+      var isCustomComponentTag = isCustomComponent(type, props);
+    }
     if (namespaceURI === HTML_NAMESPACE) {
       if (__DEV__) {
         warning(
-          type === type.toLowerCase() || isCustomComponent(type, props),
+          isCustomComponentTag || type === type.toLowerCase(),
           '<%s /> is using uppercase HTML. Always use lowercase HTML tags ' +
             'in React.',
           type,
@@ -448,6 +451,20 @@ var ReactDOMFiberComponent = {
       domElement = ownerDocument.createElementNS(namespaceURI, type);
     }
 
+    if (__DEV__) {
+      if (namespaceURI === HTML_NAMESPACE) {
+        warning(
+          isCustomComponentTag ||
+            Object.prototype.toString.call(domElement) !==
+              '[object HTMLUnknownElement]',
+          'The tag <%s> is unrecognized in this browser. ' +
+            'If you meant to render a React component, start its name with ' +
+            'an uppercase letter.',
+          type,
+        );
+      }
+    }
+
     return domElement;
   },
 
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
index 34f03e5be0dac..ca2ec1cf0079b 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
@@ -809,6 +809,32 @@ describe('ReactDOMComponent', () => {
       );
     });
 
+    it('should warn if the tag is unrecognized', () => {
+      if (ReactDOMFeatureFlags.useCreateElement) {
+        spyOn(console, 'error');
+
+        let realToString;
+        try {
+          realToString = Object.prototype.toString;
+          Object.prototype.toString = function() {
+            // Emulate browser behavior which is missing in jsdom
+            if (this instanceof window.HTMLUnknownElement) {
+              return '[object HTMLUnknownElement]';
+            }
+            return realToString.apply(this, arguments);
+          };
+          ReactTestUtils.renderIntoDocument(<mycustomcomponent />);
+        } finally {
+          Object.prototype.toString = realToString;
+        }
+
+        expectDev(console.error.calls.count()).toBe(1);
+        expectDev(console.error.calls.argsFor(0)[0]).toContain(
+          'The tag <mycustomcomponent> is unrecognized in this browser',
+        );
+      }
+    });
+
     it('should warn against children for void elements', () => {
       var container = document.createElement('div');
 
@@ -917,6 +943,8 @@ describe('ReactDOMComponent', () => {
     });
 
     it('should treat menuitem as a void element but still create the closing tag', () => {
+      // menuitem is not implemented in jsdom, so this triggers the unknown warning error
+      spyOn(console, 'error');
       var container = document.createElement('div');
 
       var returnedValue = ReactDOMServer.renderToString(
diff --git a/src/renderers/dom/stack/client/ReactDOMComponent.js b/src/renderers/dom/stack/client/ReactDOMComponent.js
index ac717f96c7366..35e54f7b4efe8 100644
--- a/src/renderers/dom/stack/client/ReactDOMComponent.js
+++ b/src/renderers/dom/stack/client/ReactDOMComponent.js
@@ -485,6 +485,9 @@ ReactDOMComponent.Mixin = {
 
     assertValidProps(this, props);
 
+    if (__DEV__) {
+      var isCustomComponentTag = isCustomComponent(this._tag, props);
+    }
     // We create tags in the namespace of their parent container, except HTML
     // tags get no namespace.
     var namespaceURI;
@@ -505,8 +508,7 @@ ReactDOMComponent.Mixin = {
     if (namespaceURI === DOMNamespaces.html) {
       if (__DEV__) {
         warning(
-          isCustomComponent(this._tag, props) ||
-            this._tag === this._currentElement.type,
+          isCustomComponentTag || this._tag === this._currentElement.type,
           '<%s /> is using uppercase HTML. Always use lowercase HTML tags ' +
             'in React.',
           this._currentElement.type,
@@ -562,17 +564,29 @@ ReactDOMComponent.Mixin = {
       } else {
         el = ownerDocument.createElementNS(namespaceURI, type);
       }
-      var isCustomComponentTag = isCustomComponent(this._tag, props);
-      if (__DEV__ && isCustomComponentTag && !didWarnShadyDOM && el.shadyRoot) {
-        var owner = this._currentElement._owner;
-        var name = (owner && owner.getName()) || 'A component';
-        warning(
-          false,
-          '%s is using shady DOM. Using shady DOM with React can ' +
-            'cause things to break subtly.',
-          name,
-        );
-        didWarnShadyDOM = true;
+      if (__DEV__) {
+        if (isCustomComponentTag && !didWarnShadyDOM && el.shadyRoot) {
+          var owner = this._currentElement._owner;
+          var name = (owner && owner.getName()) || 'A component';
+          warning(
+            false,
+            '%s is using shady DOM. Using shady DOM with React can ' +
+              'cause things to break subtly.',
+            name,
+          );
+          didWarnShadyDOM = true;
+        }
+        if (this._namespaceURI === DOMNamespaces.html) {
+          warning(
+            isCustomComponentTag ||
+              Object.prototype.toString.call(el) !==
+                '[object HTMLUnknownElement]',
+            'The tag <%s> is unrecognized in this browser. ' +
+              'If you meant to render a React component, start its name with ' +
+              'an uppercase letter.',
+            this._tag,
+          );
+        }
       }
       ReactDOMComponentTree.precacheNode(this, el);
       this._flags |= Flags.hasCachedChildNodes;

From 1447d9f1ae699b46c31d6c8b7f0e57212d6c7f1e Mon Sep 17 00:00:00 2001
From: Ben Alpert <ben@benalpert.com>
Date: Fri, 14 Apr 2017 16:57:47 -0700
Subject: [PATCH 100/153] Add component stack to uncontrolled-to-controlled
 warning (#9416)

https://twitter.com/JulianVModesto/status/836089555304448000
https://twitter.com/abevoelker/status/836040051993763842
---
 .../dom/fiber/wrappers/ReactDOMFiberInput.js  |  16 ++-
 .../wrappers/__tests__/ReactDOMInput-test.js  | 116 ++++++++++--------
 .../stack/client/wrappers/ReactDOMInput.js    |  19 +--
 3 files changed, 90 insertions(+), 61 deletions(-)

diff --git a/src/renderers/dom/fiber/wrappers/ReactDOMFiberInput.js b/src/renderers/dom/fiber/wrappers/ReactDOMFiberInput.js
index f0bbc0adcaef3..01ee87f95dfb3 100644
--- a/src/renderers/dom/fiber/wrappers/ReactDOMFiberInput.js
+++ b/src/renderers/dom/fiber/wrappers/ReactDOMFiberInput.js
@@ -25,6 +25,10 @@ var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes');
 var ReactDOMComponentTree = require('ReactDOMComponentTree');
 var {getCurrentFiberOwnerName} = require('ReactDebugCurrentFiber');
 
+if (__DEV__) {
+  var {getCurrentFiberStackAddendum} = require('ReactDebugCurrentFiber');
+}
+
 var invariant = require('fbjs/lib/invariant');
 var warning = require('fbjs/lib/warning');
 
@@ -154,12 +158,12 @@ var ReactDOMInput = {
       ) {
         warning(
           false,
-          '%s is changing an uncontrolled input of type %s to be controlled. ' +
+          'A component is changing an uncontrolled input of type %s to be controlled. ' +
             'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
             'Decide between using a controlled or uncontrolled input ' +
-            'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
-          getCurrentFiberOwnerName() || 'A component',
+            'element for the lifetime of the component. More info: https://fb.me/react-controlled-components%s',
           props.type,
+          getCurrentFiberStackAddendum(),
         );
         didWarnUncontrolledToControlled = true;
       }
@@ -170,12 +174,12 @@ var ReactDOMInput = {
       ) {
         warning(
           false,
-          '%s is changing a controlled input of type %s to be uncontrolled. ' +
+          'A component is changing a controlled input of type %s to be uncontrolled. ' +
             'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
             'Decide between using a controlled or uncontrolled input ' +
-            'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
-          getCurrentFiberOwnerName() || 'A component',
+            'element for the lifetime of the component. More info: https://fb.me/react-controlled-components%s',
           props.type,
+          getCurrentFiberStackAddendum(),
         );
         didWarnControlledToUncontrolled = true;
       }
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
index 102acc241800c..08e53783f8c6f 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
@@ -21,6 +21,10 @@ describe('ReactDOMInput', () => {
   var ReactTestUtils;
   var inputValueTracking;
 
+  function normalizeCodeLocInfo(str) {
+    return str && str.replace(/\(at .+?:\d+\)/g, '(at **)');
+  }
+
   function setUntrackedValue(elem, value) {
     var tracker = inputValueTracking._getTrackerFromNode(elem);
     var current = tracker.getValue();
@@ -738,11 +742,12 @@ describe('ReactDOMInput', () => {
     ReactDOM.render(stub, container);
     ReactDOM.render(<input type="text" />, container);
     expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'A component is changing a controlled input of type text to be uncontrolled. ' +
+    expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
+      'Warning: A component is changing a controlled input of type text to be uncontrolled. ' +
         'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
         'Decide between using a controlled or uncontrolled input ' +
-        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
+        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components\n' +
+        '    in input (at **)',
     );
   });
 
@@ -754,11 +759,12 @@ describe('ReactDOMInput', () => {
     ReactDOM.render(stub, container);
     ReactDOM.render(<input type="text" value={null} />, container);
     expectDev(console.error.calls.count()).toBeGreaterThan(0);
-    expectDev(console.error.calls.argsFor(1)[0]).toContain(
-      'A component is changing a controlled input of type text to be uncontrolled. ' +
+    expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(1)[0])).toBe(
+      'Warning: A component is changing a controlled input of type text to be uncontrolled. ' +
         'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
         'Decide between using a controlled or uncontrolled input ' +
-        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
+        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components\n' +
+        '    in input (at **)',
     );
   });
 
@@ -773,11 +779,12 @@ describe('ReactDOMInput', () => {
       container,
     );
     expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'A component is changing a controlled input of type text to be uncontrolled. ' +
+    expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
+      'Warning: A component is changing a controlled input of type text to be uncontrolled. ' +
         'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
         'Decide between using a controlled or uncontrolled input ' +
-        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
+        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components\n' +
+        '    in input (at **)',
     );
   });
 
@@ -787,11 +794,12 @@ describe('ReactDOMInput', () => {
     ReactDOM.render(stub, container);
     ReactDOM.render(<input type="text" value="controlled" />, container);
     expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'A component is changing an uncontrolled input of type text to be controlled. ' +
+    expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
+      'Warning: A component is changing an uncontrolled input of type text to be controlled. ' +
         'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
         'Decide between using a controlled or uncontrolled input ' +
-        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
+        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components\n' +
+        '    in input (at **)',
     );
   });
 
@@ -801,11 +809,12 @@ describe('ReactDOMInput', () => {
     ReactDOM.render(stub, container);
     ReactDOM.render(<input type="text" value="controlled" />, container);
     expectDev(console.error.calls.count()).toBeGreaterThan(0);
-    expectDev(console.error.calls.argsFor(1)[0]).toContain(
-      'A component is changing an uncontrolled input of type text to be controlled. ' +
+    expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(1)[0])).toBe(
+      'Warning: A component is changing an uncontrolled input of type text to be controlled. ' +
         'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
         'Decide between using a controlled or uncontrolled input ' +
-        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
+        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components\n' +
+        '    in input (at **)',
     );
   });
 
@@ -817,11 +826,12 @@ describe('ReactDOMInput', () => {
     ReactDOM.render(stub, container);
     ReactDOM.render(<input type="checkbox" />, container);
     expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'A component is changing a controlled input of type checkbox to be uncontrolled. ' +
+    expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
+      'Warning: A component is changing a controlled input of type checkbox to be uncontrolled. ' +
         'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
         'Decide between using a controlled or uncontrolled input ' +
-        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
+        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components\n' +
+        '    in input (at **)',
     );
   });
 
@@ -833,11 +843,12 @@ describe('ReactDOMInput', () => {
     ReactDOM.render(stub, container);
     ReactDOM.render(<input type="checkbox" checked={null} />, container);
     expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'A component is changing a controlled input of type checkbox to be uncontrolled. ' +
+    expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
+      'Warning: A component is changing a controlled input of type checkbox to be uncontrolled. ' +
         'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
         'Decide between using a controlled or uncontrolled input ' +
-        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
+        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components\n' +
+        '    in input (at **)',
     );
   });
 
@@ -849,11 +860,12 @@ describe('ReactDOMInput', () => {
     ReactDOM.render(stub, container);
     ReactDOM.render(<input type="checkbox" defaultChecked={true} />, container);
     expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'A component is changing a controlled input of type checkbox to be uncontrolled. ' +
+    expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
+      'Warning: A component is changing a controlled input of type checkbox to be uncontrolled. ' +
         'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
         'Decide between using a controlled or uncontrolled input ' +
-        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
+        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components\n' +
+        '    in input (at **)',
     );
   });
 
@@ -863,11 +875,12 @@ describe('ReactDOMInput', () => {
     ReactDOM.render(stub, container);
     ReactDOM.render(<input type="checkbox" checked={true} />, container);
     expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'A component is changing an uncontrolled input of type checkbox to be controlled. ' +
+    expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
+      'Warning: A component is changing an uncontrolled input of type checkbox to be controlled. ' +
         'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
         'Decide between using a controlled or uncontrolled input ' +
-        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
+        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components\n' +
+        '    in input (at **)',
     );
   });
 
@@ -877,11 +890,12 @@ describe('ReactDOMInput', () => {
     ReactDOM.render(stub, container);
     ReactDOM.render(<input type="checkbox" checked={true} />, container);
     expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'A component is changing an uncontrolled input of type checkbox to be controlled. ' +
+    expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
+      'Warning: A component is changing an uncontrolled input of type checkbox to be controlled. ' +
         'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
         'Decide between using a controlled or uncontrolled input ' +
-        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
+        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components\n' +
+        '    in input (at **)',
     );
   });
 
@@ -891,11 +905,12 @@ describe('ReactDOMInput', () => {
     ReactDOM.render(stub, container);
     ReactDOM.render(<input type="radio" />, container);
     expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'A component is changing a controlled input of type radio to be uncontrolled. ' +
+    expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
+      'Warning: A component is changing a controlled input of type radio to be uncontrolled. ' +
         'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
         'Decide between using a controlled or uncontrolled input ' +
-        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
+        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components\n' +
+        '    in input (at **)',
     );
   });
 
@@ -905,11 +920,12 @@ describe('ReactDOMInput', () => {
     ReactDOM.render(stub, container);
     ReactDOM.render(<input type="radio" checked={null} />, container);
     expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'A component is changing a controlled input of type radio to be uncontrolled. ' +
+    expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
+      'Warning: A component is changing a controlled input of type radio to be uncontrolled. ' +
         'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
         'Decide between using a controlled or uncontrolled input ' +
-        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
+        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components\n' +
+        '    in input (at **)',
     );
   });
 
@@ -919,11 +935,12 @@ describe('ReactDOMInput', () => {
     ReactDOM.render(stub, container);
     ReactDOM.render(<input type="radio" defaultChecked={true} />, container);
     expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'A component is changing a controlled input of type radio to be uncontrolled. ' +
+    expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
+      'Warning: A component is changing a controlled input of type radio to be uncontrolled. ' +
         'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
         'Decide between using a controlled or uncontrolled input ' +
-        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
+        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components\n' +
+        '    in input (at **)',
     );
   });
 
@@ -933,11 +950,12 @@ describe('ReactDOMInput', () => {
     ReactDOM.render(stub, container);
     ReactDOM.render(<input type="radio" checked={true} />, container);
     expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'A component is changing an uncontrolled input of type radio to be controlled. ' +
+    expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
+      'Warning: A component is changing an uncontrolled input of type radio to be controlled. ' +
         'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
         'Decide between using a controlled or uncontrolled input ' +
-        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
+        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components\n' +
+        '    in input (at **)',
     );
   });
 
@@ -947,11 +965,12 @@ describe('ReactDOMInput', () => {
     ReactDOM.render(stub, container);
     ReactDOM.render(<input type="radio" checked={true} />, container);
     expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'A component is changing an uncontrolled input of type radio to be controlled. ' +
+    expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
+      'Warning: A component is changing an uncontrolled input of type radio to be controlled. ' +
         'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
         'Decide between using a controlled or uncontrolled input ' +
-        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
+        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components\n' +
+        '    in input (at **)',
     );
   });
 
@@ -1002,11 +1021,12 @@ describe('ReactDOMInput', () => {
       container,
     );
     ReactDOM.render(<input type="radio" value="value" />, container);
-    expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'A component is changing a controlled input of type radio to be uncontrolled. ' +
+    expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
+      'Warning: A component is changing a controlled input of type radio to be uncontrolled. ' +
         'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
         'Decide between using a controlled or uncontrolled input ' +
-        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
+        'element for the lifetime of the component. More info: https://fb.me/react-controlled-components\n' +
+        '    in input (at **)',
     );
   });
 
diff --git a/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js b/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js
index 2f30e43a26f5e..8e7f6de01a825 100644
--- a/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js
+++ b/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js
@@ -18,6 +18,12 @@ var ReactDOMComponentTree = require('ReactDOMComponentTree');
 var invariant = require('fbjs/lib/invariant');
 var warning = require('fbjs/lib/warning');
 
+if (__DEV__) {
+  var {
+    getStackAddendumByID,
+  } = require('ReactGlobalSharedState').ReactComponentTreeHook;
+}
+
 var didWarnValueDefaultValue = false;
 var didWarnCheckedDefaultChecked = false;
 var didWarnControlledToUncontrolled = false;
@@ -137,7 +143,6 @@ var ReactDOMInput = {
 
     if (__DEV__) {
       var controlled = isControlled(props);
-      var owner = inst._currentElement._owner;
 
       if (
         !inst._wrapperState.controlled &&
@@ -146,12 +151,12 @@ var ReactDOMInput = {
       ) {
         warning(
           false,
-          '%s is changing an uncontrolled input of type %s to be controlled. ' +
+          'A component is changing an uncontrolled input of type %s to be controlled. ' +
             'Input elements should not switch from uncontrolled to controlled (or vice versa). ' +
             'Decide between using a controlled or uncontrolled input ' +
-            'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
-          (owner && owner.getName()) || 'A component',
+            'element for the lifetime of the component. More info: https://fb.me/react-controlled-components%s',
           props.type,
+          getStackAddendumByID(inst._debugID),
         );
         didWarnUncontrolledToControlled = true;
       }
@@ -162,12 +167,12 @@ var ReactDOMInput = {
       ) {
         warning(
           false,
-          '%s is changing a controlled input of type %s to be uncontrolled. ' +
+          'A component is changing a controlled input of type %s to be uncontrolled. ' +
             'Input elements should not switch from controlled to uncontrolled (or vice versa). ' +
             'Decide between using a controlled or uncontrolled input ' +
-            'element for the lifetime of the component. More info: https://fb.me/react-controlled-components',
-          (owner && owner.getName()) || 'A component',
+            'element for the lifetime of the component. More info: https://fb.me/react-controlled-components%s',
           props.type,
+          getStackAddendumByID(inst._debugID),
         );
         didWarnControlledToUncontrolled = true;
       }

From 7bf686b76f20eca07f0abef1bf6a0f0380b0c3f2 Mon Sep 17 00:00:00 2001
From: Ben Alpert <ben@benalpert.com>
Date: Fri, 14 Apr 2017 19:50:43 -0700
Subject: [PATCH 101/153] Add component stack to ReactControlledValuePropTypes
 (#9435)

---
 .../dom/fiber/wrappers/ReactDOMFiberInput.js       |  2 +-
 .../dom/fiber/wrappers/ReactDOMFiberSelect.js      |  6 +++++-
 .../dom/fiber/wrappers/ReactDOMFiberTextarea.js    |  7 +++++--
 .../shared/utils/ReactControlledValuePropTypes.js  | 11 ++---------
 .../wrappers/__tests__/ReactDOMInput-test.js       |  7 +++++++
 .../dom/stack/client/wrappers/ReactDOMInput.js     |  7 ++-----
 .../dom/stack/client/wrappers/ReactDOMSelect.js    | 13 ++++++++-----
 .../dom/stack/client/wrappers/ReactDOMTextarea.js  | 14 ++++++++------
 8 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/src/renderers/dom/fiber/wrappers/ReactDOMFiberInput.js b/src/renderers/dom/fiber/wrappers/ReactDOMFiberInput.js
index 01ee87f95dfb3..ebc9812077ea2 100644
--- a/src/renderers/dom/fiber/wrappers/ReactDOMFiberInput.js
+++ b/src/renderers/dom/fiber/wrappers/ReactDOMFiberInput.js
@@ -94,7 +94,7 @@ var ReactDOMInput = {
       ReactControlledValuePropTypes.checkPropTypes(
         'input',
         props,
-        getCurrentFiberOwnerName(),
+        getCurrentFiberStackAddendum,
       );
 
       if (
diff --git a/src/renderers/dom/fiber/wrappers/ReactDOMFiberSelect.js b/src/renderers/dom/fiber/wrappers/ReactDOMFiberSelect.js
index 2ceb3114b1bf7..4659ec7f01350 100644
--- a/src/renderers/dom/fiber/wrappers/ReactDOMFiberSelect.js
+++ b/src/renderers/dom/fiber/wrappers/ReactDOMFiberSelect.js
@@ -23,6 +23,10 @@ var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes');
 var {getCurrentFiberOwnerName} = require('ReactDebugCurrentFiber');
 var warning = require('fbjs/lib/warning');
 
+if (__DEV__) {
+  var {getCurrentFiberStackAddendum} = require('ReactDebugCurrentFiber');
+}
+
 var didWarnValueDefaultValue = false;
 
 function getDeclarationErrorAddendum() {
@@ -42,7 +46,7 @@ function checkSelectPropTypes(props) {
   ReactControlledValuePropTypes.checkPropTypes(
     'select',
     props,
-    getCurrentFiberOwnerName(),
+    getCurrentFiberStackAddendum,
   );
 
   for (var i = 0; i < valuePropNames.length; i++) {
diff --git a/src/renderers/dom/fiber/wrappers/ReactDOMFiberTextarea.js b/src/renderers/dom/fiber/wrappers/ReactDOMFiberTextarea.js
index 43c91a362372a..2f99352a0aaa1 100644
--- a/src/renderers/dom/fiber/wrappers/ReactDOMFiberTextarea.js
+++ b/src/renderers/dom/fiber/wrappers/ReactDOMFiberTextarea.js
@@ -19,11 +19,14 @@ type TextAreaWithWrapperState = HTMLTextAreaElement & {
 };
 
 var ReactControlledValuePropTypes = require('ReactControlledValuePropTypes');
-var {getCurrentFiberOwnerName} = require('ReactDebugCurrentFiber');
 
 var invariant = require('fbjs/lib/invariant');
 var warning = require('fbjs/lib/warning');
 
+if (__DEV__) {
+  var {getCurrentFiberStackAddendum} = require('ReactDebugCurrentFiber');
+}
+
 var didWarnValDefaultVal = false;
 
 /**
@@ -69,7 +72,7 @@ var ReactDOMTextarea = {
       ReactControlledValuePropTypes.checkPropTypes(
         'textarea',
         props,
-        getCurrentFiberOwnerName(),
+        getCurrentFiberStackAddendum,
       );
       if (
         props.value !== undefined &&
diff --git a/src/renderers/dom/shared/utils/ReactControlledValuePropTypes.js b/src/renderers/dom/shared/utils/ReactControlledValuePropTypes.js
index 0f8b44bc81e4d..48c37b67a3039 100644
--- a/src/renderers/dom/shared/utils/ReactControlledValuePropTypes.js
+++ b/src/renderers/dom/shared/utils/ReactControlledValuePropTypes.js
@@ -61,19 +61,13 @@ var propTypes = {
 };
 
 var loggedTypeFailures = {};
-function getDeclarationErrorAddendum(ownerName) {
-  if (ownerName) {
-    return '\n\nCheck the render method of `' + ownerName + '`.';
-  }
-  return '';
-}
 
 /**
  * Provide a linked `value` attribute for controlled forms. You should not use
  * this outside of the ReactDOM controlled form components.
  */
 var ReactControlledValuePropTypes = {
-  checkPropTypes: function(tagName, props, ownerName) {
+  checkPropTypes: function(tagName, props, getStack) {
     for (var propName in propTypes) {
       if (propTypes.hasOwnProperty(propName)) {
         var error = propTypes[propName](
@@ -90,8 +84,7 @@ var ReactControlledValuePropTypes = {
         // same error.
         loggedTypeFailures[error.message] = true;
 
-        var addendum = getDeclarationErrorAddendum(ownerName);
-        warning(false, 'Failed form propType: %s%s', error.message, addendum);
+        warning(false, 'Failed form propType: %s%s', error.message, getStack());
       }
     }
   },
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
index 08e53783f8c6f..ac76902e0cf15 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
@@ -642,6 +642,13 @@ describe('ReactDOMInput', () => {
       <input type="text" value="zoink" readOnly={false} />,
     );
     expectDev(console.error.calls.count()).toBe(1);
+    expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
+      'Warning: Failed form propType: You provided a `value` prop to a form ' +
+        'field without an `onChange` handler. This will render a read-only ' +
+        'field. If the field should be mutable use `defaultValue`. ' +
+        'Otherwise, set either `onChange` or `readOnly`.\n' +
+        '    in input (at **)',
+    );
   });
 
   it('should have a this value of undefined if bind is not used', () => {
diff --git a/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js b/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js
index 8e7f6de01a825..cf0bb9cadc0f9 100644
--- a/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js
+++ b/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js
@@ -83,11 +83,8 @@ var ReactDOMInput = {
   mountWrapper: function(inst, props) {
     if (__DEV__) {
       var owner = inst._currentElement._owner;
-      ReactControlledValuePropTypes.checkPropTypes(
-        'input',
-        props,
-        owner ? owner.getName() : null,
-      );
+      ReactControlledValuePropTypes.checkPropTypes('input', props, () =>
+        getStackAddendumByID(inst._debugID));
 
       if (
         props.checked !== undefined &&
diff --git a/src/renderers/dom/stack/client/wrappers/ReactDOMSelect.js b/src/renderers/dom/stack/client/wrappers/ReactDOMSelect.js
index efc98b4134539..1d8bbb9721429 100644
--- a/src/renderers/dom/stack/client/wrappers/ReactDOMSelect.js
+++ b/src/renderers/dom/stack/client/wrappers/ReactDOMSelect.js
@@ -16,6 +16,12 @@ var ReactDOMComponentTree = require('ReactDOMComponentTree');
 
 var warning = require('fbjs/lib/warning');
 
+if (__DEV__) {
+  var {
+    getStackAddendumByID,
+  } = require('ReactGlobalSharedState').ReactComponentTreeHook;
+}
+
 var didWarnValueDefaultValue = false;
 
 function getDeclarationErrorAddendum(owner) {
@@ -36,11 +42,8 @@ var valuePropNames = ['value', 'defaultValue'];
  */
 function checkSelectPropTypes(inst, props) {
   var owner = inst._currentElement._owner;
-  ReactControlledValuePropTypes.checkPropTypes(
-    'select',
-    props,
-    owner ? owner.getName() : null,
-  );
+  ReactControlledValuePropTypes.checkPropTypes('select', props, () =>
+    getStackAddendumByID(inst._debugID));
 
   for (var i = 0; i < valuePropNames.length; i++) {
     var propName = valuePropNames[i];
diff --git a/src/renderers/dom/stack/client/wrappers/ReactDOMTextarea.js b/src/renderers/dom/stack/client/wrappers/ReactDOMTextarea.js
index 4ddf9e51a87b2..4f20530b4eb57 100644
--- a/src/renderers/dom/stack/client/wrappers/ReactDOMTextarea.js
+++ b/src/renderers/dom/stack/client/wrappers/ReactDOMTextarea.js
@@ -17,6 +17,12 @@ var ReactDOMComponentTree = require('ReactDOMComponentTree');
 var invariant = require('fbjs/lib/invariant');
 var warning = require('fbjs/lib/warning');
 
+if (__DEV__) {
+  var {
+    getStackAddendumByID,
+  } = require('ReactGlobalSharedState').ReactComponentTreeHook;
+}
+
 var didWarnValDefaultVal = false;
 
 /**
@@ -57,12 +63,8 @@ var ReactDOMTextarea = {
 
   mountWrapper: function(inst, props) {
     if (__DEV__) {
-      var owner = inst._currentElement._owner;
-      ReactControlledValuePropTypes.checkPropTypes(
-        'textarea',
-        props,
-        owner ? owner.getName() : null,
-      );
+      ReactControlledValuePropTypes.checkPropTypes('textarea', props, () =>
+        getStackAddendumByID(inst._debugID));
       if (
         props.value !== undefined &&
         props.defaultValue !== undefined &&

From ac9d6986364fd94cd8dd0dde219b2a32a17d60e2 Mon Sep 17 00:00:00 2001
From: Sung Won Cho <mikeswcho@gmail.com>
Date: Sun, 16 Apr 2017 03:37:12 +1000
Subject: [PATCH 102/153] Make nodeType into constant for readability and reuse
 (#9113)

* Make nodeType into constant for readability and reuse

* Fix eslint line length warning

* Delete unused nodeType values

* Destructure HTMLNodeType constant

* Make nodeType into constant for readability and reuse

* Fix eslint line length warning

* Delete unused nodeType values

* Destructure HTMLNodeType constant

* Fix test

* Format using prettier
---
 .../no-primitive-constructors-test.js         |  6 +++--
 src/renderers/dom/fiber/ReactDOMFiber.js      | 19 +++++++------
 .../dom/fiber/ReactDOMFiberComponent.js       |  7 +++--
 src/renderers/dom/shared/HTMLNodeType.js      | 26 ++++++++++++++++++
 .../dom/shared/ReactDOMComponentTree.js       |  8 +++---
 .../dom/shared/ReactInputSelection.js         |  3 ++-
 .../shared/eventPlugins/SelectEventPlugin.js  |  3 ++-
 src/renderers/dom/shared/findDOMNode.js       |  3 ++-
 src/renderers/dom/shared/setTextContent.js    |  7 +++--
 .../dom/shared/utils/getEventTarget.js        |  4 ++-
 .../shared/utils/getNodeForCharacterOffset.js |  4 ++-
 src/renderers/dom/stack/client/DOMLazyTree.js |  9 +++----
 .../dom/stack/client/ReactDOMComponent.js     |  6 ++---
 .../dom/stack/client/ReactDOMContainerInfo.js |  5 ++--
 .../dom/stack/client/ReactDOMTextComponent.js |  5 +++-
 src/renderers/dom/stack/client/ReactMount.js  | 27 ++++++++++---------
 16 files changed, 89 insertions(+), 53 deletions(-)
 create mode 100644 src/renderers/dom/shared/HTMLNodeType.js

diff --git a/eslint-rules/__tests__/no-primitive-constructors-test.js b/eslint-rules/__tests__/no-primitive-constructors-test.js
index 5d1a19ef18ce4..d756beabc34a2 100644
--- a/eslint-rules/__tests__/no-primitive-constructors-test.js
+++ b/eslint-rules/__tests__/no-primitive-constructors-test.js
@@ -34,8 +34,10 @@ ruleTester.run('eslint-rules/no-primitive-constructors', rule, {
       code: 'String(obj)',
       errors: [
         {
-          message: 'Do not use the String constructor. To cast a value to a string, ' +
-            'concat it with the empty string (unless it\'s a symbol, which has different semantics): \'\' + value',
+          message:
+            'Do not use the String constructor. ' +
+            'To cast a value to a string, concat it with the empty string ' +
+            '(unless it\'s a symbol, which has different semantics): \'\' + value',
         },
       ],
     },
diff --git a/src/renderers/dom/fiber/ReactDOMFiber.js b/src/renderers/dom/fiber/ReactDOMFiber.js
index 80598dfb69079..bb327bb36b441 100644
--- a/src/renderers/dom/fiber/ReactDOMFiber.js
+++ b/src/renderers/dom/fiber/ReactDOMFiber.js
@@ -30,6 +30,11 @@ var ReactInstanceMap = require('ReactInstanceMap');
 var ReactPortal = require('ReactPortal');
 var {isValidElement} = require('react');
 var {injectInternals} = require('ReactFiberDevToolsHook');
+var {
+  ELEMENT_NODE,
+  DOCUMENT_NODE,
+  DOCUMENT_FRAGMENT_NODE,
+} = require('HTMLNodeType');
 
 var findDOMNode = require('findDOMNode');
 var invariant = require('fbjs/lib/invariant');
@@ -52,8 +57,6 @@ if (__DEV__) {
   var {updatedAncestorInfo} = validateDOMNesting;
 }
 
-const DOCUMENT_NODE = 9;
-
 ReactDOMInjection.inject();
 ReactControlledComponent.injection.injectFiberControlledHostComponent(
   ReactDOMFiberComponent,
@@ -83,10 +86,6 @@ type HostContext = HostContextDev | HostContextProd;
 let eventsEnabled: ?boolean = null;
 let selectionInformation: ?mixed = null;
 
-var ELEMENT_NODE_TYPE = 1;
-var DOC_NODE_TYPE = 9;
-var DOCUMENT_FRAGMENT_NODE_TYPE = 11;
-
 /**
  * True if the supplied DOM node is a valid node element.
  *
@@ -96,9 +95,9 @@ var DOCUMENT_FRAGMENT_NODE_TYPE = 11;
  */
 function isValidContainer(node) {
   return !!(node &&
-    (node.nodeType === ELEMENT_NODE_TYPE ||
-      node.nodeType === DOC_NODE_TYPE ||
-      node.nodeType === DOCUMENT_FRAGMENT_NODE_TYPE));
+    (node.nodeType === ELEMENT_NODE ||
+      node.nodeType === DOCUMENT_NODE ||
+      node.nodeType === DOCUMENT_FRAGMENT_NODE));
 }
 
 function validateContainer(container) {
@@ -112,7 +111,7 @@ function getReactRootElementInContainer(container: any) {
     return null;
   }
 
-  if (container.nodeType === DOC_NODE_TYPE) {
+  if (container.nodeType === DOCUMENT_NODE) {
     return container.documentElement;
   } else {
     return container.firstChild;
diff --git a/src/renderers/dom/fiber/ReactDOMFiberComponent.js b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
index 7aea3c569735a..7718b4e89ca9b 100644
--- a/src/renderers/dom/fiber/ReactDOMFiberComponent.js
+++ b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
@@ -25,6 +25,7 @@ var ReactDOMFiberOption = require('ReactDOMFiberOption');
 var ReactDOMFiberSelect = require('ReactDOMFiberSelect');
 var ReactDOMFiberTextarea = require('ReactDOMFiberTextarea');
 var {getCurrentFiberOwnerName} = require('ReactDebugCurrentFiber');
+var {DOCUMENT_FRAGMENT_NODE} = require('HTMLNodeType');
 
 var emptyFunction = require('fbjs/lib/emptyFunction');
 var invariant = require('fbjs/lib/invariant');
@@ -63,9 +64,6 @@ var {
   mathml: MATH_NAMESPACE,
 } = DOMNamespaces;
 
-// Node type for document fragments (Node.DOCUMENT_FRAGMENT_NODE).
-var DOC_FRAGMENT_TYPE = 11;
-
 function getDeclarationErrorAddendum() {
   if (__DEV__) {
     var ownerName = getCurrentFiberOwnerName();
@@ -144,7 +142,8 @@ if (__DEV__) {
 }
 
 function ensureListeningTo(rootContainerElement, registrationName) {
-  var isDocumentFragment = rootContainerElement.nodeType === DOC_FRAGMENT_TYPE;
+  var isDocumentFragment = rootContainerElement.nodeType ===
+    DOCUMENT_FRAGMENT_NODE;
   var doc = isDocumentFragment
     ? rootContainerElement
     : rootContainerElement.ownerDocument;
diff --git a/src/renderers/dom/shared/HTMLNodeType.js b/src/renderers/dom/shared/HTMLNodeType.js
new file mode 100644
index 0000000000000..35566be173211
--- /dev/null
+++ b/src/renderers/dom/shared/HTMLNodeType.js
@@ -0,0 +1,26 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule HTMLNodeType
+ */
+
+'use strict';
+
+/**
+ * HTML nodeType values that represent the type of the node
+ */
+
+var HTMLNodeType = {
+  ELEMENT_NODE: 1,
+  TEXT_NODE: 3,
+  COMMENT_NODE: 8,
+  DOCUMENT_NODE: 9,
+  DOCUMENT_FRAGMENT_NODE: 11,
+};
+
+module.exports = HTMLNodeType;
diff --git a/src/renderers/dom/shared/ReactDOMComponentTree.js b/src/renderers/dom/shared/ReactDOMComponentTree.js
index 600188f0951a3..978d60d51ec8d 100644
--- a/src/renderers/dom/shared/ReactDOMComponentTree.js
+++ b/src/renderers/dom/shared/ReactDOMComponentTree.js
@@ -14,6 +14,7 @@
 var DOMProperty = require('DOMProperty');
 var ReactDOMComponentFlags = require('ReactDOMComponentFlags');
 var {HostComponent, HostText} = require('ReactTypeOfWork');
+var {ELEMENT_NODE, COMMENT_NODE} = require('HTMLNodeType');
 
 var invariant = require('fbjs/lib/invariant');
 
@@ -30,11 +31,12 @@ var internalEventHandlersKey = '__reactEventHandlers$' + randomKey;
  * Check if a given node should be cached.
  */
 function shouldPrecacheNode(node, nodeID) {
-  return (node.nodeType === 1 &&
+  return (node.nodeType === ELEMENT_NODE &&
     node.getAttribute(ATTR_NAME) === '' + nodeID) ||
-    (node.nodeType === 8 &&
+    (node.nodeType === COMMENT_NODE &&
       node.nodeValue === ' react-text: ' + nodeID + ' ') ||
-    (node.nodeType === 8 && node.nodeValue === ' react-empty: ' + nodeID + ' ');
+    (node.nodeType === COMMENT_NODE &&
+      node.nodeValue === ' react-empty: ' + nodeID + ' ');
 }
 
 /**
diff --git a/src/renderers/dom/shared/ReactInputSelection.js b/src/renderers/dom/shared/ReactInputSelection.js
index dae4085f6a78a..2fd94d4ef0e05 100644
--- a/src/renderers/dom/shared/ReactInputSelection.js
+++ b/src/renderers/dom/shared/ReactInputSelection.js
@@ -12,6 +12,7 @@
 'use strict';
 
 var ReactDOMSelection = require('ReactDOMSelection');
+var {ELEMENT_NODE} = require('HTMLNodeType');
 
 var containsNode = require('fbjs/lib/containsNode');
 var focusNode = require('fbjs/lib/focusNode');
@@ -64,7 +65,7 @@ var ReactInputSelection = {
       const ancestors = [];
       let ancestor = priorFocusedElem;
       while ((ancestor = ancestor.parentNode)) {
-        if (ancestor.nodeType === 1) {
+        if (ancestor.nodeType === ELEMENT_NODE) {
           ancestors.push({
             element: ancestor,
             left: ancestor.scrollLeft,
diff --git a/src/renderers/dom/shared/eventPlugins/SelectEventPlugin.js b/src/renderers/dom/shared/eventPlugins/SelectEventPlugin.js
index 1989139b1a0e5..c075529e21c5e 100644
--- a/src/renderers/dom/shared/eventPlugins/SelectEventPlugin.js
+++ b/src/renderers/dom/shared/eventPlugins/SelectEventPlugin.js
@@ -17,6 +17,7 @@ var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');
 var ReactDOMComponentTree = require('ReactDOMComponentTree');
 var ReactInputSelection = require('ReactInputSelection');
 var SyntheticEvent = require('SyntheticEvent');
+var {DOCUMENT_NODE} = require('HTMLNodeType');
 
 var getActiveElement = require('fbjs/lib/getActiveElement');
 var isTextInputElement = require('isTextInputElement');
@@ -148,7 +149,7 @@ var SelectEventPlugin = {
   ) {
     var doc = nativeEventTarget.window === nativeEventTarget
       ? nativeEventTarget.document
-      : nativeEventTarget.nodeType === 9
+      : nativeEventTarget.nodeType === DOCUMENT_NODE
           ? nativeEventTarget
           : nativeEventTarget.ownerDocument;
     if (!doc || !isListeningToAllDependencies('onSelect', doc)) {
diff --git a/src/renderers/dom/shared/findDOMNode.js b/src/renderers/dom/shared/findDOMNode.js
index 35aa38518dd29..1374e320a6b31 100644
--- a/src/renderers/dom/shared/findDOMNode.js
+++ b/src/renderers/dom/shared/findDOMNode.js
@@ -11,6 +11,7 @@
  */
 
 var ReactInstanceMap = require('ReactInstanceMap');
+var {ELEMENT_NODE} = require('HTMLNodeType');
 var {ReactCurrentOwner} = require('ReactGlobalSharedState');
 
 var getComponentName = require('getComponentName');
@@ -53,7 +54,7 @@ const findDOMNode = function(
   if (componentOrElement == null) {
     return null;
   }
-  if ((componentOrElement: any).nodeType === 1) {
+  if ((componentOrElement: any).nodeType === ELEMENT_NODE) {
     return (componentOrElement: any);
   }
 
diff --git a/src/renderers/dom/shared/setTextContent.js b/src/renderers/dom/shared/setTextContent.js
index 64db36c40b40d..cef8fbc78e947 100644
--- a/src/renderers/dom/shared/setTextContent.js
+++ b/src/renderers/dom/shared/setTextContent.js
@@ -14,6 +14,7 @@
 var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
 var escapeTextContentForBrowser = require('escapeTextContentForBrowser');
 var setInnerHTML = require('setInnerHTML');
+var {TEXT_NODE} = require('HTMLNodeType');
 
 /**
  * Set the textContent property of a node, ensuring that whitespace is preserved
@@ -30,7 +31,9 @@ var setTextContent = function(node, text) {
     var firstChild = node.firstChild;
 
     if (
-      firstChild && firstChild === node.lastChild && firstChild.nodeType === 3
+      firstChild &&
+      firstChild === node.lastChild &&
+      firstChild.nodeType === TEXT_NODE
     ) {
       firstChild.nodeValue = text;
       return;
@@ -42,7 +45,7 @@ var setTextContent = function(node, text) {
 if (ExecutionEnvironment.canUseDOM) {
   if (!('textContent' in document.documentElement)) {
     setTextContent = function(node, text) {
-      if (node.nodeType === 3) {
+      if (node.nodeType === TEXT_NODE) {
         node.nodeValue = text;
         return;
       }
diff --git a/src/renderers/dom/shared/utils/getEventTarget.js b/src/renderers/dom/shared/utils/getEventTarget.js
index 83bd08b2a2558..bcd806aec48c2 100644
--- a/src/renderers/dom/shared/utils/getEventTarget.js
+++ b/src/renderers/dom/shared/utils/getEventTarget.js
@@ -11,6 +11,8 @@
 
 'use strict';
 
+var {TEXT_NODE} = require('HTMLNodeType');
+
 /**
  * Gets the target node from a native browser event by accounting for
  * inconsistencies in browser DOM APIs.
@@ -28,7 +30,7 @@ function getEventTarget(nativeEvent) {
 
   // Safari may fire events on text nodes (Node.TEXT_NODE is 3).
   // @see http://www.quirksmode.org/js/events_properties.html
-  return target.nodeType === 3 ? target.parentNode : target;
+  return target.nodeType === TEXT_NODE ? target.parentNode : target;
 }
 
 module.exports = getEventTarget;
diff --git a/src/renderers/dom/shared/utils/getNodeForCharacterOffset.js b/src/renderers/dom/shared/utils/getNodeForCharacterOffset.js
index 65d3a33a91b6d..4a300293f91a9 100644
--- a/src/renderers/dom/shared/utils/getNodeForCharacterOffset.js
+++ b/src/renderers/dom/shared/utils/getNodeForCharacterOffset.js
@@ -11,6 +11,8 @@
 
 'use strict';
 
+var {TEXT_NODE} = require('HTMLNodeType');
+
 /**
  * Given any node return the first leaf node without children.
  *
@@ -53,7 +55,7 @@ function getNodeForCharacterOffset(root, offset) {
   var nodeEnd = 0;
 
   while (node) {
-    if (node.nodeType === 3) {
+    if (node.nodeType === TEXT_NODE) {
       nodeEnd = nodeStart + node.textContent.length;
 
       if (nodeStart <= offset && nodeEnd >= offset) {
diff --git a/src/renderers/dom/stack/client/DOMLazyTree.js b/src/renderers/dom/stack/client/DOMLazyTree.js
index 7d5b6bb1b649e..a6ef556d5e836 100644
--- a/src/renderers/dom/stack/client/DOMLazyTree.js
+++ b/src/renderers/dom/stack/client/DOMLazyTree.js
@@ -13,13 +13,10 @@
 
 var DOMNamespaces = require('DOMNamespaces');
 var setInnerHTML = require('setInnerHTML');
-
+var {DOCUMENT_FRAGMENT_NODE, ELEMENT_NODE} = require('HTMLNodeType');
 var createMicrosoftUnsafeLocalFunction = require('createMicrosoftUnsafeLocalFunction');
 var setTextContent = require('setTextContent');
 
-var ELEMENT_NODE_TYPE = 1;
-var DOCUMENT_FRAGMENT_NODE_TYPE = 11;
-
 /**
  * In IE (8-11) and Edge, appending nodes with no children is dramatically
  * faster than appending a full subtree, so we essentially queue up the
@@ -63,8 +60,8 @@ var insertTreeBefore = createMicrosoftUnsafeLocalFunction(
     // <param> nodes immediately upon insertion into the DOM, so <object>
     // must also be populated prior to insertion into the DOM.
     if (
-      tree.node.nodeType === DOCUMENT_FRAGMENT_NODE_TYPE ||
-      (tree.node.nodeType === ELEMENT_NODE_TYPE &&
+      tree.node.nodeType === DOCUMENT_FRAGMENT_NODE ||
+      (tree.node.nodeType === ELEMENT_NODE &&
         tree.node.nodeName.toLowerCase() === 'object' &&
         (tree.node.namespaceURI == null ||
           tree.node.namespaceURI === DOMNamespaces.html))
diff --git a/src/renderers/dom/stack/client/ReactDOMComponent.js b/src/renderers/dom/stack/client/ReactDOMComponent.js
index 35e54f7b4efe8..8b2e144e9c24a 100644
--- a/src/renderers/dom/stack/client/ReactDOMComponent.js
+++ b/src/renderers/dom/stack/client/ReactDOMComponent.js
@@ -30,6 +30,7 @@ var ReactDOMTextarea = require('ReactDOMTextarea');
 var ReactInstrumentation = require('ReactInstrumentation');
 var ReactMultiChild = require('ReactMultiChild');
 var ReactServerRenderingTransaction = require('ReactServerRenderingTransaction');
+var {DOCUMENT_FRAGMENT_NODE} = require('HTMLNodeType');
 
 var emptyFunction = require('fbjs/lib/emptyFunction');
 var escapeTextContentForBrowser = require('escapeTextContentForBrowser');
@@ -55,9 +56,6 @@ var RESERVED_PROPS = {
   suppressContentEditableWarning: null,
 };
 
-// Node type for document fragments (Node.DOCUMENT_FRAGMENT_NODE).
-var DOC_FRAGMENT_TYPE = 11;
-
 function getDeclarationErrorAddendum(internalInstance) {
   if (internalInstance) {
     var owner = internalInstance._currentElement._owner || null;
@@ -139,7 +137,7 @@ function ensureListeningTo(inst, registrationName, transaction) {
   }
   var containerInfo = inst._hostContainerInfo;
   var isDocumentFragment = containerInfo._node &&
-    containerInfo._node.nodeType === DOC_FRAGMENT_TYPE;
+    containerInfo._node.nodeType === DOCUMENT_FRAGMENT_NODE;
   var doc = isDocumentFragment
     ? containerInfo._node
     : containerInfo._ownerDocument;
diff --git a/src/renderers/dom/stack/client/ReactDOMContainerInfo.js b/src/renderers/dom/stack/client/ReactDOMContainerInfo.js
index 263c42c7645d7..2e525014b46fb 100644
--- a/src/renderers/dom/stack/client/ReactDOMContainerInfo.js
+++ b/src/renderers/dom/stack/client/ReactDOMContainerInfo.js
@@ -12,15 +12,14 @@
 'use strict';
 
 var validateDOMNesting = require('validateDOMNesting');
-
-var DOC_NODE_TYPE = 9;
+var {DOCUMENT_NODE} = require('HTMLNodeType');
 
 function ReactDOMContainerInfo(topLevelWrapper, node) {
   var info = {
     _topLevelWrapper: topLevelWrapper,
     _idCounter: 1,
     _ownerDocument: node
-      ? node.nodeType === DOC_NODE_TYPE ? node : node.ownerDocument
+      ? node.nodeType === DOCUMENT_NODE ? node : node.ownerDocument
       : null,
     _node: node,
     _tag: node ? node.nodeName.toLowerCase() : null,
diff --git a/src/renderers/dom/stack/client/ReactDOMTextComponent.js b/src/renderers/dom/stack/client/ReactDOMTextComponent.js
index 3ff3a47f92786..55a943d1a9886 100644
--- a/src/renderers/dom/stack/client/ReactDOMTextComponent.js
+++ b/src/renderers/dom/stack/client/ReactDOMTextComponent.js
@@ -14,6 +14,7 @@
 var DOMChildrenOperations = require('DOMChildrenOperations');
 var DOMLazyTree = require('DOMLazyTree');
 var ReactDOMComponentTree = require('ReactDOMComponentTree');
+var {COMMENT_NODE} = require('HTMLNodeType');
 
 var escapeTextContentForBrowser = require('escapeTextContentForBrowser');
 var invariant = require('fbjs/lib/invariant');
@@ -159,7 +160,9 @@ Object.assign(ReactDOMTextComponent.prototype, {
           'Missing closing comment for text component %s',
           this._domID,
         );
-        if (node.nodeType === 8 && node.nodeValue === ' /react-text ') {
+        if (
+          node.nodeType === COMMENT_NODE && node.nodeValue === ' /react-text '
+        ) {
           this._closingComment = node;
           break;
         }
diff --git a/src/renderers/dom/stack/client/ReactMount.js b/src/renderers/dom/stack/client/ReactMount.js
index 9cbc2c91e44ed..2f567b8367daa 100644
--- a/src/renderers/dom/stack/client/ReactMount.js
+++ b/src/renderers/dom/stack/client/ReactMount.js
@@ -33,14 +33,15 @@ var setInnerHTML = require('setInnerHTML');
 var shouldUpdateReactComponent = require('shouldUpdateReactComponent');
 var warning = require('fbjs/lib/warning');
 var validateCallback = require('validateCallback');
+var {
+  DOCUMENT_NODE,
+  ELEMENT_NODE,
+  DOCUMENT_FRAGMENT_NODE,
+} = require('HTMLNodeType');
 
 var ATTR_NAME = DOMProperty.ID_ATTRIBUTE_NAME;
 var ROOT_ATTR_NAME = DOMProperty.ROOT_ATTRIBUTE_NAME;
 
-var ELEMENT_NODE_TYPE = 1;
-var DOC_NODE_TYPE = 9;
-var DOCUMENT_FRAGMENT_NODE_TYPE = 11;
-
 var instancesByReactRootID = {};
 
 /**
@@ -69,7 +70,7 @@ function getReactRootElementInContainer(container) {
     return null;
   }
 
-  if (container.nodeType === DOC_NODE_TYPE) {
+  if (container.nodeType === DOCUMENT_NODE) {
     return container.documentElement;
   } else {
     return container.firstChild;
@@ -181,7 +182,7 @@ function unmountComponentFromNode(instance, container) {
     ReactInstrumentation.debugTool.onEndFlush();
   }
 
-  if (container.nodeType === DOC_NODE_TYPE) {
+  if (container.nodeType === DOCUMENT_NODE) {
     container = container.documentElement;
   }
 
@@ -233,9 +234,9 @@ function nodeIsRenderedByOtherInstance(container) {
  */
 function isValidContainer(node) {
   return !!(node &&
-    (node.nodeType === ELEMENT_NODE_TYPE ||
-      node.nodeType === DOC_NODE_TYPE ||
-      node.nodeType === DOCUMENT_FRAGMENT_NODE_TYPE));
+    (node.nodeType === ELEMENT_NODE ||
+      node.nodeType === DOCUMENT_NODE ||
+      node.nodeType === DOCUMENT_FRAGMENT_NODE));
 }
 
 /**
@@ -638,7 +639,7 @@ var ReactMount = {
       var containerHasNonRootReactChild = hasNonRootReactChild(container);
 
       // Check if the container itself is a React root node.
-      var isContainerReactRoot = container.nodeType === 1 &&
+      var isContainerReactRoot = container.nodeType === ELEMENT_NODE &&
         container.hasAttribute(ROOT_ATTR_NAME);
 
       if (__DEV__) {
@@ -701,7 +702,7 @@ var ReactMount = {
           // insert markup into a <div> or <iframe> depending on the container
           // type to perform the same normalizations before comparing.
           var normalizer;
-          if (container.nodeType === ELEMENT_NODE_TYPE) {
+          if (container.nodeType === ELEMENT_NODE) {
             normalizer = document.createElement('div');
             normalizer.innerHTML = markup;
             normalizedMarkup = normalizer.innerHTML;
@@ -721,7 +722,7 @@ var ReactMount = {
           rootMarkup.substring(diffIndex - 20, diffIndex + 20);
 
         invariant(
-          container.nodeType !== DOC_NODE_TYPE,
+          container.nodeType !== DOCUMENT_NODE,
           "You're trying to render a component to the document using " +
             'server rendering but the checksum was invalid. This usually ' +
             'means you rendered a different component type or props on ' +
@@ -751,7 +752,7 @@ var ReactMount = {
     }
 
     invariant(
-      container.nodeType !== DOC_NODE_TYPE,
+      container.nodeType !== DOCUMENT_NODE,
       "You're trying to render a component to the document but " +
         "you didn't use server rendering. We can't do this " +
         'without using server rendering due to cross-browser quirks. ' +

From f6c4fe6cbbdca375b50ac10373007a9b74279e95 Mon Sep 17 00:00:00 2001
From: Chris Pearce <hello@chrispearce.me>
Date: Tue, 18 Apr 2017 14:31:47 +0100
Subject: [PATCH 103/153] Only attempt to clear measures if we created the
 measure (#9451)

This fixes an issue where if we decided not to create a measurement we would clear ALL measurements from the performance entry buffer due to passing `undefined` as the entry name.
---
 src/renderers/shared/ReactDebugTool.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/renderers/shared/ReactDebugTool.js b/src/renderers/shared/ReactDebugTool.js
index 7be3d38fe73fb..e735ad337a792 100644
--- a/src/renderers/shared/ReactDebugTool.js
+++ b/src/renderers/shared/ReactDebugTool.js
@@ -305,7 +305,9 @@ if (__DEV__) {
     }
 
     performance.clearMarks(markName);
-    performance.clearMeasures(measurementName);
+    if (measurementName) {
+      performance.clearMeasures(measurementName);
+    }
   };
 
   ReactDebugTool = {

From 359f5d276ffd4da96e3a00d7245da9fad004ba0d Mon Sep 17 00:00:00 2001
From: NE-SmallTown <ne_smalltown@163.com>
Date: Tue, 18 Apr 2017 21:42:40 +0800
Subject: [PATCH 104/153] [Documentation] Impreove the react-component section
 of doc (#9349)

* Impreove react-component of doc

[#9304](https://github.com/facebook/react/issues/9304)

* update description

* add missing space
---
 docs/docs/reference-react-component.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/reference-react-component.md b/docs/docs/reference-react-component.md
index 67efaae6a74f1..2c1b0770cb871 100644
--- a/docs/docs/reference-react-component.md
+++ b/docs/docs/reference-react-component.md
@@ -136,7 +136,7 @@ If you "fork" props by using them for state, you might also want to implement [`
 componentWillMount()
 ```
 
-`componentWillMount()` is invoked immediately before mounting occurs. It is called before `render()`, therefore setting state in this method will not trigger a re-rendering. Avoid introducing any side-effects or subscriptions in this method.
+`componentWillMount()` is invoked immediately before mounting occurs. It is called before `render()`, therefore setting state synchronously in this method will not trigger a re-rendering. Avoid introducing any side-effects or subscriptions in this method.
 
 This is the only lifecycle hook called on server rendering. Generally, we recommend using the `constructor()` instead.
 

From 363f6cb2e592f2a283eac279fb393666dcb92b65 Mon Sep 17 00:00:00 2001
From: Fraser Haer <fraser.haer@hotmail.com>
Date: Tue, 18 Apr 2017 23:47:44 +1000
Subject: [PATCH 105/153] Unique headings for linking purposes (#9259)

Previously two headings were 'Javascript Expressions' - now 'Javascript
Expressions as Props' and 'Javascript Expressions as Children'
---
 docs/docs/jsx-in-depth.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/docs/jsx-in-depth.md b/docs/docs/jsx-in-depth.md
index 41c3813dd8459..c71bc68be73b2 100644
--- a/docs/docs/jsx-in-depth.md
+++ b/docs/docs/jsx-in-depth.md
@@ -172,7 +172,7 @@ function Story(props) {
 
 There are several different ways to specify props in JSX.
 
-### JavaScript Expressions
+### JavaScript Expressions as Props
 
 You can pass any JavaScript expression as a prop, by surrounding it with `{}`. For example, in this JSX:
 
@@ -308,7 +308,7 @@ You can mix together different types of children, so you can use string literals
 
 A React component can't return multiple React elements, but a single JSX expression can have multiple children, so if you want a component to render multiple things you can wrap it in a `div` like this.
 
-### JavaScript Expressions
+### JavaScript Expressions as Children
 
 You can pass any JavaScript expression as children, by enclosing it within `{}`. For example, these expressions are equivalent:
 

From ccb38a96cf480d99a18f8764ccd12c59289bb542 Mon Sep 17 00:00:00 2001
From: Jayen Ashar <jayenashar@users.noreply.github.com>
Date: Wed, 19 Apr 2017 00:29:17 +1000
Subject: [PATCH 106/153] Update jsx-in-depth.md (#9178)

* Update jsx-in-depth.md

Line 9 isn't changed

* Move selection down

* Fix
---
 docs/docs/jsx-in-depth.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs/jsx-in-depth.md b/docs/docs/jsx-in-depth.md
index c71bc68be73b2..d75fd72fc4f4d 100644
--- a/docs/docs/jsx-in-depth.md
+++ b/docs/docs/jsx-in-depth.md
@@ -152,7 +152,7 @@ function Story(props) {
 
 To fix this, we will assign the type to a capitalized variable first:
 
-```js{9-11}
+```js{10-12}
 import React from 'react';
 import { PhotoStory, VideoStory } from './stories';
 

From 37f9e35ad93e1cb1042a7bc3d8b78290dfcecec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Ordon?= <designorant@users.noreply.github.com>
Date: Tue, 18 Apr 2017 15:38:19 +0100
Subject: [PATCH 107/153] Sort out conferences by date (#9172)

---
 docs/community/conferences.md | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/community/conferences.md b/docs/community/conferences.md
index f16f7650a598a..fdb7fdb25f881 100644
--- a/docs/community/conferences.md
+++ b/docs/community/conferences.md
@@ -14,16 +14,16 @@ March 28th at the [QEII Centre, London](http://qeiicentre.london/)
 
 [Website](http://react.london/)
 
-### ReactEurope 2017
-May 18th & 19th in Paris, France
-
-[Website](http://www.react-europe.org/) - [Schedule](http://www.react-europe.org/#schedule)
-
 ### React Amsterdam 2017
 April 21st in Amsterdam, The Netherlands
 
 [Website](https://react.amsterdam) - [Twitter](https://twitter.com/reactamsterdam)
 
+### ReactEurope 2017
+May 18th & 19th in Paris, France
+
+[Website](http://www.react-europe.org/) - [Schedule](http://www.react-europe.org/#schedule)
+
 ### Chain React 2017
 July 10-11 in Portland, Oregon USA
 
@@ -34,6 +34,11 @@ August 24-25 in Salt Lake City, Utah USA
 
 [Website](http://www.reactrally.com) - [Twitter](https://twitter.com/reactrally)
 
+### React Native EU 2017
+September 6-7 in Wroclaw, Poland
+
+[Website](http://react-native.eu/)
+
 ### ReactJS Day 2017
 October 6th in Verona, Italy
 
@@ -44,11 +49,6 @@ October 13 in Stockholm, Sweden
 
 [Website](https://statejs.com/)
 
-### React Native EU 2017
-September 6-7 in Wroclaw, Poland
-
-[Website](http://react-native.eu/)
-
 
 ## Past Conferences
 

From 53a3939fb015504d006cc4f2d3ace67133164f09 Mon Sep 17 00:00:00 2001
From: hanumanthan <hanu.sas@gmail.com>
Date: Tue, 18 Apr 2017 20:57:45 +0530
Subject: [PATCH 108/153] Lift state up - Updating the documentation to mention
 that onClick is a synthetic event handler (#9427)

* Lift state up - Updating the documentation to mention that onClick is a synthetic event handler

* Review comments - Rephrase to handle synthetic events and event handler patterns

* Tweak
---
 docs/tutorial/tutorial.md | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/docs/tutorial/tutorial.md b/docs/tutorial/tutorial.md
index 25cfa29dd5ee8..d0c1d18402e2d 100644
--- a/docs/tutorial/tutorial.md
+++ b/docs/tutorial/tutorial.md
@@ -183,7 +183,7 @@ And change Square to use `this.props.value` again. Now we need to change what ha
 return <Square value={this.state.squares[i]} onClick={() => this.handleClick(i)} />;
 ```
 
-Now we're passing down two props from Board to Square: `value` and `onClick`. The latter is a function that Square can call. So let's do that by changing `render` in Square to have:
+Now we're passing down two props from Board to Square: `value` and `onClick`. The latter is a function that Square can call. So let's replace the `this.setState()` call we used to have inside the button click handler in Square's `render()` with a call to `this.props.onClick()`:
 
 ```javascript
 <button className="square" onClick={() => this.props.onClick()}>
@@ -191,7 +191,17 @@ Now we're passing down two props from Board to Square: `value` and `onClick`. Th
 </button>
 ```
 
-This means that when the square is clicked, it calls the onClick function that was passed by the parent. The `onClick` doesn't have any special meaning here, but it's popular to name handler props starting with `on` and their implementations with `handle`. Try clicking a square – you should get an error because we haven't defined `handleClick` yet. Add it to the Board class:
+Now when the square is clicked, it calls the `onClick` function that was passed by Board. Let's recap what happens here:
+
+1. The `onClick` prop on the built-in DOM `<button>` component tells React to set up a click event listener.
+2. When the button is clicked, React will call the `onClick` event handler defined in Square's `render()` method.
+3. This event handler calls `this.props.onClick()`. Square's props were specified by the Board.
+4. This is how we get into `onClick` passed from the Board, which runs `this.handleClick()` on the Board.
+5. We have not defined `this.handleClick` on the Board yet, so the code crashes.
+
+Note that `onClick` on the DOM `<button>` component has a special meaning to React, but we could have called `onClick` prop in Square and `handleClick` in Board something else. It is, however, a common convention in React apps to use `on*` names for the handler prop names and `handle*` for their implementations.
+
+Try clicking a square – you should get an error because we haven't defined `handleClick` yet. Add it to the Board class:
 
 ```javascript
 handleClick(i) {

From d724115144e1bfd61c0d0a7aaf0bb02358652b83 Mon Sep 17 00:00:00 2001
From: Abhishek Soni <abhisheksoni2720@gmail.com>
Date: Tue, 18 Apr 2017 15:38:39 +0000
Subject: [PATCH 109/153] Fixed grammar (#9432)

* Update codebase-overview.md

* Some more fixes
---
 docs/contributing/codebase-overview.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contributing/codebase-overview.md b/docs/contributing/codebase-overview.md
index b9be535b416bc..f0eea5e65228a 100644
--- a/docs/contributing/codebase-overview.md
+++ b/docs/contributing/codebase-overview.md
@@ -38,7 +38,7 @@ var setInnerHTML = require('setInnerHTML');
 
 Haste was originally developed for giant apps like Facebook. It's easy to move files to different folders and import them without worrying about relative paths. The fuzzy file search in any editor always takes you to the correct place thanks to globally unique names.
 
-React itself was extracted from the Facebook codebase and uses Haste for historical reasons. In the future, we will probably [migrate React to use CommonJS or ES Modules](https://github.com/facebook/react/issues/6336) to be more aligned with the community. However, this requires changes in Facebook internal infrastructure so it is unlikely to happen very soon.
+React itself was extracted from Facebook's codebase and uses Haste for historical reasons. In the future, we will probably [migrate React to use CommonJS or ES Modules](https://github.com/facebook/react/issues/6336) to be more aligned with the community. However, this requires changes in Facebook's internal infrastructure so it is unlikely to happen very soon.
 
 **Haste will make more sense to you if you remember a few rules:**
 
@@ -223,7 +223,7 @@ module.exports = ReactDOMComponent;
 
 The `Mixin` in this code has no relation to React `mixins` feature. It is just a way of grouping a few methods under an object. Those methods may later get attached to some other class. We use this pattern in a few places although we try to avoid it in the new code.
 
-Equivalent code in ES6 would look like this:
+The equivalent code in ES6 would look like this:
 
 ```js
 class ReactDOMComponent {

From 8417534bd0b131882ced1360dfd23b4d6b63391b Mon Sep 17 00:00:00 2001
From: Frankie Bagnardi <f.bagnardi@gmail.com>
Date: Tue, 18 Apr 2017 09:34:43 -0700
Subject: [PATCH 110/153] [Tutorial] ES6, installation, and button closing tag
 (#9441)

* adds notes to tutorial on es6 and installation

* fixes tutorial mention of opening button tag

* More writing

* Update
---
 docs/tutorial/tutorial.md | 48 +++++++++++++++++++++++++++++++++++----
 1 file changed, 44 insertions(+), 4 deletions(-)

diff --git a/docs/tutorial/tutorial.md b/docs/tutorial/tutorial.md
index d0c1d18402e2d..827b331923de1 100644
--- a/docs/tutorial/tutorial.md
+++ b/docs/tutorial/tutorial.md
@@ -14,9 +14,47 @@ redirect_from:
 
 ## What We're Building
 
-Today, we're going to build an interactive tic-tac-toe game. We'll assume some familiarity with HTML and JavaScript but you should be able to follow along even if you haven't used them before.
+Today, we're going to build an interactive tic-tac-toe game.
 
-If you like, you can check out the final result here: <a href="https://s.codepen.io/ericnakagawa/pen/ALxakj" target="_blank">Final Result</a>. Try playing the game. You can also click on a link in the move list to go "back in time" and see what the board looked like just after that move was made.
+If you like, you can check out the final result here: <a href="https://codepen.io/gaearon/pen/VbvBWg?editors=0010" target="_blank">Final Result</a>. Try playing the game. You can also click on a link in the move list to go "back in time" and see what the board looked like just after that move was made.
+
+## Prerequisites
+
+We'll assume some familiarity with HTML and JavaScript but you should be able to follow along even if you haven't used them before.
+
+If you need a refresher on JavaScript, we recommend reading [this guide](https://developer.mozilla.org/en-US/docs/Web/JavaScript/A_re-introduction_to_JavaScript). Note that we're also using some features from ES6, a recent version of JavaScript. In this tutorial, we're using [arrow functions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/Arrow_functions), [classes](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes), [`let`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/let), and [`const`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/const) statements. You can use <a href="http://babeljs.io/repl/#?babili=false&evaluate=true&lineWrap=false&presets=es2015%2Creact&experimental=false&loose=false&spec=false&code=const%20element%20%3D%20%3Ch1%3EHello%2C%20world!%3C%2Fh1%3E%3B%0Aconst%20container%20%3D%20document.getElementById('root')%3B%0AReactDOM.render(element%2C%20container)%3B%0A">Babel REPL</a> to check what ES6 code compiles to.
+
+## How to Follow Along
+
+### Following Along in Browser
+
+We'll be using an online editor called CodePen in this guide. Start by opening this <a href="https://codepen.io/gaearon/pen/JNYBEZ?editors=0010" target="_blank">starter code</a>. It should display an empty tic-tac-toe field. We will be editing that code during this tutorial.
+
+### Following Along Locally
+
+You can also follow along locally if you don't mind a few extra steps:
+
+1. Make sure you have a recent version of [Node.js](https://nodejs.org/en/) installed.
+2. Follow the [installation instructions](/react/docs/installation.html#creating-a-new-application) to create a new project.
+3. Replace the contents of `src/index.js` in the generated project with <a href="https://codepen.io/gaearon/pen/JNYBEZ?editors=0010" target="_blank">this JavaScript code</a>.
+4. Replace the contents of `src/index.css` in the generated project with <a href="https://codepen.io/gaearon/pen/JNYBEZ?editors=0100" target="_blank">this CSS code</a>.
+5. Delete any other files in the `src/` folder, and add three lines to the top of `src/index.js`:
+
+```js
+import React from 'react';
+import ReactDOM from 'react-dom';
+import './index.css';
+```
+
+Now if you run `npm start` in the project folder and open `http://localhost:3000` in the browser, you should see an empty tic-tac-toe field.
+
+## Help, I'm Stuck!
+
+If you get stuck, check out the [community support resources](https://facebook.github.io/react/community/support.html). In particular, [Reactiflux chat](/react/community/support.html#reactiflux-chat) is a great way to get quick help. If you don't get a good answer anywhere, please file an issue, and we'll help you out.
+
+You can also look at the <a href="https://codepen.io/gaearon/pen/VbvBWg?editors=0010" target="_blank">final version of the code</a>.
+
+With this out of the way, let's get started!
 
 ## What is React?
 
@@ -62,7 +100,7 @@ The `ShoppingList` component only renders built-in DOM components, but you can c
 
 ## Getting Started
 
-Start with this example: <a href="https://codepen.io/ericnakagawa/pen/vXpjwZ?editors=0010" target="_blank">Starter Code</a>.
+Start with this example: <a href="https://codepen.io/gaearon/pen/JNYBEZ?editors=0010" target="_blank">Starter Code</a>.
 
 It contains the shell of what we're building today. We've provided the styles so you only need to worry about the JavaScript.
 
@@ -90,10 +128,12 @@ After: You should see a number in each square in the rendered output.
 
 ##An Interactive Component
 
-Let's make the Square component fill in an "X" when you click it. Try changing the opening button tag returned in the `render()` function of the `Square` class to:
+Let's make the Square component fill in an "X" when you click it. Try changing the button tag returned in the `render()` function of the `Square` class to:
 
 ```html
 <button className="square" onClick={() => alert('click')}>
+  {/* TODO */}
+</button>
 ```
 
 This uses the new JavaScript arrow function syntax. If you click on a square now, you should get an alert in your browser.

From da124f2fb1a97d43cd365b3a7694b87eb24bdf43 Mon Sep 17 00:00:00 2001
From: Dan Abramov <dan.abramov@gmail.com>
Date: Tue, 18 Apr 2017 17:40:59 +0100
Subject: [PATCH 111/153] Minor tweaks to tutorial

---
 docs/tutorial/tutorial.md | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/docs/tutorial/tutorial.md b/docs/tutorial/tutorial.md
index 827b331923de1..2ea4542f03059 100644
--- a/docs/tutorial/tutorial.md
+++ b/docs/tutorial/tutorial.md
@@ -28,23 +28,25 @@ If you need a refresher on JavaScript, we recommend reading [this guide](https:/
 
 ### Following Along in Browser
 
-We'll be using an online editor called CodePen in this guide. Start by opening this <a href="https://codepen.io/gaearon/pen/JNYBEZ?editors=0010" target="_blank">starter code</a>. It should display an empty tic-tac-toe field. We will be editing that code during this tutorial.
+We'll be using an online editor called CodePen in this guide. You can begin by opening this <a href="https://codepen.io/gaearon/pen/JNYBEZ?editors=0010" target="_blank">starter code</a>. It should display an empty tic-tac-toe field. We will be editing that code during this tutorial.
 
 ### Following Along Locally
 
 You can also follow along locally if you don't mind a few extra steps:
 
+You can also follow along locally if you don't mind a few extra steps:
+
 1. Make sure you have a recent version of [Node.js](https://nodejs.org/en/) installed.
 2. Follow the [installation instructions](/react/docs/installation.html#creating-a-new-application) to create a new project.
-3. Replace the contents of `src/index.js` in the generated project with <a href="https://codepen.io/gaearon/pen/JNYBEZ?editors=0010" target="_blank">this JavaScript code</a>.
+3. Replace the contents of `src/index.js` in the generated project with <a href="https://codepen.io/gaearon/pen/JNYBEZ?editors=0010" target="_blank">this JS code</a>.
 4. Replace the contents of `src/index.css` in the generated project with <a href="https://codepen.io/gaearon/pen/JNYBEZ?editors=0100" target="_blank">this CSS code</a>.
-5. Delete any other files in the `src/` folder, and add three lines to the top of `src/index.js`:
+5. Delete other files in the `src/` folder, and add three lines to the top of `src/index.js`:
 
-```js
-import React from 'react';
-import ReactDOM from 'react-dom';
-import './index.css';
-```
+    ```js
+    import React from 'react';
+    import ReactDOM from 'react-dom';
+    import './index.css';
+    ```
 
 Now if you run `npm start` in the project folder and open `http://localhost:3000` in the browser, you should see an empty tic-tac-toe field.
 

From a7f124f48f9cbf7e9fb15ee770fd19e971f53256 Mon Sep 17 00:00:00 2001
From: Dan Abramov <gaearon@fb.com>
Date: Tue, 18 Apr 2017 17:44:32 +0100
Subject: [PATCH 112/153] Fix duplicate sentence

---
 docs/tutorial/tutorial.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docs/tutorial/tutorial.md b/docs/tutorial/tutorial.md
index 2ea4542f03059..b8adda099330f 100644
--- a/docs/tutorial/tutorial.md
+++ b/docs/tutorial/tutorial.md
@@ -34,8 +34,6 @@ We'll be using an online editor called CodePen in this guide. You can begin by o
 
 You can also follow along locally if you don't mind a few extra steps:
 
-You can also follow along locally if you don't mind a few extra steps:
-
 1. Make sure you have a recent version of [Node.js](https://nodejs.org/en/) installed.
 2. Follow the [installation instructions](/react/docs/installation.html#creating-a-new-application) to create a new project.
 3. Replace the contents of `src/index.js` in the generated project with <a href="https://codepen.io/gaearon/pen/JNYBEZ?editors=0010" target="_blank">this JS code</a>.

From a41d469bcfbdeecf882e0694b6708005e0c8895c Mon Sep 17 00:00:00 2001
From: Dan Abramov <gaearon@fb.com>
Date: Tue, 18 Apr 2017 17:53:53 +0100
Subject: [PATCH 113/153] Minor tutorial nits

---
 docs/tutorial/tutorial.md | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/docs/tutorial/tutorial.md b/docs/tutorial/tutorial.md
index b8adda099330f..612fbc0b56261 100644
--- a/docs/tutorial/tutorial.md
+++ b/docs/tutorial/tutorial.md
@@ -60,7 +60,7 @@ With this out of the way, let's get started!
 
 React is a declarative, efficient, and flexible JavaScript library for building user interfaces.
 
-React has a few different kinds of components, but we'll start with React.Component subclasses:
+React has a few different kinds of components, but we'll start with `React.Component` subclasses:
 
 ```javascript
 class ShoppingList extends React.Component {
@@ -148,7 +148,7 @@ class Square extends React.Component {
       value: null,
     };
   }
-  ...
+  // ...
 }
 ```
 
@@ -158,7 +158,7 @@ Now change the `render` method to display `this.state.value` instead of `this.pr
 
 ```javascript
 <button className="square" onClick={() => this.setState({value: 'X'})}>
-	{this.state.value}
+  {this.state.value}
 </button>
 ```
 
@@ -277,7 +277,7 @@ var player = {score: 1, name: 'Jeff'};
 var newPlayer = Object.assign({}, player, {score: 2});
 // Now player is unchanged, but newPlayer is {score: 2, name: 'Jeff'}
 
-// Or if you are using object spread, you can write:
+// Or if you are using object spread syntax proposal, you can write:
 // var newPlayer = {...player, score: 2};
 ```
 
@@ -322,7 +322,7 @@ class Board extends React.Component {
   constructor() {
     super();
     this.state = {
-      ...
+      // ...
       xIsNext: true,
     };
   }
@@ -346,7 +346,7 @@ Now X and O take turns. Next, change the "status" text in Board's `render` so th
 ```javascript
 render() {
   const status = 'Next player: ' + (this.state.xIsNext ? 'X' : 'O');
-  ...
+  // ...
 ```
 
 ## Declaring a Winner
@@ -362,7 +362,7 @@ render() {
   } else {
     status = 'Next player: ' + (this.state.xIsNext ? 'X' : 'O');
   }
-  ...
+  // ...
 }
 ```
 
@@ -374,7 +374,7 @@ handleClick(i) {
   if (calculateWinner(squares) || squares[i]) {
     return;
   }
-  ...
+  // ...
 }
 ```
 
@@ -394,7 +394,7 @@ history = [
   {
     squares: [... x 9]
   },
-  ...
+  // ...
 ]
 ```
 
@@ -413,7 +413,7 @@ class Game extends React.Component {
       xIsNext: true
     };
   }
-  ...
+  // ...
 }
 ```
 
@@ -436,7 +436,9 @@ if (winner) {
 } else {
   status = 'Next player: ' + (this.state.xIsNext ? 'X' : 'O');
 }
-...
+
+// ...
+
 <div className="game-board">
   <Board
     squares={current.squares}
@@ -488,7 +490,9 @@ const moves = history.map((step, move) => {
     </li>
   );
 });
-...
+
+// ...
+
 <ol>{moves}</ol>
 ```
 

From 7b80361b6b857396383e83db6c3b163b8ebd1ce6 Mon Sep 17 00:00:00 2001
From: Dan Abramov <gaearon@fb.com>
Date: Tue, 18 Apr 2017 18:00:54 +0100
Subject: [PATCH 114/153] Add missing tutorial sidebar links

---
 docs/_data/nav_tutorial.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docs/_data/nav_tutorial.yml b/docs/_data/nav_tutorial.yml
index efa090f0cecb1..2a321a17eecf3 100644
--- a/docs/_data/nav_tutorial.yml
+++ b/docs/_data/nav_tutorial.yml
@@ -7,6 +7,18 @@
           title: What We're Building
           href: /react/tutorial/tutorial.html#what-were-building
           forceInternal: true
+        - id: prerequisites
+          title: Prerequisites
+          href: /react/tutorial/tutorial.html#prerequisites
+          forceInternal: true
+        - id: how-to-follow-along
+          title: How to Follow Along
+          href: /react/tutorial/tutorial.html#how-to-follow-along
+          forceInternal: true
+        - id: help-im-stuck
+          title: Help, I'm Stuck!
+          href: /react/tutorial/tutorial.html#help-im-stuck
+          forceInternal: true
         - id: what-is-react
           title: What is React?
           href: /react/tutorial/tutorial.html#what-is-react

From c5783901a89b770b39443c1a82b6e389ddfee4fd Mon Sep 17 00:00:00 2001
From: Dan Abramov <gaearon@fb.com>
Date: Tue, 18 Apr 2017 18:07:16 +0100
Subject: [PATCH 115/153] Tweak tutorial structure

---
 docs/_data/nav_tutorial.yml |  7 +++++-
 docs/tutorial/tutorial.md   | 44 ++++++++++++++++++++-----------------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/docs/_data/nav_tutorial.yml b/docs/_data/nav_tutorial.yml
index 2a321a17eecf3..49cc7557f911e 100644
--- a/docs/_data/nav_tutorial.yml
+++ b/docs/_data/nav_tutorial.yml
@@ -1,7 +1,7 @@
 - title: Tutorial
   items:
     - id: tutorial
-      title: Overview
+      title: Before We Start
       subitems:
         - id: what-were-building 
           title: What We're Building
@@ -19,6 +19,11 @@
           title: Help, I'm Stuck!
           href: /react/tutorial/tutorial.html#help-im-stuck
           forceInternal: true
+    - id: overview
+      title: Overview
+      href: /react/tutorial/tutorial.html#overview
+      forceInternal: true
+      subitems:
         - id: what-is-react
           title: What is React?
           href: /react/tutorial/tutorial.html#what-is-react
diff --git a/docs/tutorial/tutorial.md b/docs/tutorial/tutorial.md
index 612fbc0b56261..2cc9b53059875 100644
--- a/docs/tutorial/tutorial.md
+++ b/docs/tutorial/tutorial.md
@@ -12,25 +12,27 @@ redirect_from:
   - "docs/tutorial-zh-CN.html"
 ---
 
-## What We're Building
+## Before We Start
+
+### What We're Building
 
 Today, we're going to build an interactive tic-tac-toe game.
 
 If you like, you can check out the final result here: <a href="https://codepen.io/gaearon/pen/VbvBWg?editors=0010" target="_blank">Final Result</a>. Try playing the game. You can also click on a link in the move list to go "back in time" and see what the board looked like just after that move was made.
 
-## Prerequisites
+### Prerequisites
 
 We'll assume some familiarity with HTML and JavaScript but you should be able to follow along even if you haven't used them before.
 
 If you need a refresher on JavaScript, we recommend reading [this guide](https://developer.mozilla.org/en-US/docs/Web/JavaScript/A_re-introduction_to_JavaScript). Note that we're also using some features from ES6, a recent version of JavaScript. In this tutorial, we're using [arrow functions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/Arrow_functions), [classes](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes), [`let`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/let), and [`const`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/const) statements. You can use <a href="http://babeljs.io/repl/#?babili=false&evaluate=true&lineWrap=false&presets=es2015%2Creact&experimental=false&loose=false&spec=false&code=const%20element%20%3D%20%3Ch1%3EHello%2C%20world!%3C%2Fh1%3E%3B%0Aconst%20container%20%3D%20document.getElementById('root')%3B%0AReactDOM.render(element%2C%20container)%3B%0A">Babel REPL</a> to check what ES6 code compiles to.
 
-## How to Follow Along
+### How to Follow Along
 
-### Following Along in Browser
+#### Following Along in Browser
 
 We'll be using an online editor called CodePen in this guide. You can begin by opening this <a href="https://codepen.io/gaearon/pen/JNYBEZ?editors=0010" target="_blank">starter code</a>. It should display an empty tic-tac-toe field. We will be editing that code during this tutorial.
 
-### Following Along Locally
+#### Following Along Locally
 
 You can also follow along locally if you don't mind a few extra steps:
 
@@ -48,7 +50,7 @@ You can also follow along locally if you don't mind a few extra steps:
 
 Now if you run `npm start` in the project folder and open `http://localhost:3000` in the browser, you should see an empty tic-tac-toe field.
 
-## Help, I'm Stuck!
+### Help, I'm Stuck!
 
 If you get stuck, check out the [community support resources](https://facebook.github.io/react/community/support.html). In particular, [Reactiflux chat](/react/community/support.html#reactiflux-chat) is a great way to get quick help. If you don't get a good answer anywhere, please file an issue, and we'll help you out.
 
@@ -56,7 +58,9 @@ You can also look at the <a href="https://codepen.io/gaearon/pen/VbvBWg?editors=
 
 With this out of the way, let's get started!
 
-## What is React?
+## Overview
+
+### What is React?
 
 React is a declarative, efficient, and flexible JavaScript library for building user interfaces.
 
@@ -98,7 +102,7 @@ You can put any JavaScript expression within braces inside JSX. Each React eleme
 
 The `ShoppingList` component only renders built-in DOM components, but you can compose custom React components just as easily, by writing `<ShoppingList />`. Each component is encapsulated so it can operate independently, which allows you to build complex UIs out of simple components.
 
-## Getting Started
+### Getting Started
 
 Start with this example: <a href="https://codepen.io/gaearon/pen/JNYBEZ?editors=0010" target="_blank">Starter Code</a>.
 
@@ -114,7 +118,7 @@ The Square component renders a single `<button>`, the Board renders 9 squares, a
 
 (The end of the JS file also defines a helper function `calculateWinner` that we'll use later.)
 
-## Passing Data Through Props
+### Passing Data Through Props
 
 Just to get our feet wet, let's try passing some data from the Board component to the Square component. In Board's `renderSquare` method, change the code to return `<Square value={i} />` then change Square's render method to show that value by replacing `{/* TODO */}` with `{this.props.value}`.
 
@@ -126,7 +130,7 @@ After: You should see a number in each square in the rendered output.
 
 ![React Devtools](/react/img/tutorial/tictac-numbers.png)
 
-##An Interactive Component
+### An Interactive Component
 
 Let's make the Square component fill in an "X" when you click it. Try changing the button tag returned in the `render()` function of the `Square` class to:
 
@@ -166,7 +170,7 @@ Whenever `this.setState` is called, an update to the component is scheduled, cau
 
 If you click on any square, an X should show up in it.
 
-## Developer Tools
+### Developer Tools
 
 The React Devtools extension for [Chrome](https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi?hl=en) and [Firefox](https://addons.mozilla.org/en-US/firefox/addon/react-devtools/) lets you inspect a React component tree in your browser devtools.
 
@@ -257,7 +261,7 @@ Now you should be able to click in squares to fill them again, but the state is
 
 Square no longer keeps its own state; it receives its value from its parent `Board` and informs its parent when it's clicked. We call components like this **controlled components**.
 
-## Why Immutability Is Important
+### Why Immutability Is Important
 
 In the previous code example, we suggest using the `.slice()` operator to copy the `squares` array prior to making changes and to prevent mutating the existing array. Let's talk about what this means and why it is an important concept to learn.
 
@@ -289,13 +293,13 @@ Determining if a mutated object has changed is complex because changes are made
 
 Determining how an immutable object has changed is considerably easier. If the object being referenced is different from before, then the object has changed. That's it.
 
-### Determining When To Re-render in React
+#### Determining When To Re-render in React
 
 The biggest benefit of immutability in React comes when you build simple _pure components_. Since immutable data can more easily determine if changes have been made it also helps to determine when a component requires being re-rendered.
 
 To learn how you can build *pure components* take a look at [shouldComponentUpdate()](https://facebook.github.io/react/docs/update.html). Also, take a look at the [Immutable.js](https://facebook.github.io/immutable-js/) library to strictly enforce immutable data.
 
-## Functional Components
+### Functional Components
 
 Back to our project, you can now delete the `constructor` from `Square`; we won't need it any more. In fact, React supports a simpler syntax called **stateless functional components** for component types like Square that only consist of a `render` method. Rather than define a class extending React.Component, simply write a function that takes props and returns what should be rendered:
 
@@ -311,7 +315,7 @@ function Square(props) {
 
 You'll need to change `this.props` to `props` both times it appears. Many components in your apps will be able to be written as functional components: these components tend to be easier to write and React will optimize them more in the future.
 
-## Taking Turns
+### Taking Turns
 
 An obvious defect in our game is that only X can play. Let's fix that.
 
@@ -349,7 +353,7 @@ render() {
   // ...
 ```
 
-## Declaring a Winner
+### Declaring a Winner
 
 Let's show when the game is won. A `calculateWinner(squares)` helper function that takes the list of 9 values has been provided for you at the bottom of the file. You can call it in Board's `render` function to check if anyone has won the game and make the status text show "Winner: [X/O]" when someone wins:
 
@@ -475,7 +479,7 @@ handleClick(i) {
 
 At this point, Board only needs `renderSquare` and `render`; the state initialization and click handler should both live in Game.
 
-## Showing the Moves
+### Showing the Moves
 
 Let's show the previous moves made in the game so far. We learned earlier that React elements are first-class JS objects and we can store them or pass them around. To render multiple items in React, we pass an array of React elements. The most common way to build that array is to map over your array of data. Let's do that in the `render` method of Game:
 
@@ -503,7 +507,7 @@ For each step in the history, we create a list item `<li>` with a link `<a>` ins
 
 Let's talk about what that warning means.
 
-## Keys
+### Keys
 
 When you render a list of items, React always stores some info about each item in the list. If you render a component that has state, that state needs to be stored – and regardless of how you implement your components, React stores a reference to the backing native views.
 
@@ -540,7 +544,7 @@ If you don't specify any key, React will warn you and fall back to using the arr
 
 Component keys don't need to be globally unique, only unique relative to the immediate siblings.
 
-## Implementing Time Travel
+### Implementing Time Travel
 
 For our move list, we already have a unique ID for each step: the number of the move when it happened. Add the key as `<li key={move}>` and the key warning should disappear.
 
@@ -565,7 +569,7 @@ const current = history[this.state.stepNumber];
 
 If you click any move link now, the board should immediately update to show what the game looked like at that time. You may also want to update `handleClick` to be aware of `stepNumber` when reading the current board state so that you can go back in time then click in the board to create a new entry. (Hint: It's easiest to `.slice()` off the extra elements from `history` at the very top of `handleClick`.)
 
-## Wrapping Up
+### Wrapping Up
 
 Now, you've made a tic-tac-toe game that:
 

From 10eaf26809bdb1874e14f0879190c356937c2e3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Filip=20Ho=C5=A1ko?= <filiphosko@gmail.com>
Date: Tue, 18 Apr 2017 19:17:28 +0200
Subject: [PATCH 116/153] FIX: Move CRA build info under it's tab page (#9452)

* FIX: Move CRA build info under it's tab page

* Add some links
---
 docs/docs/installation.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/docs/docs/installation.md b/docs/docs/installation.md
index 3072d7768e7eb..6687a961772fe 100644
--- a/docs/docs/installation.md
+++ b/docs/docs/installation.md
@@ -90,6 +90,8 @@ npm start
 
 Create React App doesn't handle backend logic or databases; it just creates a frontend build pipeline, so you can use it with any backend you want. It uses build tools like Babel and webpack under the hood, but works with zero configuration.
 
+When you're ready to deploy to production, running `npm run build` will create an optimized build of your app in the `build` folder. You can learn more about Create React App [from its README](https://github.com/facebookincubator/create-react-app#create-react-app-) and the [User Guide](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#table-of-contents).
+
 <block class="existingapp" />
 
 ## Adding React to an Existing Application
@@ -162,10 +164,6 @@ To create an optimized production build with Brunch, just add the `-p` flag to t
 
 Run Browserify with `NODE_ENV` environment variable set to `production` and use [UglifyJS](https://github.com/mishoo/UglifyJS) as the last build step so that development-only code gets stripped out.
 
-#### Create React App
-
-If you use [Create React App](https://github.com/facebookincubator/create-react-app), `npm run build` will create an optimized build of your app in the `build` folder.
-
 #### Rollup
 
 Use [rollup-plugin-replace](https://github.com/rollup/rollup-plugin-replace) plugin together with [rollup-plugin-commonjs](https://github.com/rollup/rollup-plugin-commonjs) (in that order) to remove development-only code. [See this gist](https://gist.github.com/Rich-Harris/cb14f4bc0670c47d00d191565be36bf0) for a complete setup example.
@@ -258,4 +256,4 @@ function selectTabForHashLink() {
     }
   }
 }
-</script>
\ No newline at end of file
+</script>

From b392f1e2fcc892a0582a173e517d429f277562aa Mon Sep 17 00:00:00 2001
From: Ben Alpert <ben@benalpert.com>
Date: Tue, 18 Apr 2017 17:31:33 -0700
Subject: [PATCH 117/153] Fix errors in React Native children management
 (#9449)

* Fix errors in React Native children management

- Support using appendChild to move an existing child (Fiber does this, but we were assuming all children here were new; Yoga throws if you insert a child that already has a parent)
- Calculate beforeChildIndex after removing old child (previously, off by one when the new position is later than the old position)

* Add better children management tests for RN
---
 src/__mocks__/UIManager.js                    | 133 +++++++++++++++++-
 src/renderers/native/ReactNativeFiber.js      |  37 +++--
 .../__tests__/ReactNativeEvents-test.js       |   1 +
 .../native/__tests__/ReactNativeMount-test.js |  28 ++++
 .../ReactNativeEvents-test.js.snap            |   7 +
 .../ReactNativeMount-test.js.snap             |  51 +++++++
 6 files changed, 244 insertions(+), 13 deletions(-)
 create mode 100644 src/renderers/native/__tests__/__snapshots__/ReactNativeEvents-test.js.snap
 create mode 100644 src/renderers/native/__tests__/__snapshots__/ReactNativeMount-test.js.snap

diff --git a/src/__mocks__/UIManager.js b/src/__mocks__/UIManager.js
index f2ead9dde794c..9f7c743676f3c 100644
--- a/src/__mocks__/UIManager.js
+++ b/src/__mocks__/UIManager.js
@@ -11,12 +11,139 @@
 
 // Mock of the Native Hooks
 
+const ReactNativeTagHandles = require('ReactNativeTagHandles');
+const invariant = require('fbjs/lib/invariant');
+
+// Map of viewTag -> {children: [childTag], parent: ?parentTag}
+const roots = [];
+let views = new Map();
+
+function autoCreateRoot(tag) {
+  // Seriously, this is how we distinguish roots in RN.
+  if (!views.has(tag) && ReactNativeTagHandles.reactTagIsNativeTopRootID(tag)) {
+    roots.push(tag);
+    views.set(tag, {
+      children: [],
+      parent: null,
+      props: {},
+      viewName: '<native root>',
+    });
+  }
+}
+
+function insertSubviewAtIndex(parent, child, index) {
+  const parentInfo = views.get(parent);
+  const childInfo = views.get(child);
+  invariant(
+    childInfo.parent === null,
+    'Inserting view %s %s which already has parent',
+    child,
+    JSON.stringify(childInfo.props),
+  );
+  invariant(
+    0 <= index && index <= parentInfo.children.length,
+    'Invalid index %s for children %s',
+    index,
+    parentInfo.children
+  );
+  parentInfo.children.splice(index, 0, child);
+  childInfo.parent = parent;
+}
+
+function removeChild(parent, child) {
+  const parentInfo = views.get(parent);
+  const childInfo = views.get(child);
+  const index = parentInfo.children.indexOf(child);
+  invariant(index >= 0, 'Missing view %s during removal', child);
+  parentInfo.children.splice(index, 1);
+  childInfo.parent = null;
+}
+
 var RCTUIManager = {
+  __dumpHierarchyForJestTestsOnly: function() {
+    return roots.map((tag) => dumpSubtree(tag, 0)).join('\n');
+
+    function dumpSubtree(tag, indent) {
+      const info = views.get(tag);
+      let out = '';
+      out += ' '.repeat(indent) + info.viewName + ' ' + JSON.stringify(info.props);
+      for (const child of info.children) {
+        out += '\n' + dumpSubtree(child, indent + 2);
+      }
+      return out;
+    }
+  },
   clearJSResponder: jest.fn(),
-  createView: jest.fn(),
+  createView: jest.fn(function createView(reactTag, viewName, rootTag, props) {
+    invariant(
+      !views.has(reactTag),
+      'Created two native views with tag %s',
+      reactTag,
+    );
+    views.set(reactTag, {
+      children: [],
+      parent: null,
+      props: props,
+      viewName: viewName,
+    });
+  }),
   setJSResponder: jest.fn(),
-  setChildren: jest.fn(),
-  manageChildren: jest.fn(),
+  setChildren: jest.fn(function setChildren(parentTag, reactTags) {
+    autoCreateRoot(parentTag);
+    // Native doesn't actually check this but it seems like a good idea
+    invariant(
+      views.get(parentTag).children.length === 0,
+      'Calling .setChildren on nonempty view %s',
+      parentTag,
+    );
+    // This logic ported from iOS (RCTUIManager.m)
+    reactTags.forEach((tag, i) => {
+      insertSubviewAtIndex(parentTag, tag, i);
+    });
+  }),
+  manageChildren: jest.fn(function manageChildren(
+    parentTag,
+    moveFromIndices = [],
+    moveToIndices = [],
+    addChildReactTags = [],
+    addAtIndices = [],
+    removeAtIndices = [],
+  ) {
+    autoCreateRoot(parentTag);
+    // This logic ported from iOS (RCTUIManager.m)
+    invariant(
+      moveFromIndices.length === moveToIndices.length,
+      'Mismatched move indices %s and %s',
+      moveFromIndices,
+      moveToIndices,
+    );
+    invariant(
+      addChildReactTags.length === addAtIndices.length,
+      'Mismatched add indices %s and %s',
+      addChildReactTags,
+      addAtIndices,
+    );
+    const parentInfo = views.get(parentTag);
+    const permanentlyRemovedChildren = removeAtIndices.map((index) => parentInfo.children[index]);
+    const temporarilyRemovedChildren = moveFromIndices.map((index) => parentInfo.children[index]);
+    permanentlyRemovedChildren.forEach((tag) => removeChild(parentTag, tag));
+    temporarilyRemovedChildren.forEach((tag) => removeChild(parentTag, tag));
+    permanentlyRemovedChildren.forEach((tag) => {
+      views.delete(tag);
+    });
+    // List of [index, tag]
+    const indicesToInsert = [];
+    temporarilyRemovedChildren.forEach((tag, i) => {
+      indicesToInsert.push([moveToIndices[i], temporarilyRemovedChildren[i]]);
+    });
+    addChildReactTags.forEach((tag, i) => {
+      indicesToInsert.push([addAtIndices[i], addChildReactTags[i]]);
+    });
+    indicesToInsert.sort((a, b) => a[0] - b[0]);
+    for (const [i, tag] of indicesToInsert) {
+      insertSubviewAtIndex(parentTag, tag, i);
+    }
+  }),
   updateView: jest.fn(),
   removeSubviewsFromContainerWithID: jest.fn(),
   replaceExistingNonRootView: jest.fn(),
diff --git a/src/renderers/native/ReactNativeFiber.js b/src/renderers/native/ReactNativeFiber.js
index dd4b7a215d4a7..e7c2ea86c2cb9 100644
--- a/src/renderers/native/ReactNativeFiber.js
+++ b/src/renderers/native/ReactNativeFiber.js
@@ -82,16 +82,32 @@ const NativeRenderer = ReactFiberReconciler({
     } else {
       const children = parentInstance._children;
 
-      children.push(child);
+      const index = children.indexOf(child);
 
-      UIManager.manageChildren(
-        parentInstance._nativeTag, // containerTag
-        [], // moveFromIndices
-        [], // moveToIndices
-        [childTag], // addChildReactTags
-        [children.length - 1], // addAtIndices
-        [], // removeAtIndices
-      );
+      if (index >= 0) {
+        children.splice(index, 1);
+        children.push(child);
+
+        UIManager.manageChildren(
+          parentInstance._nativeTag, // containerTag
+          [index], // moveFromIndices
+          [children.length - 1], // moveToIndices
+          [], // addChildReactTags
+          [], // addAtIndices
+          [], // removeAtIndices
+        );
+      } else {
+        children.push(child);
+
+        UIManager.manageChildren(
+          parentInstance._nativeTag, // containerTag
+          [], // moveFromIndices
+          [], // moveToIndices
+          [childTag], // addChildReactTags
+          [children.length - 1], // addAtIndices
+          [], // removeAtIndices
+        );
+      }
     }
   },
 
@@ -264,12 +280,12 @@ const NativeRenderer = ReactFiberReconciler({
 
     const children = (parentInstance: any)._children;
 
-    const beforeChildIndex = children.indexOf(beforeChild);
     const index = children.indexOf(child);
 
     // Move existing child or add new child?
     if (index >= 0) {
       children.splice(index, 1);
+      const beforeChildIndex = children.indexOf(beforeChild);
       children.splice(beforeChildIndex, 0, child);
 
       UIManager.manageChildren(
@@ -281,6 +297,7 @@ const NativeRenderer = ReactFiberReconciler({
         [], // removeAtIndices
       );
     } else {
+      const beforeChildIndex = children.indexOf(beforeChild);
       children.splice(beforeChildIndex, 0, child);
 
       const childTag = typeof child === 'number' ? child : child._nativeTag;
diff --git a/src/renderers/native/__tests__/ReactNativeEvents-test.js b/src/renderers/native/__tests__/ReactNativeEvents-test.js
index 9efa5f05e097b..495f51338aebe 100644
--- a/src/renderers/native/__tests__/ReactNativeEvents-test.js
+++ b/src/renderers/native/__tests__/ReactNativeEvents-test.js
@@ -58,6 +58,7 @@ it('handles events', () => {
     1,
   );
 
+  expect(UIManager.__dumpHierarchyForJestTestsOnly()).toMatchSnapshot();
   expect(UIManager.createView.mock.calls.length).toBe(2);
 
   // Don't depend on the order of createView() calls.
diff --git a/src/renderers/native/__tests__/ReactNativeMount-test.js b/src/renderers/native/__tests__/ReactNativeMount-test.js
index 9c9bf936f8832..20c9418a853e7 100644
--- a/src/renderers/native/__tests__/ReactNativeMount-test.js
+++ b/src/renderers/native/__tests__/ReactNativeMount-test.js
@@ -80,4 +80,32 @@ describe('ReactNative', () => {
     expect(a).toBe(b);
     expect(a).toBe(c);
   });
+
+  it('renders and reorders children', () => {
+    var View = createReactNativeComponentClass({
+      validAttributes: {title: true},
+      uiViewClassName: 'View',
+    });
+
+    class Component extends React.Component {
+      render() {
+        var chars = this.props.chars.split('');
+        return (
+          <View>
+            {chars.map(text => <View key={text} title={text} />)}
+          </View>
+        );
+      }
+    }
+
+    // Mini multi-child stress test: lots of reorders, some adds, some removes.
+    var before = 'abcdefghijklmnopqrst';
+    var after = 'mxhpgwfralkeoivcstzy';
+
+    ReactNative.render(<Component chars={before} />, 11);
+    expect(UIManager.__dumpHierarchyForJestTestsOnly()).toMatchSnapshot();
+
+    ReactNative.render(<Component chars={after} />, 11);
+    expect(UIManager.__dumpHierarchyForJestTestsOnly()).toMatchSnapshot();
+  });
 });
diff --git a/src/renderers/native/__tests__/__snapshots__/ReactNativeEvents-test.js.snap b/src/renderers/native/__tests__/__snapshots__/ReactNativeEvents-test.js.snap
new file mode 100644
index 0000000000000..b24c719f3979b
--- /dev/null
+++ b/src/renderers/native/__tests__/__snapshots__/ReactNativeEvents-test.js.snap
@@ -0,0 +1,7 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`handles events 1`] = `
+"<native root> {}
+  View {\\"foo\\":\\"outer\\"}
+    View {\\"foo\\":\\"inner\\"}"
+`;
diff --git a/src/renderers/native/__tests__/__snapshots__/ReactNativeMount-test.js.snap b/src/renderers/native/__tests__/__snapshots__/ReactNativeMount-test.js.snap
new file mode 100644
index 0000000000000..5225479968090
--- /dev/null
+++ b/src/renderers/native/__tests__/__snapshots__/ReactNativeMount-test.js.snap
@@ -0,0 +1,51 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ReactNative renders and reorders children 1`] = `
+"<native root> {}
+  View null
+    View {\\"title\\":\\"a\\"}
+    View {\\"title\\":\\"b\\"}
+    View {\\"title\\":\\"c\\"}
+    View {\\"title\\":\\"d\\"}
+    View {\\"title\\":\\"e\\"}
+    View {\\"title\\":\\"f\\"}
+    View {\\"title\\":\\"g\\"}
+    View {\\"title\\":\\"h\\"}
+    View {\\"title\\":\\"i\\"}
+    View {\\"title\\":\\"j\\"}
+    View {\\"title\\":\\"k\\"}
+    View {\\"title\\":\\"l\\"}
+    View {\\"title\\":\\"m\\"}
+    View {\\"title\\":\\"n\\"}
+    View {\\"title\\":\\"o\\"}
+    View {\\"title\\":\\"p\\"}
+    View {\\"title\\":\\"q\\"}
+    View {\\"title\\":\\"r\\"}
+    View {\\"title\\":\\"s\\"}
+    View {\\"title\\":\\"t\\"}"
+`;
+
+exports[`ReactNative renders and reorders children 2`] = `
+"<native root> {}
+  View null
+    View {\\"title\\":\\"m\\"}
+    View {\\"title\\":\\"x\\"}
+    View {\\"title\\":\\"h\\"}
+    View {\\"title\\":\\"p\\"}
+    View {\\"title\\":\\"g\\"}
+    View {\\"title\\":\\"w\\"}
+    View {\\"title\\":\\"f\\"}
+    View {\\"title\\":\\"r\\"}
+    View {\\"title\\":\\"a\\"}
+    View {\\"title\\":\\"l\\"}
+    View {\\"title\\":\\"k\\"}
+    View {\\"title\\":\\"e\\"}
+    View {\\"title\\":\\"o\\"}
+    View {\\"title\\":\\"i\\"}
+    View {\\"title\\":\\"v\\"}
+    View {\\"title\\":\\"c\\"}
+    View {\\"title\\":\\"s\\"}
+    View {\\"title\\":\\"t\\"}
+    View {\\"title\\":\\"z\\"}
+    View {\\"title\\":\\"y\\"}"
+`;

From 1ce562ead352dc139aa622bdce0f40df7070df5e Mon Sep 17 00:00:00 2001
From: Fabrizio Castellarin <f.castellarin@gmail.com>
Date: Wed, 19 Apr 2017 13:00:15 +0200
Subject: [PATCH 118/153] Reorganize the "following along" instructions (#9453)

* Reorganize the "following along" instructions

* Minor tweaks
---
 docs/tutorial/tutorial.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/tutorial/tutorial.md b/docs/tutorial/tutorial.md
index 2cc9b53059875..7feca45be8354 100644
--- a/docs/tutorial/tutorial.md
+++ b/docs/tutorial/tutorial.md
@@ -38,9 +38,9 @@ You can also follow along locally if you don't mind a few extra steps:
 
 1. Make sure you have a recent version of [Node.js](https://nodejs.org/en/) installed.
 2. Follow the [installation instructions](/react/docs/installation.html#creating-a-new-application) to create a new project.
-3. Replace the contents of `src/index.js` in the generated project with <a href="https://codepen.io/gaearon/pen/JNYBEZ?editors=0010" target="_blank">this JS code</a>.
-4. Replace the contents of `src/index.css` in the generated project with <a href="https://codepen.io/gaearon/pen/JNYBEZ?editors=0100" target="_blank">this CSS code</a>.
-5. Delete other files in the `src/` folder, and add three lines to the top of `src/index.js`:
+3. Delete all files in the `src/` folder of the new project.
+4. Add a file named `index.css` in the `src/` folder with <a href="https://codepen.io/gaearon/pen/JNYBEZ?editors=0100" target="_blank">this CSS code</a>.
+5. Add a file named `index.js` in the `src/` folder with <a href="https://codepen.io/gaearon/pen/JNYBEZ?editors=0010" target="_blank">this JS code</a>, and then add three lines to the top of it:
 
     ```js
     import React from 'react';

From 233195cb6bc632ade61a8f64569b4d94061860d6 Mon Sep 17 00:00:00 2001
From: Joel Denning <joeldenning@gmail.com>
Date: Wed, 19 Apr 2017 05:07:16 -0600
Subject: [PATCH 119/153] Fixing the instantiation of customized builtin
 elements (related to custom elements) (#9313)

* Fixing the creation of customized builtin elements

* Whitespace

* Running prettier

* Updating ReactDOMFiberComponent
---
 src/renderers/dom/fiber/ReactDOMFiberComponent.js          | 2 +-
 .../dom/shared/__tests__/ReactDOMComponent-test.js         | 7 +++----
 src/renderers/dom/stack/client/ReactDOMComponent.js        | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/renderers/dom/fiber/ReactDOMFiberComponent.js b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
index 7718b4e89ca9b..31430af92ee2c 100644
--- a/src/renderers/dom/fiber/ReactDOMFiberComponent.js
+++ b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
@@ -439,7 +439,7 @@ var ReactDOMFiberComponent = {
         var firstChild = ((div.firstChild: any): HTMLScriptElement);
         domElement = div.removeChild(firstChild);
       } else if (props.is) {
-        domElement = ownerDocument.createElement(type, props.is);
+        domElement = ownerDocument.createElement(type, {is: props.is});
       } else {
         // Separate else branch instead of using `props.is || undefined` above because of a Firefox bug.
         // See discussion in https://github.com/facebook/react/pull/6896
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
index ca2ec1cf0079b..99bf0780925e2 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
@@ -1071,10 +1071,9 @@ describe('ReactDOMComponent', () => {
         var container = document.createElement('div');
         spyOn(document, 'createElement').and.callThrough();
         ReactDOM.render(<div is="custom-div" />, container);
-        expect(document.createElement).toHaveBeenCalledWith(
-          'div',
-          'custom-div',
-        );
+        expect(document.createElement).toHaveBeenCalledWith('div', {
+          is: 'custom-div',
+        });
       } else {
         expect(
           ReactDOMServer.renderToString(<div is="custom-div" />),
diff --git a/src/renderers/dom/stack/client/ReactDOMComponent.js b/src/renderers/dom/stack/client/ReactDOMComponent.js
index 8b2e144e9c24a..91d84e906133b 100644
--- a/src/renderers/dom/stack/client/ReactDOMComponent.js
+++ b/src/renderers/dom/stack/client/ReactDOMComponent.js
@@ -552,7 +552,7 @@ ReactDOMComponent.Mixin = {
           div.innerHTML = `<${type}></${type}>`;
           el = div.removeChild(div.firstChild);
         } else if (props.is) {
-          el = ownerDocument.createElement(type, props.is);
+          el = ownerDocument.createElement(type, {is: props.is});
         } else {
           // Separate else branch instead of using `props.is || undefined` above because of a Firefox bug.
           // See discussion in https://github.com/facebook/react/pull/6896

From 9526174e3074b39796c8c8fb31983372e7b30649 Mon Sep 17 00:00:00 2001
From: Almero Steyn <almero.steyn@gmail.com>
Date: Wed, 19 Apr 2017 13:31:39 +0200
Subject: [PATCH 120/153] [Docs] Add accessibility to tabs in installation
 documentation (#9431)

* Add accessibility to tabs in installation documentation

* Change color and fix styling
---
 docs/docs/installation.md | 91 +++++++++++++++++++++++++++++----------
 1 file changed, 68 insertions(+), 23 deletions(-)

diff --git a/docs/docs/installation.md b/docs/docs/installation.md
index 6687a961772fe..615a1726ea859 100644
--- a/docs/docs/installation.md
+++ b/docs/docs/installation.md
@@ -12,16 +12,8 @@ redirect_from:
 next: hello-world.html
 ---
 <style>
-.tab-hidden {
+  .tab-hidden {
     display: none;
-}
-.toggler a {
-    display: inline-block;
-    padding: 10px 5px;
-    margin: 2px;
-    border: 1px solid #05A5D1;
-    border-radius: 3px;
-    text-decoration: none !important;
   }
 </style>
 
@@ -29,14 +21,29 @@ React is flexible and can be used in a variety of projects. You can create new a
 
 <div class="toggler">
   <style>
-    .toggler a {
-      display: inline-block;
-      padding: 10px 5px;
-      margin: 2px;
-      border: 1px solid #05A5D1;
-      border-radius: 3px;
-      text-decoration: none !important;
-      color: #05A5D1;
+    .toggler li {
+       display: inline-block;
+       padding: 10px;
+       margin: 2px;
+       border: 1px solid #05A5D1;
+       border-radius: 3px;
+       color: #05A5D1;
+       background-color: transparent;
+       font-size: 0.99em;
+       cursor: pointer;
+    }
+    .toggler ul {
+      list-style-type: none;
+      margin: 0;
+    }
+    .toggler li {
+      display: inline;
+    }
+    .display-target-fiddle .toggler .button-fiddle:focus,
+    .display-target-newapp .toggler .button-newapp:focus,
+    .display-target-existingapp .toggler .button-existingapp:focus {
+      background-color: #046E8B;
+      color: white;
     }
     .display-target-fiddle .toggler .button-fiddle,
     .display-target-newapp .toggler .button-newapp,
@@ -59,12 +66,23 @@ React is flexible and can be used in a variety of projects. You can create new a
   <span>Which of these options best describes what you want to do?</span>
   <br />
   <br />
-  <a href="javascript:void(0);" class="button-fiddle" onclick="display('target', 'fiddle')">Try React</a>
-  <a href="javascript:void(0);" class="button-newapp" onclick="display('target', 'newapp')">Create a New App</a>
-  <a href="javascript:void(0);" class="button-existingapp" onclick="display('target', 'existingapp')">Add React to an Existing App</a>
+   <ul role="tablist" >
+      <li id="fiddle" class="button-fiddle" aria-selected="false" role="tab" tabindex="0" aria-controls="fiddletab"
+          onclick="display('target', 'fiddle')" onkeyup="keyToggle(event, 'fiddle', 'existingapp', 'newapp')">
+        Try React
+      </li>
+      <li id="newapp" class="button-newapp" aria-selected="false" role="tab" tabindex="-1" aria-controls="newapptab"
+          onclick="display('target', 'newapp')" onkeyup="keyToggle(event, 'newapp', 'fiddle', 'existingapp')">
+        Create a New App
+      </li>
+      <li id="existingapp" class="button-existingapp" aria-selected="false" role="tab" tabindex="-1" aria-controls="existingapptab"
+          onclick="display('target', 'existingapp')" onkeyup="keyToggle(event, 'existingapp', 'newapp', 'fiddle')">
+        Add React to an Existing App
+      </li>
+    </ul>
 </div>
 
-<block class="fiddle" />
+<block id="fiddletab" role="tabpanel" class="fiddle"  />
 
 ## Trying Out React
 
@@ -74,7 +92,7 @@ If you prefer to use your own text editor, you can also <a href="/react/download
 
 If you want to use it for a full application, there are two popular ways to get started with React: using Create React App, or adding it to an existing application.
 
-<block class="newapp" />
+<block id="newapptab" role="tabpanel" class="newapp" />
 
 ## Creating a New Application
 
@@ -92,7 +110,7 @@ Create React App doesn't handle backend logic or databases; it just creates a fr
 
 When you're ready to deploy to production, running `npm run build` will create an optimized build of your app in the `build` folder. You can learn more about Create React App [from its README](https://github.com/facebookincubator/create-react-app#create-react-app-) and the [User Guide](https://github.com/facebookincubator/create-react-app/blob/master/packages/react-scripts/template/README.md#table-of-contents).
 
-<block class="existingapp" />
+<block id="existingapptab" role="tabpanel" class="existingapp" />
 
 ## Adding React to an Existing Application
 
@@ -216,7 +234,34 @@ for (var i = 0; i < blocks.length; ++i) {
     block.appendChild(block.nextSibling);
   }
 }
+
+function setSelected(value){
+  var tabs = document.querySelectorAll('li[role="tab"]');
+  for (var i = 0; i < tabs.length; ++i) {
+    var tab = tabs[i];
+    if (tab.className === 'button-' + value) {
+      tabs[i].setAttribute('aria-selected', 'true');
+      tabs[i].setAttribute('tabindex', '0');
+    } else {
+      tabs[i].setAttribute('aria-selected', 'false');
+      tabs[i].setAttribute('tabindex', '-1');
+    }
+  }
+}
+
+function keyToggle(e, value, prevTab, nextTab){
+  if (e.keyCode === 37) {
+    document.getElementById(prevTab).focus();
+    display('target', prevTab);
+  }
+  if (e.keyCode === 39) {
+    document.getElementById(nextTab).focus();
+    display('target', nextTab);
+  }
+}
+
 function display(type, value) {
+  setSelected(value);
   var container = document.getElementsByTagName('block')[0].parentNode;
   container.className = 'display-' + type + '-' + value + ' ' +
     container.className.replace(RegExp('display-' + type + '-[a-z]+ ?'), '');

From 3e48422fdc2feaf741d768a6071a87adf2fc107b Mon Sep 17 00:00:00 2001
From: Flarnie Marchan <flarnie@users.noreply.github.com>
Date: Wed, 19 Apr 2017 08:05:04 -0700
Subject: [PATCH 121/153] Warn for keys in fragments - third approach (#9445)

* Fix tests to pass when we warn for missing keys in fragments

In most cases we just needed to add the 'key' prop.

This ignores the tests which are already failing on master when running
with ` REACT_DOM_JEST_USE_FIBER=1` - there are 8.

All tests should now pass with `npm run test`, and the 8 which fail when
running `REACT_DOM_JEST_USE_FIBER=1 npm run test` are the same 8 which
are failing on master.

* Added missing key warning for children in array fragments

After trying twice to reuse the code between the ReactChildFiber and
ReactElementValidator, I am thinking that it's simpler to just have some
duplication of code. The parts that are shared are interleaved with
parts which cannot be shared, either because of singleton modules that
must be required differently in 'isomorphic' and the 'renderers', or the
fact that 'warning' requires a hard coded string.

Test Plan:

- Added test to ReactChildren-test
- Manually tested via fixture that was not committed.

* commit updated "scripts/rollup/results.json"

* Make 'ReactChildren-test' more specific, and remove unneeded nesting

Based on helpful tips from @spicyj and @aweary's review
 - Made the unit test for the warning on missing keys more specific
 - Removed unneeded nesting in the code which generates missing key
   warning
 - Change test syntax to use JSX to be more consistent

Also fixes flow warning.

* Commit update of scripts/rollup/results.json

* run "scripts/fiber/record-tests"
---
 scripts/fiber/tests-passing.txt               |  2 +
 scripts/rollup/results.json                   | 58 +++++++++----------
 .../children/__tests__/ReactChildren-test.js  | 50 ++++++++++++++++
 .../classic/element/ReactElementValidator.js  |  7 +--
 .../__tests__/ReactMultiChildText-test.js     | 18 ++++--
 .../dom/fiber/__tests__/ReactDOMFiber-test.js | 39 +++++++------
 src/renderers/shared/fiber/ReactChildFiber.js | 47 ++++++++++++++-
 .../fiber/__tests__/ReactCoroutine-test.js    | 24 +++++---
 .../fiber/__tests__/ReactIncremental-test.js  | 22 +++----
 .../__tests__/ReactIncrementalPerf-test.js    |  6 +-
 .../ReactIncrementalReflection-test.js        |  2 +-
 .../ReactIncrementalSideEffects-test.js       |  5 +-
 .../__tests__/ReactTopLevelFragment-test.js   |  8 +--
 .../__tests__/ReactTestRenderer-test.js       |  6 +-
 14 files changed, 203 insertions(+), 91 deletions(-)

diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index 0cf8d024093b5..08ecd7b493d73 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -76,6 +76,8 @@ src/isomorphic/children/__tests__/ReactChildren-test.js
 * should flatten children to an array
 * should throw on object
 * should throw on regex
+* warns for keys for arrays of elements in a fragment
+* does not warn when there are keys on  elements in a fragment
 
 src/isomorphic/children/__tests__/onlyChild-test.js
 * should fail when passed two children
diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json
index 01bee146eedc6..a45b614277957 100644
--- a/scripts/rollup/results.json
+++ b/scripts/rollup/results.json
@@ -1,17 +1,17 @@
 {
-  "branch": "master",
+  "branch": "warnForKeysInFragmentsRefactorThirdApproach",
   "bundleSizes": {
     "react.development.js (UMD_DEV)": {
-      "size": 121454,
-      "gzip": 30515
+      "size": 121387,
+      "gzip": 30491
     },
     "react.production.min.js (UMD_PROD)": {
       "size": 15685,
       "gzip": 5765
     },
     "react-dom.development.js (UMD_DEV)": {
-      "size": 583190,
-      "gzip": 134534
+      "size": 584434,
+      "gzip": 134865
     },
     "react-dom.production.min.js (UMD_PROD)": {
       "size": 120740,
@@ -26,24 +26,24 @@
       "gzip": 33273
     },
     "react-art.development.js (UMD_DEV)": {
-      "size": 342608,
-      "gzip": 76782
+      "size": 343852,
+      "gzip": 77090
     },
     "react-art.production.min.js (UMD_PROD)": {
       "size": 95013,
       "gzip": 28991
     },
     "react.development.js (NODE_DEV)": {
-      "size": 70266,
-      "gzip": 17594
+      "size": 70199,
+      "gzip": 17572
     },
     "react.production.min.js (NODE_PROD)": {
       "size": 9226,
       "gzip": 3628
     },
     "React-dev.js (FB_DEV)": {
-      "size": 72123,
-      "gzip": 18231
+      "size": 72056,
+      "gzip": 18209
     },
     "React-prod.js (FB_PROD)": {
       "size": 36643,
@@ -58,20 +58,20 @@
       "gzip": 84675
     },
     "react-dom.development.js (NODE_DEV)": {
-      "size": 542188,
-      "gzip": 125158
+      "size": 543430,
+      "gzip": 125486
     },
     "react-dom.production.min.js (NODE_PROD)": {
       "size": 116925,
       "gzip": 36732
     },
     "ReactDOMFiber-dev.js (FB_DEV)": {
-      "size": 797235,
-      "gzip": 184122
+      "size": 798477,
+      "gzip": 184445
     },
     "ReactDOMFiber-prod.js (FB_PROD)": {
-      "size": 407613,
-      "gzip": 93586
+      "size": 407677,
+      "gzip": 93615
     },
     "react-dom-server.development.js (NODE_DEV)": {
       "size": 445589,
@@ -98,20 +98,20 @@
       "gzip": 22993
     },
     "react-art.development.js (NODE_DEV)": {
-      "size": 265052,
-      "gzip": 56927
+      "size": 266294,
+      "gzip": 57234
     },
     "react-art.production.min.js (NODE_PROD)": {
       "size": 56628,
       "gzip": 17152
     },
     "ReactARTFiber-dev.js (FB_DEV)": {
-      "size": 264230,
-      "gzip": 56736
+      "size": 265472,
+      "gzip": 57048
     },
     "ReactARTFiber-prod.js (FB_PROD)": {
-      "size": 205336,
-      "gzip": 43154
+      "size": 205400,
+      "gzip": 43183
     },
     "ReactNativeStack.js (RN)": {
       "size": 233993,
@@ -122,20 +122,20 @@
       "gzip": 84001
     },
     "ReactTestRendererFiber-dev.js (FB_DEV)": {
-      "size": 262139,
-      "gzip": 55704
+      "size": 263381,
+      "gzip": 56013
     },
     "ReactTestRendererStack-dev.js (FB_DEV)": {
       "size": 151521,
       "gzip": 34765
     },
     "react-noop-renderer.development.js (NODE_DEV)": {
-      "size": 254136,
-      "gzip": 53682
+      "size": 255378,
+      "gzip": 53988
     },
     "react-test-renderer.development.js (NODE_DEV)": {
-      "size": 262970,
-      "gzip": 55891
+      "size": 264212,
+      "gzip": 56201
     }
   }
 }
\ No newline at end of file
diff --git a/src/isomorphic/children/__tests__/ReactChildren-test.js b/src/isomorphic/children/__tests__/ReactChildren-test.js
index a71ea8f7a7cf9..9a2e374db7833 100644
--- a/src/isomorphic/children/__tests__/ReactChildren-test.js
+++ b/src/isomorphic/children/__tests__/ReactChildren-test.js
@@ -11,12 +11,21 @@
 
 'use strict';
 
+const ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
+
 describe('ReactChildren', () => {
   var React;
+  var ReactTestUtils;
+  var ReactFeatureFlags;
+
+  function normalizeCodeLocInfo(str) {
+    return str && str.replace(/at .+?:\d+/g, 'at **');
+  }
 
   beforeEach(() => {
     jest.resetModules();
     React = require('react');
+    ReactTestUtils = require('ReactTestUtils');
   });
 
   it('should support identity for simple', () => {
@@ -850,4 +859,45 @@ describe('ReactChildren', () => {
         'to render a collection of children, use an array instead.',
     );
   });
+
+  if (ReactDOMFeatureFlags.useFiber) {
+    describe('with fragments enabled', () => {
+      beforeEach(() => {
+        ReactFeatureFlags = require('ReactFeatureFlags');
+        ReactFeatureFlags.disableNewFiberFeatures = false;
+      });
+
+      it('warns for keys for arrays of elements in a fragment', () => {
+        spyOn(console, 'error');
+        class ComponentReturningArray extends React.Component {
+          render() {
+            return [<div />, <div />];
+          }
+        }
+
+        ReactTestUtils.renderIntoDocument(<ComponentReturningArray />);
+
+        expectDev(console.error.calls.count()).toBe(1);
+        expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
+          'Warning: ' +
+            'Each child in an array or iterator should have a unique "key" prop.' +
+            ' See https://fb.me/react-warning-keys for more information.' +
+            '\n    in ComponentReturningArray (at **)',
+        );
+      });
+
+      it('does not warn when there are keys on  elements in a fragment', () => {
+        spyOn(console, 'error');
+        class ComponentReturningArray extends React.Component {
+          render() {
+            return [<div key="foo" />, <div key="bar" />];
+          }
+        }
+
+        ReactTestUtils.renderIntoDocument(<ComponentReturningArray />);
+
+        expectDev(console.error.calls.count()).toBe(0);
+      });
+    });
+  }
 });
diff --git a/src/isomorphic/classic/element/ReactElementValidator.js b/src/isomorphic/classic/element/ReactElementValidator.js
index 9840ba3a59bb8..abcb4709e07dc 100644
--- a/src/isomorphic/classic/element/ReactElementValidator.js
+++ b/src/isomorphic/classic/element/ReactElementValidator.js
@@ -96,14 +96,11 @@ function validateExplicitKey(element, parentType) {
   }
   element._store.validated = true;
 
-  var memoizer = ownerHasKeyUseWarning.uniqueKey ||
-    (ownerHasKeyUseWarning.uniqueKey = {});
-
   var currentComponentErrorInfo = getCurrentComponentErrorInfo(parentType);
-  if (memoizer[currentComponentErrorInfo]) {
+  if (ownerHasKeyUseWarning[currentComponentErrorInfo]) {
     return;
   }
-  memoizer[currentComponentErrorInfo] = true;
+  ownerHasKeyUseWarning[currentComponentErrorInfo] = true;
 
   // Usually the current owner is the offender, but if it accepts children as a
   // property, it may be the creator of the child that's responsible for
diff --git a/src/renderers/__tests__/ReactMultiChildText-test.js b/src/renderers/__tests__/ReactMultiChildText-test.js
index b9598076ba273..199ed41d2e3a8 100644
--- a/src/renderers/__tests__/ReactMultiChildText-test.js
+++ b/src/renderers/__tests__/ReactMultiChildText-test.js
@@ -191,10 +191,20 @@ describe('ReactMultiChildText', () => {
       [true, <div>{1.2}{''}{<div />}{'foo'}</div>, true, 1.2], [<div />, '1.2'],
       ['', 'foo', <div>{true}{<div />}{1.2}{''}</div>, 'foo'], ['', 'foo', <div />, 'foo'],
     ]);
-    expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toContain(
-      'Warning: Each child in an array or iterator should have a unique "key" prop.',
-    );
+    if (ReactDOMFeatureFlags.useFiber) {
+      expectDev(console.error.calls.count()).toBe(2);
+      expectDev(console.error.calls.argsFor(0)[0]).toContain(
+        'Warning: Each child in an array or iterator should have a unique "key" prop.',
+      );
+      expectDev(console.error.calls.argsFor(1)[0]).toContain(
+        'Warning: Each child in an array or iterator should have a unique "key" prop.',
+      );
+    } else {
+      expectDev(console.error.calls.count()).toBe(1);
+      expectDev(console.error.calls.argsFor(0)[0]).toContain(
+        'Warning: Each child in an array or iterator should have a unique "key" prop.',
+      );
+    }
   });
 
   it('should throw if rendering both HTML and children', () => {
diff --git a/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js b/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js
index 026fa910355a5..60ec33ae88c3a 100644
--- a/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js
+++ b/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js
@@ -118,7 +118,7 @@ describe('ReactDOMFiber', () => {
     it('finds the first child when a component returns a fragment', () => {
       class Fragment extends React.Component {
         render() {
-          return [<div />, <span />];
+          return [<div key="a" />, <span key="b" />];
         }
       }
 
@@ -141,7 +141,7 @@ describe('ReactDOMFiber', () => {
 
       class Fragment extends React.Component {
         render() {
-          return [<Wrapper><div /></Wrapper>, <span />];
+          return [<Wrapper key="a"><div /></Wrapper>, <span key="b" />];
         }
       }
 
@@ -164,7 +164,7 @@ describe('ReactDOMFiber', () => {
 
       class Fragment extends React.Component {
         render() {
-          return [<NullComponent />, <div />, <span />];
+          return [<NullComponent key="a" />, <div key="b" />, <span key="c" />];
         }
       }
 
@@ -263,16 +263,16 @@ describe('ReactDOMFiber', () => {
         render() {
           const {step} = this.props;
           return [
-            <Child name={`normal[0]:${step}`} />,
+            <Child key="a" name={`normal[0]:${step}`} />,
             ReactDOM.unstable_createPortal(
-              <Child name={`portal1[0]:${step}`} />,
+              <Child key="b" name={`portal1[0]:${step}`} />,
               portalContainer1,
             ),
-            <Child name={`normal[1]:${step}`} />,
+            <Child key="c" name={`normal[1]:${step}`} />,
             ReactDOM.unstable_createPortal(
               [
-                <Child name={`portal2[0]:${step}`} />,
-                <Child name={`portal2[1]:${step}`} />,
+                <Child key="d" name={`portal2[0]:${step}`} />,
+                <Child key="e" name={`portal2[1]:${step}`} />,
               ],
               portalContainer2,
             ),
@@ -337,23 +337,23 @@ describe('ReactDOMFiber', () => {
 
       ReactDOM.render(
         [
-          <div>normal[0]</div>,
+          <div key="a">normal[0]</div>,
           ReactDOM.unstable_createPortal(
             [
-              <div>portal1[0]</div>,
+              <div key="b">portal1[0]</div>,
               ReactDOM.unstable_createPortal(
-                <div>portal2[0]</div>,
+                <div key="c">portal2[0]</div>,
                 portalContainer2,
               ),
               ReactDOM.unstable_createPortal(
-                <div>portal3[0]</div>,
+                <div key="d">portal3[0]</div>,
                 portalContainer3,
               ),
-              <div>portal1[1]</div>,
+              <div key="e">portal1[1]</div>,
             ],
             portalContainer1,
           ),
-          <div>normal[1]</div>,
+          <div key="f">normal[1]</div>,
         ],
         container,
       );
@@ -943,7 +943,7 @@ describe('ReactDOMFiber', () => {
       }
 
       let inst;
-      ReactDOM.render([<Example ref={n => inst = n} />], container);
+      ReactDOM.render([<Example key="a" ref={n => inst = n} />], container);
       const node = container.firstChild;
       expect(node.tagName).toEqual('DIV');
 
@@ -981,7 +981,10 @@ describe('ReactDOMFiber', () => {
       // click handler during render to simulate a click during an aborted
       // render. I use this hack because at current time we don't have a way to
       // test aborted ReactDOM renders.
-      ReactDOM.render([<Example forceA={true} />, <Click />], container);
+      ReactDOM.render(
+        [<Example key="a" forceA={true} />, <Click key="b" />],
+        container,
+      );
 
       // Because the new click handler has not yet committed, we should still
       // invoke B.
@@ -1030,7 +1033,7 @@ describe('disableNewFiberFeatures', () => {
     expect(() => ReactDOM.render(false, container)).toThrow(message, container);
     expect(() => ReactDOM.render('Hi', container)).toThrow(message, container);
     expect(() => ReactDOM.render(999, container)).toThrow(message, container);
-    expect(() => ReactDOM.render([<div />], container)).toThrow(
+    expect(() => ReactDOM.render([<div key="a" />], container)).toThrow(
       message,
       container,
     );
@@ -1048,7 +1051,7 @@ describe('disableNewFiberFeatures', () => {
       /You may have returned undefined/,
     );
     expect(() =>
-      ReactDOM.render(<Render>[<div />]</Render>, container)).toThrow(
+      ReactDOM.render(<Render>[<div key="a" />]</Render>, container)).toThrow(
       /You may have returned undefined/,
     );
   });
diff --git a/src/renderers/shared/fiber/ReactChildFiber.js b/src/renderers/shared/fiber/ReactChildFiber.js
index ac6eab0138dfe..347722fed0419 100644
--- a/src/renderers/shared/fiber/ReactChildFiber.js
+++ b/src/renderers/shared/fiber/ReactChildFiber.js
@@ -43,6 +43,43 @@ if (__DEV__) {
   var getComponentName = require('getComponentName');
   var warning = require('fbjs/lib/warning');
   var didWarnAboutMaps = false;
+  /**
+   * Warn if there's no key explicitly set on dynamic arrays of children or
+   * object keys are not valid. This allows us to keep track of children between
+   * updates.
+   */
+  var ownerHasKeyUseWarning = {};
+
+  var warnForMissingKey = (child: mixed) => {
+    if (child === null || typeof child !== 'object') {
+      return;
+    }
+    if (!child._store || child._store.validated || child.key != null) {
+      return;
+    }
+    invariant(
+      typeof child._store === 'object',
+      'React Component in warnForMissingKey should have a _store',
+    );
+    child._store.validated = true;
+
+    var currentComponentErrorInfo = 'Each child in an array or iterator should have a unique ' +
+      '"key" prop. See https://fb.me/react-warning-keys for ' +
+      'more information.' +
+      (getCurrentFiberStackAddendum(child) || '');
+    if (ownerHasKeyUseWarning[currentComponentErrorInfo]) {
+      return;
+    }
+    ownerHasKeyUseWarning[currentComponentErrorInfo] = true;
+
+    warning(
+      false,
+      'Each child in an array or iterator should have a unique ' +
+        '"key" prop. See https://fb.me/react-warning-keys for ' +
+        'more information.%s',
+      getCurrentFiberStackAddendum(child),
+    );
+  };
 }
 
 const {
@@ -592,7 +629,10 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
     return null;
   }
 
-  function warnOnDuplicateKey(
+  /**
+   * Warns if there is a duplicate or missing key
+   */
+  function warnOnInvalidKey(
     child: mixed,
     knownKeys: Set<string> | null,
   ): Set<string> | null {
@@ -604,6 +644,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
         case REACT_ELEMENT_TYPE:
         case REACT_COROUTINE_TYPE:
         case REACT_PORTAL_TYPE:
+          warnForMissingKey(child);
           const key = child.key;
           if (typeof key !== 'string') {
             break;
@@ -663,7 +704,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       let knownKeys = null;
       for (let i = 0; i < newChildren.length; i++) {
         const child = newChildren[i];
-        knownKeys = warnOnDuplicateKey(child, knownKeys);
+        knownKeys = warnOnInvalidKey(child, knownKeys);
       }
     }
 
@@ -842,7 +883,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
         let step = newChildren.next();
         for (; !step.done; step = newChildren.next()) {
           const child = step.value;
-          knownKeys = warnOnDuplicateKey(child, knownKeys);
+          knownKeys = warnOnInvalidKey(child, knownKeys);
         }
       }
     }
diff --git a/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js b/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js
index 88d35fff2fb88..7e533ce3f1775 100644
--- a/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js
@@ -57,13 +57,13 @@ describe('ReactCoroutine', () => {
 
     function Indirection() {
       ops.push('Indirection');
-      return [<Child bar={true} />, <Child bar={false} />];
+      return [<Child key="a" bar={true} />, <Child key="b" bar={false} />];
     }
 
     function HandleYields(props, yields) {
       ops.push('HandleYields');
-      return yields.map(y => (
-        <y.continuation isSame={props.foo === y.props.bar} />
+      return yields.map((y, i) => (
+        <y.continuation key={i} isSame={props.foo === y.props.bar} />
       ));
     }
 
@@ -117,12 +117,12 @@ describe('ReactCoroutine', () => {
     }
 
     function Indirection() {
-      return [<Child bar={true} />, <Child bar={false} />];
+      return [<Child key="a" bar={true} />, <Child key="b" bar={false} />];
     }
 
     function HandleYields(props, yields) {
-      return yields.map(y => (
-        <y.continuation isSame={props.foo === y.props.bar} />
+      return yields.map((y, i) => (
+        <y.continuation key={i} isSame={props.foo === y.props.bar} />
       ));
     }
 
@@ -176,7 +176,9 @@ describe('ReactCoroutine', () => {
 
     function HandleYields(props, yields) {
       ops.push('HandleYields');
-      return yields.map(ContinuationComponent => <ContinuationComponent />);
+      return yields.map((ContinuationComponent, i) => (
+        <ContinuationComponent key={i} />
+      ));
     }
 
     class Parent extends React.Component {
@@ -223,8 +225,12 @@ describe('ReactCoroutine', () => {
 
     function App(props) {
       return ReactCoroutine.createCoroutine(
-        [<Counter id="a" />, <Counter id="b" />, <Counter id="c" />],
-        (p, yields) => yields.map(y => <span prop={y * 100} />),
+        [
+          <Counter key="a" id="a" />,
+          <Counter key="b" id="b" />,
+          <Counter key="c" id="c" />,
+        ],
+        (p, yields) => yields.map((y, i) => <span key={i} prop={y * 100} />),
         {},
       );
     }
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js b/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
index b66151f38e2aa..93e874edfc8ff 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
@@ -51,7 +51,7 @@ describe('ReactIncremental', () => {
     var fooCalled = false;
     function Foo() {
       fooCalled = true;
-      return [<Bar isBar={true} />, <Bar isBar={true} />];
+      return [<Bar key="a" isBar={true} />, <Bar key="b" isBar={true} />];
     }
 
     ReactNoop.render(<Foo />, () => renderCallbackCalled = true);
@@ -384,8 +384,8 @@ describe('ReactIncremental', () => {
       }
       render() {
         return [
-          <Tester unused={this.props.unused} />,
-          <bbb hidden={true}>
+          <Tester key="a" unused={this.props.unused} />,
+          <bbb key="b" hidden={true}>
             <ccc>
               <Middle>Hi</Middle>
             </ccc>
@@ -583,8 +583,8 @@ describe('ReactIncremental', () => {
         // low priority. I think this would be fixed by changing
         // pendingWorkPriority and progressedPriority to be the priority of
         // the children only, not including the fiber itself.
-        <div><Child /></div>,
-        <Sibling />,
+        <div key="a"><Child /></div>,
+        <Sibling key="b" />,
       ];
     }
 
@@ -1413,7 +1413,7 @@ describe('ReactIncremental', () => {
     }
 
     function App(props) {
-      return [<LifeCycle x={props.x} />, <Sibling />];
+      return [<LifeCycle key="a" x={props.x} />, <Sibling key="b" />];
     }
 
     ReactNoop.render(<App x={0} />);
@@ -1662,13 +1662,13 @@ describe('ReactIncremental', () => {
       render() {
         ops.push('Indirection ' + JSON.stringify(this.context));
         return [
-          <ShowLocale />,
-          <ShowRoute />,
-          <ShowNeither />,
-          <Intl locale="ru">
+          <ShowLocale key="a" />,
+          <ShowRoute key="b" />,
+          <ShowNeither key="c" />,
+          <Intl key="d" locale="ru">
             <ShowBoth />
           </Intl>,
-          <ShowBoth />,
+          <ShowBoth key="e" />,
         ];
       }
     }
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js
index 56fa122245c1d..5bd7afb2171ff 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js
@@ -449,12 +449,12 @@ describe('ReactDebugFiberPerf', () => {
     }
 
     function Indirection() {
-      return [<CoChild bar={true} />, <CoChild bar={false} />];
+      return [<CoChild key="a" bar={true} />, <CoChild key="b" bar={false} />];
     }
 
     function HandleYields(props, yields) {
-      return yields.map(y => (
-        <y.continuation isSame={props.foo === y.props.bar} />
+      return yields.map((y, i) => (
+        <y.continuation key={i} isSame={props.foo === y.props.bar} />
       ));
     }
 
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
index f19d1d3593e28..aae01ad469025 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
@@ -169,7 +169,7 @@ describe('ReactIncrementalReflection', () => {
     }
 
     function Foo(props) {
-      return [<Component step={props.step} />, <Sibling />];
+      return [<Component key="a" step={props.step} />, <Sibling key="b" />];
     }
 
     ReactNoop.render(<Foo step={0} />);
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
index 97106fbc96a4e..430c09b628293 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
@@ -565,7 +565,10 @@ describe('ReactIncrementalSideEffects', () => {
       }
       render() {
         ops.push('Baz');
-        return [<Bar idx={this.props.idx} />, <Bar idx={this.props.idx} />];
+        return [
+          <Bar key="a" idx={this.props.idx} />,
+          <Bar key="b" idx={this.props.idx} />,
+        ];
       }
     }
     function Foo(props) {
diff --git a/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js b/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js
index fb0771fcb2da3..5e051eda3408f 100644
--- a/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactTopLevelFragment-test.js
@@ -77,7 +77,7 @@ describe('ReactTopLevelFragment', function() {
     function Fragment({condition}) {
       return condition
         ? <Stateful key="a" />
-        : [[<Stateful key="a" />, <div key="b">World</div>], <div />];
+        : [[<Stateful key="a" />, <div key="b">World</div>], <div key="c" />];
     }
     ReactNoop.render(<Fragment />);
     ReactNoop.flush();
@@ -106,8 +106,8 @@ describe('ReactTopLevelFragment', function() {
 
     function Fragment({condition}) {
       return condition
-        ? [null, <Stateful />]
-        : [<div>Hello</div>, <Stateful />];
+        ? [null, <Stateful key="a" />]
+        : [<div key="b">Hello</div>, <Stateful key="a" />];
     }
     ReactNoop.render(<Fragment />);
     ReactNoop.flush();
@@ -144,7 +144,7 @@ describe('ReactTopLevelFragment', function() {
     function Fragment({condition}) {
       return condition
         ? [[<div key="b">World</div>, <Stateful key="a" />]]
-        : [[<Stateful key="a" />, <div key="b">World</div>], <div />];
+        : [[<Stateful key="a" />, <div key="b">World</div>], <div key="c" />];
     }
     ReactNoop.render(<Fragment />);
     ReactNoop.flush();
diff --git a/src/renderers/testing/__tests__/ReactTestRenderer-test.js b/src/renderers/testing/__tests__/ReactTestRenderer-test.js
index ce64455e4a4cb..6090671ccedf4 100644
--- a/src/renderers/testing/__tests__/ReactTestRenderer-test.js
+++ b/src/renderers/testing/__tests__/ReactTestRenderer-test.js
@@ -676,8 +676,8 @@ describe('ReactTestRenderer', () => {
       var Component = props => props.children;
 
       var renderer = ReactTestRenderer.create([
-        <Component>Hi</Component>,
-        <Component>Bye</Component>,
+        <Component key="a">Hi</Component>,
+        <Component key="b">Bye</Component>,
       ]);
       expect(renderer.toJSON()).toEqual(['Hi', 'Bye']);
       renderer.update(<div />);
@@ -686,7 +686,7 @@ describe('ReactTestRenderer', () => {
         children: null,
         props: {},
       });
-      renderer.update([<div>goodbye</div>, 'world']);
+      renderer.update([<div key="a">goodbye</div>, 'world']);
       expect(renderer.toJSON()).toEqual([
         {
           type: 'div',

From 8782ab759e5564785fa1d2412ad5f4b86e24c758 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Wed, 19 Apr 2017 08:59:40 -0700
Subject: [PATCH 122/153] Fix CI failures in master (#9455)

* Ran prettier over UIManager mock
* Temporarily disabled an invariant() in UIManager mock that was breaking tests
* Updated Fiber passing tests
---
 scripts/fiber/tests-passing.txt |  1 +
 src/__mocks__/UIManager.js      | 36 ++++++++++++++++++---------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index 08ecd7b493d73..4f8ed3f517df2 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -1589,6 +1589,7 @@ src/renderers/native/__tests__/ReactNativeMount-test.js
 * should be able to create and render a native component
 * should be able to create and update a native component
 * returns the correct instance and calls it in the callback
+* renders and reorders children
 
 src/renderers/shared/__tests__/ReactDebugTool-test.js
 * should add and remove hooks
diff --git a/src/__mocks__/UIManager.js b/src/__mocks__/UIManager.js
index 9f7c743676f3c..bb5aafaf5f09f 100644
--- a/src/__mocks__/UIManager.js
+++ b/src/__mocks__/UIManager.js
@@ -44,7 +44,7 @@ function insertSubviewAtIndex(parent, child, index) {
     0 <= index && index <= parentInfo.children.length,
     'Invalid index %s for children %s',
     index,
-    parentInfo.children
+    parentInfo.children,
   );
   parentInfo.children.splice(index, 0, child);
   childInfo.parent = parent;
@@ -61,12 +61,15 @@ function removeChild(parent, child) {
 
 var RCTUIManager = {
   __dumpHierarchyForJestTestsOnly: function() {
-    return roots.map((tag) => dumpSubtree(tag, 0)).join('\n');
+    return roots.map(tag => dumpSubtree(tag, 0)).join('\n');
 
     function dumpSubtree(tag, indent) {
       const info = views.get(tag);
       let out = '';
-      out += ' '.repeat(indent) + info.viewName + ' ' + JSON.stringify(info.props);
+      out += ' '.repeat(indent) +
+        info.viewName +
+        ' ' +
+        JSON.stringify(info.props);
       for (const child of info.children) {
         out += '\n' + dumpSubtree(child, indent + 2);
       }
@@ -90,25 +93,22 @@ var RCTUIManager = {
   setJSResponder: jest.fn(),
   setChildren: jest.fn(function setChildren(parentTag, reactTags) {
     autoCreateRoot(parentTag);
+    /* TODO (spicyj) Re-enable this check once it won't cause test failures
     // Native doesn't actually check this but it seems like a good idea
     invariant(
       views.get(parentTag).children.length === 0,
       'Calling .setChildren on nonempty view %s',
       parentTag,
     );
+    */
     // This logic ported from iOS (RCTUIManager.m)
     reactTags.forEach((tag, i) => {
       insertSubviewAtIndex(parentTag, tag, i);
     });
   }),
-  manageChildren: jest.fn(function manageChildren(
-    parentTag,
-    moveFromIndices = [],
-    moveToIndices = [],
-    addChildReactTags = [],
-    addAtIndices = [],
-    removeAtIndices = [],
-  ) {
+  manageChildren: jest.fn(function manageChildren(parentTag, moveFromIndices = [
+  ], moveToIndices = [], addChildReactTags = [], addAtIndices = [
+  ], removeAtIndices = []) {
     autoCreateRoot(parentTag);
     // This logic ported from iOS (RCTUIManager.m)
     invariant(
@@ -124,11 +124,15 @@ var RCTUIManager = {
       addAtIndices,
     );
     const parentInfo = views.get(parentTag);
-    const permanentlyRemovedChildren = removeAtIndices.map((index) => parentInfo.children[index]);
-    const temporarilyRemovedChildren = moveFromIndices.map((index) => parentInfo.children[index]);
-    permanentlyRemovedChildren.forEach((tag) => removeChild(parentTag, tag));
-    temporarilyRemovedChildren.forEach((tag) => removeChild(parentTag, tag));
-    permanentlyRemovedChildren.forEach((tag) => {
+    const permanentlyRemovedChildren = removeAtIndices.map(
+      index => parentInfo.children[index],
+    );
+    const temporarilyRemovedChildren = moveFromIndices.map(
+      index => parentInfo.children[index],
+    );
+    permanentlyRemovedChildren.forEach(tag => removeChild(parentTag, tag));
+    temporarilyRemovedChildren.forEach(tag => removeChild(parentTag, tag));
+    permanentlyRemovedChildren.forEach(tag => {
       views.delete(tag);
     });
     // List of [index, tag]

From 53dbb191d60ae08643635d6a6fdf3f23a42cb9f4 Mon Sep 17 00:00:00 2001
From: Ben Alpert <ben@benalpert.com>
Date: Wed, 19 Apr 2017 16:28:59 -0700
Subject: [PATCH 123/153] Uncomment invariant in UIManager mock (#9461)

---
 src/__mocks__/UIManager.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/__mocks__/UIManager.js b/src/__mocks__/UIManager.js
index bb5aafaf5f09f..74d4e162ee202 100644
--- a/src/__mocks__/UIManager.js
+++ b/src/__mocks__/UIManager.js
@@ -93,14 +93,12 @@ var RCTUIManager = {
   setJSResponder: jest.fn(),
   setChildren: jest.fn(function setChildren(parentTag, reactTags) {
     autoCreateRoot(parentTag);
-    /* TODO (spicyj) Re-enable this check once it won't cause test failures
     // Native doesn't actually check this but it seems like a good idea
     invariant(
       views.get(parentTag).children.length === 0,
       'Calling .setChildren on nonempty view %s',
       parentTag,
     );
-    */
     // This logic ported from iOS (RCTUIManager.m)
     reactTags.forEach((tag, i) => {
       insertSubviewAtIndex(parentTag, tag, i);
@@ -149,7 +147,9 @@ var RCTUIManager = {
     }
   }),
   updateView: jest.fn(),
-  removeSubviewsFromContainerWithID: jest.fn(),
+  removeSubviewsFromContainerWithID: jest.fn(function(parentTag) {
+    views.get(parentTag).children.forEach((tag) => removeChild(parentTag, tag));
+  }),
   replaceExistingNonRootView: jest.fn(),
   __takeSnapshot: jest.fn(),
   customBubblingEventTypes: {

From 66f2097f33a3084c79aa536e11d3ca09195bc320 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Wed, 19 Apr 2017 16:45:31 -0700
Subject: [PATCH 124/153] Shallow renderer and test utils bundles (#9426)

Shallow renderer and test utils bundles

Adds new bundles introduced with React 15.5 release to master (and 16 alpha)

react-dom/test-utils:

This new bundle contains what used to be react-addons-test-utils. This bundle shares things from react-dom rather than duplicates them.

A temporary createRenderer method has been left behind as a way to access the new shallow renderer. This is for the ReactNative release cycle only and should be going away before the final release.

react-test-renderer/shallow:

This new shallow renderer is almost entirely stand-alone (in that it doesn't use the React reconciler or scheduler). The only touch points are ReactElement and prop/context validation. This renderer is stack and fiber compatible.
---
 packages/react-dom/package.json               |   1 +
 packages/react-dom/test-utils.js              |   7 +
 packages/react-test-renderer/index.js         |   6 +-
 packages/react-test-renderer/package.json     |   1 +
 packages/react-test-renderer/shallow.js       |   7 +
 scripts/fiber/tests-passing.txt               |  61 +--
 scripts/rollup/bundles.js                     |  67 ++-
 .../shims/facebook-www/ReactTestUtils.js      |  18 -
 src/fb/ReactDOMFBEntry.js                     |   5 +-
 src/fb/ReactDOMFiberFBEntry.js                |  11 -
 src/isomorphic/React.js                       |   6 +-
 .../classic/element/ReactElementValidator.js  |   2 +-
 .../types/__tests__/ReactPropTypes-test.js    |   2 +-
 .../classic/types/checkPropTypes.js           |  14 -
 .../index.js}                                 |   2 +-
 src/renderers/dom/ReactDOM.js                 |   6 +
 src/renderers/dom/fiber/ReactDOMFiber.js      |   6 +
 .../dom}/test/ReactTestUtils.js               |  45 +-
 .../test/__tests__/ReactTestUtils-test.js     | 385 ++++++++++++++----
 .../shared/fiber/ReactFiberContext.js         |   2 +-
 .../reconciler/ReactCompositeComponent.js     |   2 +-
 src/renderers/testing/ReactShallowRenderer.js | 238 +++++++++++
 .../testing/stack/ReactTestRendererStack.js   |  57 ++-
 src/test/ReactShallowRenderer.js              | 145 -------
 24 files changed, 755 insertions(+), 341 deletions(-)
 create mode 100644 packages/react-dom/test-utils.js
 create mode 100644 packages/react-test-renderer/shallow.js
 delete mode 100644 scripts/rollup/shims/facebook-www/ReactTestUtils.js
 delete mode 100644 src/isomorphic/classic/types/checkPropTypes.js
 rename src/node_modules/{react/lib/checkPropTypes.js => react-test-renderer/index.js} (66%)
 rename src/{ => renderers/dom}/test/ReactTestUtils.js (93%)
 rename src/{ => renderers/dom}/test/__tests__/ReactTestUtils-test.js (55%)
 create mode 100644 src/renderers/testing/ReactShallowRenderer.js
 delete mode 100644 src/test/ReactShallowRenderer.js

diff --git a/packages/react-dom/package.json b/packages/react-dom/package.json
index 52070cd964734..d1863e6507af0 100644
--- a/packages/react-dom/package.json
+++ b/packages/react-dom/package.json
@@ -27,6 +27,7 @@
     "README.md",
     "index.js",
     "server.js",
+    "test-utils.js",
     "cjs/",
     "umd/"
   ],
diff --git a/packages/react-dom/test-utils.js b/packages/react-dom/test-utils.js
new file mode 100644
index 0000000000000..31e2a261949ca
--- /dev/null
+++ b/packages/react-dom/test-utils.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  throw Error('test-utils is not available in production mode.');
+} else {
+  module.exports = require('./cjs/react-dom-test-utils.development');
+}
diff --git a/packages/react-test-renderer/index.js b/packages/react-test-renderer/index.js
index 3a0cbe1a0417c..48895ee7cc19c 100644
--- a/packages/react-test-renderer/index.js
+++ b/packages/react-test-renderer/index.js
@@ -1,3 +1,7 @@
 'use strict';
 
-module.exports = require('./cjs/react-test-renderer.development');
+if (process.env.NODE_ENV === 'production') {
+  throw Error('test renderer is not available in production mode.');
+} else {
+  module.exports = require('./cjs/react-test-renderer.development');
+}
diff --git a/packages/react-test-renderer/package.json b/packages/react-test-renderer/package.json
index a9cedf4ce70d9..86d25aff481d6 100644
--- a/packages/react-test-renderer/package.json
+++ b/packages/react-test-renderer/package.json
@@ -26,6 +26,7 @@
     "PATENTS",
     "README.md",
     "index.js",
+    "shallow.js",
     "cjs/"
   ]
 }
diff --git a/packages/react-test-renderer/shallow.js b/packages/react-test-renderer/shallow.js
new file mode 100644
index 0000000000000..b75c643cf0eca
--- /dev/null
+++ b/packages/react-test-renderer/shallow.js
@@ -0,0 +1,7 @@
+'use strict';
+
+if (process.env.NODE_ENV === 'production') {
+  throw Error('shallow renderer is not available in production mode.');
+} else {
+  module.exports = require('./cjs/react-test-renderer-shallow.development');
+}
diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index 4f8ed3f517df2..558711185bf73 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -1562,6 +1562,41 @@ src/renderers/dom/shared/wrappers/__tests__/ReactDOMTextarea-test.js
 * should warn if value is null
 * should warn if value and defaultValue are specified
 
+src/renderers/dom/test/__tests__/ReactTestUtils-test.js
+* should call all of the lifecycle hooks
+* should only render 1 level deep
+* should have shallow rendering
+* should enable shouldComponentUpdate to prevent a re-render
+* should shallow render a functional component
+* should throw for invalid elements
+* should have shallow unmounting
+* can shallow render to null
+* can shallow render with a ref
+* lets you update shallowly rendered components
+* can access the mounted component instance
+* can shallowly render components with contextTypes
+* can shallowly render components with ref as function
+* can setState in componentWillMount when shallow rendering
+* can setState in componentWillReceiveProps when shallow rendering
+* can setState with an updater function
+* can pass context when shallowly rendering
+* should track context across updates
+* can fail context when shallowly rendering
+* should warn about propTypes (but only once)
+* can scryRenderedDOMComponentsWithClass with TextComponent
+* can scryRenderedDOMComponentsWithClass with className contains \n
+* can scryRenderedDOMComponentsWithClass with multiple classes
+* traverses children in the correct order
+* should support injected wrapper components as DOM components
+* should change the value of an input field
+* should change the value of an input field in a component
+* should throw when attempting to use ReactTestUtils.Simulate with shallow rendering
+* should not warn when simulating events with extra properties
+* can scry with stateless components involved
+* should enable rendering of cloned element
+* should set the type of the event
+* should work with renderIntoDocument
+
 src/renderers/native/__tests__/ReactNativeAttributePayload-test.js
 * should work with simple example
 * should skip fields that are equal
@@ -1871,32 +1906,6 @@ src/shared/utils/__tests__/PooledClass-test.js
 src/shared/utils/__tests__/reactProdInvariant-test.js
 * should throw with the correct number of `%s`s in the URL
 
-src/test/__tests__/ReactTestUtils-test.js
-* should have shallow rendering
-* should shallow render a functional component
-* should throw for invalid elements
-* should have shallow unmounting
-* can shallow render to null
-* can shallow render with a ref
-* lets you update shallowly rendered components
-* can access the mounted component instance
-* can shallowly render components with contextTypes
-* can shallowly render components with ref as function
-* can setState in componentWillMount when shallow rendering
-* can pass context when shallowly rendering
-* can fail context when shallowly rendering
-* can scryRenderedDOMComponentsWithClass with TextComponent
-* can scryRenderedDOMComponentsWithClass with className contains \n
-* can scryRenderedDOMComponentsWithClass with multiple classes
-* traverses children in the correct order
-* should support injected wrapper components as DOM components
-* should change the value of an input field
-* should change the value of an input field in a component
-* should throw when attempting to use ReactTestUtils.Simulate with shallow rendering
-* should not warn when simulating events with extra properties
-* can scry with stateless components involved
-* should set the type of the event
-
 src/test/__tests__/reactComponentExpect-test.js
 * should match composite components
 * should match empty DOM components
diff --git a/scripts/rollup/bundles.js b/scripts/rollup/bundles.js
index cc33df8d123e8..7d90027c59339 100644
--- a/scripts/rollup/bundles.js
+++ b/scripts/rollup/bundles.js
@@ -89,9 +89,7 @@ const bundles = [
     paths: [
       'src/renderers/dom/**/*.js',
       'src/renderers/shared/**/*.js',
-      'src/test/**/*.js', // ReactTestUtils is currently very coupled to DOM.
 
-      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
@@ -118,9 +116,41 @@ const bundles = [
     paths: [
       'src/renderers/dom/**/*.js',
       'src/renderers/shared/**/*.js',
-      'src/test/**/*.js', // ReactTestUtils is currently very coupled to DOM.
 
-      'src/isomorphic/classic/types/checkPropTypes.js',
+      'src/ReactVersion.js',
+      'src/shared/**/*.js',
+    ],
+  },
+  {
+    babelOpts: babelOptsReact,
+    bundleTypes: [FB_DEV, NODE_DEV],
+    config: {
+      destDir: 'build/',
+      globals: {
+        react: 'React',
+      },
+      moduleName: 'ReactTestUtils',
+      sourceMap: false,
+    },
+    entry: 'src/renderers/dom/test/ReactTestUtils',
+    externals: [
+      'prop-types',
+      'prop-types/checkPropTypes',
+      'react',
+      'react-dom',
+      'react-test-renderer', // TODO (bvaughn) Remove this dependency before 16.0.0
+    ],
+    fbEntry: 'src/renderers/dom/test/ReactTestUtils',
+    hasteName: 'ReactTestUtils',
+    isRenderer: true,
+    label: 'test-utils',
+    manglePropertiesOnProd: false,
+    name: 'react-dom/test-utils',
+    paths: [
+      'src/renderers/dom/test/**/*.js',
+      'src/renderers/shared/**/*.js',
+      'src/renderers/testing/**/*.js', // TODO (bvaughn) Remove this dependency before 16.0.0
+
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
@@ -151,7 +181,6 @@ const bundles = [
       'src/renderers/dom/**/*.js',
       'src/renderers/shared/**/*.js',
 
-      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
@@ -190,7 +219,6 @@ const bundles = [
       'src/renderers/art/**/*.js',
       'src/renderers/shared/**/*.js',
 
-      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
@@ -226,7 +254,6 @@ const bundles = [
       'src/renderers/art/**/*.js',
       'src/renderers/shared/**/*.js',
 
-      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
@@ -328,12 +355,10 @@ const bundles = [
       'src/renderers/shared/**/*.js',
       'src/renderers/testing/**/*.js',
 
-      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
   },
-
   {
     babelOpts: babelOptsReact,
     bundleTypes: [FB_DEV],
@@ -355,11 +380,32 @@ const bundles = [
       'src/renderers/shared/**/*.js',
       'src/renderers/testing/**/*.js',
 
-      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
   },
+  {
+    babelOpts: babelOptsReact,
+    bundleTypes: [FB_DEV, NODE_DEV],
+    config: {
+      destDir: 'build/',
+      moduleName: 'ReactShallowRenderer',
+      sourceMap: false,
+    },
+    entry: 'src/renderers/testing/ReactShallowRenderer',
+    externals: [
+      'react-dom',
+      'prop-types/checkPropTypes',
+      'react-test-renderer',
+    ],
+    fbEntry: 'src/renderers/testing/ReactShallowRenderer',
+    hasteName: 'ReactShallowRenderer',
+    isRenderer: true,
+    label: 'shallow-renderer',
+    manglePropertiesOnProd: false,
+    name: 'react-test-renderer/shallow',
+    paths: ['src/renderers/shared/**/*.js', 'src/renderers/testing/**/*.js'],
+  },
 
   /******* React Noop Renderer (used only for fixtures/fiber-debugger) *******/
   {
@@ -383,7 +429,6 @@ const bundles = [
       'src/renderers/noop/**/*.js',
       'src/renderers/shared/**/*.js',
 
-      'src/isomorphic/classic/types/checkPropTypes.js',
       'src/ReactVersion.js',
       'src/shared/**/*.js',
     ],
diff --git a/scripts/rollup/shims/facebook-www/ReactTestUtils.js b/scripts/rollup/shims/facebook-www/ReactTestUtils.js
deleted file mode 100644
index dafb421d1d187..0000000000000
--- a/scripts/rollup/shims/facebook-www/ReactTestUtils.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule ReactTestUtils
- */
-
-'use strict';
-
-const {
-  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
-} = require('ReactDOM-fb');
-
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactTestUtils;
diff --git a/src/fb/ReactDOMFBEntry.js b/src/fb/ReactDOMFBEntry.js
index 754febaf3637a..c4e8c003fc8cf 100644
--- a/src/fb/ReactDOMFBEntry.js
+++ b/src/fb/ReactDOMFBEntry.js
@@ -43,10 +43,9 @@ Object.assign(ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, {
 
 if (__DEV__) {
   Object.assign(ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, {
-    // ReactPerf and ReactTestUtils currently only work with the DOM renderer
-    // so we expose them from here, but only in DEV mode.
+    // ReactPerf currently only works with the DOM renderer
+    // so we expose it here, but only in DEV mode.
     ReactPerf: require('ReactPerf'),
-    ReactTestUtils: require('ReactTestUtils'),
   });
 }
 
diff --git a/src/fb/ReactDOMFiberFBEntry.js b/src/fb/ReactDOMFiberFBEntry.js
index 188b9c71248ca..9ecaa6fe07844 100644
--- a/src/fb/ReactDOMFiberFBEntry.js
+++ b/src/fb/ReactDOMFiberFBEntry.js
@@ -45,15 +45,4 @@ Object.assign(
   },
 );
 
-if (__DEV__) {
-  Object.assign(
-    ReactDOMFiber.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
-    {
-      // ReactPerf and ReactTestUtils currently only work with the DOM renderer
-      // so we expose them from here, but only in DEV mode.
-      ReactTestUtils: require('ReactTestUtils'),
-    },
-  );
-}
-
 module.exports = ReactDOMFiber;
diff --git a/src/isomorphic/React.js b/src/isomorphic/React.js
index 807a1c369f4f5..eebe7b9b556a9 100644
--- a/src/isomorphic/React.js
+++ b/src/isomorphic/React.js
@@ -19,7 +19,7 @@ var ReactPropTypes = require('ReactPropTypes');
 var ReactVersion = require('ReactVersion');
 
 var onlyChild = require('onlyChild');
-var checkPropTypes = require('checkPropTypes');
+var checkPropTypes = require('prop-types/checkPropTypes');
 var createReactClass = require('createClass');
 
 var createElement = ReactElement.createElement;
@@ -57,7 +57,7 @@ var React = {
   cloneElement: cloneElement,
   isValidElement: ReactElement.isValidElement,
 
-  // TODO (bvaughn) Remove these getters in 16.0.0-alpha.10
+  // TODO (bvaughn) Remove these getters before 16.0.0
   PropTypes: ReactPropTypes,
   checkPropTypes: checkPropTypes,
   createClass: createReactClass,
@@ -100,7 +100,7 @@ if (__DEV__) {
     return mixin;
   };
 
-  // TODO (bvaughn) Remove both of these deprecation warnings in 16.0.0-alpha.10
+  // TODO (bvaughn) Remove both of these deprecation warnings before 16.0.0
   if (canDefineProperty) {
     Object.defineProperty(React, 'checkPropTypes', {
       get() {
diff --git a/src/isomorphic/classic/element/ReactElementValidator.js b/src/isomorphic/classic/element/ReactElementValidator.js
index abcb4709e07dc..0e729e34a3d87 100644
--- a/src/isomorphic/classic/element/ReactElementValidator.js
+++ b/src/isomorphic/classic/element/ReactElementValidator.js
@@ -26,7 +26,7 @@ var getComponentName = require('getComponentName');
 var getIteratorFn = require('getIteratorFn');
 
 if (__DEV__) {
-  var checkPropTypes = require('checkPropTypes');
+  var checkPropTypes = require('prop-types/checkPropTypes');
   var warning = require('fbjs/lib/warning');
   var ReactDebugCurrentFrame = require('ReactDebugCurrentFrame');
   var {
diff --git a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
index edcaca7a6f9a0..ce4c2e183372e 100644
--- a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
+++ b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
@@ -21,7 +21,7 @@ var MyComponent;
 
 function resetWarningCache() {
   jest.resetModules();
-  checkPropTypes = require('checkPropTypes');
+  checkPropTypes = require('prop-types/checkPropTypes');
 }
 
 function getPropTypeWarningMessage(propTypes, object, componentName) {
diff --git a/src/isomorphic/classic/types/checkPropTypes.js b/src/isomorphic/classic/types/checkPropTypes.js
deleted file mode 100644
index 32d9ecc677497..0000000000000
--- a/src/isomorphic/classic/types/checkPropTypes.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule checkPropTypes
- */
-
-'use strict';
-
-module.exports = require('prop-types/checkPropTypes');
diff --git a/src/node_modules/react/lib/checkPropTypes.js b/src/node_modules/react-test-renderer/index.js
similarity index 66%
rename from src/node_modules/react/lib/checkPropTypes.js
rename to src/node_modules/react-test-renderer/index.js
index 083e4df83ad8a..a11b1836c7b0d 100644
--- a/src/node_modules/react/lib/checkPropTypes.js
+++ b/src/node_modules/react-test-renderer/index.js
@@ -6,4 +6,4 @@
 
 'use strict';
 
-module.exports = require('checkPropTypes');
+module.exports = require('ReactTestRenderer');
diff --git a/src/renderers/dom/ReactDOM.js b/src/renderers/dom/ReactDOM.js
index f5f976ea7d4aa..601ce0d924b33 100644
--- a/src/renderers/dom/ReactDOM.js
+++ b/src/renderers/dom/ReactDOM.js
@@ -42,6 +42,12 @@ var ReactDOM = {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
     // For TapEventPlugin which is popular in open source
     EventPluginHub: require('EventPluginHub'),
+    // Used by test-utils
+    EventPluginRegistry: require('EventPluginRegistry'),
+    EventPropagators: require('EventPropagators'),
+    ReactControlledComponent: require('ReactControlledComponent'),
+    ReactDOMComponentTree,
+    ReactBrowserEventEmitter: require('ReactBrowserEventEmitter'),
   },
 };
 
diff --git a/src/renderers/dom/fiber/ReactDOMFiber.js b/src/renderers/dom/fiber/ReactDOMFiber.js
index bb327bb36b441..d3ed8381ca2d4 100644
--- a/src/renderers/dom/fiber/ReactDOMFiber.js
+++ b/src/renderers/dom/fiber/ReactDOMFiber.js
@@ -542,6 +542,12 @@ var ReactDOM = {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: {
     // For TapEventPlugin which is popular in open source
     EventPluginHub: require('EventPluginHub'),
+    // Used by test-utils
+    EventPluginRegistry: require('EventPluginRegistry'),
+    EventPropagators: require('EventPropagators'),
+    ReactControlledComponent,
+    ReactDOMComponentTree,
+    ReactBrowserEventEmitter,
   },
 };
 
diff --git a/src/test/ReactTestUtils.js b/src/renderers/dom/test/ReactTestUtils.js
similarity index 93%
rename from src/test/ReactTestUtils.js
rename to src/renderers/dom/test/ReactTestUtils.js
index f320be4bd12b5..23ac6fd774f9b 100644
--- a/src/test/ReactTestUtils.js
+++ b/src/renderers/dom/test/ReactTestUtils.js
@@ -12,23 +12,26 @@
 'use strict';
 
 var EventConstants = require('EventConstants');
-var EventPluginHub = require('EventPluginHub');
-var EventPluginRegistry = require('EventPluginRegistry');
-var EventPropagators = require('EventPropagators');
 var React = require('react');
-var ReactControlledComponent = require('ReactControlledComponent');
-var ReactDOM = require('ReactDOM');
-var ReactDOMComponentTree = require('ReactDOMComponentTree');
-var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');
+var ReactDOM = require('react-dom');
 var ReactFiberTreeReflection = require('ReactFiberTreeReflection');
 var ReactInstanceMap = require('ReactInstanceMap');
+var ReactShallowRenderer = require('ReactShallowRenderer'); // TODO (bvaughn) Remove this import before 16.0.0
 var ReactTypeOfWork = require('ReactTypeOfWork');
-var ReactGenericBatching = require('ReactGenericBatching');
 var SyntheticEvent = require('SyntheticEvent');
-var ReactShallowRenderer = require('ReactShallowRenderer');
 
-var findDOMNode = require('findDOMNode');
 var invariant = require('fbjs/lib/invariant');
+var warning = require('fbjs/lib/warning');
+
+var {findDOMNode} = ReactDOM;
+var {
+  EventPluginHub,
+  EventPluginRegistry,
+  EventPropagators,
+  ReactBrowserEventEmitter,
+  ReactControlledComponent,
+  ReactDOMComponentTree,
+} = ReactDOM.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
 
 var topLevelTypes = EventConstants.topLevelTypes;
 var {
@@ -38,6 +41,20 @@ var {
   HostText,
 } = ReactTypeOfWork;
 
+// TODO (bvaughn) Remove this warning before 16.0.0
+// It's only being added for temporary deprecation notice in RN.
+let warnedAboutShallowRenderer = false;
+function createRendererWithWarning() {
+  warning(
+    warnedAboutShallowRenderer,
+    'Shallow renderer has been moved to react-test-renderer/shallow. ' +
+      'Update references to remove this warning. ' +
+      'TestUtils.createRenderer will be removed completely in React 16.',
+  );
+  warnedAboutShallowRenderer = true;
+  return new ReactShallowRenderer();
+}
+
 function Event(suffix) {}
 
 /**
@@ -403,9 +420,9 @@ var ReactTestUtils = {
     };
   },
 
-  createRenderer: function() {
-    return new ReactShallowRenderer();
-  },
+  // TODO (bvaughn) Remove this warning accessor before 16.0.0.
+  // It's only being added for temporary deprecation notice in RN.
+  createRenderer: createRendererWithWarning,
 
   Simulate: null,
   SimulateNative: {},
@@ -462,7 +479,7 @@ function makeSimulator(eventType) {
       EventPropagators.accumulateDirectDispatches(event);
     }
 
-    ReactGenericBatching.batchedUpdates(function() {
+    ReactDOM.unstable_batchedUpdates(function() {
       // Normally extractEvent enqueues a state restore, but we'll just always
       // do that since we we're by-passing it here.
       ReactControlledComponent.enqueueStateRestore(node);
diff --git a/src/test/__tests__/ReactTestUtils-test.js b/src/renderers/dom/test/__tests__/ReactTestUtils-test.js
similarity index 55%
rename from src/test/__tests__/ReactTestUtils-test.js
rename to src/renderers/dom/test/__tests__/ReactTestUtils-test.js
index cd1b2a5dc8a5c..2623e0fa89393 100644
--- a/src/test/__tests__/ReactTestUtils-test.js
+++ b/src/renderers/dom/test/__tests__/ReactTestUtils-test.js
@@ -11,14 +11,16 @@
 
 'use strict';
 
-var PropTypes;
-var React;
-var ReactDOM;
-var ReactDOMServer;
-var ReactTestUtils;
+let createRenderer;
+let PropTypes;
+let React;
+let ReactDOM;
+let ReactDOMServer;
+let ReactTestUtils;
 
 describe('ReactTestUtils', () => {
   beforeEach(() => {
+    createRenderer = require('ReactShallowRenderer').createRenderer;
     PropTypes = require('prop-types');
     React = require('react');
     ReactDOM = require('react-dom');
@@ -26,6 +28,66 @@ describe('ReactTestUtils', () => {
     ReactTestUtils = require('ReactTestUtils');
   });
 
+  it('should call all of the lifecycle hooks', () => {
+    const logs = [];
+    const logger = message => () => logs.push(message) || true;
+
+    class SomeComponent extends React.Component {
+      componentWillMount = logger('componentWillMount');
+      componentDidMount = logger('componentDidMount');
+      componentWillReceiveProps = logger('componentWillReceiveProps');
+      shouldComponentUpdate = logger('shouldComponentUpdate');
+      componentWillUpdate = logger('componentWillUpdate');
+      componentDidUpdate = logger('componentDidUpdate');
+      componentWillUnmount = logger('componentWillUnmount');
+      render() {
+        return <div />;
+      }
+    }
+
+    const shallowRenderer = createRenderer();
+    shallowRenderer.render(<SomeComponent foo={1} />);
+
+    // Calling cDU might lead to problems with host component references.
+    // Since our components aren't really mounted, refs won't be available.
+    expect(logs).toEqual(['componentWillMount']);
+
+    logs.splice(0);
+
+    const instance = shallowRenderer.getMountedInstance();
+    instance.setState({});
+
+    // The previous shallow renderer triggered cDU for setState() calls.
+    expect(logs).toEqual([
+      'shouldComponentUpdate',
+      'componentWillUpdate',
+      'componentDidUpdate',
+    ]);
+
+    logs.splice(0);
+
+    shallowRenderer.render(<SomeComponent foo={2} />);
+
+    // The previous shallow renderer did not trigger cDU for props changes.
+    expect(logs).toEqual([
+      'componentWillReceiveProps',
+      'shouldComponentUpdate',
+      'componentWillUpdate',
+    ]);
+  });
+
+  it('should only render 1 level deep', () => {
+    function Parent() {
+      return <div><Child /></div>;
+    }
+    function Child() {
+      throw Error('This component should not render');
+    }
+
+    const shallowRenderer = createRenderer();
+    shallowRenderer.render(React.createElement(Parent));
+  });
+
   it('should have shallow rendering', () => {
     class SomeComponent extends React.Component {
       render() {
@@ -38,8 +100,8 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var shallowRenderer = ReactTestUtils.createRenderer();
-    var result = shallowRenderer.render(<SomeComponent />);
+    const shallowRenderer = createRenderer();
+    const result = shallowRenderer.render(<SomeComponent />);
 
     expect(result.type).toBe('div');
     expect(result.props.children).toEqual([
@@ -48,21 +110,52 @@ describe('ReactTestUtils', () => {
     ]);
   });
 
+  it('should enable shouldComponentUpdate to prevent a re-render', () => {
+    let renderCounter = 0;
+    class SimpleComponent extends React.Component {
+      state = {update: false};
+      shouldComponentUpdate(nextProps, nextState) {
+        return this.state.update !== nextState.update;
+      }
+      render() {
+        renderCounter++;
+        return <div>{`${renderCounter}`}</div>;
+      }
+    }
+
+    const shallowRenderer = createRenderer();
+    shallowRenderer.render(<SimpleComponent />);
+    expect(shallowRenderer.getRenderOutput()).toEqual(<div>1</div>);
+
+    const instance = shallowRenderer.getMountedInstance();
+    instance.setState({update: false});
+    expect(shallowRenderer.getRenderOutput()).toEqual(<div>1</div>);
+
+    instance.setState({update: true});
+    expect(shallowRenderer.getRenderOutput()).toEqual(<div>2</div>);
+  });
+
   it('should shallow render a functional component', () => {
-    function SomeComponent() {
+    function SomeComponent(props, context) {
       return (
         <div>
+          <div>{props.foo}</div>
+          <div>{context.bar}</div>
           <span className="child1" />
           <span className="child2" />
         </div>
       );
     }
 
-    var shallowRenderer = ReactTestUtils.createRenderer();
-    var result = shallowRenderer.render(<SomeComponent />);
+    const shallowRenderer = createRenderer();
+    const result = shallowRenderer.render(<SomeComponent foo={'FOO'} />, {
+      bar: 'BAR',
+    });
 
     expect(result.type).toBe('div');
     expect(result.props.children).toEqual([
+      <div>FOO</div>,
+      <div>BAR</div>,
       <span className="child1" />,
       <span className="child2" />,
     ]);
@@ -75,7 +168,7 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var shallowRenderer = ReactTestUtils.createRenderer();
+    const shallowRenderer = createRenderer();
     expect(() => shallowRenderer.render(SomeComponent)).toThrowError(
       'ReactShallowRenderer render(): Invalid component element. Instead of ' +
         'passing a component class, make sure to instantiate it by passing it ' +
@@ -90,7 +183,7 @@ describe('ReactTestUtils', () => {
   });
 
   it('should have shallow unmounting', () => {
-    var componentWillUnmount = jest.fn();
+    const componentWillUnmount = jest.fn();
 
     class SomeComponent extends React.Component {
       componentWillUnmount = componentWillUnmount;
@@ -99,7 +192,7 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var shallowRenderer = ReactTestUtils.createRenderer();
+    const shallowRenderer = createRenderer();
     shallowRenderer.render(<SomeComponent />);
     shallowRenderer.unmount();
 
@@ -113,8 +206,8 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var shallowRenderer = ReactTestUtils.createRenderer();
-    var result = shallowRenderer.render(<SomeComponent />);
+    const shallowRenderer = createRenderer();
+    const result = shallowRenderer.render(<SomeComponent />);
 
     expect(result).toBe(null);
   });
@@ -126,7 +219,7 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var shallowRenderer = ReactTestUtils.createRenderer();
+    const shallowRenderer = createRenderer();
     // Shouldn't crash.
     shallowRenderer.render(<SomeComponent />);
   });
@@ -140,7 +233,7 @@ describe('ReactTestUtils', () => {
       };
 
       render() {
-        var className = this.state.clicked ? 'was-clicked' : '';
+        const className = this.state.clicked ? 'was-clicked' : '';
 
         if (this.props.aNew === 'prop') {
           return (
@@ -159,21 +252,21 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var shallowRenderer = ReactTestUtils.createRenderer();
-    var result = shallowRenderer.render(<SomeComponent />);
+    const shallowRenderer = createRenderer();
+    const result = shallowRenderer.render(<SomeComponent />);
     expect(result.type).toBe('div');
     expect(result.props.children).toEqual([
       <span className="child1" />,
       <span className="child2" />,
     ]);
 
-    var updatedResult = shallowRenderer.render(<SomeComponent aNew="prop" />);
+    const updatedResult = shallowRenderer.render(<SomeComponent aNew="prop" />);
     expect(updatedResult.type).toBe('a');
 
-    var mockEvent = {};
+    const mockEvent = {};
     updatedResult.props.onClick(mockEvent);
 
-    var updatedResultCausedByClick = shallowRenderer.getRenderOutput();
+    const updatedResultCausedByClick = shallowRenderer.getRenderOutput();
     expect(updatedResultCausedByClick.type).toBe('a');
     expect(updatedResultCausedByClick.props.className).toBe('was-clicked');
   });
@@ -189,7 +282,7 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var shallowRenderer = ReactTestUtils.createRenderer();
+    const shallowRenderer = createRenderer();
     shallowRenderer.render(<SimpleComponent n={5} />);
     expect(shallowRenderer.getMountedInstance().someMethod()).toEqual(5);
   });
@@ -205,8 +298,8 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var shallowRenderer = ReactTestUtils.createRenderer();
-    var result = shallowRenderer.render(<SimpleComponent />);
+    const shallowRenderer = createRenderer();
+    const result = shallowRenderer.render(<SimpleComponent />);
     expect(result).toEqual(<div />);
   });
 
@@ -229,9 +322,9 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var shallowRenderer = ReactTestUtils.createRenderer();
+    const shallowRenderer = createRenderer();
     shallowRenderer.render(<SimpleComponent />);
-    var result = shallowRenderer.getRenderOutput();
+    let result = shallowRenderer.getRenderOutput();
     expect(result.type).toEqual('div');
     expect(result.props.className).toEqual('');
     result.props.onClick();
@@ -252,11 +345,66 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var shallowRenderer = ReactTestUtils.createRenderer();
-    var result = shallowRenderer.render(<SimpleComponent />);
+    const shallowRenderer = createRenderer();
+    const result = shallowRenderer.render(<SimpleComponent />);
     expect(result).toEqual(<div>doovy</div>);
   });
 
+  it('can setState in componentWillReceiveProps when shallow rendering', () => {
+    class SimpleComponent extends React.Component {
+      state = {count: 0};
+
+      componentWillReceiveProps(nextProps) {
+        if (nextProps.updateState) {
+          this.setState({count: 1});
+        }
+      }
+
+      render() {
+        return <div>{this.state.count}</div>;
+      }
+    }
+
+    const shallowRenderer = createRenderer();
+    let result = shallowRenderer.render(
+      <SimpleComponent updateState={false} />,
+    );
+    expect(result.props.children).toEqual(0);
+
+    result = shallowRenderer.render(<SimpleComponent updateState={true} />);
+    expect(result.props.children).toEqual(1);
+  });
+
+  it('can setState with an updater function', () => {
+    let instance;
+
+    class SimpleComponent extends React.Component {
+      state = {
+        counter: 0,
+      };
+
+      render() {
+        instance = this;
+        return (
+          <button ref="button" onClick={this.onClick}>
+            {this.state.counter}
+          </button>
+        );
+      }
+    }
+
+    const shallowRenderer = createRenderer();
+    let result = shallowRenderer.render(<SimpleComponent defaultCount={1} />);
+    expect(result.props.children).toEqual(0);
+
+    instance.setState((state, props) => {
+      return {counter: props.defaultCount + 1};
+    });
+
+    result = shallowRenderer.getRenderOutput();
+    expect(result.props.children).toEqual(2);
+  });
+
   it('can pass context when shallowly rendering', () => {
     class SimpleComponent extends React.Component {
       static contextTypes = {
@@ -268,13 +416,41 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var shallowRenderer = ReactTestUtils.createRenderer();
-    var result = shallowRenderer.render(<SimpleComponent />, {
+    const shallowRenderer = createRenderer();
+    const result = shallowRenderer.render(<SimpleComponent />, {
       name: 'foo',
     });
     expect(result).toEqual(<div>foo</div>);
   });
 
+  it('should track context across updates', () => {
+    class SimpleComponent extends React.Component {
+      static contextTypes = {
+        foo: PropTypes.string,
+      };
+
+      state = {
+        bar: 'bar',
+      };
+
+      render() {
+        return <div>{`${this.context.foo}:${this.state.bar}`}</div>;
+      }
+    }
+
+    const shallowRenderer = createRenderer();
+    let result = shallowRenderer.render(<SimpleComponent />, {
+      foo: 'foo',
+    });
+    expect(result).toEqual(<div>foo:bar</div>);
+
+    const instance = shallowRenderer.getMountedInstance();
+    instance.setState({bar: 'baz'});
+
+    result = shallowRenderer.getRenderOutput();
+    expect(result).toEqual(<div>foo:baz</div>);
+  });
+
   it('can fail context when shallowly rendering', () => {
     spyOn(console, 'error');
 
@@ -288,7 +464,7 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var shallowRenderer = ReactTestUtils.createRenderer();
+    const shallowRenderer = createRenderer();
     shallowRenderer.render(<SimpleComponent />);
     expectDev(console.error.calls.count()).toBe(1);
     expect(
@@ -300,6 +476,32 @@ describe('ReactTestUtils', () => {
     );
   });
 
+  it('should warn about propTypes (but only once)', () => {
+    spyOn(console, 'error');
+
+    class SimpleComponent extends React.Component {
+      render() {
+        return React.createElement('div', null, this.props.name);
+      }
+    }
+
+    SimpleComponent.propTypes = {
+      name: PropTypes.string.isRequired,
+    };
+
+    const shallowRenderer = createRenderer();
+    shallowRenderer.render(React.createElement(SimpleComponent, {name: 123}));
+
+    expect(console.error.calls.count()).toBe(1);
+    expect(
+      console.error.calls.argsFor(0)[0].replace(/\(at .+?:\d+\)/g, '(at **)'),
+    ).toBe(
+      'Warning: Failed prop type: Invalid prop `name` of type `number` ' +
+        'supplied to `SimpleComponent`, expected `string`.\n' +
+        '    in SimpleComponent',
+    );
+  });
+
   it('can scryRenderedDOMComponentsWithClass with TextComponent', () => {
     class Wrapper extends React.Component {
       render() {
@@ -307,8 +509,8 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var renderedComponent = ReactTestUtils.renderIntoDocument(<Wrapper />);
-    var scryResults = ReactTestUtils.scryRenderedDOMComponentsWithClass(
+    const renderedComponent = ReactTestUtils.renderIntoDocument(<Wrapper />);
+    const scryResults = ReactTestUtils.scryRenderedDOMComponentsWithClass(
       renderedComponent,
       'NonExistentClass',
     );
@@ -322,8 +524,8 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var renderedComponent = ReactTestUtils.renderIntoDocument(<Wrapper />);
-    var scryResults = ReactTestUtils.scryRenderedDOMComponentsWithClass(
+    const renderedComponent = ReactTestUtils.renderIntoDocument(<Wrapper />);
+    const scryResults = ReactTestUtils.scryRenderedDOMComponentsWithClass(
       renderedComponent,
       'x',
     );
@@ -337,20 +539,20 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var renderedComponent = ReactTestUtils.renderIntoDocument(<Wrapper />);
-    var scryResults1 = ReactTestUtils.scryRenderedDOMComponentsWithClass(
+    const renderedComponent = ReactTestUtils.renderIntoDocument(<Wrapper />);
+    const scryResults1 = ReactTestUtils.scryRenderedDOMComponentsWithClass(
       renderedComponent,
       'x y',
     );
     expect(scryResults1.length).toBe(1);
 
-    var scryResults2 = ReactTestUtils.scryRenderedDOMComponentsWithClass(
+    const scryResults2 = ReactTestUtils.scryRenderedDOMComponentsWithClass(
       renderedComponent,
       'x z',
     );
     expect(scryResults2.length).toBe(1);
 
-    var scryResults3 = ReactTestUtils.scryRenderedDOMComponentsWithClass(
+    const scryResults3 = ReactTestUtils.scryRenderedDOMComponentsWithClass(
       renderedComponent,
       ['x', 'y'],
     );
@@ -359,13 +561,13 @@ describe('ReactTestUtils', () => {
     expect(scryResults1[0]).toBe(scryResults2[0]);
     expect(scryResults1[0]).toBe(scryResults3[0]);
 
-    var scryResults4 = ReactTestUtils.scryRenderedDOMComponentsWithClass(
+    const scryResults4 = ReactTestUtils.scryRenderedDOMComponentsWithClass(
       renderedComponent,
       ['x', 'a'],
     );
     expect(scryResults4.length).toBe(0);
 
-    var scryResults5 = ReactTestUtils.scryRenderedDOMComponentsWithClass(
+    const scryResults5 = ReactTestUtils.scryRenderedDOMComponentsWithClass(
       renderedComponent,
       ['x a'],
     );
@@ -379,7 +581,7 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var container = document.createElement('div');
+    const container = document.createElement('div');
     ReactDOM.render(
       <Wrapper>
         {null}
@@ -387,7 +589,7 @@ describe('ReactTestUtils', () => {
       </Wrapper>,
       container,
     );
-    var tree = ReactDOM.render(
+    const tree = ReactDOM.render(
       <Wrapper>
         <div>orange</div>
         <div>purple</div>
@@ -395,7 +597,7 @@ describe('ReactTestUtils', () => {
       container,
     );
 
-    var log = [];
+    const log = [];
     ReactTestUtils.findAllInRenderedTree(tree, function(child) {
       if (ReactTestUtils.isDOMComponent(child)) {
         log.push(ReactDOM.findDOMNode(child).textContent);
@@ -407,9 +609,9 @@ describe('ReactTestUtils', () => {
   });
 
   it('should support injected wrapper components as DOM components', () => {
-    var getTestDocument = require('getTestDocument');
+    const getTestDocument = require('getTestDocument');
 
-    var injectedDOMComponents = [
+    const injectedDOMComponents = [
       'button',
       'form',
       'iframe',
@@ -421,7 +623,7 @@ describe('ReactTestUtils', () => {
     ];
 
     injectedDOMComponents.forEach(function(type) {
-      var testComponent = ReactTestUtils.renderIntoDocument(
+      const testComponent = ReactTestUtils.renderIntoDocument(
         React.createElement(type),
       );
       expect(testComponent.tagName).toBe(type.toUpperCase());
@@ -445,9 +647,9 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var markup = ReactDOMServer.renderToString(<Root />);
-    var testDocument = getTestDocument(markup);
-    var component = ReactDOM.render(<Root />, testDocument);
+    const markup = ReactDOMServer.renderToString(<Root />);
+    const testDocument = getTestDocument(markup);
+    const component = ReactDOM.render(<Root />, testDocument);
 
     expect(component.refs.html.tagName).toBe('HTML');
     expect(component.refs.head.tagName).toBe('HEAD');
@@ -458,19 +660,19 @@ describe('ReactTestUtils', () => {
   });
 
   it('should change the value of an input field', () => {
-    var obj = {
+    const obj = {
       handler: function(e) {
         e.persist();
       },
     };
     spyOn(obj, 'handler').and.callThrough();
-    var container = document.createElement('div');
-    var instance = ReactDOM.render(
+    const container = document.createElement('div');
+    const instance = ReactDOM.render(
       <input type="text" onChange={obj.handler} />,
       container,
     );
 
-    var node = ReactDOM.findDOMNode(instance);
+    const node = ReactDOM.findDOMNode(instance);
     node.value = 'giraffe';
     ReactTestUtils.Simulate.change(node);
 
@@ -490,19 +692,19 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var obj = {
+    const obj = {
       handler: function(e) {
         e.persist();
       },
     };
     spyOn(obj, 'handler').and.callThrough();
-    var container = document.createElement('div');
-    var instance = ReactDOM.render(
+    const container = document.createElement('div');
+    const instance = ReactDOM.render(
       <SomeComponent handleChange={obj.handler} />,
       container,
     );
 
-    var node = ReactDOM.findDOMNode(instance.refs.input);
+    const node = ReactDOM.findDOMNode(instance.refs.input);
     node.value = 'zebra';
     ReactTestUtils.Simulate.change(node);
 
@@ -522,9 +724,9 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var handler = jasmine.createSpy('spy');
-    var shallowRenderer = ReactTestUtils.createRenderer();
-    var result = shallowRenderer.render(
+    const handler = jasmine.createSpy('spy');
+    const shallowRenderer = createRenderer();
+    const result = shallowRenderer.render(
       <SomeComponent handleClick={handler} />,
     );
 
@@ -538,7 +740,7 @@ describe('ReactTestUtils', () => {
   it('should not warn when simulating events with extra properties', () => {
     spyOn(console, 'error');
 
-    var CLIENT_X = 100;
+    const CLIENT_X = 100;
 
     class Component extends React.Component {
       handleClick = e => {
@@ -550,8 +752,8 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var element = document.createElement('div');
-    var instance = ReactDOM.render(<Component />, element);
+    const element = document.createElement('div');
+    const instance = ReactDOM.render(<Component />, element);
     ReactTestUtils.Simulate.click(ReactDOM.findDOMNode(instance), {
       clientX: CLIENT_X,
     });
@@ -559,7 +761,7 @@ describe('ReactTestUtils', () => {
   });
 
   it('can scry with stateless components involved', () => {
-    var Stateless = () => <div><hr /></div>;
+    const Stateless = () => <div><hr /></div>;
 
     class SomeComponent extends React.Component {
       render() {
@@ -572,11 +774,36 @@ describe('ReactTestUtils', () => {
       }
     }
 
-    var inst = ReactTestUtils.renderIntoDocument(<SomeComponent />);
-    var hrs = ReactTestUtils.scryRenderedDOMComponentsWithTag(inst, 'hr');
+    const inst = ReactTestUtils.renderIntoDocument(<SomeComponent />);
+    const hrs = ReactTestUtils.scryRenderedDOMComponentsWithTag(inst, 'hr');
     expect(hrs.length).toBe(2);
   });
 
+  it('should enable rendering of cloned element', () => {
+    class SimpleComponent extends React.Component {
+      constructor(props) {
+        super(props);
+
+        this.state = {
+          bar: 'bar',
+        };
+      }
+
+      render() {
+        return <div>{`${this.props.foo}:${this.state.bar}`}</div>;
+      }
+    }
+
+    const shallowRenderer = createRenderer();
+    let result = shallowRenderer.render(<SimpleComponent foo="foo" />);
+    expect(result).toEqual(<div>foo:bar</div>);
+
+    const instance = shallowRenderer.getMountedInstance();
+    const cloned = React.cloneElement(instance, {foo: 'baz'});
+    result = shallowRenderer.render(cloned);
+    expect(result).toEqual(<div>baz:bar</div>);
+  });
+
   describe('Simulate', () => {
     it('should set the type of the event', () => {
       let event;
@@ -594,5 +821,27 @@ describe('ReactTestUtils', () => {
       expect(event.type).toBe('keydown');
       expect(event.nativeEvent.type).toBe('keydown');
     });
+
+    it('should work with renderIntoDocument', () => {
+      const onChange = jest.fn();
+
+      class MyComponent extends React.Component {
+        render() {
+          return <div><input type="text" onChange={onChange} /></div>;
+        }
+      }
+
+      const instance = ReactTestUtils.renderIntoDocument(<MyComponent />);
+      const input = ReactTestUtils.findRenderedDOMComponentWithTag(
+        instance,
+        'input',
+      );
+      input.value = 'giraffe';
+      ReactTestUtils.Simulate.change(input);
+
+      expect(onChange).toHaveBeenCalledWith(
+        jasmine.objectContaining({target: input}),
+      );
+    });
   });
 });
diff --git a/src/renderers/shared/fiber/ReactFiberContext.js b/src/renderers/shared/fiber/ReactFiberContext.js
index b2104d19e9039..4d669a8611b30 100644
--- a/src/renderers/shared/fiber/ReactFiberContext.js
+++ b/src/renderers/shared/fiber/ReactFiberContext.js
@@ -15,7 +15,7 @@
 import type {Fiber} from 'ReactFiber';
 import type {StackCursor} from 'ReactFiberStack';
 
-var checkPropTypes = require('checkPropTypes');
+var checkPropTypes = require('prop-types/checkPropTypes');
 var emptyObject = require('fbjs/lib/emptyObject');
 var getComponentName = require('getComponentName');
 var invariant = require('fbjs/lib/invariant');
diff --git a/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js b/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
index 2ad0d4b40316b..ec117977dc02d 100644
--- a/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
+++ b/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
@@ -27,7 +27,7 @@ if (__DEV__) {
   var warningAboutMissingGetChildContext = {};
 }
 
-var checkPropTypes = require('checkPropTypes');
+var checkPropTypes = require('prop-types/checkPropTypes');
 var emptyObject = require('fbjs/lib/emptyObject');
 var invariant = require('fbjs/lib/invariant');
 var shallowEqual = require('fbjs/lib/shallowEqual');
diff --git a/src/renderers/testing/ReactShallowRenderer.js b/src/renderers/testing/ReactShallowRenderer.js
new file mode 100644
index 0000000000000..ee114dfde3639
--- /dev/null
+++ b/src/renderers/testing/ReactShallowRenderer.js
@@ -0,0 +1,238 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactShallowRenderer
+ * @preventMunge
+ */
+
+'use strict';
+
+const checkPropTypes = require('prop-types/checkPropTypes');
+const React = require('react');
+
+const emptyObject = require('fbjs/lib/emptyObject');
+const invariant = require('fbjs/lib/invariant');
+
+const {ReactDebugCurrentFrame} = require('ReactGlobalSharedState');
+
+class ReactShallowRenderer {
+  static createRenderer = function() {
+    return new ReactShallowRenderer();
+  };
+
+  constructor() {
+    this._context = null;
+    this._element = null;
+    this._instance = null;
+    this._newState = null;
+    this._rendered = null;
+    this._rendering = false;
+    this._updater = new Updater(this);
+  }
+
+  getMountedInstance() {
+    return this._instance;
+  }
+
+  getRenderOutput() {
+    return this._rendered;
+  }
+
+  render(element, context = emptyObject) {
+    invariant(
+      React.isValidElement(element),
+      'ReactShallowRenderer render(): Invalid component element.%s',
+      typeof element === 'function'
+        ? ' Instead of passing a component class, make sure to instantiate ' +
+            'it by passing it to React.createElement.'
+        : '',
+    );
+    invariant(
+      typeof element.type !== 'string',
+      'ReactShallowRenderer render(): Shallow rendering works only with custom ' +
+        'components, not primitives (%s). Instead of calling `.render(el)` and ' +
+        'inspecting the rendered output, look at `el.props` directly instead.',
+      element.type,
+    );
+
+    if (this._rendering) {
+      return;
+    }
+
+    this._rendering = true;
+    this._element = element;
+    this._context = context;
+
+    if (this._instance) {
+      this._updateClassComponent(element.props, context);
+    } else {
+      if (shouldConstruct(element.type)) {
+        this._instance = new element.type(
+          element.props,
+          context,
+          this._updater,
+        );
+
+        if (element.type.hasOwnProperty('contextTypes')) {
+          ReactDebugCurrentFrame.element = element;
+
+          checkPropTypes(
+            element.type.contextTypes,
+            context,
+            'context',
+            getName(element.type, this._instance),
+            ReactDebugCurrentFrame.getStackAddendum,
+          );
+
+          ReactDebugCurrentFrame.element = null;
+        }
+
+        this._mountClassComponent(element.props, context);
+      } else {
+        this._rendered = element.type(element.props, context);
+      }
+    }
+
+    this._rendering = false;
+
+    return this.getRenderOutput();
+  }
+
+  unmount() {
+    if (this._instance) {
+      if (typeof this._instance.componentWillUnmount === 'function') {
+        this._instance.componentWillUnmount();
+      }
+    }
+
+    this._context = null;
+    this._element = null;
+    this._newState = null;
+    this._rendered = null;
+    this._instance = null;
+  }
+
+  _mountClassComponent(props, context) {
+    this._instance.context = context;
+    this._instance.props = props;
+    this._instance.state = this._instance.state || emptyObject;
+    this._instance.updater = this._updater;
+
+    if (typeof this._instance.componentWillMount === 'function') {
+      const beforeState = this._newState;
+
+      this._instance.componentWillMount();
+
+      // setState may have been called during cWM
+      if (beforeState !== this._newState) {
+        this._instance.state = this._newState || emptyObject;
+      }
+    }
+
+    this._rendered = this._instance.render();
+
+    // Calling cDU might lead to problems with host component references.
+    // Since our components aren't really mounted, refs won't be available.
+    // if (typeof this._instance.componentDidMount === 'function') {
+    //   this._instance.componentDidMount();
+    // }
+  }
+
+  _updateClassComponent(props, context) {
+    const oldProps = this._instance.props;
+    const oldState = this._instance.state;
+
+    if (
+      oldProps !== props &&
+      typeof this._instance.componentWillReceiveProps === 'function'
+    ) {
+      this._instance.componentWillReceiveProps(props);
+    }
+
+    // Read state after cWRP in case it calls setState
+    // Fallback to previous instance state to support rendering React.cloneElement()
+    const state = this._newState || this._instance.state || emptyObject;
+
+    if (typeof this._instance.shouldComponentUpdate === 'function') {
+      if (
+        this._instance.shouldComponentUpdate(props, state, context) === false
+      ) {
+        this._instance.context = context;
+        this._instance.props = props;
+        this._instance.state = state;
+
+        return;
+      }
+    }
+
+    if (typeof this._instance.componentWillUpdate === 'function') {
+      this._instance.componentWillUpdate(props, state, context);
+    }
+
+    this._instance.context = context;
+    this._instance.props = props;
+    this._instance.state = state;
+
+    this._rendered = this._instance.render();
+
+    // The 15.x shallow renderer triggered cDU for setState() calls only.
+    if (
+      oldState !== state &&
+      typeof this._instance.componentDidUpdate === 'function'
+    ) {
+      this._instance.componentDidUpdate(oldProps, oldState);
+    }
+  }
+}
+
+class Updater {
+  constructor(renderer) {
+    this._renderer = renderer;
+  }
+
+  isMounted(publicInstance) {
+    return !!this._renderer._element;
+  }
+
+  enqueueForceUpdate(publicInstance, callback, callerName) {
+    this._renderer.render(this._renderer._element, this._renderer._context);
+  }
+
+  enqueueReplaceState(publicInstance, completeState, callback, callerName) {
+    this._renderer._newState = completeState;
+    this._renderer.render(this._renderer._element, this._renderer._context);
+  }
+
+  enqueueSetState(publicInstance, partialState, callback, callerName) {
+    if (typeof partialState === 'function') {
+      partialState = partialState(publicInstance.state, publicInstance.props);
+    }
+
+    this._renderer._newState = {
+      ...publicInstance.state,
+      ...partialState,
+    };
+
+    this._renderer.render(this._renderer._element, this._renderer._context);
+  }
+}
+
+function getName(type, instance) {
+  var constructor = instance && instance.constructor;
+  return type.displayName ||
+    (constructor && constructor.displayName) ||
+    type.name ||
+    (constructor && constructor.name) ||
+    null;
+}
+
+function shouldConstruct(Component) {
+  return !!(Component.prototype && Component.prototype.isReactComponent);
+}
+
+module.exports = ReactShallowRenderer;
diff --git a/src/renderers/testing/stack/ReactTestRendererStack.js b/src/renderers/testing/stack/ReactTestRendererStack.js
index f87b0383bd2a8..bad8b3589d827 100644
--- a/src/renderers/testing/stack/ReactTestRendererStack.js
+++ b/src/renderers/testing/stack/ReactTestRendererStack.js
@@ -25,8 +25,8 @@ var ReactTestTextComponent = require('ReactTestTextComponent');
 var ReactTestEmptyComponent = require('ReactTestEmptyComponent');
 var invariant = require('fbjs/lib/invariant');
 
-import type {ReactElement} from 'ReactElementType';
 import type {ReactInstance} from 'ReactInstanceType';
+import type {TestRendererOptions} from 'ReactTestMount';
 import type {ReactText} from 'ReactTypes';
 
 type ReactTestRendererJSON = {
@@ -36,6 +36,31 @@ type ReactTestRendererJSON = {
   $$typeof?: any,
 };
 
+let injected = false;
+function inject() {
+  if (injected) {
+    return;
+  }
+
+  injected = true;
+
+  ReactUpdates.injection.injectReconcileTransaction(
+    ReactTestReconcileTransaction,
+  );
+  ReactUpdates.injection.injectBatchingStrategy(ReactDefaultBatchingStrategy);
+
+  ReactHostComponent.injection.injectGenericComponentClass(ReactTestComponent);
+  ReactHostComponent.injection.injectTextComponentClass(ReactTestTextComponent);
+  ReactEmptyComponent.injection.injectEmptyComponentFactory(function() {
+    return new ReactTestEmptyComponent();
+  });
+
+  ReactComponentEnvironment.injection.injectEnvironment({
+    processChildrenUpdates: function() {},
+    replaceNodeWithMarkup: function() {},
+  });
+}
+
 /**
  * Drill down (through composites and empty components) until we get a native or
  * native text component.
@@ -54,13 +79,13 @@ function getRenderedHostOrTextFromComponent(component) {
 var UNSET = {};
 
 class ReactTestComponent {
-  _currentElement: ReactElement;
+  _currentElement: ReactElement<any>;
   _renderedChildren: null | Object;
   _topLevelWrapper: null | ReactInstance;
   _hostContainerInfo: null | Object;
   _nodeMock: Object;
 
-  constructor(element: ReactElement) {
+  constructor(element: ReactElement<any>) {
     this._currentElement = element;
     this._renderedChildren = null;
     this._topLevelWrapper = null;
@@ -82,7 +107,7 @@ class ReactTestComponent {
   }
 
   receiveComponent(
-    nextElement: ReactElement,
+    nextElement: ReactElement<any>,
     transaction: ReactTestReconcileTransaction,
     context: Object,
   ) {
@@ -113,7 +138,7 @@ class ReactTestComponent {
       }
     }
     var object: ReactTestRendererJSON = {
-      type: this._currentElement.type,
+      type: ((this._currentElement.type: any): string),
       props: props,
       children: childrenJSON.length ? childrenJSON : null,
     };
@@ -134,24 +159,12 @@ Object.assign(ReactTestComponent.prototype, ReactMultiChild);
 
 // =============================================================================
 
-ReactUpdates.injection.injectReconcileTransaction(
-  ReactTestReconcileTransaction,
-);
-ReactUpdates.injection.injectBatchingStrategy(ReactDefaultBatchingStrategy);
-
-ReactHostComponent.injection.injectGenericComponentClass(ReactTestComponent);
-ReactHostComponent.injection.injectTextComponentClass(ReactTestTextComponent);
-ReactEmptyComponent.injection.injectEmptyComponentFactory(function() {
-  return new ReactTestEmptyComponent();
-});
-
-ReactComponentEnvironment.injection.injectEnvironment({
-  processChildrenUpdates: function() {},
-  replaceNodeWithMarkup: function() {},
-});
-
 var ReactTestRenderer = {
-  create: ReactTestMount.render,
+  create: (element: ReactElement<any>, options?: TestRendererOptions) => {
+    inject();
+
+    return ReactTestMount.render(element, options);
+  },
   /* eslint-disable camelcase */
   unstable_batchedUpdates: ReactUpdates.batchedUpdates,
   /* eslint-enable camelcase */
diff --git a/src/test/ReactShallowRenderer.js b/src/test/ReactShallowRenderer.js
deleted file mode 100644
index 2606448439cfa..0000000000000
--- a/src/test/ReactShallowRenderer.js
+++ /dev/null
@@ -1,145 +0,0 @@
-/**
- * Copyright 2013-present, Facebook, Inc.
- * All rights reserved.
- *
- * This source code is licensed under the BSD-style license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
- * of patent rights can be found in the PATENTS file in the same directory.
- *
- * @providesModule ReactShallowRenderer
- * @preventMunge
- */
-
-'use strict';
-
-var React = require('react');
-var ReactDOMInjection = require('ReactDOMInjection');
-var ReactDOMStackInjection = require('ReactDOMStackInjection');
-var ReactCompositeComponent = require('ReactCompositeComponent');
-var ReactReconciler = require('ReactReconciler');
-var ReactUpdates = require('ReactUpdates');
-
-var emptyObject = require('fbjs/lib/emptyObject');
-var getNextDebugID = require('getNextDebugID');
-var invariant = require('fbjs/lib/invariant');
-
-class NoopInternalComponent {
-  constructor(element) {
-    this._renderedOutput = element;
-    this._currentElement = element;
-
-    if (__DEV__) {
-      this._debugID = getNextDebugID();
-    }
-  }
-  mountComponent() {}
-  receiveComponent(element) {
-    this._renderedOutput = element;
-    this._currentElement = element;
-  }
-  unmountComponent() {}
-  getHostNode() {
-    return undefined;
-  }
-  getPublicInstance() {
-    return null;
-  }
-}
-
-var ShallowComponentWrapper = function(element) {
-  // TODO: Consolidate with instantiateReactComponent
-  if (__DEV__) {
-    this._debugID = getNextDebugID();
-  }
-
-  this.construct(element);
-};
-Object.assign(ShallowComponentWrapper.prototype, ReactCompositeComponent, {
-  _constructComponent: ReactCompositeComponent._constructComponentWithoutOwner,
-  _instantiateReactComponent: function(element) {
-    return new NoopInternalComponent(element);
-  },
-  _replaceNodeWithMarkup: function() {},
-  _renderValidatedComponent: ReactCompositeComponent._renderValidatedComponentWithoutOwnerOrContext,
-});
-
-function _batchedRender(renderer, element, context) {
-  var transaction = ReactUpdates.ReactReconcileTransaction.getPooled(true);
-  renderer._render(element, transaction, context);
-  ReactUpdates.ReactReconcileTransaction.release(transaction);
-}
-
-class ReactShallowRenderer {
-  _instance = null;
-  getMountedInstance() {
-    return this._instance ? this._instance._instance : null;
-  }
-  render(element, context) {
-    // Ensure we've done the default injections. This might not be true in the
-    // case of a simple test that only requires React and the TestUtils in
-    // conjunction with an inline-requires transform.
-    ReactDOMInjection.inject();
-    ReactDOMStackInjection.inject();
-
-    invariant(
-      React.isValidElement(element),
-      'ReactShallowRenderer render(): Invalid component element.%s',
-      typeof element === 'function'
-        ? ' Instead of passing a component class, make sure to instantiate ' +
-            'it by passing it to React.createElement.'
-        : '',
-    );
-    invariant(
-      typeof element.type !== 'string',
-      'ReactShallowRenderer render(): Shallow rendering works only with custom ' +
-        'components, not primitives (%s). Instead of calling `.render(el)` and ' +
-        'inspecting the rendered output, look at `el.props` directly instead.',
-      element.type,
-    );
-
-    if (!context) {
-      context = emptyObject;
-    }
-    ReactUpdates.batchedUpdates(_batchedRender, this, element, context);
-
-    return this.getRenderOutput();
-  }
-  getRenderOutput() {
-    return (this._instance &&
-      this._instance._renderedComponent &&
-      this._instance._renderedComponent._renderedOutput) ||
-      null;
-  }
-  unmount() {
-    if (this._instance) {
-      ReactReconciler.unmountComponent(
-        this._instance,
-        false /* safely */,
-        false /* skipLifecycle */,
-      );
-    }
-  }
-  _render(element, transaction, context) {
-    if (this._instance) {
-      ReactReconciler.receiveComponent(
-        this._instance,
-        element,
-        transaction,
-        context,
-      );
-    } else {
-      var instance = new ShallowComponentWrapper(element);
-      ReactReconciler.mountComponent(
-        instance,
-        transaction,
-        null,
-        null,
-        context,
-        0,
-      );
-      this._instance = instance;
-    }
-  }
-}
-
-module.exports = ReactShallowRenderer;

From 9bb7ca5001105bc803a273eda4fcebc64499cfc7 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <bvaughn@fb.com>
Date: Wed, 19 Apr 2017 19:03:04 -0700
Subject: [PATCH 125/153] Fix master (ran prettier)

---
 src/__mocks__/UIManager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/__mocks__/UIManager.js b/src/__mocks__/UIManager.js
index 74d4e162ee202..a513409ee112b 100644
--- a/src/__mocks__/UIManager.js
+++ b/src/__mocks__/UIManager.js
@@ -148,7 +148,7 @@ var RCTUIManager = {
   }),
   updateView: jest.fn(),
   removeSubviewsFromContainerWithID: jest.fn(function(parentTag) {
-    views.get(parentTag).children.forEach((tag) => removeChild(parentTag, tag));
+    views.get(parentTag).children.forEach(tag => removeChild(parentTag, tag));
   }),
   replaceExistingNonRootView: jest.fn(),
   __takeSnapshot: jest.fn(),

From a92128e7fb158f4aadc31e549ff96c4645cd9d83 Mon Sep 17 00:00:00 2001
From: Almero Steyn <almero.steyn@gmail.com>
Date: Thu, 20 Apr 2017 12:49:48 +0200
Subject: [PATCH 126/153] [Docs: Installation] Fix tabs responsive layout -
 Resubmit (#9458)

* [Docs: Installation] Fix tabs responsive layout

* Move tabs a pixel down

* Remove left margin on first tab

* Remove the long line

* Fix mobile styles
---
 docs/docs/installation.md | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/docs/docs/installation.md b/docs/docs/installation.md
index 615a1726ea859..bbbaf4cadc28b 100644
--- a/docs/docs/installation.md
+++ b/docs/docs/installation.md
@@ -23,21 +23,43 @@ React is flexible and can be used in a variety of projects. You can create new a
   <style>
     .toggler li {
        display: inline-block;
+       position: relative;
+       top: 1px;
        padding: 10px;
-       margin: 2px;
+       margin: 0px 2px 0px 2px;
        border: 1px solid #05A5D1;
-       border-radius: 3px;
+       border-bottom-color: transparent;
+       border-radius: 3px 3px 0px 0px;
        color: #05A5D1;
        background-color: transparent;
        font-size: 0.99em;
        cursor: pointer;
     }
+    .toggler li:first-child {
+      margin-left: 0;
+    }
+    .toggler li:last-child {
+      margin-right: 0;
+    }
     .toggler ul {
+      display: inline-block;
       list-style-type: none;
       margin: 0;
+      border-bottom: 1px solid #05A5D1;
+      cursor: default;
     }
-    .toggler li {
-      display: inline;
+    @media screen and (max-width: 960px) {
+      .toggler li,
+      .toggler li:first-child,
+      .toggler li:last-child {
+        display: block;
+        border-bottom-color: #05A5D1;
+        border-radius: 3px;
+        margin: 2px 0px 2px 0px;
+      }
+      .toggler ul {
+        border-bottom: 0;
+      }
     }
     .display-target-fiddle .toggler .button-fiddle:focus,
     .display-target-newapp .toggler .button-newapp:focus,

From e59506c478ce976c7dd65233f46fb94f055421e1 Mon Sep 17 00:00:00 2001
From: Dan Abramov <gaearon@fb.com>
Date: Thu, 20 Apr 2017 16:40:58 +0100
Subject: [PATCH 127/153] Bump prop-types

---
 package.json | 2 +-
 yarn.lock    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 7dba9499b1739..d3ee9d99cea40 100644
--- a/package.json
+++ b/package.json
@@ -73,7 +73,7 @@
     "object-assign": "^4.1.1",
     "platform": "^1.1.0",
     "prettier": "^0.22.0",
-    "prop-types": "^15.5.6",
+    "prop-types": "^15.5.8",
     "rimraf": "^2.6.1",
     "rollup": "^0.41.6",
     "rollup-plugin-alias": "^1.2.1",
diff --git a/yarn.lock b/yarn.lock
index bd8f7924ce013..b632d751b2ba5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3930,9 +3930,9 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
-prop-types@^15.5.6:
-  version "15.5.6"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.6.tgz#797a915b1714b645ebb7c5d6cc690346205bd2aa"
+prop-types@^15.5.8:
+  version "15.5.8"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.5.8.tgz#6b7b2e141083be38c8595aa51fc55775c7199394"
   dependencies:
     fbjs "^0.8.9"
 

From 32480a0462e94be510095c668e92061c02107597 Mon Sep 17 00:00:00 2001
From: Ben Alpert <ben@benalpert.com>
Date: Thu, 20 Apr 2017 09:49:46 -0700
Subject: [PATCH 128/153] Add component stack to invalid-object-child error
 (#9415)

https://twitter.com/EsaMatti/status/835952325525188608 (28 likes!)
---
 .../children/traverseAllChildren.js           | 27 +++++---------
 .../__tests__/ReactComponent-test.js          | 35 +++++++++++++++----
 .../__tests__/ReactMultiChild-test.js         |  7 ++--
 src/renderers/shared/fiber/ReactChildFiber.js | 24 ++-----------
 .../stack/reconciler/traverseStackChildren.js | 27 +++++---------
 5 files changed, 55 insertions(+), 65 deletions(-)

diff --git a/src/isomorphic/children/traverseAllChildren.js b/src/isomorphic/children/traverseAllChildren.js
index a68d1816d68ab..4f1692e2773fc 100644
--- a/src/isomorphic/children/traverseAllChildren.js
+++ b/src/isomorphic/children/traverseAllChildren.js
@@ -12,13 +12,18 @@
 'use strict';
 
 var REACT_ELEMENT_TYPE = require('ReactElementSymbol');
-var ReactCurrentOwner = require('ReactCurrentOwner');
 
 var getIteratorFn = require('getIteratorFn');
 var invariant = require('fbjs/lib/invariant');
 var KeyEscapeUtils = require('KeyEscapeUtils');
 var warning = require('fbjs/lib/warning');
 
+if (__DEV__) {
+  var {
+    getCurrentStackAddendum,
+  } = require('ReactComponentTreeHook');
+}
+
 var SEPARATOR = '.';
 var SUBSEPARATOR = ':';
 
@@ -114,21 +119,12 @@ function traverseAllChildrenImpl(
       if (__DEV__) {
         // Warn about using Maps as children
         if (iteratorFn === children.entries) {
-          let mapsAsChildrenAddendum = '';
-          if (ReactCurrentOwner.current) {
-            var mapsAsChildrenOwnerName = ReactCurrentOwner.current.getName();
-            if (mapsAsChildrenOwnerName) {
-              mapsAsChildrenAddendum = '\n\nCheck the render method of `' +
-                mapsAsChildrenOwnerName +
-                '`.';
-            }
-          }
           warning(
             didWarnAboutMaps,
             'Using Maps as children is unsupported and will likely yield ' +
               'unexpected results. Convert it to a sequence/iterable of keyed ' +
               'ReactElements instead.%s',
-            mapsAsChildrenAddendum,
+            getCurrentStackAddendum(),
           );
           didWarnAboutMaps = true;
         }
@@ -151,13 +147,8 @@ function traverseAllChildrenImpl(
       var addendum = '';
       if (__DEV__) {
         addendum = ' If you meant to render a collection of children, use an array ' +
-          'instead.';
-        if (ReactCurrentOwner.current) {
-          var name = ReactCurrentOwner.current.getName();
-          if (name) {
-            addendum += '\n\nCheck the render method of `' + name + '`.';
-          }
-        }
+          'instead.' +
+          getCurrentStackAddendum();
       }
       var childrenString = '' + children;
       invariant(
diff --git a/src/renderers/__tests__/ReactComponent-test.js b/src/renderers/__tests__/ReactComponent-test.js
index 50dcec84efa98..aaba580bde812 100644
--- a/src/renderers/__tests__/ReactComponent-test.js
+++ b/src/renderers/__tests__/ReactComponent-test.js
@@ -17,6 +17,10 @@ var ReactDOMFeatureFlags;
 var ReactTestUtils;
 
 describe('ReactComponent', () => {
+  function normalizeCodeLocInfo(str) {
+    return str && str.replace(/\(at .+?:\d+\)/g, '(at **)');
+  }
+
   beforeEach(() => {
     React = require('react');
     ReactDOM = require('react-dom');
@@ -389,10 +393,19 @@ describe('ReactComponent', () => {
     };
     var element = <div>{[children]}</div>;
     var container = document.createElement('div');
-    expect(() => ReactDOM.render(element, container)).toThrowError(
+    var ex;
+    try {
+      ReactDOM.render(element, container);
+    } catch (e) {
+      ex = e;
+    }
+    expect(ex).toBeDefined();
+    expect(normalizeCodeLocInfo(ex.message)).toBe(
       '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.',
+        '{x, y, z}). If you meant to render a collection of children, use ' +
+        'an array instead.' +
+        // Fiber gives a slightly better stack with the nearest host components
+        (ReactDOMFeatureFlags.useFiber ? '\n    in div (at **)' : ''),
     );
   });
 
@@ -408,10 +421,20 @@ describe('ReactComponent', () => {
       }
     }
     var container = document.createElement('div');
-    expect(() => ReactDOM.render(<Foo />, container)).toThrowError(
+    var ex;
+    try {
+      ReactDOM.render(<Foo />, container);
+    } catch (e) {
+      ex = e;
+    }
+    expect(ex).toBeDefined();
+    expect(normalizeCodeLocInfo(ex.message)).toBe(
       '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.\n\nCheck the render method of `Foo`.',
+        '{a, b, c}). If you meant to render a collection of children, use ' +
+        'an array instead.\n' +
+        // Fiber gives a slightly better stack with the nearest host components
+        (ReactDOMFeatureFlags.useFiber ? '    in div (at **)\n' : '') +
+        '    in Foo (at **)',
     );
   });
 });
diff --git a/src/renderers/__tests__/ReactMultiChild-test.js b/src/renderers/__tests__/ReactMultiChild-test.js
index d3c408f7ac203..f8262f8b8a167 100644
--- a/src/renderers/__tests__/ReactMultiChild-test.js
+++ b/src/renderers/__tests__/ReactMultiChild-test.js
@@ -274,10 +274,13 @@ describe('ReactMultiChild', () => {
     var container = document.createElement('div');
     ReactDOM.render(<Parent />, container);
     expectDev(console.error.calls.count()).toBe(1);
-    expectDev(console.error.calls.argsFor(0)[0]).toBe(
+    expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
       'Warning: Using Maps as children is unsupported and will likely yield ' +
         'unexpected results. Convert it to a sequence/iterable of keyed ' +
-        'ReactElements instead.\n\nCheck the render method of `Parent`.',
+        'ReactElements instead.\n' +
+        // Fiber gives a slightly better stack with the nearest host components
+        (ReactDOMFeatureFlags.useFiber ? '    in div (at **)\n' : '') +
+        '    in Parent (at **)',
     );
   });
 
diff --git a/src/renderers/shared/fiber/ReactChildFiber.js b/src/renderers/shared/fiber/ReactChildFiber.js
index 347722fed0419..7e8469e3fa2c3 100644
--- a/src/renderers/shared/fiber/ReactChildFiber.js
+++ b/src/renderers/shared/fiber/ReactChildFiber.js
@@ -36,11 +36,9 @@ var emptyObject = require('fbjs/lib/emptyObject');
 var getIteratorFn = require('getIteratorFn');
 var invariant = require('fbjs/lib/invariant');
 var ReactFeatureFlags = require('ReactFeatureFlags');
-var {ReactCurrentOwner} = require('ReactGlobalSharedState');
 
 if (__DEV__) {
   var {getCurrentFiberStackAddendum} = require('ReactDebugCurrentFiber');
-  var getComponentName = require('getComponentName');
   var warning = require('fbjs/lib/warning');
   var didWarnAboutMaps = false;
   /**
@@ -164,14 +162,8 @@ function throwOnInvalidObjectType(returnFiber: Fiber, newChild: Object) {
     let addendum = '';
     if (__DEV__) {
       addendum = ' If you meant to render a collection of children, use an array ' +
-        'instead.';
-      const owner = ReactCurrentOwner.owner || returnFiber._debugOwner;
-      if (owner && typeof owner.tag === 'number') {
-        const name = getComponentName((owner: any));
-        if (name) {
-          addendum += '\n\nCheck the render method of `' + name + '`.';
-        }
-      }
+        'instead.' +
+        (getCurrentFiberStackAddendum() || '');
     }
     invariant(
       false,
@@ -854,22 +846,12 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       if (typeof newChildrenIterable.entries === 'function') {
         const possibleMap = (newChildrenIterable: any);
         if (possibleMap.entries === iteratorFn) {
-          let mapsAsChildrenAddendum = '';
-          const owner = ReactCurrentOwner.owner || returnFiber._debugOwner;
-          if (owner && typeof owner.tag === 'number') {
-            const mapsAsChildrenOwnerName = getComponentName((owner: any));
-            if (mapsAsChildrenOwnerName) {
-              mapsAsChildrenAddendum = '\n\nCheck the render method of `' +
-                mapsAsChildrenOwnerName +
-                '`.';
-            }
-          }
           warning(
             didWarnAboutMaps,
             'Using Maps as children is unsupported and will likely yield ' +
               'unexpected results. Convert it to a sequence/iterable of keyed ' +
               'ReactElements instead.%s',
-            mapsAsChildrenAddendum,
+            getCurrentFiberStackAddendum(),
           );
           didWarnAboutMaps = true;
         }
diff --git a/src/renderers/shared/stack/reconciler/traverseStackChildren.js b/src/renderers/shared/stack/reconciler/traverseStackChildren.js
index b717ea28fbc02..3bf7550ae3817 100644
--- a/src/renderers/shared/stack/reconciler/traverseStackChildren.js
+++ b/src/renderers/shared/stack/reconciler/traverseStackChildren.js
@@ -12,13 +12,18 @@
 'use strict';
 
 var REACT_ELEMENT_TYPE = require('ReactElementSymbol');
-var {ReactCurrentOwner} = require('ReactGlobalSharedState');
 
 var getIteratorFn = require('getIteratorFn');
 var invariant = require('fbjs/lib/invariant');
 var KeyEscapeUtils = require('KeyEscapeUtils');
 var warning = require('fbjs/lib/warning');
 
+if (__DEV__) {
+  var {
+    getCurrentStackAddendum,
+  } = require('ReactGlobalSharedState').ReactComponentTreeHook;
+}
+
 var SEPARATOR = '.';
 var SUBSEPARATOR = ':';
 
@@ -114,21 +119,12 @@ function traverseStackChildrenImpl(
       if (__DEV__) {
         // Warn about using Maps as children
         if (iteratorFn === children.entries) {
-          let mapsAsChildrenAddendum = '';
-          if (ReactCurrentOwner.current) {
-            var mapsAsChildrenOwnerName = ReactCurrentOwner.current.getName();
-            if (mapsAsChildrenOwnerName) {
-              mapsAsChildrenAddendum = '\n\nCheck the render method of `' +
-                mapsAsChildrenOwnerName +
-                '`.';
-            }
-          }
           warning(
             didWarnAboutMaps,
             'Using Maps as children is unsupported and will likely yield ' +
               'unexpected results. Convert it to a sequence/iterable of keyed ' +
               'ReactElements instead.%s',
-            mapsAsChildrenAddendum,
+            getCurrentStackAddendum(),
           );
           didWarnAboutMaps = true;
         }
@@ -151,13 +147,8 @@ function traverseStackChildrenImpl(
       var addendum = '';
       if (__DEV__) {
         addendum = ' If you meant to render a collection of children, use an array ' +
-          'instead.';
-        if (ReactCurrentOwner.current) {
-          var name = ReactCurrentOwner.current.getName();
-          if (name) {
-            addendum += '\n\nCheck the render method of `' + name + '`.';
-          }
-        }
+          'instead.' +
+          getCurrentStackAddendum();
       }
       var childrenString = '' + children;
       invariant(

From b1768b5a48d1f82e4ef4150e0036c5f846d3758a Mon Sep 17 00:00:00 2001
From: Ben Alpert <ben@benalpert.com>
Date: Thu, 20 Apr 2017 11:18:33 -0700
Subject: [PATCH 129/153] Prettier 1.2 (#9462)

---
 package.json                                  |  2 +-
 .../dev-expression-with-codes-test.js         |  3 +-
 scripts/facts-tracker/index.js                | 12 ++--
 scripts/jest/preprocessor.js                  |  3 +-
 scripts/jest/setupSpecEquivalenceReporter.js  |  2 +-
 scripts/jest/ts-preprocessor.js               |  6 +-
 scripts/rollup/build.js                       |  7 +-
 scripts/rollup/packaging.js                   |  6 +-
 .../shims/facebook-www/EventPluginHub.js      |  3 +-
 .../shims/facebook-www/EventPluginUtils.js    |  3 +-
 .../shims/facebook-www/EventPropagators.js    |  3 +-
 .../facebook-www/ReactBrowserEventEmitter.js  |  3 +-
 .../shims/facebook-www/ReactChildren.js       |  7 +-
 .../facebook-www/ReactDOMComponentTree.js     |  3 +-
 .../facebook-www/ReactDOMInputSelection.js    |  3 +-
 .../shims/facebook-www/ReactDOMSelection.js   |  3 +-
 .../rollup/shims/facebook-www/ReactElement.js |  6 +-
 .../shims/facebook-www/ReactErrorUtils.js     |  3 +-
 .../facebook-www/ReactFiberErrorLogger.js     |  3 +-
 .../shims/facebook-www/ReactInputSelection.js |  3 +-
 .../shims/facebook-www/ReactInstanceMap.js    |  3 +-
 .../rollup/shims/facebook-www/ReactPerf.js    |  3 +-
 .../shims/facebook-www/SyntheticEvent.js      |  3 +-
 .../facebook-www/SyntheticKeyboardEvent.js    |  3 +-
 .../shims/facebook-www/SyntheticMouseEvent.js |  3 +-
 .../shims/facebook-www/SyntheticUIEvent.js    |  3 +-
 .../rollup/shims/facebook-www/findDOMNode.js  |  4 +-
 .../shims/facebook-www/flattenChildren.js     |  7 +-
 .../shims/facebook-www/getComponentName.js    |  7 +-
 .../shims/facebook-www/getEventCharCode.js    |  3 +-
 .../shims/facebook-www/getEventTarget.js      |  3 +-
 .../getVendorPrefixedEventName.js             |  3 +-
 .../shims/facebook-www/isEventSupported.js    |  3 +-
 .../rollup/shims/facebook-www/setInnerHTML.js |  3 +-
 .../shims/facebook-www/setTextContent.js      |  3 +-
 .../shims/react-native/NativeMethodsMixin.js  |  3 +-
 .../shims/react-native/ReactDebugTool.js      |  3 +-
 .../shims/react-native/ReactErrorUtils.js     |  3 +-
 .../react-native/ReactNativeComponentTree.js  |  3 +-
 .../react-native/ReactNativePropRegistry.js   |  3 +-
 .../shims/react-native/TouchHistoryMath.js    |  3 +-
 .../createReactNativeComponentClass.js        |  3 +-
 .../shims/react-native/findNodeHandle.js      |  3 +-
 .../ReactDebugCurrentFrameRollupShim.js       |  3 +-
 scripts/rollup/stats.js                       |  6 +-
 scripts/tasks/version-check.js                |  9 ++-
 src/__mocks__/UIManager.js                    | 17 +++--
 .../children/__tests__/ReactChildren-test.js  |  6 +-
 .../children/traverseAllChildren.js           |  7 +-
 .../create-react-class-integration-test.js    |  3 +-
 .../classic/element/ReactElement.js           |  6 +-
 .../classic/element/ReactElementValidator.js  | 11 ++--
 .../element/__tests__/ReactElement-test.js    |  2 +-
 .../types/__tests__/ReactPropTypes-test.js    |  9 ++-
 .../element/__tests__/ReactJSXElement-test.js |  2 +-
 .../__tests__/ReactComponent-test.js          | 10 +--
 .../ReactComponentTreeHook-test.native.js     |  5 +-
 .../__tests__/ReactCompositeComponent-test.js |  8 ++-
 .../ReactCompositeComponentState-test.js      | 11 ++--
 .../__tests__/ReactErrorBoundaries-test.js    |  2 +-
 src/renderers/__tests__/ReactIdentity-test.js |  9 +--
 .../ReactMultiChildReconcile-test.js          | 11 ++--
 src/renderers/__tests__/ReactUpdates-test.js  |  4 +-
 .../__tests__/refs-destruction-test.js        | 35 ++++------
 src/renderers/art/ReactARTFiber.js            | 15 +++--
 src/renderers/art/ReactARTStack.js            | 12 ++--
 src/renderers/dom/ReactDOM.js                 |  9 +--
 src/renderers/dom/fiber/ReactDOMFiber.js      | 23 +++----
 .../dom/fiber/ReactDOMFiberComponent.js       | 13 ++--
 .../dom/fiber/__tests__/ReactDOMFiber-test.js | 31 +++++----
 .../dom/shared/CSSPropertyOperations.js       |  7 +-
 src/renderers/dom/shared/DOMProperty.js       |  3 +-
 .../dom/shared/DOMPropertyOperations.js       | 12 ++--
 .../dom/shared/HTMLDOMPropertyConfig.js       |  6 +-
 .../dom/shared/ReactBrowserEventEmitter.js    | 10 ++-
 .../dom/shared/ReactDOMComponentTree.js       |  8 ++-
 .../dom/shared/ReactInputSelection.js         |  6 +-
 .../ReactBrowserEventEmitter-test.js          |  6 +-
 .../dom/shared/__tests__/ReactDOM-test.js     |  4 +-
 .../__tests__/ReactDOMComponent-test.js       |  2 +-
 .../dom/shared/__tests__/ReactDOMSVG-test.js  | 54 ++++++++--------
 .../ReactDOMServerIntegration-test.js         | 43 +++++++------
 .../__tests__/ReactEventListener-test.js      | 40 +++++++-----
 .../__tests__/ReactRenderDocument-test.js     |  3 +-
 .../eventPlugins/BeforeInputEventPlugin.js    | 22 ++++---
 .../shared/eventPlugins/ChangeEventPlugin.js  | 14 ++--
 .../shared/eventPlugins/SelectEventPlugin.js  | 12 ++--
 .../__tests__/BeforeInputEventPlugin-test.js  |  5 +-
 .../shared/hooks/ReactDOMInvalidARIAHook.js   |  4 +-
 .../dom/shared/inputValueTracking.js          |  6 +-
 src/renderers/dom/shared/setInnerHTML.js      |  4 +-
 .../syntheticEvents/SyntheticMouseEvent.js    |  6 +-
 .../utils/ReactControlledValuePropTypes.js    |  5 +-
 .../dom/shared/utils/isEventSupported.js      |  3 +-
 .../dom/shared/validateDOMNesting.js          | 64 ++++++++++---------
 .../wrappers/__tests__/ReactDOMInput-test.js  | 12 ++--
 .../dom/stack/client/DOMChildrenOperations.js | 23 +++----
 src/renderers/dom/stack/client/DOMLazyTree.js | 53 +++++++--------
 .../dom/stack/client/ReactDOMComponent.js     |  9 ++-
 .../stack/client/ReactDOMStackInjection.js    | 10 +--
 .../dom/stack/client/ReactDOMTextComponent.js |  9 ++-
 src/renderers/dom/stack/client/ReactMount.js  | 35 ++++++----
 .../stack/client/wrappers/ReactDOMInput.js    |  3 +-
 .../stack/client/wrappers/ReactDOMSelect.js   |  3 +-
 .../stack/client/wrappers/ReactDOMTextarea.js |  3 +-
 .../dom/stack/server/ReactServerRendering.js  | 41 ++++++------
 src/renderers/dom/test/ReactTestUtils.js      | 23 ++++---
 src/renderers/native/NativeMethodsMixin.js    |  3 +-
 .../native/NativeMethodsMixinUtils.js         |  6 +-
 .../native/ReactNativeAttributePayload.js     |  3 +-
 .../native/ReactNativeBridgeEventPlugin.js    |  5 +-
 src/renderers/native/ReactNativeFiber.js      |  7 +-
 .../native/ReactNativeFiberHostComponent.js   |  5 +-
 .../native/__tests__/ReactNativeMount-test.js |  2 +-
 src/renderers/noop/ReactNoop.js               |  9 ++-
 .../shared/ReactDOMFrameScheduling.js         |  3 +-
 src/renderers/shared/ReactDebugTool.js        | 42 ++++++------
 .../shared/ReactGlobalSharedState.js          |  3 +-
 src/renderers/shared/ReactPerf.js             | 15 +++--
 src/renderers/shared/fiber/ReactChildFiber.js | 51 +++++++--------
 .../shared/fiber/ReactDebugFiberPerf.js       |  3 +-
 src/renderers/shared/fiber/ReactFiber.js      | 19 +++---
 .../shared/fiber/ReactFiberBeginWork.js       | 32 ++++------
 .../shared/fiber/ReactFiberClassComponent.js  | 34 +++++-----
 .../shared/fiber/ReactFiberCommitWork.js      | 14 ++--
 .../shared/fiber/ReactFiberCompleteWork.js    | 10 +--
 .../shared/fiber/ReactFiberContext.js         | 24 ++-----
 .../shared/fiber/ReactFiberErrorLogger.js     | 15 ++---
 .../shared/fiber/ReactFiberHostContext.js     | 11 +---
 .../shared/fiber/ReactFiberReconciler.js      | 18 ++----
 .../shared/fiber/ReactFiberScheduler.js       | 24 ++++---
 .../shared/fiber/ReactFiberTreeReflection.js  |  5 +-
 .../shared/fiber/ReactFiberUpdateQueue.js     |  7 +-
 .../fiber/__tests__/ReactCoroutine-test.js    |  2 +-
 .../fiber/__tests__/ReactIncremental-test.js  | 11 ++--
 .../ReactIncrementalErrorHandling-test.js     |  2 +-
 .../__tests__/ReactIncrementalPerf-test.js    | 16 +++--
 .../ReactIncrementalReflection-test.js        |  6 +-
 .../ReactIncrementalSideEffects-test.js       |  2 +-
 .../shared/fiber/isomorphic/ReactCoroutine.js | 12 ++--
 .../shared/fiber/isomorphic/ReactPortal.js    | 11 ++--
 .../hooks/ReactHostOperationHistoryHook.js    | 22 +++----
 .../shared/shared/event/EventPluginHub.js     |  9 ++-
 .../shared/event/EventPluginRegistry.js       |  5 +-
 .../shared/shared/event/EventPluginUtils.js   |  6 +-
 .../shared/shared/event/EventPropagators.js   |  5 +-
 .../shared/event/ReactSyntheticEventType.js   | 18 +++---
 .../eventPlugins/ResponderEventPlugin.js      | 25 +++++---
 .../ResponderTouchHistoryStore.js             | 11 +---
 .../__tests__/ResponderEventPlugin-test.js    | 10 ++-
 .../shared/shouldUpdateReactComponent.js      |  6 +-
 .../stack/reconciler/ReactChildReconciler.js  | 12 ++--
 .../reconciler/ReactComponentEnvironment.js   |  6 +-
 .../reconciler/ReactCompositeComponent.js     | 16 +++--
 .../shared/stack/reconciler/ReactRef.js       | 11 ++--
 .../stack/reconciler/ReactUpdateQueue.js      |  3 +-
 .../shared/stack/reconciler/Transaction.js    | 18 +++---
 .../stack/reconciler/flattenStackChildren.js  |  6 +-
 .../reconciler/instantiateReactComponent.js   |  9 ++-
 .../stack/reconciler/traverseStackChildren.js |  3 +-
 src/renderers/shared/utils/adler32.js         |  7 +-
 src/renderers/testing/ReactShallowRenderer.js |  6 +-
 src/shared/ReactFiberComponentTreeHook.js     |  6 +-
 src/shared/utils/PooledClass.js               |  2 +-
 src/shared/utils/ReactElementSymbol.js        |  5 +-
 src/shared/utils/getIteratorFn.js             |  3 +-
 src/shared/utils/reactProdInvariant.js        |  6 +-
 yarn.lock                                     | 42 ++++++------
 168 files changed, 911 insertions(+), 813 deletions(-)

diff --git a/package.json b/package.json
index d3ee9d99cea40..9b1b96edd9733 100644
--- a/package.json
+++ b/package.json
@@ -72,7 +72,7 @@
     "ncp": "^2.0.0",
     "object-assign": "^4.1.1",
     "platform": "^1.1.0",
-    "prettier": "^0.22.0",
+    "prettier": "^1.2.2",
     "prop-types": "^15.5.8",
     "rimraf": "^2.6.1",
     "rollup": "^0.41.6",
diff --git a/scripts/error-codes/__tests__/dev-expression-with-codes-test.js b/scripts/error-codes/__tests__/dev-expression-with-codes-test.js
index f91d5e39a5938..49bc43d979609 100644
--- a/scripts/error-codes/__tests__/dev-expression-with-codes-test.js
+++ b/scripts/error-codes/__tests__/dev-expression-with-codes-test.js
@@ -76,7 +76,8 @@ var invariant = require('invariant');`
   });
 
   it('should only add `reactProdInvariant` once', () => {
-    var expectedInvariantTransformResult = '!condition ? ' +
+    var expectedInvariantTransformResult =
+      '!condition ? ' +
       "process.env.NODE_ENV !== 'production' ? " +
       "invariant(false, 'Do not override existing functions.') : " +
       `_prodInvariant('16') : void 0;`;
diff --git a/scripts/facts-tracker/index.js b/scripts/facts-tracker/index.js
index fc47e43e1697e..5c52a37709c3c 100644
--- a/scripts/facts-tracker/index.js
+++ b/scripts/facts-tracker/index.js
@@ -29,8 +29,9 @@ var isCI = !!process.env.TRAVIS_REPO_SLUG;
 
 if (isCI) {
   var branch = process.env.TRAVIS_BRANCH || process.env.CIRCLE_BRANCH;
-  var isPullRequest = (!!process.env.TRAVIS_PULL_REQUEST &&
-    process.env.TRAVIS_PULL_REQUEST !== 'false') ||
+  var isPullRequest =
+    (!!process.env.TRAVIS_PULL_REQUEST &&
+      process.env.TRAVIS_PULL_REQUEST !== 'false') ||
     !!process.env.CI_PULL_REQUEST;
 
   if (branch !== 'master') {
@@ -117,7 +118,8 @@ function checkoutFactsFolder() {
   if (!fs.existsSync(factsFolder)) {
     var repoURL;
     if (isCI) {
-      repoURL = 'https://' +
+      repoURL =
+        'https://' +
         process.env.GITHUB_USER +
         '@github.com/' +
         repoSlug +
@@ -165,8 +167,8 @@ for (var i = 2; i < process.argv.length; i += 2) {
   } catch (e) {
     // ignore error
   }
-  var lastValue = lastLine &&
-    lastLine.replace(/^[^\t]+\t[^\t]+\t/, '').slice(0, -1); // commit hash \t timestamp \t // trailing \n
+  var lastValue =
+    lastLine && lastLine.replace(/^[^\t]+\t[^\t]+\t/, '').slice(0, -1); // commit hash \t timestamp \t // trailing \n
 
   if (value !== lastValue) {
     fs.appendFileSync(
diff --git a/scripts/jest/preprocessor.js b/scripts/jest/preprocessor.js
index 7adc47e443471..5f661d1aabbf4 100644
--- a/scripts/jest/preprocessor.js
+++ b/scripts/jest/preprocessor.js
@@ -66,7 +66,8 @@ module.exports = {
       return tsPreprocessor.compile(src, filePath);
     }
     if (
-      !filePath.match(/\/node_modules\//) && !filePath.match(/\/third_party\//)
+      !filePath.match(/\/node_modules\//) &&
+      !filePath.match(/\/third_party\//)
     ) {
       // for test files, we also apply the async-await transform, but we want to
       // make sure we don't accidentally apply that transform to product code.
diff --git a/scripts/jest/setupSpecEquivalenceReporter.js b/scripts/jest/setupSpecEquivalenceReporter.js
index 6f32fd38bf741..f432e3150d466 100644
--- a/scripts/jest/setupSpecEquivalenceReporter.js
+++ b/scripts/jest/setupSpecEquivalenceReporter.js
@@ -18,7 +18,7 @@ global.expect = function() {
   return expect.apply(this, arguments);
 };
 
-beforeEach(() => numExpectations = 0);
+beforeEach(() => (numExpectations = 0));
 
 jasmine.currentEnv_.addReporter({
   specDone: spec => {
diff --git a/scripts/jest/ts-preprocessor.js b/scripts/jest/ts-preprocessor.js
index 29ad307a9a392..1345888c2c0d9 100644
--- a/scripts/jest/ts-preprocessor.js
+++ b/scripts/jest/ts-preprocessor.js
@@ -10,11 +10,13 @@ var tsOptions = {
 };
 
 function formatErrorMessage(error) {
-  return error.file.filename +
+  return (
+    error.file.filename +
     '(' +
     error.file.getLineAndCharacterOfPosition(error.start).line +
     '): ' +
-    error.messageText;
+    error.messageText
+  );
 }
 
 function compile(content, contentFilename) {
diff --git a/scripts/rollup/build.js b/scripts/rollup/build.js
index 7f3055b099239..47ff46952912f 100644
--- a/scripts/rollup/build.js
+++ b/scripts/rollup/build.js
@@ -327,8 +327,8 @@ function createBundle(bundle, bundleType) {
   }
 
   const filename = getFilename(bundle.name, bundle.hasteName, bundleType);
-  const logKey = chalk.white.bold(filename) +
-    chalk.dim(` (${bundleType.toLowerCase()})`);
+  const logKey =
+    chalk.white.bold(filename) + chalk.dim(` (${bundleType.toLowerCase()})`);
   const format = getFormat(bundleType);
   const packageName = Packaging.getPackageName(bundle.name);
 
@@ -362,7 +362,8 @@ function createBundle(bundle, bundleType) {
           bundleType,
           bundle.hasteName
         )
-      ))
+      )
+    )
     .then(() => Packaging.createNodePackage(bundleType, packageName, filename))
     .then(() => {
       console.log(`${chalk.bgGreen.black(' COMPLETE ')} ${logKey}\n`);
diff --git a/scripts/rollup/packaging.js b/scripts/rollup/packaging.js
index 46d1c5ecfc59b..d8510607aabcd 100644
--- a/scripts/rollup/packaging.js
+++ b/scripts/rollup/packaging.js
@@ -126,7 +126,8 @@ function copyNodePackageTemplate(packageName) {
       Promise.all([
         asyncCopyTo(resolve('./LICENSE'), `${to}/LICENSE`),
         asyncCopyTo(resolve('./PATENTS'), `${to}/PATENTS`),
-      ]));
+      ])
+    );
   } else {
     return Promise.resolve();
   }
@@ -136,7 +137,8 @@ function createNodePackage(bundleType, packageName, filename) {
   // the only case where we don't want to copy the package is for FB bundles
   if (bundleType !== FB_DEV && bundleType !== FB_PROD) {
     return copyNodePackageTemplate(packageName).then(() =>
-      copyBundleIntoNodePackage(packageName, filename, bundleType));
+      copyBundleIntoNodePackage(packageName, filename, bundleType)
+    );
   }
   return Promise.resolve();
 }
diff --git a/scripts/rollup/shims/facebook-www/EventPluginHub.js b/scripts/rollup/shims/facebook-www/EventPluginHub.js
index e332f5ec802c2..6c1858387b902 100644
--- a/scripts/rollup/shims/facebook-www/EventPluginHub.js
+++ b/scripts/rollup/shims/facebook-www/EventPluginHub.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactDOM-fb');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.EventPluginHub;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.EventPluginHub;
diff --git a/scripts/rollup/shims/facebook-www/EventPluginUtils.js b/scripts/rollup/shims/facebook-www/EventPluginUtils.js
index 610db82c3adb8..d66e8cdfa195f 100644
--- a/scripts/rollup/shims/facebook-www/EventPluginUtils.js
+++ b/scripts/rollup/shims/facebook-www/EventPluginUtils.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactDOM-fb');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.EventPluginUtils;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.EventPluginUtils;
diff --git a/scripts/rollup/shims/facebook-www/EventPropagators.js b/scripts/rollup/shims/facebook-www/EventPropagators.js
index a7c17e26561cf..5eb2309427416 100644
--- a/scripts/rollup/shims/facebook-www/EventPropagators.js
+++ b/scripts/rollup/shims/facebook-www/EventPropagators.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactDOM-fb');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.EventPropagators;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.EventPropagators;
diff --git a/scripts/rollup/shims/facebook-www/ReactBrowserEventEmitter.js b/scripts/rollup/shims/facebook-www/ReactBrowserEventEmitter.js
index ce214f4ea198c..fbc731f10db9c 100644
--- a/scripts/rollup/shims/facebook-www/ReactBrowserEventEmitter.js
+++ b/scripts/rollup/shims/facebook-www/ReactBrowserEventEmitter.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactDOM-fb');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactBrowserEventEmitter;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactBrowserEventEmitter;
diff --git a/scripts/rollup/shims/facebook-www/ReactChildren.js b/scripts/rollup/shims/facebook-www/ReactChildren.js
index 021b8e6262816..69fec72c99c4a 100644
--- a/scripts/rollup/shims/facebook-www/ReactChildren.js
+++ b/scripts/rollup/shims/facebook-www/ReactChildren.js
@@ -11,10 +11,9 @@
 
 'use strict';
 
-const {
-  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
-} = require('React');
+const {__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED} = require('React');
 
 // TODO: can't reexport public API because of
 // mapIntoWithKeyPrefixInternal() dependency in an addon.
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactChildren;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactChildren;
diff --git a/scripts/rollup/shims/facebook-www/ReactDOMComponentTree.js b/scripts/rollup/shims/facebook-www/ReactDOMComponentTree.js
index 9f3f214d6a00e..21f4c6cc31de0 100644
--- a/scripts/rollup/shims/facebook-www/ReactDOMComponentTree.js
+++ b/scripts/rollup/shims/facebook-www/ReactDOMComponentTree.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactDOM-fb');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactDOMComponentTree;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactDOMComponentTree;
diff --git a/scripts/rollup/shims/facebook-www/ReactDOMInputSelection.js b/scripts/rollup/shims/facebook-www/ReactDOMInputSelection.js
index 2725fd4d6ca8a..f7eca08810101 100644
--- a/scripts/rollup/shims/facebook-www/ReactDOMInputSelection.js
+++ b/scripts/rollup/shims/facebook-www/ReactDOMInputSelection.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactDOM-fb');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactDOMInputSelection;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactDOMInputSelection;
diff --git a/scripts/rollup/shims/facebook-www/ReactDOMSelection.js b/scripts/rollup/shims/facebook-www/ReactDOMSelection.js
index 71c5fd1a60cc2..f1d54a8e915be 100644
--- a/scripts/rollup/shims/facebook-www/ReactDOMSelection.js
+++ b/scripts/rollup/shims/facebook-www/ReactDOMSelection.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactDOM-fb');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactDOMSelection;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactDOMSelection;
diff --git a/scripts/rollup/shims/facebook-www/ReactElement.js b/scripts/rollup/shims/facebook-www/ReactElement.js
index 6a872652c1a76..41c490cf8eaa2 100644
--- a/scripts/rollup/shims/facebook-www/ReactElement.js
+++ b/scripts/rollup/shims/facebook-www/ReactElement.js
@@ -10,11 +10,7 @@
  */
 'use strict';
 
-const {
-  createElement,
-  createFactory,
-  isValidElement,
-} = require('React');
+const {createElement, createFactory, isValidElement} = require('React');
 
 module.exports = {
   createElement,
diff --git a/scripts/rollup/shims/facebook-www/ReactErrorUtils.js b/scripts/rollup/shims/facebook-www/ReactErrorUtils.js
index 0adabdd3974ee..c445fd3b23beb 100644
--- a/scripts/rollup/shims/facebook-www/ReactErrorUtils.js
+++ b/scripts/rollup/shims/facebook-www/ReactErrorUtils.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactDOM-fb');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactErrorUtils;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactErrorUtils;
diff --git a/scripts/rollup/shims/facebook-www/ReactFiberErrorLogger.js b/scripts/rollup/shims/facebook-www/ReactFiberErrorLogger.js
index a66686a9c4b39..f6a78cbc83e32 100644
--- a/scripts/rollup/shims/facebook-www/ReactFiberErrorLogger.js
+++ b/scripts/rollup/shims/facebook-www/ReactFiberErrorLogger.js
@@ -22,5 +22,6 @@ const ReactFiberErrorLoggerStackShim = {
   },
 };
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactFiberErrorLogger ||
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactFiberErrorLogger ||
   ReactFiberErrorLoggerStackShim;
diff --git a/scripts/rollup/shims/facebook-www/ReactInputSelection.js b/scripts/rollup/shims/facebook-www/ReactInputSelection.js
index a43bf82265a83..91cc838737148 100644
--- a/scripts/rollup/shims/facebook-www/ReactInputSelection.js
+++ b/scripts/rollup/shims/facebook-www/ReactInputSelection.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactDOM-fb');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactInputSelection;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactInputSelection;
diff --git a/scripts/rollup/shims/facebook-www/ReactInstanceMap.js b/scripts/rollup/shims/facebook-www/ReactInstanceMap.js
index 4543e981857d3..b27f100db8589 100644
--- a/scripts/rollup/shims/facebook-www/ReactInstanceMap.js
+++ b/scripts/rollup/shims/facebook-www/ReactInstanceMap.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactDOM-fb');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactInstanceMap;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactInstanceMap;
diff --git a/scripts/rollup/shims/facebook-www/ReactPerf.js b/scripts/rollup/shims/facebook-www/ReactPerf.js
index 6dc81d72b8852..699d6a35b1b2a 100644
--- a/scripts/rollup/shims/facebook-www/ReactPerf.js
+++ b/scripts/rollup/shims/facebook-www/ReactPerf.js
@@ -34,5 +34,6 @@ const ReactPerfFiberShim = {
   getMeasurementsSummaryMap: emptyFunction,
 };
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactPerf ||
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactPerf ||
   ReactPerfFiberShim;
diff --git a/scripts/rollup/shims/facebook-www/SyntheticEvent.js b/scripts/rollup/shims/facebook-www/SyntheticEvent.js
index dc59584824220..0984fbd773b37 100644
--- a/scripts/rollup/shims/facebook-www/SyntheticEvent.js
+++ b/scripts/rollup/shims/facebook-www/SyntheticEvent.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactDOM-fb');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.SyntheticEvent;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.SyntheticEvent;
diff --git a/scripts/rollup/shims/facebook-www/SyntheticKeyboardEvent.js b/scripts/rollup/shims/facebook-www/SyntheticKeyboardEvent.js
index f5ce292759126..db42cccf64f54 100644
--- a/scripts/rollup/shims/facebook-www/SyntheticKeyboardEvent.js
+++ b/scripts/rollup/shims/facebook-www/SyntheticKeyboardEvent.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactDOM-fb');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.SyntheticKeyboardEvent;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.SyntheticKeyboardEvent;
diff --git a/scripts/rollup/shims/facebook-www/SyntheticMouseEvent.js b/scripts/rollup/shims/facebook-www/SyntheticMouseEvent.js
index 0d371be43dde4..41088848a84db 100644
--- a/scripts/rollup/shims/facebook-www/SyntheticMouseEvent.js
+++ b/scripts/rollup/shims/facebook-www/SyntheticMouseEvent.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactDOM-fb');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.SyntheticMouseEvent;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.SyntheticMouseEvent;
diff --git a/scripts/rollup/shims/facebook-www/SyntheticUIEvent.js b/scripts/rollup/shims/facebook-www/SyntheticUIEvent.js
index 82a98fb3e3a8e..65f05b366090b 100644
--- a/scripts/rollup/shims/facebook-www/SyntheticUIEvent.js
+++ b/scripts/rollup/shims/facebook-www/SyntheticUIEvent.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactDOM-fb');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.SyntheticUIEvent;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.SyntheticUIEvent;
diff --git a/scripts/rollup/shims/facebook-www/findDOMNode.js b/scripts/rollup/shims/facebook-www/findDOMNode.js
index 4ce72fd0d9643..2e698f724aa3f 100644
--- a/scripts/rollup/shims/facebook-www/findDOMNode.js
+++ b/scripts/rollup/shims/facebook-www/findDOMNode.js
@@ -11,8 +11,6 @@
 
 'use strict';
 
-const {
-  findDOMNode,
-} = require('ReactDOM-fb');
+const {findDOMNode} = require('ReactDOM-fb');
 
 module.exports = findDOMNode;
diff --git a/scripts/rollup/shims/facebook-www/flattenChildren.js b/scripts/rollup/shims/facebook-www/flattenChildren.js
index e0e76d6f17c72..a87bac81673b0 100644
--- a/scripts/rollup/shims/facebook-www/flattenChildren.js
+++ b/scripts/rollup/shims/facebook-www/flattenChildren.js
@@ -11,8 +11,7 @@
 
 'use strict';
 
-const {
-  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
-} = require('React');
+const {__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED} = require('React');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.flattenChildren;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.flattenChildren;
diff --git a/scripts/rollup/shims/facebook-www/getComponentName.js b/scripts/rollup/shims/facebook-www/getComponentName.js
index 9dcdbb8f9afb4..ec4d804719048 100644
--- a/scripts/rollup/shims/facebook-www/getComponentName.js
+++ b/scripts/rollup/shims/facebook-www/getComponentName.js
@@ -11,8 +11,7 @@
 
 'use strict';
 
-const {
-  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
-} = require('React');
+const {__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED} = require('React');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.getComponentName;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.getComponentName;
diff --git a/scripts/rollup/shims/facebook-www/getEventCharCode.js b/scripts/rollup/shims/facebook-www/getEventCharCode.js
index dcaf75734cb96..12ea04291f071 100644
--- a/scripts/rollup/shims/facebook-www/getEventCharCode.js
+++ b/scripts/rollup/shims/facebook-www/getEventCharCode.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactDOM-fb');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.getEventCharCode;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.getEventCharCode;
diff --git a/scripts/rollup/shims/facebook-www/getEventTarget.js b/scripts/rollup/shims/facebook-www/getEventTarget.js
index c7ab395956e15..c6c561fd639b2 100644
--- a/scripts/rollup/shims/facebook-www/getEventTarget.js
+++ b/scripts/rollup/shims/facebook-www/getEventTarget.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactDOM-fb');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.getEventTarget;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.getEventTarget;
diff --git a/scripts/rollup/shims/facebook-www/getVendorPrefixedEventName.js b/scripts/rollup/shims/facebook-www/getVendorPrefixedEventName.js
index fa4a5b1a8e3de..20dc1e12c5350 100644
--- a/scripts/rollup/shims/facebook-www/getVendorPrefixedEventName.js
+++ b/scripts/rollup/shims/facebook-www/getVendorPrefixedEventName.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactDOM-fb');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.getVendorPrefixedEventName;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.getVendorPrefixedEventName;
diff --git a/scripts/rollup/shims/facebook-www/isEventSupported.js b/scripts/rollup/shims/facebook-www/isEventSupported.js
index 0de4f444a26f2..8ccf401807cef 100644
--- a/scripts/rollup/shims/facebook-www/isEventSupported.js
+++ b/scripts/rollup/shims/facebook-www/isEventSupported.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactDOM-fb');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.isEventSupported;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.isEventSupported;
diff --git a/scripts/rollup/shims/facebook-www/setInnerHTML.js b/scripts/rollup/shims/facebook-www/setInnerHTML.js
index 99c074803afee..b5cc89bf0d5aa 100644
--- a/scripts/rollup/shims/facebook-www/setInnerHTML.js
+++ b/scripts/rollup/shims/facebook-www/setInnerHTML.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactDOM-fb');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.setInnerHTML;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.setInnerHTML;
diff --git a/scripts/rollup/shims/facebook-www/setTextContent.js b/scripts/rollup/shims/facebook-www/setTextContent.js
index 76ed7088d0073..1b6b6a127e606 100644
--- a/scripts/rollup/shims/facebook-www/setTextContent.js
+++ b/scripts/rollup/shims/facebook-www/setTextContent.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactDOM-fb');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.setTextContent;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.setTextContent;
diff --git a/scripts/rollup/shims/react-native/NativeMethodsMixin.js b/scripts/rollup/shims/react-native/NativeMethodsMixin.js
index 786c903600445..dd17a59b613b4 100644
--- a/scripts/rollup/shims/react-native/NativeMethodsMixin.js
+++ b/scripts/rollup/shims/react-native/NativeMethodsMixin.js
@@ -16,4 +16,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactNative');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.NativeMethodsMixin;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.NativeMethodsMixin;
diff --git a/scripts/rollup/shims/react-native/ReactDebugTool.js b/scripts/rollup/shims/react-native/ReactDebugTool.js
index 883a254093b81..c532f4bbe9b6b 100644
--- a/scripts/rollup/shims/react-native/ReactDebugTool.js
+++ b/scripts/rollup/shims/react-native/ReactDebugTool.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactNative');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactDebugTool;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactDebugTool;
diff --git a/scripts/rollup/shims/react-native/ReactErrorUtils.js b/scripts/rollup/shims/react-native/ReactErrorUtils.js
index 441a9b81c83c7..0a424191e1ca7 100644
--- a/scripts/rollup/shims/react-native/ReactErrorUtils.js
+++ b/scripts/rollup/shims/react-native/ReactErrorUtils.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactNative');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactErrorUtils;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactErrorUtils;
diff --git a/scripts/rollup/shims/react-native/ReactNativeComponentTree.js b/scripts/rollup/shims/react-native/ReactNativeComponentTree.js
index 54192a5d9de85..92672f3e8fcce 100644
--- a/scripts/rollup/shims/react-native/ReactNativeComponentTree.js
+++ b/scripts/rollup/shims/react-native/ReactNativeComponentTree.js
@@ -16,4 +16,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactNative');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactNativeComponentTree;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactNativeComponentTree;
diff --git a/scripts/rollup/shims/react-native/ReactNativePropRegistry.js b/scripts/rollup/shims/react-native/ReactNativePropRegistry.js
index e4cfeb3ed9cbb..d72d46018351f 100644
--- a/scripts/rollup/shims/react-native/ReactNativePropRegistry.js
+++ b/scripts/rollup/shims/react-native/ReactNativePropRegistry.js
@@ -16,4 +16,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactNative');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactNativePropRegistry;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactNativePropRegistry;
diff --git a/scripts/rollup/shims/react-native/TouchHistoryMath.js b/scripts/rollup/shims/react-native/TouchHistoryMath.js
index f0e6bc2ae9c58..339bfe03f94f5 100644
--- a/scripts/rollup/shims/react-native/TouchHistoryMath.js
+++ b/scripts/rollup/shims/react-native/TouchHistoryMath.js
@@ -15,4 +15,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactNative');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.TouchHistoryMath;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.TouchHistoryMath;
diff --git a/scripts/rollup/shims/react-native/createReactNativeComponentClass.js b/scripts/rollup/shims/react-native/createReactNativeComponentClass.js
index 3302f061b4195..6934beb791d84 100644
--- a/scripts/rollup/shims/react-native/createReactNativeComponentClass.js
+++ b/scripts/rollup/shims/react-native/createReactNativeComponentClass.js
@@ -16,4 +16,5 @@ const {
   __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED,
 } = require('ReactNative');
 
-module.exports = __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.createReactNativeComponentClass;
+module.exports =
+  __SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.createReactNativeComponentClass;
diff --git a/scripts/rollup/shims/react-native/findNodeHandle.js b/scripts/rollup/shims/react-native/findNodeHandle.js
index 7570b832c870c..d17da1cc19f50 100644
--- a/scripts/rollup/shims/react-native/findNodeHandle.js
+++ b/scripts/rollup/shims/react-native/findNodeHandle.js
@@ -21,7 +21,8 @@ let realFindNodeHandle = null;
 
 function findNodeHandle(componentOrHandle: any): ?number {
   if (realFindNodeHandle === null) {
-    realFindNodeHandle = require('ReactNative').__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.findNodeHandle;
+    realFindNodeHandle = require('ReactNative')
+      .__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.findNodeHandle;
   }
   return realFindNodeHandle(componentOrHandle);
 }
diff --git a/scripts/rollup/shims/rollup/ReactDebugCurrentFrameRollupShim.js b/scripts/rollup/shims/rollup/ReactDebugCurrentFrameRollupShim.js
index 2174fb0166844..6d205e5b03d87 100644
--- a/scripts/rollup/shims/rollup/ReactDebugCurrentFrameRollupShim.js
+++ b/scripts/rollup/shims/rollup/ReactDebugCurrentFrameRollupShim.js
@@ -1,3 +1,4 @@
-var ReactInternals = require('react').__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+var ReactInternals = require('react')
+  .__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
 
 module.exports = ReactInternals.ReactDebugCurrentFrame;
diff --git a/scripts/rollup/stats.js b/scripts/rollup/stats.js
index 3cbac43796f92..b862e7452e0e6 100644
--- a/scripts/rollup/stats.js
+++ b/scripts/rollup/stats.js
@@ -65,8 +65,10 @@ function printResults() {
       percentChange(prevGzip, gzip),
     ]);
   });
-  return table.toString() +
-    `\n\nThe difference was compared to the last build on "${chalk.green.bold(prevBuildResults.branch)}" branch.\n`;
+  return (
+    table.toString() +
+    `\n\nThe difference was compared to the last build on "${chalk.green.bold(prevBuildResults.branch)}" branch.\n`
+  );
 }
 
 module.exports = {
diff --git a/scripts/tasks/version-check.js b/scripts/tasks/version-check.js
index d8fa30bf6dcb5..98268e55a01a7 100644
--- a/scripts/tasks/version-check.js
+++ b/scripts/tasks/version-check.js
@@ -11,9 +11,12 @@
 
 const reactVersion = require('../../package.json').version;
 const versions = {
-  'packages/react/package.json': require('../../packages/react/package.json').version,
-  'packages/react-dom/package.json': require('../../packages/react-dom/package.json').version,
-  'packages/react-test-renderer/package.json': require('../../packages/react-test-renderer/package.json').version,
+  'packages/react/package.json': require('../../packages/react/package.json')
+    .version,
+  'packages/react-dom/package.json': require('../../packages/react-dom/package.json')
+    .version,
+  'packages/react-test-renderer/package.json': require('../../packages/react-test-renderer/package.json')
+    .version,
   'src/ReactVersion.js': require('../../src/ReactVersion'),
 };
 
diff --git a/src/__mocks__/UIManager.js b/src/__mocks__/UIManager.js
index a513409ee112b..28aa5304a6d73 100644
--- a/src/__mocks__/UIManager.js
+++ b/src/__mocks__/UIManager.js
@@ -66,10 +66,8 @@ var RCTUIManager = {
     function dumpSubtree(tag, indent) {
       const info = views.get(tag);
       let out = '';
-      out += ' '.repeat(indent) +
-        info.viewName +
-        ' ' +
-        JSON.stringify(info.props);
+      out +=
+        ' '.repeat(indent) + info.viewName + ' ' + JSON.stringify(info.props);
       for (const child of info.children) {
         out += '\n' + dumpSubtree(child, indent + 2);
       }
@@ -104,9 +102,14 @@ var RCTUIManager = {
       insertSubviewAtIndex(parentTag, tag, i);
     });
   }),
-  manageChildren: jest.fn(function manageChildren(parentTag, moveFromIndices = [
-  ], moveToIndices = [], addChildReactTags = [], addAtIndices = [
-  ], removeAtIndices = []) {
+  manageChildren: jest.fn(function manageChildren(
+    parentTag,
+    moveFromIndices = [],
+    moveToIndices = [],
+    addChildReactTags = [],
+    addAtIndices = [],
+    removeAtIndices = [],
+  ) {
     autoCreateRoot(parentTag);
     // This logic ported from iOS (RCTUIManager.m)
     invariant(
diff --git a/src/isomorphic/children/__tests__/ReactChildren-test.js b/src/isomorphic/children/__tests__/ReactChildren-test.js
index 9a2e374db7833..d3ed108f6766f 100644
--- a/src/isomorphic/children/__tests__/ReactChildren-test.js
+++ b/src/isomorphic/children/__tests__/ReactChildren-test.js
@@ -725,7 +725,8 @@ describe('ReactChildren', () => {
     );
 
     var mappedWithClone = React.Children.map(instance.props.children, element =>
-      React.cloneElement(element));
+      React.cloneElement(element),
+    );
 
     expect(mapped[0].key).toBe(mappedWithClone[0].key);
   });
@@ -743,7 +744,8 @@ describe('ReactChildren', () => {
     );
 
     var mappedWithClone = React.Children.map(instance.props.children, element =>
-      React.cloneElement(element, {key: 'unique'}));
+      React.cloneElement(element, {key: 'unique'}),
+    );
 
     expect(mapped[0].key).toBe(mappedWithClone[0].key);
   });
diff --git a/src/isomorphic/children/traverseAllChildren.js b/src/isomorphic/children/traverseAllChildren.js
index 4f1692e2773fc..718d2418cfa37 100644
--- a/src/isomorphic/children/traverseAllChildren.js
+++ b/src/isomorphic/children/traverseAllChildren.js
@@ -19,9 +19,7 @@ var KeyEscapeUtils = require('KeyEscapeUtils');
 var warning = require('fbjs/lib/warning');
 
 if (__DEV__) {
-  var {
-    getCurrentStackAddendum,
-  } = require('ReactComponentTreeHook');
+  var {getCurrentStackAddendum} = require('ReactComponentTreeHook');
 }
 
 var SEPARATOR = '.';
@@ -146,7 +144,8 @@ function traverseAllChildrenImpl(
     } else if (type === 'object') {
       var addendum = '';
       if (__DEV__) {
-        addendum = ' If you meant to render a collection of children, use an array ' +
+        addendum =
+          ' If you meant to render a collection of children, use an array ' +
           'instead.' +
           getCurrentStackAddendum();
       }
diff --git a/src/isomorphic/classic/class/__tests__/create-react-class-integration-test.js b/src/isomorphic/classic/class/__tests__/create-react-class-integration-test.js
index 55fb8c1ed8a49..2c5cb6fcd2dbe 100644
--- a/src/isomorphic/classic/class/__tests__/create-react-class-integration-test.js
+++ b/src/isomorphic/classic/class/__tests__/create-react-class-integration-test.js
@@ -326,7 +326,8 @@ describe('create-react-class-integration', () => {
       },
     });
     expect(() =>
-      ReactTestUtils.renderIntoDocument(<Component />)).not.toThrow();
+      ReactTestUtils.renderIntoDocument(<Component />),
+    ).not.toThrow();
   });
 
   it('should throw when using legacy factories', () => {
diff --git a/src/isomorphic/classic/element/ReactElement.js b/src/isomorphic/classic/element/ReactElement.js
index b47d5e247f545..e311067d9cfd5 100644
--- a/src/isomorphic/classic/element/ReactElement.js
+++ b/src/isomorphic/classic/element/ReactElement.js
@@ -374,9 +374,11 @@ ReactElement.cloneElement = function(element, config, children) {
  * @final
  */
 ReactElement.isValidElement = function(object) {
-  return typeof object === 'object' &&
+  return (
+    typeof object === 'object' &&
     object !== null &&
-    object.$$typeof === REACT_ELEMENT_TYPE;
+    object.$$typeof === REACT_ELEMENT_TYPE
+  );
 };
 
 module.exports = ReactElement;
diff --git a/src/isomorphic/classic/element/ReactElementValidator.js b/src/isomorphic/classic/element/ReactElementValidator.js
index 0e729e34a3d87..ea919f3a35caf 100644
--- a/src/isomorphic/classic/element/ReactElementValidator.js
+++ b/src/isomorphic/classic/element/ReactElementValidator.js
@@ -29,9 +29,7 @@ if (__DEV__) {
   var checkPropTypes = require('prop-types/checkPropTypes');
   var warning = require('fbjs/lib/warning');
   var ReactDebugCurrentFrame = require('ReactDebugCurrentFrame');
-  var {
-    getCurrentStackAddendum,
-  } = require('ReactComponentTreeHook');
+  var {getCurrentStackAddendum} = require('ReactComponentTreeHook');
 }
 
 function getDeclarationErrorAddendum() {
@@ -107,7 +105,9 @@ function validateExplicitKey(element, parentType) {
   // assigning it a key.
   var childOwner = '';
   if (
-    element && element._owner && element._owner !== ReactCurrentOwner.current
+    element &&
+    element._owner &&
+    element._owner !== ReactCurrentOwner.current
   ) {
     // Give the component that originally created this child.
     childOwner = ` It was passed a child from ${getComponentName(element._owner)}.`;
@@ -219,7 +219,8 @@ var ReactElementValidator = {
           type !== null &&
           Object.keys(type).length === 0)
       ) {
-        info += ' You likely forgot to export your component from the file ' +
+        info +=
+          ' You likely forgot to export your component from the file ' +
           "it's defined in.";
       }
 
diff --git a/src/isomorphic/classic/element/__tests__/ReactElement-test.js b/src/isomorphic/classic/element/__tests__/ReactElement-test.js
index 30a74615feb3c..0db69a0c9abd1 100644
--- a/src/isomorphic/classic/element/__tests__/ReactElement-test.js
+++ b/src/isomorphic/classic/element/__tests__/ReactElement-test.js
@@ -143,7 +143,7 @@ describe('ReactElement', () => {
 
   it('returns an immutable element', () => {
     var element = React.createFactory(ComponentClass)();
-    expect(() => element.type = 'div').toThrow();
+    expect(() => (element.type = 'div')).toThrow();
   });
 
   it('does not reuse the original config object', () => {
diff --git a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
index ce4c2e183372e..c4c25d723fcf3 100644
--- a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
+++ b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
@@ -54,9 +54,11 @@ function typeCheckFail(declaration, value, expectedMessage) {
 }
 
 function typeCheckFailRequiredValues(declaration) {
-  var specifiedButIsNullMsg = 'The prop `testProp` is marked as required in ' +
+  var specifiedButIsNullMsg =
+    'The prop `testProp` is marked as required in ' +
     '`testComponent`, but its value is `null`.';
-  var unspecifiedMsg = 'The prop `testProp` is marked as required in ' +
+  var unspecifiedMsg =
+    'The prop `testProp` is marked as required in ' +
     '`testComponent`, but its value is \`undefined\`.';
 
   var propTypes = {testProp: declaration};
@@ -602,7 +604,8 @@ describe('ReactPropTypes', () => {
     });
 
     it('should warn for invalid values', () => {
-      var failMessage = 'Invalid prop `testProp` supplied to ' +
+      var failMessage =
+        'Invalid prop `testProp` supplied to ' +
         '`testComponent`, expected a ReactNode.';
       typeCheckFail(PropTypes.node, true, failMessage);
       typeCheckFail(PropTypes.node, function() {}, failMessage);
diff --git a/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js b/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js
index 8508cdf5a4ec9..d4ea915bba432 100644
--- a/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js
+++ b/src/isomorphic/modern/element/__tests__/ReactJSXElement-test.js
@@ -64,7 +64,7 @@ describe('ReactJSXElement', () => {
 
   it('returns an immutable element', () => {
     var element = <Component />;
-    expect(() => element.type = 'div').toThrow();
+    expect(() => (element.type = 'div')).toThrow();
   });
 
   it('does not reuse the object that is spread into props', () => {
diff --git a/src/renderers/__tests__/ReactComponent-test.js b/src/renderers/__tests__/ReactComponent-test.js
index aaba580bde812..1ea4d6dddce59 100644
--- a/src/renderers/__tests__/ReactComponent-test.js
+++ b/src/renderers/__tests__/ReactComponent-test.js
@@ -157,9 +157,11 @@ describe('ReactComponent', () => {
 
     class Component extends React.Component {
       render() {
-        var inner = <Wrapper object={innerObj} ref={c => this.innerRef = c} />;
+        var inner = (
+          <Wrapper object={innerObj} ref={c => (this.innerRef = c)} />
+        );
         var outer = (
-          <Wrapper object={outerObj} ref={c => this.outerRef = c}>
+          <Wrapper object={outerObj} ref={c => (this.outerRef = c)}>
             {inner}
           </Wrapper>
         );
@@ -194,14 +196,14 @@ describe('ReactComponent', () => {
       getInner = () => {
         // (With old-style refs, it's impossible to get a ref to this div
         // because Wrapper is the current owner when this function is called.)
-        return <div className="inner" ref={c => this.innerRef = c} />;
+        return <div className="inner" ref={c => (this.innerRef = c)} />;
       };
 
       render() {
         return (
           <Wrapper
             title="wrapper"
-            ref={c => this.wrapperRef = c}
+            ref={c => (this.wrapperRef = c)}
             getContent={this.getInner}
           />
         );
diff --git a/src/renderers/__tests__/ReactComponentTreeHook-test.native.js b/src/renderers/__tests__/ReactComponentTreeHook-test.native.js
index ff458d64a4d6d..7095d0df60f70 100644
--- a/src/renderers/__tests__/ReactComponentTreeHook-test.native.js
+++ b/src/renderers/__tests__/ReactComponentTreeHook-test.native.js
@@ -1992,7 +1992,8 @@ describeStack('ReactComponentTreeHook', () => {
 
     ReactNative.unmountComponentAtNode(1);
     expectDev(ReactComponentTreeTestUtils.getRootDisplayNames()).toEqual([]);
-    expectDev(ReactComponentTreeTestUtils.getRegisteredDisplayNames()).toEqual([
-    ]);
+    expectDev(ReactComponentTreeTestUtils.getRegisteredDisplayNames()).toEqual(
+      [],
+    );
   });
 });
diff --git a/src/renderers/__tests__/ReactCompositeComponent-test.js b/src/renderers/__tests__/ReactCompositeComponent-test.js
index d3ead32dc5906..520319ee288c0 100644
--- a/src/renderers/__tests__/ReactCompositeComponent-test.js
+++ b/src/renderers/__tests__/ReactCompositeComponent-test.js
@@ -36,8 +36,10 @@ describe('ReactCompositeComponent', () => {
     shallowEqual = require('fbjs/lib/shallowEqual');
 
     shallowCompare = function(instance, nextProps, nextState) {
-      return !shallowEqual(instance.props, nextProps) ||
-        !shallowEqual(instance.state, nextState);
+      return (
+        !shallowEqual(instance.props, nextProps) ||
+        !shallowEqual(instance.state, nextState)
+      );
     };
 
     MorphingComponent = class extends React.Component {
@@ -938,7 +940,7 @@ describe('ReactCompositeComponent', () => {
 
     var parentInstance = null;
     ReactDOM.render(
-      <Parent ref={inst => parentInstance = inst}>
+      <Parent ref={inst => (parentInstance = inst)}>
         <ChildWithoutContext>
           A1
           <GrandChild>A2</GrandChild>
diff --git a/src/renderers/__tests__/ReactCompositeComponentState-test.js b/src/renderers/__tests__/ReactCompositeComponentState-test.js
index 958d40692daac..118220bf5cc7d 100644
--- a/src/renderers/__tests__/ReactCompositeComponentState-test.js
+++ b/src/renderers/__tests__/ReactCompositeComponentState-test.js
@@ -93,13 +93,10 @@ describe('ReactCompositeComponent-state', () => {
           // No longer a public API, but we can test that it works internally by
           // reaching into the updater.
           this.updater.enqueueReplaceState(this, {color: undefined});
-          this.setState(
-            function(state) {
-              this.peekAtState('before-setState-again-receiveProps', state);
-              return {color: newProps.nextColor};
-            },
-            this.peekAtCallback('setState-receiveProps'),
-          );
+          this.setState(function(state) {
+            this.peekAtState('before-setState-again-receiveProps', state);
+            return {color: newProps.nextColor};
+          }, this.peekAtCallback('setState-receiveProps'));
           this.setState(function(state) {
             this.peekAtState('after-setState-receiveProps', state);
           });
diff --git a/src/renderers/__tests__/ReactErrorBoundaries-test.js b/src/renderers/__tests__/ReactErrorBoundaries-test.js
index 49e9a1273dc28..5b4ef6ecf36ea 100644
--- a/src/renderers/__tests__/ReactErrorBoundaries-test.js
+++ b/src/renderers/__tests__/ReactErrorBoundaries-test.js
@@ -1878,7 +1878,7 @@ describe('ReactErrorBoundaries', () => {
       var container = document.createElement('div');
       ReactDOM.render(
         <ErrorBoundary>
-          <Stateful ref={inst => statefulInst = inst} />
+          <Stateful ref={inst => (statefulInst = inst)} />
         </ErrorBoundary>,
         container,
       );
diff --git a/src/renderers/__tests__/ReactIdentity-test.js b/src/renderers/__tests__/ReactIdentity-test.js
index 369c62570660d..7837e7f3341dc 100644
--- a/src/renderers/__tests__/ReactIdentity-test.js
+++ b/src/renderers/__tests__/ReactIdentity-test.js
@@ -26,7 +26,7 @@ describe('ReactIdentity', () => {
   it('should allow key property to express identity', () => {
     var node;
     var Component = props => (
-      <div ref={c => node = c}>
+      <div ref={c => (node = c)}>
         <div key={props.swap ? 'banana' : 'apple'} />
         <div key={props.swap ? 'apple' : 'banana'} />
       </div>
@@ -52,11 +52,11 @@ describe('ReactIdentity', () => {
     var node1;
     var node2;
     ReactDOM.render(
-      <Wrapper key="wrap1"><span ref={c => node1 = c} /></Wrapper>,
+      <Wrapper key="wrap1"><span ref={c => (node1 = c)} /></Wrapper>,
       container,
     );
     ReactDOM.render(
-      <Wrapper key="wrap2"><span ref={c => node2 = c} /></Wrapper>,
+      <Wrapper key="wrap2"><span ref={c => (node2 = c)} /></Wrapper>,
       container,
     );
 
@@ -92,7 +92,8 @@ describe('ReactIdentity', () => {
   });
 
   it('should not allow scripts in keys to execute', () => {
-    var h4x0rKey = '"><script>window[\'YOUVEBEENH4X0RED\']=true;</script><div id="';
+    var h4x0rKey =
+      '"><script>window[\'YOUVEBEENH4X0RED\']=true;</script><div id="';
 
     var attachedContainer = document.createElement('div');
     document.body.appendChild(attachedContainer);
diff --git a/src/renderers/__tests__/ReactMultiChildReconcile-test.js b/src/renderers/__tests__/ReactMultiChildReconcile-test.js
index a6f7a9af65585..cc8f22a2a54e5 100644
--- a/src/renderers/__tests__/ReactMultiChildReconcile-test.js
+++ b/src/renderers/__tests__/ReactMultiChildReconcile-test.js
@@ -140,13 +140,10 @@ class FriendsStatusDisplay extends React.Component {
 }
 
 function getInternalStateByUserName(statusDisplays) {
-  return Object.keys(statusDisplays).reduce(
-    (acc, key) => {
-      acc[key] = statusDisplays[key].getInternalState();
-      return acc;
-    },
-    {},
-  );
+  return Object.keys(statusDisplays).reduce((acc, key) => {
+    acc[key] = statusDisplays[key].getInternalState();
+    return acc;
+  }, {});
 }
 
 /**
diff --git a/src/renderers/__tests__/ReactUpdates-test.js b/src/renderers/__tests__/ReactUpdates-test.js
index bba996cbc65c4..28ff819de7757 100644
--- a/src/renderers/__tests__/ReactUpdates-test.js
+++ b/src/renderers/__tests__/ReactUpdates-test.js
@@ -523,7 +523,7 @@ describe('ReactUpdates', () => {
         // If we're using Fiber, we use Portals instead to achieve this.
         if (ReactDOMFeatureFlags.useFiber) {
           portal = ReactDOM.unstable_createPortal(
-            <B ref={n => b = n} />,
+            <B ref={n => (b = n)} />,
             bContainer,
           );
         }
@@ -541,7 +541,7 @@ describe('ReactUpdates', () => {
 
     a = ReactTestUtils.renderIntoDocument(<A />);
     if (!ReactDOMFeatureFlags.useFiber) {
-      ReactDOM.render(<B ref={n => b = n} />, bContainer);
+      ReactDOM.render(<B ref={n => (b = n)} />, bContainer);
     }
 
     ReactDOM.unstable_batchedUpdates(function() {
diff --git a/src/renderers/__tests__/refs-destruction-test.js b/src/renderers/__tests__/refs-destruction-test.js
index 5f95d3d9319bd..b691851c34b14 100644
--- a/src/renderers/__tests__/refs-destruction-test.js
+++ b/src/renderers/__tests__/refs-destruction-test.js
@@ -47,15 +47,13 @@ describe('refs-destruction', () => {
       true,
     );
     expect(
-      Object.keys(testInstance.refs || {}).filter(
-        key => testInstance.refs[key],
-      ).length,
+      Object.keys(testInstance.refs || {}).filter(key => testInstance.refs[key])
+        .length,
     ).toEqual(1);
     ReactDOM.unmountComponentAtNode(container);
     expect(
-      Object.keys(testInstance.refs || {}).filter(
-        key => testInstance.refs[key],
-      ).length,
+      Object.keys(testInstance.refs || {}).filter(key => testInstance.refs[key])
+        .length,
     ).toEqual(0);
   });
 
@@ -66,15 +64,13 @@ describe('refs-destruction', () => {
       true,
     );
     expect(
-      Object.keys(testInstance.refs || {}).filter(
-        key => testInstance.refs[key],
-      ).length,
+      Object.keys(testInstance.refs || {}).filter(key => testInstance.refs[key])
+        .length,
     ).toEqual(1);
     ReactDOM.render(<TestComponent destroy={true} />, container);
     expect(
-      Object.keys(testInstance.refs || {}).filter(
-        key => testInstance.refs[key],
-      ).length,
+      Object.keys(testInstance.refs || {}).filter(key => testInstance.refs[key])
+        .length,
     ).toEqual(0);
   });
 
@@ -93,15 +89,12 @@ describe('refs-destruction', () => {
       componentWillUnmount() {
         var self = this;
         // some async animation
-        setTimeout(
-          function() {
-            expect(function() {
-              ReactDOM.unmountComponentAtNode(self.div);
-            }).not.toThrow();
-            document.body.removeChild(self.div);
-          },
-          0,
-        );
+        setTimeout(function() {
+          expect(function() {
+            ReactDOM.unmountComponentAtNode(self.div);
+          }).not.toThrow();
+          document.body.removeChild(self.div);
+        }, 0);
       }
 
       render() {
diff --git a/src/renderers/art/ReactARTFiber.js b/src/renderers/art/ReactARTFiber.js
index 215d15153fb39..9aa0048af50b2 100644
--- a/src/renderers/art/ReactARTFiber.js
+++ b/src/renderers/art/ReactARTFiber.js
@@ -136,11 +136,13 @@ function isSameFont(oldFont, newFont) {
   } else if (typeof newFont === 'string' || typeof oldFont === 'string') {
     return false;
   } else {
-    return newFont.fontSize === oldFont.fontSize &&
+    return (
+      newFont.fontSize === oldFont.fontSize &&
       newFont.fontStyle === oldFont.fontStyle &&
       newFont.fontVariant === oldFont.fontVariant &&
       newFont.fontWeight === oldFont.fontWeight &&
-      newFont.fontFamily === oldFont.fontFamily;
+      newFont.fontFamily === oldFont.fontFamily
+    );
   }
 }
 
@@ -348,7 +350,7 @@ class Surface extends Component {
 
     return (
       <Tag
-        ref={ref => this._tagRef = ref}
+        ref={ref => (this._tagRef = ref)}
         accessKey={props.accessKey}
         className={props.className}
         draggable={props.draggable}
@@ -378,7 +380,7 @@ class Text extends React.Component {
     // This means you can't have children that render into strings...
     const T = TYPES.TEXT;
     return (
-      <T {...this.props} ref={t => this._text = t}>
+      <T {...this.props} ref={t => (this._text = t)}>
         {childrenAsString(this.props.children)}
       </T>
     );
@@ -512,8 +514,9 @@ const ARTRenderer = ReactFiberReconciler({
   scheduleDeferredCallback: ReactDOMFrameScheduling.rIC,
 
   shouldSetTextContent(props) {
-    return typeof props.children === 'string' ||
-      typeof props.children === 'number';
+    return (
+      typeof props.children === 'string' || typeof props.children === 'number'
+    );
   },
 
   useSyncScheduling: true,
diff --git a/src/renderers/art/ReactARTStack.js b/src/renderers/art/ReactARTStack.js
index 26e3ff92e82f6..c57877b63d609 100644
--- a/src/renderers/art/ReactARTStack.js
+++ b/src/renderers/art/ReactARTStack.js
@@ -68,7 +68,8 @@ function createComponent(name) {
 function injectAfter(parentNode, referenceNode, node) {
   let beforeNode;
   if (
-    node.parentNode === parentNode && node.previousSibling === referenceNode
+    node.parentNode === parentNode &&
+    node.previousSibling === referenceNode
   ) {
     return;
   }
@@ -190,7 +191,8 @@ class Surface extends React.Component {
   componentDidUpdate(oldProps) {
     const node = this.node;
     if (
-      this.props.width != oldProps.width || this.props.height != oldProps.height
+      this.props.width != oldProps.width ||
+      this.props.height != oldProps.height
     ) {
       node.resize(+this.props.width, +this.props.height);
     }
@@ -562,11 +564,13 @@ const Text = createComponent('Text', RenderableMixin, {
     if (typeof newFont === 'string' || typeof oldFont === 'string') {
       return false;
     }
-    return newFont.fontSize === oldFont.fontSize &&
+    return (
+      newFont.fontSize === oldFont.fontSize &&
       newFont.fontStyle === oldFont.fontStyle &&
       newFont.fontVariant === oldFont.fontVariant &&
       newFont.fontWeight === oldFont.fontWeight &&
-      newFont.fontFamily === oldFont.fontFamily;
+      newFont.fontFamily === oldFont.fontFamily
+    );
   },
 
   receiveComponent: function(nextComponent, transaction, context) {
diff --git a/src/renderers/dom/ReactDOM.js b/src/renderers/dom/ReactDOM.js
index 601ce0d924b33..cbb39b1fd2feb 100644
--- a/src/renderers/dom/ReactDOM.js
+++ b/src/renderers/dom/ReactDOM.js
@@ -89,8 +89,9 @@ if (__DEV__) {
         navigator.userAgent.indexOf('Firefox') > -1
       ) {
         // Firefox does not have the issue with devtools loaded over file://
-        var showFileUrlMessage = window.location.protocol.indexOf('http') ===
-          -1 && navigator.userAgent.indexOf('Firefox') === -1;
+        var showFileUrlMessage =
+          window.location.protocol.indexOf('http') === -1 &&
+          navigator.userAgent.indexOf('Firefox') === -1;
         console.debug(
           'Download the React DevTools ' +
             (showFileUrlMessage
@@ -113,8 +114,8 @@ if (__DEV__) {
 
     // If we're in IE8, check to see if we are in compatibility mode and provide
     // information on preventing compatibility mode
-    var ieCompatibilityMode = document.documentMode &&
-      document.documentMode < 8;
+    var ieCompatibilityMode =
+      document.documentMode && document.documentMode < 8;
 
     warning(
       !ieCompatibilityMode,
diff --git a/src/renderers/dom/fiber/ReactDOMFiber.js b/src/renderers/dom/fiber/ReactDOMFiber.js
index d3ed8381ca2d4..77b980cd3628a 100644
--- a/src/renderers/dom/fiber/ReactDOMFiber.js
+++ b/src/renderers/dom/fiber/ReactDOMFiber.js
@@ -47,10 +47,7 @@ var {
   diffProperties,
   updateProperties,
 } = ReactDOMFiberComponent;
-var {
-  precacheFiberNode,
-  updateFiberProps,
-} = ReactDOMComponentTree;
+var {precacheFiberNode, updateFiberProps} = ReactDOMComponentTree;
 
 if (__DEV__) {
   var validateDOMNesting = require('validateDOMNesting');
@@ -135,7 +132,8 @@ var DOMRenderer = ReactFiberReconciler({
     const type = rootContainerInstance.tagName;
     const namespace = getChildNamespace(ownNamespace, type);
     if (__DEV__) {
-      const isMountingIntoDocument = rootContainerInstance.ownerDocument.documentElement ===
+      const isMountingIntoDocument =
+        rootContainerInstance.ownerDocument.documentElement ===
         rootContainerInstance;
       const validatedTag = isMountingIntoDocument
         ? '#document'
@@ -194,7 +192,8 @@ var DOMRenderer = ReactFiberReconciler({
       const hostContextDev = ((hostContext: any): HostContextDev);
       validateDOMNesting(type, null, null, hostContextDev.ancestorInfo);
       if (
-        typeof props.children === 'string' || typeof props.children === 'number'
+        typeof props.children === 'string' ||
+        typeof props.children === 'number'
       ) {
         const string = '' + props.children;
         const ownAncestorInfo = updatedAncestorInfo(
@@ -298,11 +297,13 @@ var DOMRenderer = ReactFiberReconciler({
   },
 
   shouldSetTextContent(props: Props): boolean {
-    return typeof props.children === 'string' ||
+    return (
+      typeof props.children === 'string' ||
       typeof props.children === 'number' ||
       (typeof props.dangerouslySetInnerHTML === 'object' &&
         props.dangerouslySetInnerHTML !== null &&
-        typeof props.dangerouslySetInnerHTML.__html === 'string');
+        typeof props.dangerouslySetInnerHTML.__html === 'string')
+    );
   },
 
   resetTextContent(domElement: Instance): void {
@@ -399,7 +400,7 @@ function renderSubtreeIntoContainer(
       container.removeChild(container.lastChild);
     }
     const newRoot = DOMRenderer.createContainer(container);
-    root = (container._reactRootContainer = newRoot);
+    root = container._reactRootContainer = newRoot;
     // Initial mount should not be batched.
     DOMRenderer.unbatchedUpdates(() => {
       DOMRenderer.updateContainer(children, newRoot, parentComponent, callback);
@@ -506,8 +507,8 @@ var ReactDOM = {
     if (container._reactRootContainer) {
       if (__DEV__) {
         const rootEl = getReactRootElementInContainer(container);
-        const renderedByDifferentReact = rootEl &&
-          !ReactDOMComponentTree.getInstanceFromNode(rootEl);
+        const renderedByDifferentReact =
+          rootEl && !ReactDOMComponentTree.getInstanceFromNode(rootEl);
         warning(
           !renderedByDifferentReact,
           "unmountComponentAtNode(): The node you're attempting to unmount " +
diff --git a/src/renderers/dom/fiber/ReactDOMFiberComponent.js b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
index 31430af92ee2c..613fa7fa6568a 100644
--- a/src/renderers/dom/fiber/ReactDOMFiberComponent.js
+++ b/src/renderers/dom/fiber/ReactDOMFiberComponent.js
@@ -142,8 +142,8 @@ if (__DEV__) {
 }
 
 function ensureListeningTo(rootContainerElement, registrationName) {
-  var isDocumentFragment = rootContainerElement.nodeType ===
-    DOCUMENT_FRAGMENT_NODE;
+  var isDocumentFragment =
+    rootContainerElement.nodeType === DOCUMENT_FRAGMENT_NODE;
   var doc = isDocumentFragment
     ? rootContainerElement
     : rootContainerElement.ownerDocument;
@@ -315,7 +315,8 @@ function setInitialDOMProperties(
     } else if (isCustomComponentTag) {
       DOMPropertyOperations.setValueForAttribute(domElement, propKey, nextProp);
     } else if (
-      DOMProperty.properties[propKey] || DOMProperty.isCustomAttribute(propKey)
+      DOMProperty.properties[propKey] ||
+      DOMProperty.isCustomAttribute(propKey)
     ) {
       // If we're updating to null or undefined, we should remove the property
       // from the DOM node instead of inadvertently setting to a string. This
@@ -359,7 +360,8 @@ function updateDOMProperties(
         DOMPropertyOperations.deleteValueForAttribute(domElement, propKey);
       }
     } else if (
-      DOMProperty.properties[propKey] || DOMProperty.isCustomAttribute(propKey)
+      DOMProperty.properties[propKey] ||
+      DOMProperty.isCustomAttribute(propKey)
     ) {
       // If we're updating to null or undefined, we should remove the property
       // from the DOM node instead of inadvertently setting to a string. This
@@ -648,7 +650,8 @@ var ReactDOMFiberComponent = {
           }
         }
       } else if (
-        propKey === DANGEROUSLY_SET_INNER_HTML || propKey === CHILDREN
+        propKey === DANGEROUSLY_SET_INNER_HTML ||
+        propKey === CHILDREN
       ) {
         // Noop. This is handled by the clear text mechanism.
       } else if (propKey === SUPPRESS_CONTENT_EDITABLE_WARNING) {
diff --git a/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js b/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js
index 60ec33ae88c3a..c659d65123e59 100644
--- a/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js
+++ b/src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js
@@ -50,12 +50,12 @@ describe('ReactDOMFiber', () => {
   it('should be called a callback argument', () => {
     // mounting phase
     let called = false;
-    ReactDOM.render(<div>Foo</div>, container, () => called = true);
+    ReactDOM.render(<div>Foo</div>, container, () => (called = true));
     expect(called).toEqual(true);
 
     // updating phase
     called = false;
-    ReactDOM.render(<div>Foo</div>, container, () => called = true);
+    ReactDOM.render(<div>Foo</div>, container, () => (called = true));
     expect(called).toEqual(true);
   });
 
@@ -69,13 +69,13 @@ describe('ReactDOMFiber', () => {
 
     // mounting phase
     let called = false;
-    ReactDOM.render(element, container, () => called = true);
+    ReactDOM.render(element, container, () => (called = true));
     expect(called).toEqual(true);
 
     // updating phase
     called = false;
     ReactDOM.unstable_batchedUpdates(() => {
-      ReactDOM.render(element, container, () => called = true);
+      ReactDOM.render(element, container, () => (called = true));
     });
     expect(called).toEqual(true);
   });
@@ -105,7 +105,7 @@ describe('ReactDOMFiber', () => {
 
       let instance = null;
       ReactDOM.render(
-        <Text value="foo" ref={ref => instance = ref} />,
+        <Text value="foo" ref={ref => (instance = ref)} />,
         container,
       );
 
@@ -123,7 +123,7 @@ describe('ReactDOMFiber', () => {
       }
 
       let instance = null;
-      ReactDOM.render(<Fragment ref={ref => instance = ref} />, container);
+      ReactDOM.render(<Fragment ref={ref => (instance = ref)} />, container);
 
       expect(container.childNodes.length).toBe(2);
 
@@ -146,7 +146,7 @@ describe('ReactDOMFiber', () => {
       }
 
       let instance = null;
-      ReactDOM.render(<Fragment ref={ref => instance = ref} />, container);
+      ReactDOM.render(<Fragment ref={ref => (instance = ref)} />, container);
 
       expect(container.childNodes.length).toBe(2);
 
@@ -169,7 +169,7 @@ describe('ReactDOMFiber', () => {
       }
 
       let instance = null;
-      ReactDOM.render(<Fragment ref={ref => instance = ref} />, container);
+      ReactDOM.render(<Fragment ref={ref => (instance = ref)} />, container);
 
       expect(container.childNodes.length).toBe(2);
 
@@ -828,7 +828,7 @@ describe('ReactDOMFiber', () => {
           {ReactDOM.unstable_createPortal(
             <div
               onClick={() => ops.push('portal clicked')}
-              ref={n => portal = n}>
+              ref={n => (portal = n)}>
               portal
             </div>,
             portalContainer,
@@ -877,18 +877,18 @@ describe('ReactDOMFiber', () => {
           <div
             onMouseEnter={() => ops.push('enter parent')}
             onMouseLeave={() => ops.push('leave parent')}>
-            <div ref={n => firstTarget = n} />
+            <div ref={n => (firstTarget = n)} />
             {ReactDOM.unstable_createPortal(
               <div
                 onMouseEnter={() => ops.push('enter portal')}
                 onMouseLeave={() => ops.push('leave portal')}
-                ref={n => secondTarget = n}>
+                ref={n => (secondTarget = n)}>
                 portal
               </div>,
               portalContainer,
             )}
           </div>
-          <div ref={n => thirdTarget = n} />
+          <div ref={n => (thirdTarget = n)} />
         </div>,
         container,
       );
@@ -943,7 +943,7 @@ describe('ReactDOMFiber', () => {
       }
 
       let inst;
-      ReactDOM.render([<Example key="a" ref={n => inst = n} />], container);
+      ReactDOM.render([<Example key="a" ref={n => (inst = n)} />], container);
       const node = container.firstChild;
       expect(node.tagName).toEqual('DIV');
 
@@ -1051,9 +1051,8 @@ describe('disableNewFiberFeatures', () => {
       /You may have returned undefined/,
     );
     expect(() =>
-      ReactDOM.render(<Render>[<div key="a" />]</Render>, container)).toThrow(
-      /You may have returned undefined/,
-    );
+      ReactDOM.render(<Render>[<div key="a" />]</Render>, container),
+    ).toThrow(/You may have returned undefined/);
   });
 
   it('treats mocked render functions as if they return null', () => {
diff --git a/src/renderers/dom/shared/CSSPropertyOperations.js b/src/renderers/dom/shared/CSSPropertyOperations.js
index a7a70ed895372..35e1be90a1c7f 100644
--- a/src/renderers/dom/shared/CSSPropertyOperations.js
+++ b/src/renderers/dom/shared/CSSPropertyOperations.js
@@ -181,8 +181,8 @@ var CSSPropertyOperations = {
       }
       if (styleValue != null) {
         serialized += processStyleName(styleName) + ':';
-        serialized += dangerousStyleValue(styleName, styleValue, component) +
-          ';';
+        serialized +=
+          dangerousStyleValue(styleName, styleValue, component) + ';';
       }
     }
     return serialized || null;
@@ -216,7 +216,8 @@ var CSSPropertyOperations = {
       if (styleValue) {
         style[styleName] = styleValue;
       } else {
-        var expansion = hasShorthandPropertyBug &&
+        var expansion =
+          hasShorthandPropertyBug &&
           CSSProperty.shorthandPropertyExpansions[styleName];
         if (expansion) {
           // Shorthand property that IE8 won't like unsetting, so unset each
diff --git a/src/renderers/dom/shared/DOMProperty.js b/src/renderers/dom/shared/DOMProperty.js
index f938c73ff8b45..793df14dd773f 100644
--- a/src/renderers/dom/shared/DOMProperty.js
+++ b/src/renderers/dom/shared/DOMProperty.js
@@ -141,7 +141,8 @@ var DOMPropertyInjection = {
 };
 
 /* eslint-disable max-len */
-var ATTRIBUTE_NAME_START_CHAR = ':A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD';
+var ATTRIBUTE_NAME_START_CHAR =
+  ':A-Z_a-z\\u00C0-\\u00D6\\u00D8-\\u00F6\\u00F8-\\u02FF\\u0370-\\u037D\\u037F-\\u1FFF\\u200C-\\u200D\\u2070-\\u218F\\u2C00-\\u2FEF\\u3001-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFFD';
 /* eslint-enable max-len */
 
 /**
diff --git a/src/renderers/dom/shared/DOMPropertyOperations.js b/src/renderers/dom/shared/DOMPropertyOperations.js
index be65bdbf1b739..26e9e6c59316c 100644
--- a/src/renderers/dom/shared/DOMPropertyOperations.js
+++ b/src/renderers/dom/shared/DOMPropertyOperations.js
@@ -45,11 +45,13 @@ function isAttributeNameSafe(attributeName) {
 }
 
 function shouldIgnoreValue(propertyInfo, value) {
-  return value == null ||
+  return (
+    value == null ||
     (propertyInfo.hasBooleanValue && !value) ||
     (propertyInfo.hasNumericValue && isNaN(value)) ||
     (propertyInfo.hasPositiveNumericValue && value < 1) ||
-    (propertyInfo.hasOverloadedBooleanValue && value === false);
+    (propertyInfo.hasOverloadedBooleanValue && value === false)
+  );
 }
 
 /**
@@ -63,9 +65,9 @@ var DOMPropertyOperations = {
    * @return {string} Markup string.
    */
   createMarkupForID: function(id) {
-    return DOMProperty.ID_ATTRIBUTE_NAME +
-      '=' +
-      quoteAttributeValueForBrowser(id);
+    return (
+      DOMProperty.ID_ATTRIBUTE_NAME + '=' + quoteAttributeValueForBrowser(id)
+    );
   },
 
   setAttributeForID: function(node, id) {
diff --git a/src/renderers/dom/shared/HTMLDOMPropertyConfig.js b/src/renderers/dom/shared/HTMLDOMPropertyConfig.js
index ccd92eaf7c95c..56255312fdcf8 100644
--- a/src/renderers/dom/shared/HTMLDOMPropertyConfig.js
+++ b/src/renderers/dom/shared/HTMLDOMPropertyConfig.js
@@ -16,8 +16,10 @@ var DOMProperty = require('DOMProperty');
 var MUST_USE_PROPERTY = DOMProperty.injection.MUST_USE_PROPERTY;
 var HAS_BOOLEAN_VALUE = DOMProperty.injection.HAS_BOOLEAN_VALUE;
 var HAS_NUMERIC_VALUE = DOMProperty.injection.HAS_NUMERIC_VALUE;
-var HAS_POSITIVE_NUMERIC_VALUE = DOMProperty.injection.HAS_POSITIVE_NUMERIC_VALUE;
-var HAS_OVERLOADED_BOOLEAN_VALUE = DOMProperty.injection.HAS_OVERLOADED_BOOLEAN_VALUE;
+var HAS_POSITIVE_NUMERIC_VALUE =
+  DOMProperty.injection.HAS_POSITIVE_NUMERIC_VALUE;
+var HAS_OVERLOADED_BOOLEAN_VALUE =
+  DOMProperty.injection.HAS_OVERLOADED_BOOLEAN_VALUE;
 
 var HTMLDOMPropertyConfig = {
   isCustomAttribute: RegExp.prototype.test.bind(
diff --git a/src/renderers/dom/shared/ReactBrowserEventEmitter.js b/src/renderers/dom/shared/ReactBrowserEventEmitter.js
index 07dc3c4a73cb1..a57d70846fa7b 100644
--- a/src/renderers/dom/shared/ReactBrowserEventEmitter.js
+++ b/src/renderers/dom/shared/ReactBrowserEventEmitter.js
@@ -227,9 +227,8 @@ var ReactBrowserEventEmitter = Object.assign({}, ReactEventEmitterMixin, {
   listenTo: function(registrationName, contentDocumentHandle) {
     var mountAt = contentDocumentHandle;
     var isListening = getListeningForDocument(mountAt);
-    var dependencies = EventPluginRegistry.registrationNameDependencies[
-      registrationName
-    ];
+    var dependencies =
+      EventPluginRegistry.registrationNameDependencies[registrationName];
 
     for (var i = 0; i < dependencies.length; i++) {
       var dependency = dependencies[i];
@@ -312,9 +311,8 @@ var ReactBrowserEventEmitter = Object.assign({}, ReactEventEmitterMixin, {
 
   isListeningToAllDependencies: function(registrationName, mountAt) {
     var isListening = getListeningForDocument(mountAt);
-    var dependencies = EventPluginRegistry.registrationNameDependencies[
-      registrationName
-    ];
+    var dependencies =
+      EventPluginRegistry.registrationNameDependencies[registrationName];
     for (var i = 0; i < dependencies.length; i++) {
       var dependency = dependencies[i];
       if (
diff --git a/src/renderers/dom/shared/ReactDOMComponentTree.js b/src/renderers/dom/shared/ReactDOMComponentTree.js
index 978d60d51ec8d..700ffb6811817 100644
--- a/src/renderers/dom/shared/ReactDOMComponentTree.js
+++ b/src/renderers/dom/shared/ReactDOMComponentTree.js
@@ -31,12 +31,14 @@ var internalEventHandlersKey = '__reactEventHandlers$' + randomKey;
  * Check if a given node should be cached.
  */
 function shouldPrecacheNode(node, nodeID) {
-  return (node.nodeType === ELEMENT_NODE &&
-    node.getAttribute(ATTR_NAME) === '' + nodeID) ||
+  return (
+    (node.nodeType === ELEMENT_NODE &&
+      node.getAttribute(ATTR_NAME) === '' + nodeID) ||
     (node.nodeType === COMMENT_NODE &&
       node.nodeValue === ' react-text: ' + nodeID + ' ') ||
     (node.nodeType === COMMENT_NODE &&
-      node.nodeValue === ' react-empty: ' + nodeID + ' ');
+      node.nodeValue === ' react-empty: ' + nodeID + ' ')
+  );
 }
 
 /**
diff --git a/src/renderers/dom/shared/ReactInputSelection.js b/src/renderers/dom/shared/ReactInputSelection.js
index 2fd94d4ef0e05..427e71f88a79a 100644
--- a/src/renderers/dom/shared/ReactInputSelection.js
+++ b/src/renderers/dom/shared/ReactInputSelection.js
@@ -31,10 +31,12 @@ function isInDocument(node) {
 var ReactInputSelection = {
   hasSelectionCapabilities: function(elem) {
     var nodeName = elem && elem.nodeName && elem.nodeName.toLowerCase();
-    return nodeName &&
+    return (
+      nodeName &&
       ((nodeName === 'input' && elem.type === 'text') ||
         nodeName === 'textarea' ||
-        elem.contentEditable === 'true');
+        elem.contentEditable === 'true')
+    );
   },
 
   getSelectionInformation: function() {
diff --git a/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js b/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js
index 0136b1df6bd4b..c08384e46e4c4 100644
--- a/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactBrowserEventEmitter-test.js
@@ -76,7 +76,7 @@ describe('ReactBrowserEventEmitter', () => {
     var CHILD_PROPS = {};
 
     function Child(props) {
-      return <div ref={c => CHILD = c} {...props} />;
+      return <div ref={c => (CHILD = c)} {...props} />;
     }
 
     class ChildWrapper extends React.PureComponent {
@@ -87,8 +87,8 @@ describe('ReactBrowserEventEmitter', () => {
 
     function renderTree() {
       ReactDOM.render(
-        <div ref={c => GRANDPARENT = c} {...GRANDPARENT_PROPS}>
-          <div ref={c => PARENT = c} {...PARENT_PROPS}>
+        <div ref={c => (GRANDPARENT = c)} {...GRANDPARENT_PROPS}>
+          <div ref={c => (PARENT = c)} {...PARENT_PROPS}>
             <ChildWrapper {...CHILD_PROPS} />
           </div>
         </div>,
diff --git a/src/renderers/dom/shared/__tests__/ReactDOM-test.js b/src/renderers/dom/shared/__tests__/ReactDOM-test.js
index f05df659d12a7..cedcfbd34ac37 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOM-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOM-test.js
@@ -215,9 +215,9 @@ describe('ReactDOM', () => {
       render() {
         return (
           <div>
-            <input id="one" ref={r => input = input || r} />
+            <input id="one" ref={r => (input = input || r)} />
             {this.props.showTwo &&
-              <input id="two" ref={r => input2 = input2 || r} />}
+              <input id="two" ref={r => (input2 = input2 || r)} />}
           </div>
         );
       }
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
index 99bf0780925e2..6468f45b9a1f3 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
@@ -137,7 +137,7 @@ describe('ReactDOMComponent', () => {
       }
 
       ReactTestUtils.renderIntoDocument(<App />);
-      expectDev(() => style.position = 'absolute').toThrow();
+      expectDev(() => (style.position = 'absolute')).toThrow();
     });
 
     it('should warn for unknown prop', () => {
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMSVG-test.js b/src/renderers/dom/shared/__tests__/ReactDOMSVG-test.js
index 7fe93cf7d1744..025da6e402d79 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMSVG-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMSVG-test.js
@@ -51,38 +51,38 @@ describe('ReactDOMSVG', () => {
       svg4;
     ReactDOM.render(
       <div>
-        <svg ref={el => svg = el}>
-          <g ref={el => g = el} strokeWidth="5">
-            <svg ref={el => svg2 = el}>
-              <foreignObject ref={el => foreignObject = el}>
-                <svg ref={el => svg3 = el}>
-                  <svg ref={el => svg4 = el} />
+        <svg ref={el => (svg = el)}>
+          <g ref={el => (g = el)} strokeWidth="5">
+            <svg ref={el => (svg2 = el)}>
+              <foreignObject ref={el => (foreignObject = el)}>
+                <svg ref={el => (svg3 = el)}>
+                  <svg ref={el => (svg4 = el)} />
                   <image
-                    ref={el => image = el}
+                    ref={el => (image = el)}
                     xlinkHref="http://i.imgur.com/w7GCRPb.png"
                   />
                 </svg>
-                <div ref={el => div = el} />
+                <div ref={el => (div = el)} />
               </foreignObject>
             </svg>
             <image
-              ref={el => image2 = el}
+              ref={el => (image2 = el)}
               xlinkHref="http://i.imgur.com/w7GCRPb.png"
             />
-            <foreignObject ref={el => foreignObject2 = el}>
-              <div ref={el => div2 = el} />
+            <foreignObject ref={el => (foreignObject2 = el)}>
+              <div ref={el => (div2 = el)} />
             </foreignObject>
           </g>
         </svg>
-        <p ref={el => p = el}>
+        <p ref={el => (p = el)}>
           <svg>
             <image
-              ref={el => image3 = el}
+              ref={el => (image3 = el)}
               xlinkHref="http://i.imgur.com/w7GCRPb.png"
             />
           </svg>
         </p>
-        <div ref={el => div3 = el} />
+        <div ref={el => (div3 = el)} />
       </div>,
       node,
     );
@@ -137,25 +137,25 @@ describe('ReactDOMSVG', () => {
           return null;
         }
         return (
-          <g ref={el => g = el} strokeWidth="5">
-            <svg ref={el => svg2 = el}>
-              <foreignObject ref={el => foreignObject = el}>
-                <svg ref={el => svg3 = el}>
-                  <svg ref={el => svg4 = el} />
+          <g ref={el => (g = el)} strokeWidth="5">
+            <svg ref={el => (svg2 = el)}>
+              <foreignObject ref={el => (foreignObject = el)}>
+                <svg ref={el => (svg3 = el)}>
+                  <svg ref={el => (svg4 = el)} />
                   <image
-                    ref={el => image = el}
+                    ref={el => (image = el)}
                     xlinkHref="http://i.imgur.com/w7GCRPb.png"
                   />
                 </svg>
-                <div ref={el => div = el} />
+                <div ref={el => (div = el)} />
               </foreignObject>
             </svg>
             <image
-              ref={el => image2 = el}
+              ref={el => (image2 = el)}
               xlinkHref="http://i.imgur.com/w7GCRPb.png"
             />
-            <foreignObject ref={el => foreignObject2 = el}>
-              <div ref={el => div2 = el} />
+            <foreignObject ref={el => (foreignObject2 = el)}>
+              <div ref={el => (div2 = el)} />
             </foreignObject>
           </g>
         );
@@ -164,7 +164,7 @@ describe('ReactDOMSVG', () => {
 
     var node = document.createElement('div');
     ReactDOM.render(
-      <svg ref={el => svg = el}>
+      <svg ref={el => (svg = el)}>
         <App />
       </svg>,
       node,
@@ -205,7 +205,7 @@ describe('ReactDOMSVG', () => {
     var container = document.createElementNS('http://www.w3.org/2000/svg', 'g');
     outerSVGRoot.appendChild(container);
     var image;
-    ReactDOM.render(<image ref={el => image = el} />, container);
+    ReactDOM.render(<image ref={el => (image = el)} />, container);
     expect(image.namespaceURI).toBe('http://www.w3.org/2000/svg');
     expect(image.tagName).toBe('image');
   });
@@ -230,7 +230,7 @@ describe('ReactDOMSVG', () => {
     );
     outerSVGRoot.appendChild(container);
     var div;
-    ReactDOM.render(<div ref={el => div = el} />, container);
+    ReactDOM.render(<div ref={el => (div = el)} />, container);
     expect(div.namespaceURI).toBe('http://www.w3.org/1999/xhtml');
     expect(div.tagName).toBe('DIV');
   });
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js b/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
index 0381ec8fb82aa..a39026ae96d95 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMServerIntegration-test.js
@@ -25,7 +25,8 @@ let ReactTestUtils;
 // promisified version of ReactDOM.render()
 function asyncReactDOMRender(reactElement, domElement) {
   return new Promise(resolve =>
-    ReactDOM.render(reactElement, domElement, resolve));
+    ReactDOM.render(reactElement, domElement, resolve),
+  );
 }
 // performs fn asynchronously and expects count errors logged to console.error.
 // will fail the test if the count of errors logged is not equal to count.
@@ -38,7 +39,8 @@ async function expectErrors(fn, count) {
 
   const result = await fn();
   if (
-    console.error.calls.count() !== count && console.error.calls.count() !== 0
+    console.error.calls.count() !== count &&
+    console.error.calls.count() !== 0
   ) {
     console.log(
       `We expected ${count} warning(s), but saw ${console.error.calls.count()} warning(s).`,
@@ -57,22 +59,20 @@ async function expectErrors(fn, count) {
 // renders the reactElement into domElement, and expects a certain number of errors.
 // returns a Promise that resolves when the render is complete.
 function renderIntoDom(reactElement, domElement, errorCount = 0) {
-  return expectErrors(
-    async () => {
-      ExecutionEnvironment.canUseDOM = true;
-      await asyncReactDOMRender(reactElement, domElement);
-      ExecutionEnvironment.canUseDOM = false;
-      return domElement.firstChild;
-    },
-    errorCount,
-  );
+  return expectErrors(async () => {
+    ExecutionEnvironment.canUseDOM = true;
+    await asyncReactDOMRender(reactElement, domElement);
+    ExecutionEnvironment.canUseDOM = false;
+    return domElement.firstChild;
+  }, errorCount);
 }
 
 async function renderIntoString(reactElement, errorCount = 0) {
   return await expectErrors(
     () =>
       new Promise(resolve =>
-        resolve(ReactDOMServer.renderToString(reactElement))),
+        resolve(ReactDOMServer.renderToString(reactElement)),
+      ),
     errorCount,
   );
 }
@@ -108,7 +108,8 @@ const clientRenderOnServerString = async (element, errorCount = 0) => {
 
 const clientRenderOnBadMarkup = (element, errorCount = 0) => {
   var domElement = document.createElement('div');
-  domElement.innerHTML = '<div id="badIdWhichWillCauseMismatch" data-reactroot="" data-reactid="1"></div>';
+  domElement.innerHTML =
+    '<div id="badIdWhichWillCauseMismatch" data-reactroot="" data-reactid="1"></div>';
   return renderIntoDom(element, domElement, errorCount + 1);
 };
 
@@ -155,16 +156,19 @@ function itThrows(desc, testFn) {
   it(`throws ${desc}`, () => {
     return testFn()
       .then(() =>
-        expect(false).toBe('The promise resolved and should not have.'))
+        expect(false).toBe('The promise resolved and should not have.'),
+      )
       .catch(() => {});
   });
 }
 
 function itThrowsWhenRendering(desc, testFn) {
   itThrows(`when rendering ${desc} with server string render`, () =>
-    testFn(serverRender));
+    testFn(serverRender),
+  );
   itThrows(`when rendering ${desc} with clean client render`, () =>
-    testFn(clientCleanRender));
+    testFn(clientCleanRender),
+  );
 
   // we subtract one from the warning count here because the throw means that it won't
   // get the usual markup mismatch warning.
@@ -172,7 +176,8 @@ function itThrowsWhenRendering(desc, testFn) {
     `when rendering ${desc} with client render on top of bad server markup`,
     () =>
       testFn((element, warningCount = 0) =>
-        clientRenderOnBadMarkup(element, warningCount - 1)),
+        clientRenderOnBadMarkup(element, warningCount - 1),
+      ),
   );
 }
 
@@ -1823,7 +1828,7 @@ describe('ReactDOMServerIntegration', () => {
       let refElement = null;
       class RefsComponent extends React.Component {
         render() {
-          return <div ref={e => refElement = e} />;
+          return <div ref={e => (refElement = e)} />;
         }
       }
       const e = await clientRenderOnServerString(<RefsComponent />);
@@ -1844,7 +1849,7 @@ describe('ReactDOMServerIntegration', () => {
       let component = null;
       resetModules();
       await asyncReactDOMRender(
-        <RefsComponent ref={e => component = e} />,
+        <RefsComponent ref={e => (component = e)} />,
         root,
       );
       expect(component.refs.myDiv).toBe(root.firstChild);
diff --git a/src/renderers/dom/shared/__tests__/ReactEventListener-test.js b/src/renderers/dom/shared/__tests__/ReactEventListener-test.js
index 7dc1c8ddaa0f4..a4e9ac72251f8 100644
--- a/src/renderers/dom/shared/__tests__/ReactEventListener-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactEventListener-test.js
@@ -123,13 +123,16 @@ describe('ReactEventListener', () => {
       // node when the first event handlers are called; we'll still
       // expect to receive a second call for the parent control.
       var childNode = ReactDOM.findDOMNode(childControl);
-      handleTopLevel.mockImplementation(
-        function(topLevelType, topLevelTarget, topLevelTargetID, nativeEvent) {
-          if (topLevelTarget === childNode) {
-            ReactDOM.unmountComponentAtNode(childContainer);
-          }
-        },
-      );
+      handleTopLevel.mockImplementation(function(
+        topLevelType,
+        topLevelTarget,
+        topLevelTargetID,
+        nativeEvent,
+      ) {
+        if (topLevelTarget === childNode) {
+          ReactDOM.unmountComponentAtNode(childContainer);
+        }
+      });
 
       var callback = ReactEventListener.dispatchEvent.bind(null, 'test');
       callback({
@@ -156,16 +159,19 @@ describe('ReactEventListener', () => {
       // Suppose an event handler in each root enqueues an update to the
       // childControl element -- the two updates should get batched together.
       var childNode = ReactDOM.findDOMNode(childControl);
-      handleTopLevel.mockImplementation(
-        function(topLevelType, topLevelTarget, topLevelTargetID, nativeEvent) {
-          ReactDOM.render(
-            <div>{topLevelTarget === childNode ? '1' : '2'}</div>,
-            childContainer,
-          );
-          // Since we're batching, neither update should yet have gone through.
-          expect(childNode.textContent).toBe('Child');
-        },
-      );
+      handleTopLevel.mockImplementation(function(
+        topLevelType,
+        topLevelTarget,
+        topLevelTargetID,
+        nativeEvent,
+      ) {
+        ReactDOM.render(
+          <div>{topLevelTarget === childNode ? '1' : '2'}</div>,
+          childContainer,
+        );
+        // Since we're batching, neither update should yet have gone through.
+        expect(childNode.textContent).toBe('Child');
+      });
 
       var callback = ReactEventListener.dispatchEvent.bind(
         ReactEventListener,
diff --git a/src/renderers/dom/shared/__tests__/ReactRenderDocument-test.js b/src/renderers/dom/shared/__tests__/ReactRenderDocument-test.js
index 965a41dfff66a..642db7bd780b7 100644
--- a/src/renderers/dom/shared/__tests__/ReactRenderDocument-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactRenderDocument-test.js
@@ -19,7 +19,8 @@ var getTestDocument;
 
 var testDocument;
 
-var UNMOUNT_INVARIANT_MESSAGE = '<html> tried to unmount. ' +
+var UNMOUNT_INVARIANT_MESSAGE =
+  '<html> tried to unmount. ' +
   'Because of cross-browser quirks it is impossible to unmount some ' +
   'top-level components (eg <html>, <head>, and <body>) reliably and ' +
   'efficiently. To fix this, have a single top-level component that ' +
diff --git a/src/renderers/dom/shared/eventPlugins/BeforeInputEventPlugin.js b/src/renderers/dom/shared/eventPlugins/BeforeInputEventPlugin.js
index 81fb53da4f07f..8bcd30782adae 100644
--- a/src/renderers/dom/shared/eventPlugins/BeforeInputEventPlugin.js
+++ b/src/renderers/dom/shared/eventPlugins/BeforeInputEventPlugin.js
@@ -22,8 +22,8 @@ import type {TopLevelTypes} from 'EventConstants';
 var END_KEYCODES = [9, 13, 27, 32]; // Tab, Return, Esc, Space
 var START_KEYCODE = 229;
 
-var canUseCompositionEvent = ExecutionEnvironment.canUseDOM &&
-  'CompositionEvent' in window;
+var canUseCompositionEvent =
+  ExecutionEnvironment.canUseDOM && 'CompositionEvent' in window;
 
 var documentMode = null;
 if (ExecutionEnvironment.canUseDOM && 'documentMode' in document) {
@@ -33,7 +33,8 @@ if (ExecutionEnvironment.canUseDOM && 'documentMode' in document) {
 // Webkit offers a very useful `textInput` event that can be used to
 // directly represent `beforeInput`. The IE `textinput` event is not as
 // useful, so we don't use it.
-var canUseTextInputEvent = ExecutionEnvironment.canUseDOM &&
+var canUseTextInputEvent =
+  ExecutionEnvironment.canUseDOM &&
   'TextEvent' in window &&
   !documentMode &&
   !isPresto();
@@ -41,7 +42,8 @@ var canUseTextInputEvent = ExecutionEnvironment.canUseDOM &&
 // In IE9+, we have access to composition events, but the data supplied
 // by the native compositionend event may be incorrect. Japanese ideographic
 // spaces, for instance (\u3000) are not recorded correctly.
-var useFallbackCompositionData = ExecutionEnvironment.canUseDOM &&
+var useFallbackCompositionData =
+  ExecutionEnvironment.canUseDOM &&
   (!canUseCompositionEvent ||
     (documentMode && documentMode > 8 && documentMode <= 11));
 
@@ -51,9 +53,11 @@ var useFallbackCompositionData = ExecutionEnvironment.canUseDOM &&
  */
 function isPresto() {
   var opera = window.opera;
-  return typeof opera === 'object' &&
+  return (
+    typeof opera === 'object' &&
     typeof opera.version === 'function' &&
-    parseInt(opera.version(), 10) <= 12;
+    parseInt(opera.version(), 10) <= 12
+  );
 }
 
 var SPACEBAR_CODE = 32;
@@ -126,9 +130,11 @@ var hasSpaceKeypress = false;
  * (cut, copy, select-all, etc.) even though no character is inserted.
  */
 function isKeypressCommand(nativeEvent) {
-  return (nativeEvent.ctrlKey || nativeEvent.altKey || nativeEvent.metaKey) &&
+  return (
+    (nativeEvent.ctrlKey || nativeEvent.altKey || nativeEvent.metaKey) &&
     // ctrlKey && altKey is equivalent to AltGr, and is not a command.
-    !(nativeEvent.ctrlKey && nativeEvent.altKey);
+    !(nativeEvent.ctrlKey && nativeEvent.altKey)
+  );
 }
 
 /**
diff --git a/src/renderers/dom/shared/eventPlugins/ChangeEventPlugin.js b/src/renderers/dom/shared/eventPlugins/ChangeEventPlugin.js
index fb56d1408f5ed..f60e2d44a32a4 100644
--- a/src/renderers/dom/shared/eventPlugins/ChangeEventPlugin.js
+++ b/src/renderers/dom/shared/eventPlugins/ChangeEventPlugin.js
@@ -67,8 +67,9 @@ var activeElementInst = null;
  */
 function shouldUseChangeEvent(elem) {
   var nodeName = elem.nodeName && elem.nodeName.toLowerCase();
-  return nodeName === 'select' ||
-    (nodeName === 'input' && elem.type === 'file');
+  return (
+    nodeName === 'select' || (nodeName === 'input' && elem.type === 'file')
+  );
 }
 
 function manualDispatchChangeEvent(nativeEvent) {
@@ -116,7 +117,8 @@ var isInputEventSupported = false;
 if (ExecutionEnvironment.canUseDOM) {
   // IE9 claims to support the input event but fails to trigger it when
   // deleting text, so we ignore its input events.
-  isInputEventSupported = isEventSupported('input') &&
+  isInputEventSupported =
+    isEventSupported('input') &&
     (!document.documentMode || document.documentMode > 9);
 }
 
@@ -205,9 +207,11 @@ function shouldUseClickEvent(elem) {
   // This approach works across all browsers, whereas `change` does not fire
   // until `blur` in IE8.
   var nodeName = elem.nodeName;
-  return nodeName &&
+  return (
+    nodeName &&
     nodeName.toLowerCase() === 'input' &&
-    (elem.type === 'checkbox' || elem.type === 'radio');
+    (elem.type === 'checkbox' || elem.type === 'radio')
+  );
 }
 
 function getTargetInstForClickEvent(topLevelType, targetInst) {
diff --git a/src/renderers/dom/shared/eventPlugins/SelectEventPlugin.js b/src/renderers/dom/shared/eventPlugins/SelectEventPlugin.js
index c075529e21c5e..6e1f214036da2 100644
--- a/src/renderers/dom/shared/eventPlugins/SelectEventPlugin.js
+++ b/src/renderers/dom/shared/eventPlugins/SelectEventPlugin.js
@@ -23,7 +23,8 @@ var getActiveElement = require('fbjs/lib/getActiveElement');
 var isTextInputElement = require('isTextInputElement');
 var shallowEqual = require('fbjs/lib/shallowEqual');
 
-var skipSelectionChangeEvent = ExecutionEnvironment.canUseDOM &&
+var skipSelectionChangeEvent =
+  ExecutionEnvironment.canUseDOM &&
   'documentMode' in document &&
   document.documentMode <= 11;
 
@@ -53,7 +54,8 @@ var mouseDown = false;
 
 // Track whether all listeners exists for this plugin. If none exist, we do
 // not extract events. See #3639.
-var isListeningToAllDependencies = ReactBrowserEventEmitter.isListeningToAllDependencies;
+var isListeningToAllDependencies =
+  ReactBrowserEventEmitter.isListeningToAllDependencies;
 
 /**
  * Get an object which is a unique representation of the current selection.
@@ -96,7 +98,9 @@ function constructSelectEvent(nativeEvent, nativeEventTarget) {
   // fires only on input and textarea thus if there's no focused element we
   // won't dispatch.
   if (
-    mouseDown || activeElement == null || activeElement !== getActiveElement()
+    mouseDown ||
+    activeElement == null ||
+    activeElement !== getActiveElement()
   ) {
     return null;
   }
@@ -177,7 +181,6 @@ var SelectEventPlugin = {
         activeElementInst = null;
         lastSelection = null;
         break;
-
       // Don't fire the event while the user is dragging. This matches the
       // semantics of the native select event.
       case 'topMouseDown':
@@ -187,7 +190,6 @@ var SelectEventPlugin = {
       case 'topMouseUp':
         mouseDown = false;
         return constructSelectEvent(nativeEvent, nativeEventTarget);
-
       // Chrome and IE fire non-standard event when selection is changed (and
       // sometimes when it hasn't). IE's event fires out of order with respect
       // to key and input events on deletion, so we discard it.
diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js
index 5007116a6ea09..46dbcf490da1e 100644
--- a/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js
+++ b/src/renderers/dom/shared/eventPlugins/__tests__/BeforeInputEventPlugin-test.js
@@ -67,7 +67,7 @@ describe('BeforeInputEventPlugin', function() {
   }
 
   function setElementText(node) {
-    return args => node.innerHTML = args;
+    return args => (node.innerHTML = args);
   }
 
   function accumulateEvents(node, events) {
@@ -95,7 +95,8 @@ describe('BeforeInputEventPlugin', function() {
         } else if (actual === null) {
           throw new EventMismatchError(idx, 'Expected not to be null');
         } else if (
-          expected.type === null || !(actual instanceof expected.type)
+          expected.type === null ||
+          !(actual instanceof expected.type)
         ) {
           throw new EventMismatchError(idx, 'Unexpected type: ' + actual);
         } else {
diff --git a/src/renderers/dom/shared/hooks/ReactDOMInvalidARIAHook.js b/src/renderers/dom/shared/hooks/ReactDOMInvalidARIAHook.js
index 6ada3db767a02..7eaf0bc1ac3b5 100644
--- a/src/renderers/dom/shared/hooks/ReactDOMInvalidARIAHook.js
+++ b/src/renderers/dom/shared/hooks/ReactDOMInvalidARIAHook.js
@@ -21,9 +21,7 @@ var rARIA = new RegExp('^(aria)-[' + DOMProperty.ATTRIBUTE_NAME_CHAR + ']*$');
 
 if (__DEV__) {
   var {ReactComponentTreeHook} = require('ReactGlobalSharedState');
-  var {
-    getStackAddendumByID,
-  } = ReactComponentTreeHook;
+  var {getStackAddendumByID} = ReactComponentTreeHook;
 }
 
 function getStackAddendum(debugID) {
diff --git a/src/renderers/dom/shared/inputValueTracking.js b/src/renderers/dom/shared/inputValueTracking.js
index 5cc50e150bbec..9f0d50ecd07a5 100644
--- a/src/renderers/dom/shared/inputValueTracking.js
+++ b/src/renderers/dom/shared/inputValueTracking.js
@@ -29,9 +29,11 @@ var ReactDOMComponentTree = require('ReactDOMComponentTree');
 function isCheckable(elem: any) {
   var type = elem.type;
   var nodeName = elem.nodeName;
-  return nodeName &&
+  return (
+    nodeName &&
     nodeName.toLowerCase() === 'input' &&
-    (type === 'checkbox' || type === 'radio');
+    (type === 'checkbox' || type === 'radio')
+  );
 }
 
 function getTracker(inst: any) {
diff --git a/src/renderers/dom/shared/setInnerHTML.js b/src/renderers/dom/shared/setInnerHTML.js
index 25c7570071b5d..d5cbb20109792 100644
--- a/src/renderers/dom/shared/setInnerHTML.js
+++ b/src/renderers/dom/shared/setInnerHTML.js
@@ -29,8 +29,8 @@ var setInnerHTML = createMicrosoftUnsafeLocalFunction(function(node, html) {
   // new markup in a temp node and then move the child nodes across into
   // the target node
   if (node.namespaceURI === DOMNamespaces.svg && !('innerHTML' in node)) {
-    reusableSVGContainer = reusableSVGContainer ||
-      document.createElement('div');
+    reusableSVGContainer =
+      reusableSVGContainer || document.createElement('div');
     reusableSVGContainer.innerHTML = '<svg>' + html + '</svg>';
     var svgNode = reusableSVGContainer.firstChild;
     while (svgNode.firstChild) {
diff --git a/src/renderers/dom/shared/syntheticEvents/SyntheticMouseEvent.js b/src/renderers/dom/shared/syntheticEvents/SyntheticMouseEvent.js
index 33c4046a89dd1..428ec754aa9bf 100644
--- a/src/renderers/dom/shared/syntheticEvents/SyntheticMouseEvent.js
+++ b/src/renderers/dom/shared/syntheticEvents/SyntheticMouseEvent.js
@@ -34,10 +34,12 @@ var MouseEventInterface = {
   button: null,
   buttons: null,
   relatedTarget: function(event) {
-    return event.relatedTarget ||
+    return (
+      event.relatedTarget ||
       (event.fromElement === event.srcElement
         ? event.toElement
-        : event.fromElement);
+        : event.fromElement)
+    );
   },
 };
 
diff --git a/src/renderers/dom/shared/utils/ReactControlledValuePropTypes.js b/src/renderers/dom/shared/utils/ReactControlledValuePropTypes.js
index 48c37b67a3039..0f64cd58c5a2e 100644
--- a/src/renderers/dom/shared/utils/ReactControlledValuePropTypes.js
+++ b/src/renderers/dom/shared/utils/ReactControlledValuePropTypes.js
@@ -46,7 +46,10 @@ var propTypes = {
   },
   checked: function(props, propName, componentName) {
     if (
-      !props[propName] || props.onChange || props.readOnly || props.disabled
+      !props[propName] ||
+      props.onChange ||
+      props.readOnly ||
+      props.disabled
     ) {
       return null;
     }
diff --git a/src/renderers/dom/shared/utils/isEventSupported.js b/src/renderers/dom/shared/utils/isEventSupported.js
index ef258994eab73..a5eee44c85547 100644
--- a/src/renderers/dom/shared/utils/isEventSupported.js
+++ b/src/renderers/dom/shared/utils/isEventSupported.js
@@ -15,7 +15,8 @@ var ExecutionEnvironment = require('fbjs/lib/ExecutionEnvironment');
 
 var useHasFeature;
 if (ExecutionEnvironment.canUseDOM) {
-  useHasFeature = document.implementation &&
+  useHasFeature =
+    document.implementation &&
     document.implementation.hasFeature &&
     // always returns true in newer browsers as per the standard.
     // @see http://dom.spec.whatwg.org/#dom-domimplementation-hasfeature
diff --git a/src/renderers/dom/shared/validateDOMNesting.js b/src/renderers/dom/shared/validateDOMNesting.js
index 1ecf8e01754a8..d4ebc5e1abe43 100644
--- a/src/renderers/dom/shared/validateDOMNesting.js
+++ b/src/renderers/dom/shared/validateDOMNesting.js
@@ -233,7 +233,6 @@ if (__DEV__) {
       // but
       case 'option':
         return tag === '#text';
-
       // https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-intd
       // https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-incaption
       // No special behavior since these rules fall back to "in body" mode for
@@ -241,39 +240,42 @@ if (__DEV__) {
 
       // https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-intr
       case 'tr':
-        return tag === 'th' ||
+        return (
+          tag === 'th' ||
           tag === 'td' ||
           tag === 'style' ||
           tag === 'script' ||
-          tag === 'template';
-
+          tag === 'template'
+        );
       // https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-intbody
       case 'tbody':
       case 'thead':
       case 'tfoot':
-        return tag === 'tr' ||
+        return (
+          tag === 'tr' ||
           tag === 'style' ||
           tag === 'script' ||
-          tag === 'template';
-
+          tag === 'template'
+        );
       // https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-incolgroup
       case 'colgroup':
         return tag === 'col' || tag === 'template';
-
       // https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-intable
       case 'table':
-        return tag === 'caption' ||
+        return (
+          tag === 'caption' ||
           tag === 'colgroup' ||
           tag === 'tbody' ||
           tag === 'tfoot' ||
           tag === 'thead' ||
           tag === 'style' ||
           tag === 'script' ||
-          tag === 'template';
-
+          tag === 'template'
+        );
       // https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-inhead
       case 'head':
-        return tag === 'base' ||
+        return (
+          tag === 'base' ||
           tag === 'basefont' ||
           tag === 'bgsound' ||
           tag === 'link' ||
@@ -283,8 +285,8 @@ if (__DEV__) {
           tag === 'noframes' ||
           tag === 'style' ||
           tag === 'script' ||
-          tag === 'template';
-
+          tag === 'template'
+        );
       // https://html.spec.whatwg.org/multipage/semantics.html#the-html-element
       case 'html':
         return tag === 'head' || tag === 'body';
@@ -302,12 +304,14 @@ if (__DEV__) {
       case 'h4':
       case 'h5':
       case 'h6':
-        return parentTag !== 'h1' &&
+        return (
+          parentTag !== 'h1' &&
           parentTag !== 'h2' &&
           parentTag !== 'h3' &&
           parentTag !== 'h4' &&
           parentTag !== 'h5' &&
-          parentTag !== 'h6';
+          parentTag !== 'h6'
+        );
 
       case 'rp':
       case 'rt':
@@ -428,8 +432,8 @@ if (__DEV__) {
     isParent,
   ) {
     var childOwner = childInstance && childInstance._currentElement._owner;
-    var ancestorOwner = ancestorInstance &&
-      ancestorInstance._currentElement._owner;
+    var ancestorOwner =
+      ancestorInstance && ancestorInstance._currentElement._owner;
 
     var childOwners = findOwnerStack(childOwner);
     var ancestorOwners = findOwnerStack(ancestorOwner);
@@ -508,7 +512,8 @@ if (__DEV__) {
     var addendum;
 
     if (childInstance != null) {
-      addendum = ' See ' +
+      addendum =
+        ' See ' +
         getOwnerInfo(
           childInstance,
           childTag,
@@ -521,13 +526,8 @@ if (__DEV__) {
       addendum = getCurrentFiberStackAddendum();
     }
 
-    var warnKey = !!invalidParent +
-      '|' +
-      childTag +
-      '|' +
-      ancestorTag +
-      '|' +
-      addendum;
+    var warnKey =
+      !!invalidParent + '|' + childTag + '|' + ancestorTag + '|' + addendum;
     if (didWarn[warnKey]) {
       return;
     }
@@ -540,7 +540,8 @@ if (__DEV__) {
         tagDisplayName = 'Text nodes';
       } else {
         tagDisplayName = 'Whitespace text nodes';
-        whitespaceInfo = " Make sure you don't have any extra whitespace between tags on " +
+        whitespaceInfo =
+          " Make sure you don't have any extra whitespace between tags on " +
           'each line of your source code.';
       }
     } else {
@@ -550,7 +551,8 @@ if (__DEV__) {
     if (invalidParent) {
       var info = '';
       if (ancestorTag === 'table' && childTag === 'tr') {
-        info += ' Add a <tbody> to your code to match the DOM tree generated by ' +
+        info +=
+          ' Add a <tbody> to your code to match the DOM tree generated by ' +
           'the browser.';
       }
       warning(
@@ -581,8 +583,10 @@ if (__DEV__) {
     ancestorInfo = ancestorInfo || emptyAncestorInfo;
     var parentInfo = ancestorInfo.current;
     var parentTag = parentInfo && parentInfo.tag;
-    return isTagValidWithParent(tag, parentTag) &&
-      !findInvalidAncestorForTag(tag, ancestorInfo);
+    return (
+      isTagValidWithParent(tag, parentTag) &&
+      !findInvalidAncestorForTag(tag, ancestorInfo)
+    );
   };
 }
 
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
index ac76902e0cf15..16b2fba74814a 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
@@ -100,12 +100,12 @@ describe('ReactDOMInput', () => {
           <div>
             <input
               type="text"
-              ref={n => this.a = n}
+              ref={n => (this.a = n)}
               value={this.state.value}
               onChange={e => this.change(e.target.value)}
               onBlur={e => this.blur(e.target.value)}
             />
-            <input type="text" ref={n => this.b = n} />
+            <input type="text" ref={n => (this.b = n)} />
           </div>
         );
       }
@@ -151,11 +151,11 @@ describe('ReactDOMInput', () => {
           <div>
             <input
               type="text"
-              ref={n => this.a = n}
+              ref={n => (this.a = n)}
               value="lion"
               onChange={e => this.change(e.target.value)}
             />
-            <input type="checkbox" ref={n => this.b = n} checked={true} />
+            <input type="checkbox" ref={n => (this.b = n)} checked={true} />
           </div>
         );
       }
@@ -575,7 +575,7 @@ describe('ReactDOMInput', () => {
         return (
           <div>
             <input
-              ref={n => aNode = n}
+              ref={n => (aNode = n)}
               type="radio"
               name="fruit"
               checked={true}
@@ -601,7 +601,7 @@ describe('ReactDOMInput', () => {
         return (
           <div>
             <input
-              ref={n => bNode = n}
+              ref={n => (bNode = n)}
               type="radio"
               name="fruit"
               checked={false}
diff --git a/src/renderers/dom/stack/client/DOMChildrenOperations.js b/src/renderers/dom/stack/client/DOMChildrenOperations.js
index 6457b21b1356a..b7e4e1e105d86 100644
--- a/src/renderers/dom/stack/client/DOMChildrenOperations.js
+++ b/src/renderers/dom/stack/client/DOMChildrenOperations.js
@@ -37,14 +37,16 @@ function getNodeAfter(parentNode, node) {
  * @param {number} index Index at which to insert the child.
  * @internal
  */
-var insertChildAt = createMicrosoftUnsafeLocalFunction(
-  function(parentNode, childNode, referenceNode) {
-    // We rely exclusively on `insertBefore(node, null)` instead of also using
-    // `appendChild(node)`. (Using `undefined` is not allowed by all browsers so
-    // we are careful to use `null`.)
-    parentNode.insertBefore(childNode, referenceNode);
-  },
-);
+var insertChildAt = createMicrosoftUnsafeLocalFunction(function(
+  parentNode,
+  childNode,
+  referenceNode,
+) {
+  // We rely exclusively on `insertBefore(node, null)` instead of also using
+  // `appendChild(node)`. (Using `undefined` is not allowed by all browsers so
+  // we are careful to use `null`.)
+  parentNode.insertBefore(childNode, referenceNode);
+});
 
 function insertLazyTreeChildAt(parentNode, childTree, referenceNode) {
   DOMLazyTree.insertTreeBefore(parentNode, childTree, referenceNode);
@@ -123,9 +125,8 @@ function replaceDelimitedText(openingComment, closingComment, stringText) {
 
   if (__DEV__) {
     ReactInstrumentation.debugTool.onHostOperation({
-      instanceID: ReactDOMComponentTree.getInstanceFromNode(
-        openingComment,
-      )._debugID,
+      instanceID: ReactDOMComponentTree.getInstanceFromNode(openingComment)
+        ._debugID,
       type: 'replace text',
       payload: stringText,
     });
diff --git a/src/renderers/dom/stack/client/DOMLazyTree.js b/src/renderers/dom/stack/client/DOMLazyTree.js
index a6ef556d5e836..6e2fb0c94b1c9 100644
--- a/src/renderers/dom/stack/client/DOMLazyTree.js
+++ b/src/renderers/dom/stack/client/DOMLazyTree.js
@@ -28,8 +28,9 @@ var setTextContent = require('setTextContent');
  *
  * See https://github.com/spicyj/innerhtml-vs-createelement-vs-clonenode.
  */
-var enableLazy = (typeof document !== 'undefined' &&
-  typeof document.documentMode === 'number') ||
+var enableLazy =
+  (typeof document !== 'undefined' &&
+    typeof document.documentMode === 'number') ||
   (typeof navigator !== 'undefined' &&
     typeof navigator.userAgent === 'string' &&
     /\bEdge\/\d/.test(navigator.userAgent));
@@ -51,29 +52,31 @@ function insertTreeChildren(tree) {
   }
 }
 
-var insertTreeBefore = createMicrosoftUnsafeLocalFunction(
-  function(parentNode, tree, referenceNode) {
-    // DocumentFragments aren't actually part of the DOM after insertion so
-    // appending children won't update the DOM. We need to ensure the fragment
-    // is properly populated first, breaking out of our lazy approach for just
-    // this level. Also, some <object> plugins (like Flash Player) will read
-    // <param> nodes immediately upon insertion into the DOM, so <object>
-    // must also be populated prior to insertion into the DOM.
-    if (
-      tree.node.nodeType === DOCUMENT_FRAGMENT_NODE ||
-      (tree.node.nodeType === ELEMENT_NODE &&
-        tree.node.nodeName.toLowerCase() === 'object' &&
-        (tree.node.namespaceURI == null ||
-          tree.node.namespaceURI === DOMNamespaces.html))
-    ) {
-      insertTreeChildren(tree);
-      parentNode.insertBefore(tree.node, referenceNode);
-    } else {
-      parentNode.insertBefore(tree.node, referenceNode);
-      insertTreeChildren(tree);
-    }
-  },
-);
+var insertTreeBefore = createMicrosoftUnsafeLocalFunction(function(
+  parentNode,
+  tree,
+  referenceNode,
+) {
+  // DocumentFragments aren't actually part of the DOM after insertion so
+  // appending children won't update the DOM. We need to ensure the fragment
+  // is properly populated first, breaking out of our lazy approach for just
+  // this level. Also, some <object> plugins (like Flash Player) will read
+  // <param> nodes immediately upon insertion into the DOM, so <object>
+  // must also be populated prior to insertion into the DOM.
+  if (
+    tree.node.nodeType === DOCUMENT_FRAGMENT_NODE ||
+    (tree.node.nodeType === ELEMENT_NODE &&
+      tree.node.nodeName.toLowerCase() === 'object' &&
+      (tree.node.namespaceURI == null ||
+        tree.node.namespaceURI === DOMNamespaces.html))
+  ) {
+    insertTreeChildren(tree);
+    parentNode.insertBefore(tree.node, referenceNode);
+  } else {
+    parentNode.insertBefore(tree.node, referenceNode);
+    insertTreeChildren(tree);
+  }
+});
 
 function replaceChildWithTree(oldNode, newTree) {
   oldNode.parentNode.replaceChild(newTree.node, oldNode);
diff --git a/src/renderers/dom/stack/client/ReactDOMComponent.js b/src/renderers/dom/stack/client/ReactDOMComponent.js
index 91d84e906133b..9c06327e6e0b5 100644
--- a/src/renderers/dom/stack/client/ReactDOMComponent.js
+++ b/src/renderers/dom/stack/client/ReactDOMComponent.js
@@ -136,7 +136,8 @@ function ensureListeningTo(inst, registrationName, transaction) {
     return;
   }
   var containerInfo = inst._hostContainerInfo;
-  var isDocumentFragment = containerInfo._node &&
+  var isDocumentFragment =
+    containerInfo._node &&
     containerInfo._node.nodeType === DOCUMENT_FRAGMENT_NODE;
   var doc = isDocumentFragment
     ? containerInfo._node
@@ -1061,9 +1062,11 @@ ReactDOMComponent.Mixin = {
       ? nextProps.children
       : null;
 
-    var lastHtml = lastProps.dangerouslySetInnerHTML &&
+    var lastHtml =
+      lastProps.dangerouslySetInnerHTML &&
       lastProps.dangerouslySetInnerHTML.__html;
-    var nextHtml = nextProps.dangerouslySetInnerHTML &&
+    var nextHtml =
+      nextProps.dangerouslySetInnerHTML &&
       nextProps.dangerouslySetInnerHTML.__html;
 
     // Note the use of `!=` which checks for null or undefined.
diff --git a/src/renderers/dom/stack/client/ReactDOMStackInjection.js b/src/renderers/dom/stack/client/ReactDOMStackInjection.js
index 8ca7c1c9eec3a..5a0046976b159 100644
--- a/src/renderers/dom/stack/client/ReactDOMStackInjection.js
+++ b/src/renderers/dom/stack/client/ReactDOMStackInjection.js
@@ -46,11 +46,11 @@ function inject() {
 
   ReactHostComponent.injection.injectTextComponentClass(ReactDOMTextComponent);
 
-  ReactEmptyComponent.injection.injectEmptyComponentFactory(
-    function(instantiate) {
-      return new ReactDOMEmptyComponent(instantiate);
-    },
-  );
+  ReactEmptyComponent.injection.injectEmptyComponentFactory(function(
+    instantiate,
+  ) {
+    return new ReactDOMEmptyComponent(instantiate);
+  });
 
   ReactUpdates.injection.injectReconcileTransaction(ReactReconcileTransaction);
   ReactUpdates.injection.injectBatchingStrategy(ReactDefaultBatchingStrategy);
diff --git a/src/renderers/dom/stack/client/ReactDOMTextComponent.js b/src/renderers/dom/stack/client/ReactDOMTextComponent.js
index 55a943d1a9886..992a6267754ce 100644
--- a/src/renderers/dom/stack/client/ReactDOMTextComponent.js
+++ b/src/renderers/dom/stack/client/ReactDOMTextComponent.js
@@ -110,13 +110,15 @@ Object.assign(ReactDOMTextComponent.prototype, {
         return escapedText;
       }
 
-      return '<!--' +
+      return (
+        '<!--' +
         openingValue +
         '-->' +
         escapedText +
         '<!--' +
         closingValue +
-        '-->';
+        '-->'
+      );
     }
   },
 
@@ -161,7 +163,8 @@ Object.assign(ReactDOMTextComponent.prototype, {
           this._domID,
         );
         if (
-          node.nodeType === COMMENT_NODE && node.nodeValue === ' /react-text '
+          node.nodeType === COMMENT_NODE &&
+          node.nodeValue === ' /react-text '
         ) {
           this._closingComment = node;
           break;
diff --git a/src/renderers/dom/stack/client/ReactMount.js b/src/renderers/dom/stack/client/ReactMount.js
index 2f567b8367daa..77b2fa444cda4 100644
--- a/src/renderers/dom/stack/client/ReactMount.js
+++ b/src/renderers/dom/stack/client/ReactMount.js
@@ -103,7 +103,8 @@ function mountComponentIntoNode(
   if (ReactFeatureFlags.logTopLevelRenders) {
     var wrappedElement = wrapperInstance._currentElement.props.child;
     var type = wrappedElement.type;
-    markerName = 'React mount: ' +
+    markerName =
+      'React mount: ' +
       (typeof type === 'string' ? type : type.displayName || type.name);
     console.time(markerName);
   }
@@ -247,14 +248,16 @@ function isValidContainer(node) {
  * @internal
  */
 function isReactNode(node) {
-  return isValidContainer(node) &&
-    (node.hasAttribute(ROOT_ATTR_NAME) || node.hasAttribute(ATTR_NAME));
+  return (
+    isValidContainer(node) &&
+    (node.hasAttribute(ROOT_ATTR_NAME) || node.hasAttribute(ATTR_NAME))
+  );
 }
 
 function getHostRootInstanceInContainer(container) {
   var rootEl = getReactRootElementInContainer(container);
-  var prevHostInstance = rootEl &&
-    ReactDOMComponentTree.getInstanceFromNode(rootEl);
+  var prevHostInstance =
+    rootEl && ReactDOMComponentTree.getInstanceFromNode(rootEl);
   return prevHostInstance && !prevHostInstance._hostParent
     ? prevHostInstance
     : null;
@@ -475,7 +478,8 @@ var ReactMount = {
             'or <Foo />.',
         );
       } else if (
-        nextElement != null && typeof nextElement.props !== 'undefined'
+        nextElement != null &&
+        typeof nextElement.props !== 'undefined'
       ) {
         // Check if it quacks like an element
         invariant(
@@ -512,7 +516,8 @@ var ReactMount = {
       var prevElement = prevWrappedElement.props.child;
       if (shouldUpdateReactComponent(prevElement, nextElement)) {
         var publicInst = prevComponent._renderedComponent.getPublicInstance();
-        var updatedCallback = callback &&
+        var updatedCallback =
+          callback &&
           function() {
             validateCallback(callback);
             callback.call(publicInst);
@@ -531,8 +536,8 @@ var ReactMount = {
     }
 
     var reactRootElement = getReactRootElementInContainer(container);
-    var containerHasReactMarkup = reactRootElement &&
-      !!internalGetID(reactRootElement);
+    var containerHasReactMarkup =
+      reactRootElement && !!internalGetID(reactRootElement);
     var containerHasNonRootReactChild = hasNonRootReactChild(container);
 
     if (__DEV__) {
@@ -561,7 +566,8 @@ var ReactMount = {
       }
     }
 
-    var shouldReuseMarkup = containerHasReactMarkup &&
+    var shouldReuseMarkup =
+      containerHasReactMarkup &&
       !prevComponent &&
       !containerHasNonRootReactChild;
     var component = ReactMount._renderNewRootComponent(
@@ -639,7 +645,8 @@ var ReactMount = {
       var containerHasNonRootReactChild = hasNonRootReactChild(container);
 
       // Check if the container itself is a React root node.
-      var isContainerReactRoot = container.nodeType === ELEMENT_NODE &&
+      var isContainerReactRoot =
+        container.nodeType === ELEMENT_NODE &&
         container.hasAttribute(ROOT_ATTR_NAME);
 
       if (__DEV__) {
@@ -710,13 +717,15 @@ var ReactMount = {
             normalizer = document.createElement('iframe');
             document.body.appendChild(normalizer);
             normalizer.contentDocument.write(markup);
-            normalizedMarkup = normalizer.contentDocument.documentElement.outerHTML;
+            normalizedMarkup =
+              normalizer.contentDocument.documentElement.outerHTML;
             document.body.removeChild(normalizer);
           }
         }
 
         var diffIndex = firstDifferenceIndex(normalizedMarkup, rootMarkup);
-        var difference = ' (client) ' +
+        var difference =
+          ' (client) ' +
           normalizedMarkup.substring(diffIndex - 20, diffIndex + 20) +
           '\n (server) ' +
           rootMarkup.substring(diffIndex - 20, diffIndex + 20);
diff --git a/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js b/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js
index cf0bb9cadc0f9..15c98554b4578 100644
--- a/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js
+++ b/src/renderers/dom/stack/client/wrappers/ReactDOMInput.js
@@ -84,7 +84,8 @@ var ReactDOMInput = {
     if (__DEV__) {
       var owner = inst._currentElement._owner;
       ReactControlledValuePropTypes.checkPropTypes('input', props, () =>
-        getStackAddendumByID(inst._debugID));
+        getStackAddendumByID(inst._debugID),
+      );
 
       if (
         props.checked !== undefined &&
diff --git a/src/renderers/dom/stack/client/wrappers/ReactDOMSelect.js b/src/renderers/dom/stack/client/wrappers/ReactDOMSelect.js
index 1d8bbb9721429..848d6d513ebf5 100644
--- a/src/renderers/dom/stack/client/wrappers/ReactDOMSelect.js
+++ b/src/renderers/dom/stack/client/wrappers/ReactDOMSelect.js
@@ -43,7 +43,8 @@ var valuePropNames = ['value', 'defaultValue'];
 function checkSelectPropTypes(inst, props) {
   var owner = inst._currentElement._owner;
   ReactControlledValuePropTypes.checkPropTypes('select', props, () =>
-    getStackAddendumByID(inst._debugID));
+    getStackAddendumByID(inst._debugID),
+  );
 
   for (var i = 0; i < valuePropNames.length; i++) {
     var propName = valuePropNames[i];
diff --git a/src/renderers/dom/stack/client/wrappers/ReactDOMTextarea.js b/src/renderers/dom/stack/client/wrappers/ReactDOMTextarea.js
index 4f20530b4eb57..b939d687403c5 100644
--- a/src/renderers/dom/stack/client/wrappers/ReactDOMTextarea.js
+++ b/src/renderers/dom/stack/client/wrappers/ReactDOMTextarea.js
@@ -64,7 +64,8 @@ var ReactDOMTextarea = {
   mountWrapper: function(inst, props) {
     if (__DEV__) {
       ReactControlledValuePropTypes.checkPropTypes('textarea', props, () =>
-        getStackAddendumByID(inst._debugID));
+        getStackAddendumByID(inst._debugID),
+      );
       if (
         props.value !== undefined &&
         props.defaultValue !== undefined &&
diff --git a/src/renderers/dom/stack/server/ReactServerRendering.js b/src/renderers/dom/stack/server/ReactServerRendering.js
index e998e1319900c..e673b84ed3eee 100644
--- a/src/renderers/dom/stack/server/ReactServerRendering.js
+++ b/src/renderers/dom/stack/server/ReactServerRendering.js
@@ -40,29 +40,26 @@ function renderToStringImpl(element, makeStaticMarkup) {
 
     pendingTransactions++;
 
-    return transaction.perform(
-      function() {
-        var componentInstance = instantiateReactComponent(element, true);
-        var markup = ReactReconciler.mountComponent(
-          componentInstance,
-          transaction,
-          null,
-          ReactDOMContainerInfo(),
-          emptyObject,
-          0 /* parentDebugID */,
+    return transaction.perform(function() {
+      var componentInstance = instantiateReactComponent(element, true);
+      var markup = ReactReconciler.mountComponent(
+        componentInstance,
+        transaction,
+        null,
+        ReactDOMContainerInfo(),
+        emptyObject,
+        0 /* parentDebugID */,
+      );
+      if (__DEV__) {
+        ReactInstrumentation.debugTool.onUnmountComponent(
+          componentInstance._debugID,
         );
-        if (__DEV__) {
-          ReactInstrumentation.debugTool.onUnmountComponent(
-            componentInstance._debugID,
-          );
-        }
-        if (!makeStaticMarkup) {
-          markup = ReactMarkupChecksum.addChecksumToMarkup(markup);
-        }
-        return markup;
-      },
-      null,
-    );
+      }
+      if (!makeStaticMarkup) {
+        markup = ReactMarkupChecksum.addChecksumToMarkup(markup);
+      }
+      return markup;
+    }, null);
   } finally {
     pendingTransactions--;
     ReactServerRenderingTransaction.release(transaction);
diff --git a/src/renderers/dom/test/ReactTestUtils.js b/src/renderers/dom/test/ReactTestUtils.js
index 23ac6fd774f9b..f88e8ce929986 100644
--- a/src/renderers/dom/test/ReactTestUtils.js
+++ b/src/renderers/dom/test/ReactTestUtils.js
@@ -175,9 +175,11 @@ var ReactTestUtils = {
       // this returns when we have DOM nodes as refs directly
       return false;
     }
-    return inst != null &&
+    return (
+      inst != null &&
       typeof inst.render === 'function' &&
-      typeof inst.setState === 'function';
+      typeof inst.setState === 'function'
+    );
   },
 
   isCompositeComponentWithType: function(inst, type) {
@@ -200,8 +202,10 @@ var ReactTestUtils = {
     // We check the prototype of the type that will get mounted, not the
     // instance itself. This is a future proof way of duck typing.
     var prototype = inst.type.prototype;
-    return typeof prototype.render === 'function' &&
-      typeof prototype.setState === 'function';
+    return (
+      typeof prototype.render === 'function' &&
+      typeof prototype.setState === 'function'
+    );
   },
 
   // TODO: deprecate? It's undocumented and unused.
@@ -299,8 +303,10 @@ var ReactTestUtils = {
    */
   scryRenderedDOMComponentsWithTag: function(root, tagName) {
     return ReactTestUtils.findAllInRenderedTree(root, function(inst) {
-      return ReactTestUtils.isDOMComponent(inst) &&
-        inst.tagName.toUpperCase() === tagName.toUpperCase();
+      return (
+        ReactTestUtils.isDOMComponent(inst) &&
+        inst.tagName.toUpperCase() === tagName.toUpperCase()
+      );
     });
   },
 
@@ -450,9 +456,8 @@ function makeSimulator(eventType) {
       node = domComponentOrNode;
     }
 
-    var dispatchConfig = EventPluginRegistry.eventNameDispatchConfigs[
-      eventType
-    ];
+    var dispatchConfig =
+      EventPluginRegistry.eventNameDispatchConfigs[eventType];
 
     var fakeNativeEvent = new Event();
     fakeNativeEvent.target = node;
diff --git a/src/renderers/native/NativeMethodsMixin.js b/src/renderers/native/NativeMethodsMixin.js
index 893668fb25f2a..44b5dcc2382db 100644
--- a/src/renderers/native/NativeMethodsMixin.js
+++ b/src/renderers/native/NativeMethodsMixin.js
@@ -176,7 +176,8 @@ function setNativePropsFiber(componentOrHandle: any, nativeProps: Object) {
     return;
   }
 
-  const viewConfig: ReactNativeBaseComponentViewConfig = maybeInstance.viewConfig;
+  const viewConfig: ReactNativeBaseComponentViewConfig =
+    maybeInstance.viewConfig;
 
   if (__DEV__) {
     warnForStyleProps(nativeProps, viewConfig.validAttributes);
diff --git a/src/renderers/native/NativeMethodsMixinUtils.js b/src/renderers/native/NativeMethodsMixinUtils.js
index 68e4150869a80..a30e115bcc52e 100644
--- a/src/renderers/native/NativeMethodsMixinUtils.js
+++ b/src/renderers/native/NativeMethodsMixinUtils.js
@@ -71,12 +71,14 @@ function throwOnStylesProp(component: any, props: any) {
   if (props.styles !== undefined) {
     var owner = component._owner || null;
     var name = component.constructor.displayName;
-    var msg = '`styles` is not a supported property of `' +
+    var msg =
+      '`styles` is not a supported property of `' +
       name +
       '`, did ' +
       'you mean `style` (singular)?';
     if (owner && owner.constructor && owner.constructor.displayName) {
-      msg += '\n\nCheck the `' +
+      msg +=
+        '\n\nCheck the `' +
         owner.constructor.displayName +
         '` parent ' +
         ' component.';
diff --git a/src/renderers/native/ReactNativeAttributePayload.js b/src/renderers/native/ReactNativeAttributePayload.js
index ccd98c6fef0a6..07dd2058de787 100644
--- a/src/renderers/native/ReactNativeAttributePayload.js
+++ b/src/renderers/native/ReactNativeAttributePayload.js
@@ -377,7 +377,8 @@ function diffProperties(
       typeof attributeConfig.process === 'function'
     ) {
       // case: CustomAttributeConfiguration
-      var shouldUpdate = prevProp === undefined ||
+      var shouldUpdate =
+        prevProp === undefined ||
         (typeof attributeConfig.diff === 'function'
           ? attributeConfig.diff(prevProp, nextProp)
           : defaultDiffer(prevProp, nextProp));
diff --git a/src/renderers/native/ReactNativeBridgeEventPlugin.js b/src/renderers/native/ReactNativeBridgeEventPlugin.js
index df1f4392376bc..628b9e0d0ffc6 100644
--- a/src/renderers/native/ReactNativeBridgeEventPlugin.js
+++ b/src/renderers/native/ReactNativeBridgeEventPlugin.js
@@ -23,9 +23,8 @@ var customDirectEventTypes = UIManager.customDirectEventTypes;
 var allTypesByEventName = {};
 
 for (var bubblingTypeName in customBubblingEventTypes) {
-  allTypesByEventName[bubblingTypeName] = customBubblingEventTypes[
-    bubblingTypeName
-  ];
+  allTypesByEventName[bubblingTypeName] =
+    customBubblingEventTypes[bubblingTypeName];
 }
 
 for (var directTypeName in customDirectEventTypes) {
diff --git a/src/renderers/native/ReactNativeFiber.js b/src/renderers/native/ReactNativeFiber.js
index e7c2ea86c2cb9..05094043316c6 100644
--- a/src/renderers/native/ReactNativeFiber.js
+++ b/src/renderers/native/ReactNativeFiber.js
@@ -239,9 +239,9 @@ const NativeRenderer = ReactFiberReconciler({
     // Either way we need to pass a copy of the Array to prevent it from being frozen.
     const nativeTags = parentInstance._children.map(
       child =>
-        typeof child === 'number'
+        (typeof child === 'number'
           ? child // Leaf node (eg text)
-          : child._nativeTag,
+          : child._nativeTag),
     );
 
     UIManager.setChildren(
@@ -396,7 +396,8 @@ ReactGenericBatching.injection.injectFiberBatchedUpdates(
 const roots = new Map();
 
 findNodeHandle.injection.injectFindNode((fiber: Fiber) =>
-  NativeRenderer.findHostInstance(fiber));
+  NativeRenderer.findHostInstance(fiber),
+);
 findNodeHandle.injection.injectFindRootNodeID(instance => instance);
 
 // Intercept lifecycle errors and ensure they are shown with the correct stack
diff --git a/src/renderers/native/ReactNativeFiberHostComponent.js b/src/renderers/native/ReactNativeFiberHostComponent.js
index 0c0c69a65dfeb..017f08b847576 100644
--- a/src/renderers/native/ReactNativeFiberHostComponent.js
+++ b/src/renderers/native/ReactNativeFiberHostComponent.js
@@ -17,10 +17,7 @@ var ReactNativeAttributePayload = require('ReactNativeAttributePayload');
 var TextInputState = require('TextInputState');
 var UIManager = require('UIManager');
 
-var {
-  mountSafeCallback,
-  warnForStyleProps,
-} = require('NativeMethodsMixinUtils');
+var {mountSafeCallback, warnForStyleProps} = require('NativeMethodsMixinUtils');
 
 import type {
   MeasureInWindowOnSuccessCallback,
diff --git a/src/renderers/native/__tests__/ReactNativeMount-test.js b/src/renderers/native/__tests__/ReactNativeMount-test.js
index 20c9418a853e7..2328b49065c2d 100644
--- a/src/renderers/native/__tests__/ReactNativeMount-test.js
+++ b/src/renderers/native/__tests__/ReactNativeMount-test.js
@@ -69,7 +69,7 @@ describe('ReactNative', () => {
     var a;
     var b;
     var c = ReactNative.render(
-      <View foo="foo" ref={v => a = v} />,
+      <View foo="foo" ref={v => (a = v)} />,
       11,
       function() {
         b = this;
diff --git a/src/renderers/noop/ReactNoop.js b/src/renderers/noop/ReactNoop.js
index 331eed4928a3b..754b2c265e88d 100644
--- a/src/renderers/noop/ReactNoop.js
+++ b/src/renderers/noop/ReactNoop.js
@@ -25,9 +25,7 @@ import type {UpdateQueue} from 'ReactFiberUpdateQueue';
 var ReactFiberInstrumentation = require('ReactFiberInstrumentation');
 var ReactFiberReconciler = require('ReactFiberReconciler');
 var ReactInstanceMap = require('ReactInstanceMap');
-var {
-  AnimationPriority,
-} = require('ReactPriorityLevel');
+var {AnimationPriority} = require('ReactPriorityLevel');
 var emptyObject = require('fbjs/lib/emptyObject');
 
 const UPDATE_SIGNAL = {};
@@ -116,8 +114,9 @@ var NoopRenderer = ReactFiberReconciler({
   },
 
   shouldSetTextContent(props: Props): boolean {
-    return typeof props.children === 'string' ||
-      typeof props.children === 'number';
+    return (
+      typeof props.children === 'string' || typeof props.children === 'number'
+    );
   },
 
   resetTextContent(instance: Instance): void {},
diff --git a/src/renderers/shared/ReactDOMFrameScheduling.js b/src/renderers/shared/ReactDOMFrameScheduling.js
index 060aa95da631f..17a8749154d37 100644
--- a/src/renderers/shared/ReactDOMFrameScheduling.js
+++ b/src/renderers/shared/ReactDOMFrameScheduling.js
@@ -84,7 +84,8 @@ if (typeof requestAnimationFrame !== 'function') {
     isAnimationFrameScheduled = false;
     var nextFrameTime = rafTime - frameDeadline + activeFrameTime;
     if (
-      nextFrameTime < activeFrameTime && previousFrameTime < activeFrameTime
+      nextFrameTime < activeFrameTime &&
+      previousFrameTime < activeFrameTime
     ) {
       if (nextFrameTime < 8) {
         // Defensive coding. We don't support higher frame rates than 120hz.
diff --git a/src/renderers/shared/ReactDebugTool.js b/src/renderers/shared/ReactDebugTool.js
index e735ad337a792..9d4693420fbc6 100644
--- a/src/renderers/shared/ReactDebugTool.js
+++ b/src/renderers/shared/ReactDebugTool.js
@@ -113,25 +113,22 @@ if (__DEV__) {
   };
 
   const getTreeSnapshot = function(registeredIDs) {
-    return registeredIDs.reduce(
-      (tree, id) => {
-        var ownerID = ReactComponentTreeHook.getOwnerID(id);
-        var parentID = ReactComponentTreeHook.getParentID(id);
-        tree[id] = {
-          displayName: ReactComponentTreeHook.getDisplayName(id),
-          text: ReactComponentTreeHook.getText(id),
-          updateCount: ReactComponentTreeHook.getUpdateCount(id),
-          childIDs: ReactComponentTreeHook.getChildIDs(id),
-          // Text nodes don't have owners but this is close enough.
-          ownerID: ownerID ||
-            (parentID && ReactComponentTreeHook.getOwnerID(parentID)) ||
-            0,
-          parentID,
-        };
-        return tree;
-      },
-      {},
-    );
+    return registeredIDs.reduce((tree, id) => {
+      var ownerID = ReactComponentTreeHook.getOwnerID(id);
+      var parentID = ReactComponentTreeHook.getParentID(id);
+      tree[id] = {
+        displayName: ReactComponentTreeHook.getDisplayName(id),
+        text: ReactComponentTreeHook.getText(id),
+        updateCount: ReactComponentTreeHook.getUpdateCount(id),
+        childIDs: ReactComponentTreeHook.getChildIDs(id),
+        // Text nodes don't have owners but this is close enough.
+        ownerID: ownerID ||
+          (parentID && ReactComponentTreeHook.getOwnerID(parentID)) ||
+          0,
+        parentID,
+      };
+      return tree;
+    }, {});
   };
 
   const resetMeasurements = function() {
@@ -252,7 +249,8 @@ if (__DEV__) {
   };
 
   var lastMarkTimeStamp = 0;
-  var canUsePerformanceMeasure: boolean = typeof performance !== 'undefined' &&
+  var canUsePerformanceMeasure: boolean =
+    typeof performance !== 'undefined' &&
     typeof performance.mark === 'function' &&
     typeof performance.clearMarks === 'function' &&
     typeof performance.measure === 'function' &&
@@ -289,8 +287,8 @@ if (__DEV__) {
     }
 
     var markName = `${debugID}::${markType}`;
-    var displayName = ReactComponentTreeHook.getDisplayName(debugID) ||
-      'Unknown';
+    var displayName =
+      ReactComponentTreeHook.getDisplayName(debugID) || 'Unknown';
 
     // Chrome has an issue of dropping markers recorded too fast:
     // https://bugs.chromium.org/p/chromium/issues/detail?id=640652
diff --git a/src/renderers/shared/ReactGlobalSharedState.js b/src/renderers/shared/ReactGlobalSharedState.js
index b9107b435857e..42e9d9bc01149 100644
--- a/src/renderers/shared/ReactGlobalSharedState.js
+++ b/src/renderers/shared/ReactGlobalSharedState.js
@@ -11,7 +11,8 @@
 
 'use strict';
 
-var ReactInternals = require('react').__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
+var ReactInternals = require('react')
+  .__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
 
 var ReactGlobalSharedState = {
   ReactCurrentOwner: ReactInternals.ReactCurrentOwner,
diff --git a/src/renderers/shared/ReactPerf.js b/src/renderers/shared/ReactPerf.js
index f7f8984c0b580..d119959c551b1 100644
--- a/src/renderers/shared/ReactPerf.js
+++ b/src/renderers/shared/ReactPerf.js
@@ -71,13 +71,13 @@ function getExclusive(flushHistory = getLastMeasurements()) {
     var stats = aggregatedStats[key];
     if (!stats) {
       affectedIDs[key] = {};
-      stats = (aggregatedStats[key] = {
+      stats = aggregatedStats[key] = {
         key,
         instanceCount: 0,
         counts: {},
         durations: {},
         totalDuration: 0,
-      });
+      };
     }
     if (!stats.durations[timerType]) {
       stats.durations[timerType] = 0;
@@ -125,12 +125,12 @@ function getInclusive(flushHistory = getLastMeasurements()) {
     var stats = aggregatedStats[key];
     if (!stats) {
       affectedIDs[key] = {};
-      stats = (aggregatedStats[key] = {
+      stats = aggregatedStats[key] = {
         key,
         instanceCount: 0,
         inclusiveRenderDuration: 0,
         renderCount: 0,
-      });
+      };
     }
     affectedIDs[key][instanceID] = true;
     applyUpdate(stats);
@@ -196,12 +196,12 @@ function getWasted(flushHistory = getLastMeasurements()) {
     var stats = aggregatedStats[key];
     if (!stats) {
       affectedIDs[key] = {};
-      stats = (aggregatedStats[key] = {
+      stats = aggregatedStats[key] = {
         key,
         instanceCount: 0,
         inclusiveRenderDuration: 0,
         renderCount: 0,
-      });
+      };
     }
     affectedIDs[key][instanceID] = true;
     applyUpdate(stats);
@@ -255,7 +255,8 @@ function getWasted(flushHistory = getLastMeasurements()) {
       while (nextParentID) {
         // Any parents rendered during this batch are considered wasted
         // unless we previously marked them as dirty.
-        var isWasted = renderedCompositeIDs[nextParentID] &&
+        var isWasted =
+          renderedCompositeIDs[nextParentID] &&
           !isDefinitelyNotWastedByID[nextParentID];
         if (isWasted) {
           updateAggregatedStats(treeSnapshot, nextParentID, stats => {
diff --git a/src/renderers/shared/fiber/ReactChildFiber.js b/src/renderers/shared/fiber/ReactChildFiber.js
index 7e8469e3fa2c3..ca1022e3e23d8 100644
--- a/src/renderers/shared/fiber/ReactChildFiber.js
+++ b/src/renderers/shared/fiber/ReactChildFiber.js
@@ -20,13 +20,8 @@ import type {ReactInstance} from 'ReactInstanceType';
 import type {PriorityLevel} from 'ReactPriorityLevel';
 
 var REACT_ELEMENT_TYPE = require('ReactElementSymbol');
-var {
-  REACT_COROUTINE_TYPE,
-  REACT_YIELD_TYPE,
-} = require('ReactCoroutine');
-var {
-  REACT_PORTAL_TYPE,
-} = require('ReactPortal');
+var {REACT_COROUTINE_TYPE, REACT_YIELD_TYPE} = require('ReactCoroutine');
+var {REACT_PORTAL_TYPE} = require('ReactPortal');
 
 var ReactFiber = require('ReactFiber');
 var ReactTypeOfSideEffect = require('ReactTypeOfSideEffect');
@@ -61,7 +56,8 @@ if (__DEV__) {
     );
     child._store.validated = true;
 
-    var currentComponentErrorInfo = 'Each child in an array or iterator should have a unique ' +
+    var currentComponentErrorInfo =
+      'Each child in an array or iterator should have a unique ' +
       '"key" prop. See https://fb.me/react-warning-keys for ' +
       'more information.' +
       (getCurrentFiberStackAddendum(child) || '');
@@ -102,11 +98,7 @@ const {
   Fragment,
 } = ReactTypeOfWork;
 
-const {
-  NoEffect,
-  Placement,
-  Deletion,
-} = ReactTypeOfSideEffect;
+const {NoEffect, Placement, Deletion} = ReactTypeOfSideEffect;
 
 function coerceRef(current: Fiber | null, element: ReactElement) {
   let mixedRef = element.ref;
@@ -161,7 +153,8 @@ function throwOnInvalidObjectType(returnFiber: Fiber, newChild: Object) {
   if (returnFiber.type !== 'textarea') {
     let addendum = '';
     if (__DEV__) {
-      addendum = ' If you meant to render a collection of children, use an array ' +
+      addendum =
+        ' If you meant to render a collection of children, use an array ' +
         'instead.' +
         (getCurrentFiberStackAddendum() || '');
     }
@@ -201,7 +194,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       last.nextEffect = childToDelete;
       returnFiber.progressedLastDeletion = childToDelete;
     } else {
-      returnFiber.progressedFirstDeletion = (returnFiber.progressedLastDeletion = childToDelete);
+      returnFiber.progressedFirstDeletion = returnFiber.progressedLastDeletion = childToDelete;
     }
     childToDelete.nextEffect = null;
     childToDelete.effectTag = Deletion;
@@ -582,16 +575,18 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
     if (typeof newChild === 'object' && newChild !== null) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE: {
-          const matchedFiber = existingChildren.get(
-            newChild.key === null ? newIdx : newChild.key,
-          ) || null;
+          const matchedFiber =
+            existingChildren.get(
+              newChild.key === null ? newIdx : newChild.key,
+            ) || null;
           return updateElement(returnFiber, matchedFiber, newChild, priority);
         }
 
         case REACT_COROUTINE_TYPE: {
-          const matchedFiber = existingChildren.get(
-            newChild.key === null ? newIdx : newChild.key,
-          ) || null;
+          const matchedFiber =
+            existingChildren.get(
+              newChild.key === null ? newIdx : newChild.key,
+            ) || null;
           return updateCoroutine(returnFiber, matchedFiber, newChild, priority);
         }
 
@@ -603,9 +598,10 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
         }
 
         case REACT_PORTAL_TYPE: {
-          const matchedFiber = existingChildren.get(
-            newChild.key === null ? newIdx : newChild.key,
-          ) || null;
+          const matchedFiber =
+            existingChildren.get(
+              newChild.key === null ? newIdx : newChild.key,
+            ) || null;
           return updatePortal(returnFiber, matchedFiber, newChild, priority);
         }
       }
@@ -1251,7 +1247,8 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
           if (__DEV__) {
             const instance = returnFiber.stateNode;
             if (
-              instance.render._isMockFunction && typeof newChild === 'undefined'
+              instance.render._isMockFunction &&
+              typeof newChild === 'undefined'
             ) {
               // We allow auto-mocks to proceed as if they're
               // returning null.
@@ -1384,10 +1381,10 @@ exports.cloneChildFibers = function(
     newChild.return = workInProgress;
     while (currentChild.sibling !== null) {
       currentChild = currentChild.sibling;
-      newChild = (newChild.sibling = cloneFiber(
+      newChild = newChild.sibling = cloneFiber(
         currentChild,
         currentChild.pendingWorkPriority,
-      ));
+      );
       newChild.return = workInProgress;
     }
     newChild.sibling = null;
diff --git a/src/renderers/shared/fiber/ReactDebugFiberPerf.js b/src/renderers/shared/fiber/ReactDebugFiberPerf.js
index 331430cf3a500..f1591e7ee3e5a 100644
--- a/src/renderers/shared/fiber/ReactDebugFiberPerf.js
+++ b/src/renderers/shared/fiber/ReactDebugFiberPerf.js
@@ -41,7 +41,8 @@ if (__DEV__) {
   // Longer prefixes are hard to read in DevTools.
   const reactEmoji = '\u269B';
   const warningEmoji = '\u26D4';
-  const supportsUserTiming = typeof performance !== 'undefined' &&
+  const supportsUserTiming =
+    typeof performance !== 'undefined' &&
     typeof performance.mark === 'function' &&
     typeof performance.clearMarks === 'function' &&
     typeof performance.measure === 'function' &&
diff --git a/src/renderers/shared/fiber/ReactFiber.js b/src/renderers/shared/fiber/ReactFiber.js
index faf8f95d37047..38dd9bcfeda27 100644
--- a/src/renderers/shared/fiber/ReactFiber.js
+++ b/src/renderers/shared/fiber/ReactFiber.js
@@ -35,17 +35,11 @@ var {
   Fragment,
 } = ReactTypeOfWork;
 
-var {
-  NoWork,
-} = require('ReactPriorityLevel');
+var {NoWork} = require('ReactPriorityLevel');
 
-var {
-  NoEffect,
-} = require('ReactTypeOfSideEffect');
+var {NoEffect} = require('ReactTypeOfSideEffect');
 
-var {
-  cloneUpdateQueue,
-} = require('ReactFiberUpdateQueue');
+var {cloneUpdateQueue} = require('ReactFiberUpdateQueue');
 
 var invariant = require('fbjs/lib/invariant');
 
@@ -360,7 +354,9 @@ function createFiberFromElementType(
     fiber = createFiber(HostComponent, key);
     fiber.type = type;
   } else if (
-    typeof type === 'object' && type !== null && typeof type.tag === 'number'
+    typeof type === 'object' &&
+    type !== null &&
+    typeof type.tag === 'number'
   ) {
     // Currently assumed to be a continuation and therefore is a fiber already.
     // TODO: The yield system is currently broken for updates in some cases.
@@ -378,7 +374,8 @@ function createFiberFromElementType(
           type !== null &&
           Object.keys(type).length === 0)
       ) {
-        info += ' You likely forgot to export your component from the file ' +
+        info +=
+          ' You likely forgot to export your component from the file ' +
           "it's defined in.";
       }
       const ownerName = debugOwner ? getComponentName(debugOwner) : null;
diff --git a/src/renderers/shared/fiber/ReactFiberBeginWork.js b/src/renderers/shared/fiber/ReactFiberBeginWork.js
index 3787e98be02d9..584bdaf1c6fbb 100644
--- a/src/renderers/shared/fiber/ReactFiberBeginWork.js
+++ b/src/renderers/shared/fiber/ReactFiberBeginWork.js
@@ -25,9 +25,7 @@ var {
   reconcileChildFibersInPlace,
   cloneChildFibers,
 } = require('ReactChildFiber');
-var {
-  beginUpdateQueue,
-} = require('ReactFiberUpdateQueue');
+var {beginUpdateQueue} = require('ReactFiberUpdateQueue');
 var ReactTypeOfWork = require('ReactTypeOfWork');
 var {
   getMaskedContext,
@@ -50,16 +48,8 @@ var {
   YieldComponent,
   Fragment,
 } = ReactTypeOfWork;
-var {
-  NoWork,
-  OffscreenPriority,
-} = require('ReactPriorityLevel');
-var {
-  Placement,
-  ContentReset,
-  Err,
-  Ref,
-} = require('ReactTypeOfSideEffect');
+var {NoWork, OffscreenPriority} = require('ReactPriorityLevel');
+var {Placement, ContentReset, Err, Ref} = require('ReactTypeOfSideEffect');
 var ReactFiberClassComponent = require('ReactFiberClassComponent');
 var {ReactCurrentOwner} = require('ReactGlobalSharedState');
 var invariant = require('fbjs/lib/invariant');
@@ -84,10 +74,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     shouldDeprioritizeSubtree,
   } = config;
 
-  const {
-    pushHostContext,
-    pushHostContainer,
-  } = hostContext;
+  const {pushHostContext, pushHostContainer} = hostContext;
 
   const {
     adoptClassInstance,
@@ -115,7 +102,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   }
 
   function clearDeletions(workInProgress) {
-    workInProgress.progressedFirstDeletion = (workInProgress.progressedLastDeletion = null);
+    workInProgress.progressedFirstDeletion = workInProgress.progressedLastDeletion = null;
   }
 
   function transferDeletions(workInProgress) {
@@ -196,7 +183,8 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         nextChildren = workInProgress.memoizedProps;
       }
     } else if (
-      nextChildren === null || workInProgress.memoizedProps === nextChildren
+      nextChildren === null ||
+      workInProgress.memoizedProps === nextChildren
     ) {
       return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
@@ -585,7 +573,8 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         );
       }
     } else if (
-      nextCoroutine === null || workInProgress.memoizedProps === nextCoroutine
+      nextCoroutine === null ||
+      workInProgress.memoizedProps === nextCoroutine
     ) {
       nextCoroutine = workInProgress.memoizedProps;
       // TODO: When bailing out, we might need to return the stateNode instead
@@ -653,7 +642,8 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         );
       }
     } else if (
-      nextChildren === null || workInProgress.memoizedProps === nextChildren
+      nextChildren === null ||
+      workInProgress.memoizedProps === nextChildren
     ) {
       return bailoutOnAlreadyFinishedWork(current, workInProgress);
     }
diff --git a/src/renderers/shared/fiber/ReactFiberClassComponent.js b/src/renderers/shared/fiber/ReactFiberClassComponent.js
index c417f2f42ecde..d43a32f3ba0f8 100644
--- a/src/renderers/shared/fiber/ReactFiberClassComponent.js
+++ b/src/renderers/shared/fiber/ReactFiberClassComponent.js
@@ -15,9 +15,7 @@
 import type {Fiber} from 'ReactFiber';
 import type {PriorityLevel} from 'ReactPriorityLevel';
 
-var {
-  Update,
-} = require('ReactTypeOfSideEffect');
+var {Update} = require('ReactTypeOfSideEffect');
 var {
   cacheContext,
   getMaskedContext,
@@ -41,10 +39,7 @@ var invariant = require('fbjs/lib/invariant');
 const isArray = Array.isArray;
 
 if (__DEV__) {
-  var {
-    startPhaseTimer,
-    stopPhaseTimer,
-  } = require('ReactDebugFiberPerf');
+  var {startPhaseTimer, stopPhaseTimer} = require('ReactDebugFiberPerf');
   var warning = require('fbjs/lib/warning');
   var warnOnInvalidCallback = function(callback: mixed, callerName: string) {
     warning(
@@ -143,8 +138,9 @@ module.exports = function(
 
     const type = workInProgress.type;
     if (type.prototype && type.prototype.isPureReactComponent) {
-      return !shallowEqual(oldProps, newProps) ||
-        !shallowEqual(oldState, newState);
+      return (
+        !shallowEqual(oldProps, newProps) || !shallowEqual(oldState, newState)
+      );
     }
 
     return true;
@@ -161,7 +157,8 @@ module.exports = function(
           'instance: you may have forgotten to define `render`.',
         name,
       );
-      const noGetInitialStateOnES6 = !instance.getInitialState ||
+      const noGetInitialStateOnES6 =
+        !instance.getInitialState ||
         instance.getInitialState.isReactClassApproved ||
         instance.state;
       warning(
@@ -171,7 +168,8 @@ module.exports = function(
           'Did you mean to define a state property instead?',
         name,
       );
-      const noGetDefaultPropsOnES6 = !instance.getDefaultProps ||
+      const noGetDefaultPropsOnES6 =
+        !instance.getDefaultProps ||
         instance.getDefaultProps.isReactClassApproved;
       warning(
         noGetDefaultPropsOnES6,
@@ -194,8 +192,8 @@ module.exports = function(
           'property to define contextTypes instead.',
         name,
       );
-      const noComponentShouldUpdate = typeof instance.componentShouldUpdate !==
-        'function';
+      const noComponentShouldUpdate =
+        typeof instance.componentShouldUpdate !== 'function';
       warning(
         noComponentShouldUpdate,
         '%s has a method called ' +
@@ -204,8 +202,8 @@ module.exports = function(
           'expected to return a value.',
         name,
       );
-      const noComponentDidUnmount = typeof instance.componentDidUnmount !==
-        'function';
+      const noComponentDidUnmount =
+        typeof instance.componentDidUnmount !== 'function';
       warning(
         noComponentDidUnmount,
         '%s has a method called ' +
@@ -213,8 +211,8 @@ module.exports = function(
           'Did you mean componentWillUnmount()?',
         name,
       );
-      const noComponentWillRecieveProps = typeof instance.componentWillRecieveProps !==
-        'function';
+      const noComponentWillRecieveProps =
+        typeof instance.componentWillRecieveProps !== 'function';
       warning(
         noComponentWillRecieveProps,
         '%s has a method called ' +
@@ -381,7 +379,7 @@ module.exports = function(
     // want to reuse one that failed to fully mount.
     const newInstance = constructClassInstance(workInProgress);
     newInstance.props = newProps;
-    newInstance.state = (newState = newInstance.state || null);
+    newInstance.state = newState = newInstance.state || null;
     newInstance.context = newContext;
 
     if (typeof newInstance.componentWillMount === 'function') {
diff --git a/src/renderers/shared/fiber/ReactFiberCommitWork.js b/src/renderers/shared/fiber/ReactFiberCommitWork.js
index 17000dc690306..2703f065897f9 100644
--- a/src/renderers/shared/fiber/ReactFiberCommitWork.js
+++ b/src/renderers/shared/fiber/ReactFiberCommitWork.js
@@ -38,10 +38,7 @@ var {
 var invariant = require('fbjs/lib/invariant');
 
 if (__DEV__) {
-  var {
-    startPhaseTimer,
-    stopPhaseTimer,
-  } = require('ReactDebugFiberPerf');
+  var {startPhaseTimer, stopPhaseTimer} = require('ReactDebugFiberPerf');
 }
 
 module.exports = function<T, P, I, TI, PI, C, CX, PL>(
@@ -143,9 +140,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   }
 
   function isHostParent(fiber: Fiber): boolean {
-    return fiber.tag === HostComponent ||
+    return (
+      fiber.tag === HostComponent ||
       fiber.tag === HostRoot ||
-      fiber.tag === HostPortal;
+      fiber.tag === HostPortal
+    );
   }
 
   function getHostSibling(fiber: Fiber): ?I {
@@ -468,7 +467,8 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
           }
         }
         if (
-          finishedWork.effectTag & Callback && finishedWork.updateQueue !== null
+          finishedWork.effectTag & Callback &&
+          finishedWork.updateQueue !== null
         ) {
           commitCallbacks(finishedWork, finishedWork.updateQueue, instance);
         }
diff --git a/src/renderers/shared/fiber/ReactFiberCompleteWork.js b/src/renderers/shared/fiber/ReactFiberCompleteWork.js
index a65b0d3d71353..644356983b71b 100644
--- a/src/renderers/shared/fiber/ReactFiberCompleteWork.js
+++ b/src/renderers/shared/fiber/ReactFiberCompleteWork.js
@@ -19,9 +19,7 @@ import type {FiberRoot} from 'ReactFiberRoot';
 import type {HostConfig} from 'ReactFiberReconciler';
 
 var {reconcileChildFibers} = require('ReactChildFiber');
-var {
-  popContextProvider,
-} = require('ReactFiberContext');
+var {popContextProvider} = require('ReactFiberContext');
 var ReactTypeOfWork = require('ReactTypeOfWork');
 var ReactTypeOfSideEffect = require('ReactTypeOfSideEffect');
 var {
@@ -37,10 +35,7 @@ var {
   YieldComponent,
   Fragment,
 } = ReactTypeOfWork;
-var {
-  Ref,
-  Update,
-} = ReactTypeOfSideEffect;
+var {Ref, Update} = ReactTypeOfSideEffect;
 
 if (__DEV__) {
   var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');
@@ -342,7 +337,6 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
         markUpdate(workInProgress);
         popHostContainer(workInProgress);
         return null;
-
       // Error cases
       case IndeterminateComponent:
         invariant(
diff --git a/src/renderers/shared/fiber/ReactFiberContext.js b/src/renderers/shared/fiber/ReactFiberContext.js
index 4d669a8611b30..8a2c606409ceb 100644
--- a/src/renderers/shared/fiber/ReactFiberContext.js
+++ b/src/renderers/shared/fiber/ReactFiberContext.js
@@ -20,26 +20,14 @@ var emptyObject = require('fbjs/lib/emptyObject');
 var getComponentName = require('getComponentName');
 var invariant = require('fbjs/lib/invariant');
 var warning = require('fbjs/lib/warning');
-var {
-  isFiberMounted,
-} = require('ReactFiberTreeReflection');
-var {
-  ClassComponent,
-  HostRoot,
-} = require('ReactTypeOfWork');
-const {
-  createCursor,
-  pop,
-  push,
-} = require('ReactFiberStack');
+var {isFiberMounted} = require('ReactFiberTreeReflection');
+var {ClassComponent, HostRoot} = require('ReactTypeOfWork');
+const {createCursor, pop, push} = require('ReactFiberStack');
 
 if (__DEV__) {
   var ReactDebugCurrentFiber = require('ReactDebugCurrentFiber');
   var {ReactDebugCurrentFrame} = require('ReactGlobalSharedState');
-  var {
-    startPhaseTimer,
-    stopPhaseTimer,
-  } = require('ReactDebugFiberPerf');
+  var {startPhaseTimer, stopPhaseTimer} = require('ReactDebugFiberPerf');
   var warnedAboutMissingGetChildContext = {};
 }
 
@@ -241,8 +229,8 @@ exports.pushContextProvider = function(workInProgress: Fiber): boolean {
   // We push the context as early as possible to ensure stack integrity.
   // If the instance does not exist yet, we will push null at first,
   // and replace it on the stack later when invalidating the context.
-  const memoizedMergedChildContext = (instance &&
-    instance.__reactInternalMemoizedMergedChildContext) ||
+  const memoizedMergedChildContext =
+    (instance && instance.__reactInternalMemoizedMergedChildContext) ||
     emptyObject;
 
   // Remember the parent context so we can merge with it later.
diff --git a/src/renderers/shared/fiber/ReactFiberErrorLogger.js b/src/renderers/shared/fiber/ReactFiberErrorLogger.js
index 093439b6389e4..007be1a8b6186 100644
--- a/src/renderers/shared/fiber/ReactFiberErrorLogger.js
+++ b/src/renderers/shared/fiber/ReactFiberErrorLogger.js
@@ -39,11 +39,7 @@ function logCapturedError(capturedError: CapturedError): void {
       willRetry,
     } = capturedError;
 
-    const {
-      message,
-      name,
-      stack,
-    } = error;
+    const {message, name, stack} = error;
 
     const errorSummary = message ? `${name}: ${message}` : name;
 
@@ -69,15 +65,18 @@ function logCapturedError(capturedError: CapturedError): void {
     // errorBoundaryFound check is sufficient; errorBoundaryName check is to satisfy Flow.
     if (errorBoundaryFound && errorBoundaryName) {
       if (willRetry) {
-        errorBoundaryMessage = `React will try to recreate this component tree from scratch ` +
+        errorBoundaryMessage =
+          `React will try to recreate this component tree from scratch ` +
           `using the error boundary you provided, ${errorBoundaryName}.`;
       } else {
-        errorBoundaryMessage = `This error was initially handled by the error boundary ${errorBoundaryName}. ` +
+        errorBoundaryMessage =
+          `This error was initially handled by the error boundary ${errorBoundaryName}. ` +
           `Recreating the tree from scratch failed so React will unmount the tree.`;
       }
     } else {
       // TODO Link to unstable_handleError() documentation once it exists.
-      errorBoundaryMessage = 'Consider adding an error boundary to your tree to customize error handling behavior.';
+      errorBoundaryMessage =
+        'Consider adding an error boundary to your tree to customize error handling behavior.';
     }
 
     console.error(
diff --git a/src/renderers/shared/fiber/ReactFiberHostContext.js b/src/renderers/shared/fiber/ReactFiberHostContext.js
index 41e4ff15dfb7d..448bd8c72ea4a 100644
--- a/src/renderers/shared/fiber/ReactFiberHostContext.js
+++ b/src/renderers/shared/fiber/ReactFiberHostContext.js
@@ -16,11 +16,7 @@ import type {Fiber} from 'ReactFiber';
 import type {HostConfig} from 'ReactFiberReconciler';
 import type {StackCursor} from 'ReactFiberStack';
 
-const {
-  createCursor,
-  pop,
-  push,
-} = require('ReactFiberStack');
+const {createCursor, pop, push} = require('ReactFiberStack');
 
 const invariant = require('fbjs/lib/invariant');
 
@@ -40,10 +36,7 @@ export type HostContext<C, CX> = {
 module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   config: HostConfig<T, P, I, TI, PI, C, CX, PL>,
 ): HostContext<C, CX> {
-  const {
-    getChildHostContext,
-    getRootHostContext,
-  } = config;
+  const {getChildHostContext, getRootHostContext} = config;
 
   let contextStackCursor: StackCursor<CX | NoContextT> = createCursor(
     NO_CONTEXT,
diff --git a/src/renderers/shared/fiber/ReactFiberReconciler.js b/src/renderers/shared/fiber/ReactFiberReconciler.js
index 75e96aa274dfe..17979297ee49e 100644
--- a/src/renderers/shared/fiber/ReactFiberReconciler.js
+++ b/src/renderers/shared/fiber/ReactFiberReconciler.js
@@ -17,9 +17,7 @@ import type {FiberRoot} from 'ReactFiberRoot';
 import type {PriorityLevel} from 'ReactPriorityLevel';
 import type {ReactNodeList} from 'ReactTypes';
 
-var {
-  addTopLevelUpdate,
-} = require('ReactFiberUpdateQueue');
+var {addTopLevelUpdate} = require('ReactFiberUpdateQueue');
 
 var {
   findCurrentUnmaskedContext,
@@ -107,9 +105,9 @@ export type HostConfig<T, P, I, TI, PI, C, CX, PL> = {
   removeChild(parentInstance: I | C, child: I | TI): void,
 
   scheduleAnimationCallback(callback: () => void): number | void,
-  scheduleDeferredCallback(callback: (deadline: Deadline) => void):
-    | number
-    | void,
+  scheduleDeferredCallback(
+    callback: (deadline: Deadline) => void,
+  ): number | void,
 
   prepareForCommit(): void,
   resetAfterCommit(): void,
@@ -131,11 +129,9 @@ export type Reconciler<C, I, TI> = {
   deferredUpdates<A>(fn: () => A): A,
 
   // Used to extract the return value from the initial render. Legacy API.
-  getPublicRootInstance(container: OpaqueRoot):
-    | ReactComponent<any, any, any>
-    | TI
-    | I
-    | null,
+  getPublicRootInstance(
+    container: OpaqueRoot,
+  ): ReactComponent<any, any, any> | TI | I | null,
 
   // Use for findDOMNode/findHostNode. Legacy API.
   findHostInstance(component: Fiber): I | TI | null,
diff --git a/src/renderers/shared/fiber/ReactFiberScheduler.js b/src/renderers/shared/fiber/ReactFiberScheduler.js
index 80ff10825e531..6654d20dd55f0 100644
--- a/src/renderers/shared/fiber/ReactFiberScheduler.js
+++ b/src/renderers/shared/fiber/ReactFiberScheduler.js
@@ -31,9 +31,7 @@ export type HandleErrorInfo = {
   componentStack: string,
 };
 
-var {
-  popContextProvider,
-} = require('ReactFiberContext');
+var {popContextProvider} = require('ReactFiberContext');
 const {reset} = require('ReactFiberStack');
 var {
   getStackAddendumByWorkInProgressFiber,
@@ -81,13 +79,9 @@ var {
   ClassComponent,
 } = require('ReactTypeOfWork');
 
-var {
-  getPendingPriority,
-} = require('ReactFiberUpdateQueue');
+var {getPendingPriority} = require('ReactFiberUpdateQueue');
 
-var {
-  resetContext,
-} = require('ReactFiberContext');
+var {resetContext} = require('ReactFiberContext');
 
 var invariant = require('fbjs/lib/invariant');
 
@@ -1148,17 +1142,21 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   function hasCapturedError(fiber: Fiber): boolean {
     // TODO: capturedErrors should store the boundary instance, to avoid needing
     // to check the alternate.
-    return capturedErrors !== null &&
+    return (
+      capturedErrors !== null &&
       (capturedErrors.has(fiber) ||
-        (fiber.alternate !== null && capturedErrors.has(fiber.alternate)));
+        (fiber.alternate !== null && capturedErrors.has(fiber.alternate)))
+    );
   }
 
   function isFailedBoundary(fiber: Fiber): boolean {
     // TODO: failedBoundaries should store the boundary instance, to avoid
     // needing to check the alternate.
-    return failedBoundaries !== null &&
+    return (
+      failedBoundaries !== null &&
       (failedBoundaries.has(fiber) ||
-        (fiber.alternate !== null && failedBoundaries.has(fiber.alternate)));
+        (fiber.alternate !== null && failedBoundaries.has(fiber.alternate)))
+    );
   }
 
   function commitErrorHandling(effectfulFiber: Fiber) {
diff --git a/src/renderers/shared/fiber/ReactFiberTreeReflection.js b/src/renderers/shared/fiber/ReactFiberTreeReflection.js
index b527587c45ee9..94d7c880724f3 100644
--- a/src/renderers/shared/fiber/ReactFiberTreeReflection.js
+++ b/src/renderers/shared/fiber/ReactFiberTreeReflection.js
@@ -31,10 +31,7 @@ var {
   ClassComponent,
 } = require('ReactTypeOfWork');
 
-var {
-  NoEffect,
-  Placement,
-} = require('ReactTypeOfSideEffect');
+var {NoEffect, Placement} = require('ReactTypeOfSideEffect');
 
 var MOUNTING = 1;
 var MOUNTED = 2;
diff --git a/src/renderers/shared/fiber/ReactFiberUpdateQueue.js b/src/renderers/shared/fiber/ReactFiberUpdateQueue.js
index 03e6c5e5cedca..b3fd536c9dfd5 100644
--- a/src/renderers/shared/fiber/ReactFiberUpdateQueue.js
+++ b/src/renderers/shared/fiber/ReactFiberUpdateQueue.js
@@ -15,9 +15,7 @@
 import type {Fiber} from 'ReactFiber';
 import type {PriorityLevel} from 'ReactPriorityLevel';
 
-const {
-  Callback: CallbackEffect,
-} = require('ReactTypeOfSideEffect');
+const {Callback: CallbackEffect} = require('ReactTypeOfSideEffect');
 
 const {
   NoWork,
@@ -431,7 +429,8 @@ function beginUpdateQueue(
   let callbackList = null;
   let update = queue.first;
   while (
-    update !== null && comparePriority(update.priorityLevel, priorityLevel) <= 0
+    update !== null &&
+    comparePriority(update.priorityLevel, priorityLevel) <= 0
   ) {
     // Remove each update from the queue right before it is processed. That way
     // if setState is called from inside an updater function, the new update
diff --git a/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js b/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js
index 7e533ce3f1775..f54d5c180e652 100644
--- a/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactCoroutine-test.js
@@ -27,7 +27,7 @@ describe('ReactCoroutine', () => {
   });
 
   function div(...children) {
-    children = children.map(c => typeof c === 'string' ? {text: c} : c);
+    children = children.map(c => (typeof c === 'string' ? {text: c} : c));
     return {type: 'div', children, prop: undefined};
   }
 
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js b/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
index 93e874edfc8ff..4e31a6b77e7bf 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncremental-test.js
@@ -54,7 +54,7 @@ describe('ReactIncremental', () => {
       return [<Bar key="a" isBar={true} />, <Bar key="b" isBar={true} />];
     }
 
-    ReactNoop.render(<Foo />, () => renderCallbackCalled = true);
+    ReactNoop.render(<Foo />, () => (renderCallbackCalled = true));
     expect(fooCalled).toBe(false);
     expect(barCalled).toBe(false);
     expect(renderCallbackCalled).toBe(false);
@@ -103,7 +103,8 @@ describe('ReactIncremental', () => {
     }
 
     ReactNoop.render(<Foo text="foo" />, () =>
-      ops.push('renderCallbackCalled'));
+      ops.push('renderCallbackCalled'),
+    );
     ReactNoop.flush();
 
     expect(ops).toEqual([
@@ -117,9 +118,11 @@ describe('ReactIncremental', () => {
     ops = [];
 
     ReactNoop.render(<Foo text="bar" />, () =>
-      ops.push('firstRenderCallbackCalled'));
+      ops.push('firstRenderCallbackCalled'),
+    );
     ReactNoop.render(<Foo text="bar" />, () =>
-      ops.push('secondRenderCallbackCalled'));
+      ops.push('secondRenderCallbackCalled'),
+    );
     ReactNoop.flush();
 
     // TODO: Test bail out of host components. This is currently unobservable.
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
index b4c9098e8f4cf..6e9581c2b0a0b 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
@@ -27,7 +27,7 @@ describe('ReactIncrementalErrorHandling', () => {
   });
 
   function div(...children) {
-    children = children.map(c => typeof c === 'string' ? {text: c} : c);
+    children = children.map(c => (typeof c === 'string' ? {text: c} : c));
     return {type: 'div', children, prop: undefined};
   }
 
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js
index 5bd7afb2171ff..6504dac2bfc23 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalPerf-test.js
@@ -71,12 +71,14 @@ describe('ReactDebugFiberPerf', () => {
           label: null,
           parent: activeMeasure,
           toString() {
-            return [
-              '  '.repeat(this.indent) + this.label,
-              ...this.children.map(c => c.toString()),
-            ].join('\n') +
+            return (
+              [
+                '  '.repeat(this.indent) + this.label,
+                ...this.children.map(c => c.toString()),
+              ].join('\n') +
               // Extra newline after each root reconciliation
-              (this.indent === 0 ? '\n' : '');
+              (this.indent === 0 ? '\n' : '')
+            );
           },
         };
         // Step one level deeper
@@ -170,11 +172,11 @@ describe('ReactDebugFiberPerf', () => {
       <Parent>
         <Parent>
           <Parent>
-            <A ref={inst => a = inst} />
+            <A ref={inst => (a = inst)} />
           </Parent>
         </Parent>
         <Parent>
-          <B ref={inst => b = inst} />
+          <B ref={inst => (b = inst)} />
         </Parent>
       </Parent>,
     );
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
index aae01ad469025..55a6227022c77 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalReflection-test.js
@@ -151,13 +151,13 @@ describe('ReactIncrementalReflection', () => {
       render() {
         ops.push('render');
         return this.props.step < 2
-          ? <span ref={ref => this.span = ref} />
+          ? <span ref={ref => (this.span = ref)} />
           : this.props.step === 2
-              ? <div ref={ref => this.div = ref} />
+              ? <div ref={ref => (this.div = ref)} />
               : this.props.step === 3
                   ? null
                   : this.props.step === 4
-                      ? <div ref={ref => this.span = ref} />
+                      ? <div ref={ref => (this.span = ref)} />
                       : null;
       }
     }
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
index 430c09b628293..43aa4e4980ea8 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
@@ -29,7 +29,7 @@ describe('ReactIncrementalSideEffects', () => {
   }
 
   function div(...children) {
-    children = children.map(c => typeof c === 'string' ? {text: c} : c);
+    children = children.map(c => (typeof c === 'string' ? {text: c} : c));
     return {type: 'div', children, prop: undefined};
   }
 
diff --git a/src/renderers/shared/fiber/isomorphic/ReactCoroutine.js b/src/renderers/shared/fiber/isomorphic/ReactCoroutine.js
index 605b15e8832df..a11cb5b0c23e0 100644
--- a/src/renderers/shared/fiber/isomorphic/ReactCoroutine.js
+++ b/src/renderers/shared/fiber/isomorphic/ReactCoroutine.js
@@ -88,18 +88,22 @@ exports.createYield = function(value: mixed): ReactYield {
  * Verifies the object is a coroutine object.
  */
 exports.isCoroutine = function(object: mixed): boolean {
-  return typeof object === 'object' &&
+  return (
+    typeof object === 'object' &&
     object !== null &&
-    object.$$typeof === REACT_COROUTINE_TYPE;
+    object.$$typeof === REACT_COROUTINE_TYPE
+  );
 };
 
 /**
  * Verifies the object is a yield object.
  */
 exports.isYield = function(object: mixed): boolean {
-  return typeof object === 'object' &&
+  return (
+    typeof object === 'object' &&
     object !== null &&
-    object.$$typeof === REACT_YIELD_TYPE;
+    object.$$typeof === REACT_YIELD_TYPE
+  );
 };
 
 exports.REACT_YIELD_TYPE = REACT_YIELD_TYPE;
diff --git a/src/renderers/shared/fiber/isomorphic/ReactPortal.js b/src/renderers/shared/fiber/isomorphic/ReactPortal.js
index 13d99c7116af5..e7045ac7241af 100644
--- a/src/renderers/shared/fiber/isomorphic/ReactPortal.js
+++ b/src/renderers/shared/fiber/isomorphic/ReactPortal.js
@@ -16,9 +16,8 @@ import type {ReactNodeList} from 'ReactTypes';
 
 // The Symbol used to tag the special React types. If there is no native Symbol
 // nor polyfill, then a plain number is used for performance.
-var REACT_PORTAL_TYPE = (typeof Symbol === 'function' &&
-  Symbol.for &&
-  Symbol.for('react.portal')) ||
+var REACT_PORTAL_TYPE =
+  (typeof Symbol === 'function' && Symbol.for && Symbol.for('react.portal')) ||
   0xeaca;
 
 export type ReactPortal = {
@@ -51,9 +50,11 @@ exports.createPortal = function(
  * Verifies the object is a portal object.
  */
 exports.isPortal = function(object: mixed): boolean {
-  return typeof object === 'object' &&
+  return (
+    typeof object === 'object' &&
     object !== null &&
-    object.$$typeof === REACT_PORTAL_TYPE;
+    object.$$typeof === REACT_PORTAL_TYPE
+  );
 };
 
 exports.REACT_PORTAL_TYPE = REACT_PORTAL_TYPE;
diff --git a/src/renderers/shared/hooks/ReactHostOperationHistoryHook.js b/src/renderers/shared/hooks/ReactHostOperationHistoryHook.js
index ef3ec1ae8d1d1..08da2d68c124c 100644
--- a/src/renderers/shared/hooks/ReactHostOperationHistoryHook.js
+++ b/src/renderers/shared/hooks/ReactHostOperationHistoryHook.js
@@ -14,18 +14,16 @@
 
 import type {DebugID} from 'ReactInstanceType';
 
-export type Operation =
-  & {instanceID: DebugID}
-  & (
-    | {type: 'mount', payload: string}
-    | {type: 'insert child', payload: {toIndex: number, content: string}}
-    | {type: 'move child', payload: {fromIndex: number, toIndex: number}}
-    | {type: 'replace children', payload: string}
-    | {type: 'replace text', payload: string}
-    | {type: 'replace with', payload: string}
-    | {type: 'update styles', payload: mixed /* Style Object */}
-    | {type: 'update attribute', payload: {[name: string]: string}}
-    | {type: 'remove attribute', payload: string});
+export type Operation = {instanceID: DebugID} & (
+  | {type: 'mount', payload: string}
+  | {type: 'insert child', payload: {toIndex: number, content: string}}
+  | {type: 'move child', payload: {fromIndex: number, toIndex: number}}
+  | {type: 'replace children', payload: string}
+  | {type: 'replace text', payload: string}
+  | {type: 'replace with', payload: string}
+  | {type: 'update styles', payload: mixed /* Style Object */}
+  | {type: 'update attribute', payload: {[name: string]: string}}
+  | {type: 'remove attribute', payload: string});
 
 // Trust the developer to only use this with a __DEV__ check
 var ReactHostOperationHistoryHook = ((null: any): typeof ReactHostOperationHistoryHook);
diff --git a/src/renderers/shared/shared/event/EventPluginHub.js b/src/renderers/shared/shared/event/EventPluginHub.js
index ac723ff890052..6d1bf6d79091d 100644
--- a/src/renderers/shared/shared/event/EventPluginHub.js
+++ b/src/renderers/shared/shared/event/EventPluginHub.js
@@ -49,10 +49,12 @@ var executeDispatchesAndReleaseTopLevel = function(e) {
 };
 
 function isInteractive(tag) {
-  return tag === 'button' ||
+  return (
+    tag === 'button' ||
     tag === 'input' ||
     tag === 'select' ||
-    tag === 'textarea';
+    tag === 'textarea'
+  );
 }
 
 function shouldPreventMouseEvent(name, type, props) {
@@ -140,7 +142,8 @@ var EventPluginHub = {
     } else {
       const currentElement = inst._currentElement;
       if (
-        typeof currentElement === 'string' || typeof currentElement === 'number'
+        typeof currentElement === 'string' ||
+        typeof currentElement === 'number'
       ) {
         // Text node, let it bubble through.
         return null;
diff --git a/src/renderers/shared/shared/event/EventPluginRegistry.js b/src/renderers/shared/shared/event/EventPluginRegistry.js
index e60ba5d829cf5..f3359d0d9935a 100644
--- a/src/renderers/shared/shared/event/EventPluginRegistry.js
+++ b/src/renderers/shared/shared/event/EventPluginRegistry.js
@@ -141,9 +141,8 @@ function publishRegistrationName(
     registrationName,
   );
   EventPluginRegistry.registrationNameModules[registrationName] = pluginModule;
-  EventPluginRegistry.registrationNameDependencies[
-    registrationName
-  ] = pluginModule.eventTypes[eventName].dependencies;
+  EventPluginRegistry.registrationNameDependencies[registrationName] =
+    pluginModule.eventTypes[eventName].dependencies;
 
   if (__DEV__) {
     var lowerCasedName = registrationName.toLowerCase();
diff --git a/src/renderers/shared/shared/event/EventPluginUtils.js b/src/renderers/shared/shared/event/EventPluginUtils.js
index 38952088b2470..2bd12dc56f583 100644
--- a/src/renderers/shared/shared/event/EventPluginUtils.js
+++ b/src/renderers/shared/shared/event/EventPluginUtils.js
@@ -41,9 +41,11 @@ var injection = {
 };
 
 function isEndish(topLevelType) {
-  return topLevelType === 'topMouseUp' ||
+  return (
+    topLevelType === 'topMouseUp' ||
     topLevelType === 'topTouchEnd' ||
-    topLevelType === 'topTouchCancel';
+    topLevelType === 'topTouchCancel'
+  );
 }
 
 function isMoveish(topLevelType) {
diff --git a/src/renderers/shared/shared/event/EventPropagators.js b/src/renderers/shared/shared/event/EventPropagators.js
index 05d6863d3855e..43bfaaa4a6353 100644
--- a/src/renderers/shared/shared/event/EventPropagators.js
+++ b/src/renderers/shared/shared/event/EventPropagators.js
@@ -27,9 +27,8 @@ var getListener = EventPluginHub.getListener;
  * "phases" of propagation. This finds listeners by a given phase.
  */
 function listenerAtPhase(inst, event, propagationPhase: PropagationPhases) {
-  var registrationName = event.dispatchConfig.phasedRegistrationNames[
-    propagationPhase
-  ];
+  var registrationName =
+    event.dispatchConfig.phasedRegistrationNames[propagationPhase];
   return getListener(inst, registrationName);
 }
 
diff --git a/src/renderers/shared/shared/event/ReactSyntheticEventType.js b/src/renderers/shared/shared/event/ReactSyntheticEventType.js
index a9e453bcb26d4..3496d633c9e6d 100644
--- a/src/renderers/shared/shared/event/ReactSyntheticEventType.js
+++ b/src/renderers/shared/shared/event/ReactSyntheticEventType.js
@@ -25,14 +25,12 @@ export type DispatchConfig = {
   registrationName?: string,
 };
 
-export type ReactSyntheticEvent =
-  & {
+export type ReactSyntheticEvent = {
+  dispatchConfig: DispatchConfig,
+  getPooled: (
     dispatchConfig: DispatchConfig,
-    getPooled: (
-      dispatchConfig: DispatchConfig,
-      targetInst: ReactInstance,
-      nativeTarget: Event,
-      nativeEventTarget: EventTarget,
-    ) => ReactSyntheticEvent,
-  }
-  & SyntheticEvent;
+    targetInst: ReactInstance,
+    nativeTarget: Event,
+    nativeEventTarget: EventTarget,
+  ) => ReactSyntheticEvent,
+} & SyntheticEvent;
diff --git a/src/renderers/shared/shared/event/eventPlugins/ResponderEventPlugin.js b/src/renderers/shared/shared/event/eventPlugins/ResponderEventPlugin.js
index 8f853afe08beb..54ffe58bb9866 100644
--- a/src/renderers/shared/shared/event/eventPlugins/ResponderEventPlugin.js
+++ b/src/renderers/shared/shared/event/eventPlugins/ResponderEventPlugin.js
@@ -24,7 +24,8 @@ var isMoveish = EventPluginUtils.isMoveish;
 var isEndish = EventPluginUtils.isEndish;
 var executeDirectDispatch = EventPluginUtils.executeDirectDispatch;
 var hasDispatches = EventPluginUtils.hasDispatches;
-var executeDispatchesInOrderStopAtTrue = EventPluginUtils.executeDispatchesInOrderStopAtTrue;
+var executeDispatchesInOrderStopAtTrue =
+  EventPluginUtils.executeDispatchesInOrderStopAtTrue;
 
 /**
  * Instance of element that should respond to touch/move types of interactions,
@@ -375,9 +376,11 @@ function setResponderAndExtractTransfer(
       nativeEvent,
       nativeEventTarget,
     );
-    terminationRequestEvent.touchHistory = ResponderTouchHistoryStore.touchHistory;
+    terminationRequestEvent.touchHistory =
+      ResponderTouchHistoryStore.touchHistory;
     EventPropagators.accumulateDirectDispatches(terminationRequestEvent);
-    var shouldSwitch = !hasDispatches(terminationRequestEvent) ||
+    var shouldSwitch =
+      !hasDispatches(terminationRequestEvent) ||
       executeDirectDispatch(terminationRequestEvent);
     if (!terminationRequestEvent.isPersistent()) {
       terminationRequestEvent.constructor.release(terminationRequestEvent);
@@ -421,14 +424,16 @@ function setResponderAndExtractTransfer(
  * @return {boolean} True if a transfer of responder could possibly occur.
  */
 function canTriggerTransfer(topLevelType, topLevelInst, nativeEvent) {
-  return topLevelInst &&
+  return (
+    topLevelInst &&
     // responderIgnoreScroll: We are trying to migrate away from specifically
     // tracking native scroll events here and responderIgnoreScroll indicates we
     // will send topTouchCancel to handle canceling touch events instead
     ((topLevelType === 'topScroll' && !nativeEvent.responderIgnoreScroll) ||
       (trackedTouchCount > 0 && topLevelType === 'topSelectionChange') ||
       isStartish(topLevelType) ||
-      isMoveish(topLevelType));
+      isMoveish(topLevelType))
+  );
 }
 
 /**
@@ -530,9 +535,10 @@ var ResponderEventPlugin = {
       extracted = accumulate(extracted, gesture);
     }
 
-    var isResponderTerminate = responderInst &&
-      topLevelType === 'topTouchCancel';
-    var isResponderRelease = responderInst &&
+    var isResponderTerminate =
+      responderInst && topLevelType === 'topTouchCancel';
+    var isResponderRelease =
+      responderInst &&
       !isResponderTerminate &&
       isEndish(topLevelType) &&
       noResponderTouches(nativeEvent);
@@ -552,7 +558,8 @@ var ResponderEventPlugin = {
       changeResponder(null);
     }
 
-    var numberActiveTouches = ResponderTouchHistoryStore.touchHistory.numberActiveTouches;
+    var numberActiveTouches =
+      ResponderTouchHistoryStore.touchHistory.numberActiveTouches;
     if (
       ResponderEventPlugin.GlobalInteractionHandler &&
       numberActiveTouches !== previousActiveTouches
diff --git a/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js b/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js
index b3831ce143670..2b79393efe277 100644
--- a/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js
+++ b/src/renderers/shared/shared/event/eventPlugins/ResponderTouchHistoryStore.js
@@ -17,11 +17,7 @@ const EventPluginUtils = require('EventPluginUtils');
 const invariant = require('fbjs/lib/invariant');
 const warning = require('fbjs/lib/warning');
 
-const {
-  isEndish,
-  isMoveish,
-  isStartish,
-} = EventPluginUtils;
+const {isEndish, isMoveish, isStartish} = EventPluginUtils;
 
 /**
  * Tracks the position and time of each active touch by `touch.identifier`. We
@@ -193,9 +189,8 @@ const ResponderTouchHistoryStore = {
       nativeEvent.changedTouches.forEach(recordTouchStart);
       touchHistory.numberActiveTouches = nativeEvent.touches.length;
       if (touchHistory.numberActiveTouches === 1) {
-        touchHistory.indexOfSingleActiveTouch = nativeEvent.touches[
-          0
-        ].identifier;
+        touchHistory.indexOfSingleActiveTouch =
+          nativeEvent.touches[0].identifier;
       }
     } else if (isEndish(topLevelType)) {
       nativeEvent.changedTouches.forEach(recordTouchEnd);
diff --git a/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js b/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js
index ed62c2fb8384b..336f76fde5d62 100644
--- a/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js
+++ b/src/renderers/shared/shared/event/eventPlugins/__tests__/ResponderEventPlugin-test.js
@@ -256,15 +256,13 @@ var registerTestHandlers = function(eventTestConfig, readableIDToID) {
     var hasTwoPhase = !!oneEventTypeTestConfig.bubbled;
     if (hasTwoPhase) {
       registerOneEventType(
-        ResponderEventPlugin.eventTypes[
-          eventName
-        ].phasedRegistrationNames.bubbled,
+        ResponderEventPlugin.eventTypes[eventName].phasedRegistrationNames
+          .bubbled,
         oneEventTypeTestConfig.bubbled,
       );
       registerOneEventType(
-        ResponderEventPlugin.eventTypes[
-          eventName
-        ].phasedRegistrationNames.captured,
+        ResponderEventPlugin.eventTypes[eventName].phasedRegistrationNames
+          .captured,
         oneEventTypeTestConfig.captured,
       );
     } else {
diff --git a/src/renderers/shared/shared/shouldUpdateReactComponent.js b/src/renderers/shared/shared/shouldUpdateReactComponent.js
index 9a723b884d2cc..097eab1c5424d 100644
--- a/src/renderers/shared/shared/shouldUpdateReactComponent.js
+++ b/src/renderers/shared/shared/shouldUpdateReactComponent.js
@@ -34,9 +34,11 @@ function shouldUpdateReactComponent(prevElement, nextElement) {
   if (prevType === 'string' || prevType === 'number') {
     return nextType === 'string' || nextType === 'number';
   } else {
-    return nextType === 'object' &&
+    return (
+      nextType === 'object' &&
       prevElement.type === nextElement.type &&
-      prevElement.key === nextElement.key;
+      prevElement.key === nextElement.key
+    );
   }
 }
 
diff --git a/src/renderers/shared/stack/reconciler/ReactChildReconciler.js b/src/renderers/shared/stack/reconciler/ReactChildReconciler.js
index b0eedb0af9544..856cc15fa3471 100644
--- a/src/renderers/shared/stack/reconciler/ReactChildReconciler.js
+++ b/src/renderers/shared/stack/reconciler/ReactChildReconciler.js
@@ -32,7 +32,8 @@ if (
   // https://github.com/facebook/react/issues/7240
   // Remove the inline requires when we don't need them anymore:
   // https://github.com/facebook/react/pull/7178
-  ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook;
+  ReactComponentTreeHook = require('ReactGlobalSharedState')
+    .ReactComponentTreeHook;
 }
 
 function instantiateChild(childInstances, child, name, selfDebugID) {
@@ -40,7 +41,8 @@ function instantiateChild(childInstances, child, name, selfDebugID) {
   var keyUnique = childInstances[name] === undefined;
   if (__DEV__) {
     if (!ReactComponentTreeHook) {
-      ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook;
+      ReactComponentTreeHook = require('ReactGlobalSharedState')
+        .ReactComponentTreeHook;
     }
     if (!keyUnique) {
       warning(
@@ -147,7 +149,8 @@ var ReactChildReconciler = {
         nextChildren[name] = prevChild;
       } else {
         if (
-          !ReactFeatureFlags.prepareNewChildrenBeforeUnmountInStack && prevChild
+          !ReactFeatureFlags.prepareNewChildrenBeforeUnmountInStack &&
+          prevChild
         ) {
           removedNodes[name] = ReactReconciler.getHostNode(prevChild);
           ReactReconciler.unmountComponent(
@@ -171,7 +174,8 @@ var ReactChildReconciler = {
         );
         mountImages.push(nextChildMountImage);
         if (
-          ReactFeatureFlags.prepareNewChildrenBeforeUnmountInStack && prevChild
+          ReactFeatureFlags.prepareNewChildrenBeforeUnmountInStack &&
+          prevChild
         ) {
           removedNodes[name] = ReactReconciler.getHostNode(prevChild);
           ReactReconciler.unmountComponent(
diff --git a/src/renderers/shared/stack/reconciler/ReactComponentEnvironment.js b/src/renderers/shared/stack/reconciler/ReactComponentEnvironment.js
index dae8811e7e15f..25e4b9c5d09f0 100644
--- a/src/renderers/shared/stack/reconciler/ReactComponentEnvironment.js
+++ b/src/renderers/shared/stack/reconciler/ReactComponentEnvironment.js
@@ -43,8 +43,10 @@ var ReactComponentEnvironment = {
         !injected,
         'ReactCompositeComponent: injectEnvironment() can only be called once.',
       );
-      ReactComponentEnvironment.replaceNodeWithMarkup = environment.replaceNodeWithMarkup;
-      ReactComponentEnvironment.processChildrenUpdates = environment.processChildrenUpdates;
+      ReactComponentEnvironment.replaceNodeWithMarkup =
+        environment.replaceNodeWithMarkup;
+      ReactComponentEnvironment.processChildrenUpdates =
+        environment.processChildrenUpdates;
       injected = true;
     },
   },
diff --git a/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js b/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
index ec117977dc02d..096b5240a0e0c 100644
--- a/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
+++ b/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
@@ -222,9 +222,8 @@ var ReactCompositeComponent = {
       }
 
       var propsMutated = inst.props !== publicProps;
-      var componentName = Component.displayName ||
-        Component.name ||
-        'Component';
+      var componentName =
+        Component.displayName || Component.name || 'Component';
 
       warning(
         inst.props === undefined || !propsMutated,
@@ -304,7 +303,7 @@ var ReactCompositeComponent = {
 
     var initialState = inst.state;
     if (initialState === undefined) {
-      inst.state = (initialState = null);
+      inst.state = initialState = null;
     }
     invariant(
       typeof initialState === 'object' && !Array.isArray(initialState),
@@ -898,7 +897,8 @@ var ReactCompositeComponent = {
         }
       } else {
         if (this._compositeType === ReactCompositeComponentTypes.PureClass) {
-          shouldUpdate = !shallowEqual(prevProps, nextProps) ||
+          shouldUpdate =
+            !shallowEqual(prevProps, nextProps) ||
             !shallowEqual(inst.state, nextState);
         }
       }
@@ -1309,11 +1309,13 @@ var ReactCompositeComponent = {
   getName: function() {
     var type = this._currentElement.type;
     var constructor = this._instance && this._instance.constructor;
-    return type.displayName ||
+    return (
+      type.displayName ||
       (constructor && constructor.displayName) ||
       type.name ||
       (constructor && constructor.name) ||
-      null;
+      null
+    );
   },
 
   /**
diff --git a/src/renderers/shared/stack/reconciler/ReactRef.js b/src/renderers/shared/stack/reconciler/ReactRef.js
index 89abe98df736f..de656b02396ea 100644
--- a/src/renderers/shared/stack/reconciler/ReactRef.js
+++ b/src/renderers/shared/stack/reconciler/ReactRef.js
@@ -47,9 +47,8 @@ function attachRef(ref, component, owner) {
       let warningKey = ownerName || component._debugID;
       let element = component._currentElement;
       if (element && element._source) {
-        warningKey = element._source.fileName +
-          ':' +
-          element._source.lineNumber;
+        warningKey =
+          element._source.fileName + ':' + element._source.lineNumber;
       }
       if (!warnedAboutStatelessRefs[warningKey]) {
         warnedAboutStatelessRefs[warningKey] = true;
@@ -124,9 +123,11 @@ ReactRef.shouldUpdateRefs = function(
     nextOwner = nextElement._owner;
   }
 
-  return prevRef !== nextRef ||
+  return (
+    prevRef !== nextRef ||
     // If owner changes but we have an unchanged function ref, don't update refs
-    (typeof nextRef === 'string' && nextOwner !== prevOwner);
+    (typeof nextRef === 'string' && nextOwner !== prevOwner)
+  );
 };
 
 ReactRef.detachRefs = function(
diff --git a/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js b/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js
index e34cfee15b960..778936380e900 100644
--- a/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js
+++ b/src/renderers/shared/stack/reconciler/ReactUpdateQueue.js
@@ -226,7 +226,8 @@ var ReactUpdateQueue = {
       return;
     }
 
-    var queue = internalInstance._pendingStateQueue ||
+    var queue =
+      internalInstance._pendingStateQueue ||
       (internalInstance._pendingStateQueue = []);
     queue.push(partialState);
 
diff --git a/src/renderers/shared/stack/reconciler/Transaction.js b/src/renderers/shared/stack/reconciler/Transaction.js
index e08f2bbd4e101..ee45da1b78a8c 100644
--- a/src/renderers/shared/stack/reconciler/Transaction.js
+++ b/src/renderers/shared/stack/reconciler/Transaction.js
@@ -124,14 +124,16 @@ var TransactionImpl = {
    *
    * @return {*} Return value from `method`.
    */
-  perform: function<A, B, C, D, E, F, G, T: (
-    a: A,
-    b: B,
-    c: C,
-    d: D,
-    e: E,
-    f: F,
-  ) => G>(method: T, scope: any, a: A, b: B, c: C, d: D, e: E, f: F): G {
+  perform: function<
+    A,
+    B,
+    C,
+    D,
+    E,
+    F,
+    G,
+    T: (a: A, b: B, c: C, d: D, e: E, f: F) => G
+  >(method: T, scope: any, a: A, b: B, c: C, d: D, e: E, f: F): G {
     invariant(
       !this.isInTransaction(),
       'Transaction.perform(...): Cannot initialize a transaction when there ' +
diff --git a/src/renderers/shared/stack/reconciler/flattenStackChildren.js b/src/renderers/shared/stack/reconciler/flattenStackChildren.js
index 4abb79e78f054..06dc4e69c6ee8 100644
--- a/src/renderers/shared/stack/reconciler/flattenStackChildren.js
+++ b/src/renderers/shared/stack/reconciler/flattenStackChildren.js
@@ -28,7 +28,8 @@ if (
   // https://github.com/facebook/react/issues/7240
   // Remove the inline requires when we don't need them anymore:
   // https://github.com/facebook/react/pull/7178
-  ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook;
+  ReactComponentTreeHook = require('ReactGlobalSharedState')
+    .ReactComponentTreeHook;
 }
 
 /**
@@ -49,7 +50,8 @@ function flattenSingleChildIntoContext(
     const keyUnique = result[name] === undefined;
     if (__DEV__) {
       if (!ReactComponentTreeHook) {
-        ReactComponentTreeHook = require('ReactGlobalSharedState').ReactComponentTreeHook;
+        ReactComponentTreeHook = require('ReactGlobalSharedState')
+          .ReactComponentTreeHook;
       }
       if (!keyUnique) {
         warning(
diff --git a/src/renderers/shared/stack/reconciler/instantiateReactComponent.js b/src/renderers/shared/stack/reconciler/instantiateReactComponent.js
index 76b4343d67551..ac959f5d1dc64 100644
--- a/src/renderers/shared/stack/reconciler/instantiateReactComponent.js
+++ b/src/renderers/shared/stack/reconciler/instantiateReactComponent.js
@@ -42,10 +42,12 @@ function getDeclarationErrorAddendum(owner) {
  * @return {boolean} Returns true if this is a valid internal type.
  */
 function isInternalComponentType(type) {
-  return typeof type === 'function' &&
+  return (
+    typeof type === 'function' &&
     typeof type.prototype !== 'undefined' &&
     typeof type.prototype.mountComponent === 'function' &&
-    typeof type.prototype.receiveComponent === 'function';
+    typeof type.prototype.receiveComponent === 'function'
+  );
 }
 
 /**
@@ -73,7 +75,8 @@ function instantiateReactComponent(node, shouldHaveDebugID) {
             type !== null &&
             Object.keys(type).length === 0)
         ) {
-          info += ' You likely forgot to export your component from the file ' +
+          info +=
+            ' You likely forgot to export your component from the file ' +
             "it's defined in.";
         }
       }
diff --git a/src/renderers/shared/stack/reconciler/traverseStackChildren.js b/src/renderers/shared/stack/reconciler/traverseStackChildren.js
index 3bf7550ae3817..92bc111c814b9 100644
--- a/src/renderers/shared/stack/reconciler/traverseStackChildren.js
+++ b/src/renderers/shared/stack/reconciler/traverseStackChildren.js
@@ -146,7 +146,8 @@ function traverseStackChildrenImpl(
     } else if (type === 'object') {
       var addendum = '';
       if (__DEV__) {
-        addendum = ' If you meant to render a collection of children, use an array ' +
+        addendum =
+          ' If you meant to render a collection of children, use an array ' +
           'instead.' +
           getCurrentStackAddendum();
       }
diff --git a/src/renderers/shared/utils/adler32.js b/src/renderers/shared/utils/adler32.js
index 4899d3b7db3c6..4013f2b26bede 100644
--- a/src/renderers/shared/utils/adler32.js
+++ b/src/renderers/shared/utils/adler32.js
@@ -28,7 +28,8 @@ function adler32(data: string): number {
   while (i < m) {
     var n = Math.min(i + 4096, m);
     for (; i < n; i += 4) {
-      b += (a += data.charCodeAt(i)) +
+      b +=
+        (a += data.charCodeAt(i)) +
         (a += data.charCodeAt(i + 1)) +
         (a += data.charCodeAt(i + 2)) +
         (a += data.charCodeAt(i + 3));
@@ -37,11 +38,11 @@ function adler32(data: string): number {
     b %= MOD;
   }
   for (; i < l; i++) {
-    b += (a += data.charCodeAt(i));
+    b += a += data.charCodeAt(i);
   }
   a %= MOD;
   b %= MOD;
-  return a | b << 16;
+  return a | (b << 16);
 }
 
 module.exports = adler32;
diff --git a/src/renderers/testing/ReactShallowRenderer.js b/src/renderers/testing/ReactShallowRenderer.js
index ee114dfde3639..d9c5a58095454 100644
--- a/src/renderers/testing/ReactShallowRenderer.js
+++ b/src/renderers/testing/ReactShallowRenderer.js
@@ -224,11 +224,13 @@ class Updater {
 
 function getName(type, instance) {
   var constructor = instance && instance.constructor;
-  return type.displayName ||
+  return (
+    type.displayName ||
     (constructor && constructor.displayName) ||
     type.name ||
     (constructor && constructor.name) ||
-    null;
+    null
+  );
 }
 
 function shouldConstruct(Component) {
diff --git a/src/shared/ReactFiberComponentTreeHook.js b/src/shared/ReactFiberComponentTreeHook.js
index 30a4e83656b88..d965c718add79 100644
--- a/src/shared/ReactFiberComponentTreeHook.js
+++ b/src/shared/ReactFiberComponentTreeHook.js
@@ -24,7 +24,8 @@ var getComponentName = require('getComponentName');
 import type {Fiber} from 'ReactFiber';
 
 function describeComponentFrame(name, source: any, ownerName) {
-  return '\n    in ' +
+  return (
+    '\n    in ' +
     (name || 'Unknown') +
     (source
       ? ' (at ' +
@@ -32,7 +33,8 @@ function describeComponentFrame(name, source: any, ownerName) {
           ':' +
           source.lineNumber +
           ')'
-      : ownerName ? ' (created by ' + ownerName + ')' : '');
+      : ownerName ? ' (created by ' + ownerName + ')' : '')
+  );
 }
 
 function describeFiber(fiber: Fiber): string {
diff --git a/src/shared/utils/PooledClass.js b/src/shared/utils/PooledClass.js
index 15e00789e3f48..a89b9e1a7f425 100644
--- a/src/shared/utils/PooledClass.js
+++ b/src/shared/utils/PooledClass.js
@@ -95,7 +95,7 @@ var addPoolingTo = function<T>(
   CopyConstructor: Class<T>,
   pooler: Pooler,
 ): Class<T> & {
-  getPooled /* arguments of the constructor */(): T,
+  getPooled(): /* arguments of the constructor */ T,
   release(): void,
 } {
   // Casting as any so that flow ignores the actual implementation and trusts
diff --git a/src/shared/utils/ReactElementSymbol.js b/src/shared/utils/ReactElementSymbol.js
index 2596b6817f3cb..9d59d505e78bc 100644
--- a/src/shared/utils/ReactElementSymbol.js
+++ b/src/shared/utils/ReactElementSymbol.js
@@ -14,9 +14,8 @@
 
 // The Symbol used to tag the ReactElement type. If there is no native Symbol
 // nor polyfill, then a plain number is used for performance.
-var REACT_ELEMENT_TYPE = (typeof Symbol === 'function' &&
-  Symbol.for &&
-  Symbol.for('react.element')) ||
+var REACT_ELEMENT_TYPE =
+  (typeof Symbol === 'function' && Symbol.for && Symbol.for('react.element')) ||
   0xeac7;
 
 module.exports = REACT_ELEMENT_TYPE;
diff --git a/src/shared/utils/getIteratorFn.js b/src/shared/utils/getIteratorFn.js
index ffde8ff3b90e5..91d8e9d36986e 100644
--- a/src/shared/utils/getIteratorFn.js
+++ b/src/shared/utils/getIteratorFn.js
@@ -31,7 +31,8 @@ var FAUX_ITERATOR_SYMBOL = '@@iterator'; // Before Symbol spec.
  * @return {?function}
  */
 function getIteratorFn(maybeIterable: ?any): ?() => ?Iterator<*> {
-  var iteratorFn = maybeIterable &&
+  var iteratorFn =
+    maybeIterable &&
     ((ITERATOR_SYMBOL && maybeIterable[ITERATOR_SYMBOL]) ||
       maybeIterable[FAUX_ITERATOR_SYMBOL]);
   if (typeof iteratorFn === 'function') {
diff --git a/src/shared/utils/reactProdInvariant.js b/src/shared/utils/reactProdInvariant.js
index b52766eb206f3..9390b9eaa706b 100644
--- a/src/shared/utils/reactProdInvariant.js
+++ b/src/shared/utils/reactProdInvariant.js
@@ -20,7 +20,8 @@
 function reactProdInvariant(code: string): void {
   var argCount = arguments.length - 1;
 
-  var message = 'Minified React error #' +
+  var message =
+    'Minified React error #' +
     code +
     '; visit ' +
     'http://facebook.github.io/react/docs/error-decoder.html?invariant=' +
@@ -30,7 +31,8 @@ function reactProdInvariant(code: string): void {
     message += '&args[]=' + encodeURIComponent(arguments[argIdx + 1]);
   }
 
-  message += ' for the full message or use the non-minified dev environment' +
+  message +=
+    ' for the full message or use the non-minified dev environment' +
     ' for full errors and additional helpful warnings.';
 
   var error: Error & {framesToPop?: number} = new Error(message);
diff --git a/yarn.lock b/yarn.lock
index b632d751b2ba5..334a8845d4660 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -225,18 +225,14 @@ ast-types@0.8.12:
   version "0.8.12"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.12.tgz#a0d90e4351bb887716c83fd637ebf818af4adfcc"
 
-ast-types@0.8.18:
-  version "0.8.18"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.18.tgz#c8b98574898e8914e9d8de74b947564a9fe929af"
-
-ast-types@0.9.4:
-  version "0.9.4"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.4.tgz#410d1f81890aeb8e0a38621558ba5869ae53c91b"
-
 ast-types@0.9.6:
   version "0.9.6"
   resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9"
 
+ast-types@0.9.8:
+  version "0.9.8"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.8.tgz#6cb6a40beba31f49f20928e28439fc14a3dab078"
+
 astw@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/astw/-/astw-2.2.0.tgz#7bd41784d32493987aeb239b6b4e1c57a873b917"
@@ -896,6 +892,10 @@ babylon@6.15.0, babylon@^6.11.0:
   version "6.15.0"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.15.0.tgz#ba65cfa1a80e1759b0e89fb562e27dccae70348e"
 
+babylon@7.0.0-beta.8:
+  version "7.0.0-beta.8"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.8.tgz#2bdc5ae366041442c27e068cce6f0d7c06ea9949"
+
 babylon@^5.8.38:
   version "5.8.38"
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-5.8.38.tgz#ec9b120b11bf6ccd4173a18bf217e60b79859ffd"
@@ -1303,7 +1303,7 @@ color-name@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.2.tgz#5c8ab72b64bd2215d617ae9559ebb148475cf98d"
 
-colors@1.0.3, colors@>=0.6.2:
+colors@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
 
@@ -2143,13 +2143,9 @@ flow-bin@^0.41.0:
   version "0.41.0"
   resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.41.0.tgz#8badac9a19da45004997e599bd316518db489b2e"
 
-flow-parser@0.40.0:
-  version "0.40.0"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.40.0.tgz#b3444742189093323c4319c4fe9d35391f46bcbc"
-  dependencies:
-    ast-types "0.8.18"
-    colors ">=0.6.2"
-    minimist ">=0.2.0"
+flow-parser@0.43.0:
+  version "0.43.0"
+  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.43.0.tgz#e2b8eb1ac83dd53f7b6b04a7c35b6a52c33479b7"
 
 for-in@^1.0.1:
   version "1.0.2"
@@ -3514,7 +3510,7 @@ minimist@0.0.8, minimist@~0.0.1:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
 
-minimist@1.2.0, minimist@>=0.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0:
+minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.1, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
@@ -3887,16 +3883,16 @@ preserve@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
-prettier@^0.22.0:
-  version "0.22.0"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-0.22.0.tgz#7b37c4480d0858180407e5a8e13f0f47da7385d2"
+prettier@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.2.2.tgz#22d17c1132faaaea1f1d4faea31f19f7a1959f3e"
   dependencies:
-    ast-types "0.9.4"
+    ast-types "0.9.8"
     babel-code-frame "6.22.0"
-    babylon "6.15.0"
+    babylon "7.0.0-beta.8"
     chalk "1.1.3"
     esutils "2.0.2"
-    flow-parser "0.40.0"
+    flow-parser "0.43.0"
     get-stdin "5.0.1"
     glob "7.1.1"
     jest-validate "19.0.0"

From 648822952fa24cf0e6f2d3b387f6e1fa96ec897e Mon Sep 17 00:00:00 2001
From: Eric Sakmar <eric.sakmar@gmail.com>
Date: Thu, 20 Apr 2017 14:20:15 -0400
Subject: [PATCH 130/153] Adds CSS Grid properties to list of unitless numbers
 (#9185)

---
 src/renderers/dom/shared/CSSProperty.js                | 6 ++++++
 src/renderers/dom/shared/__tests__/CSSProperty-test.js | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/src/renderers/dom/shared/CSSProperty.js b/src/renderers/dom/shared/CSSProperty.js
index fa0645c987057..6091751529646 100644
--- a/src/renderers/dom/shared/CSSProperty.js
+++ b/src/renderers/dom/shared/CSSProperty.js
@@ -30,7 +30,13 @@ var isUnitlessNumber = {
   flexNegative: true,
   flexOrder: true,
   gridRow: true,
+  gridRowEnd: true,
+  gridRowSpan: true,
+  gridRowStart: true,
   gridColumn: true,
+  gridColumnEnd: true,
+  gridColumnSpan: true,
+  gridColumnStart: true,
   fontWeight: true,
   lineClamp: true,
   lineHeight: true,
diff --git a/src/renderers/dom/shared/__tests__/CSSProperty-test.js b/src/renderers/dom/shared/__tests__/CSSProperty-test.js
index af8325c26b17a..a3c04d706d6cf 100644
--- a/src/renderers/dom/shared/__tests__/CSSProperty-test.js
+++ b/src/renderers/dom/shared/__tests__/CSSProperty-test.js
@@ -25,6 +25,12 @@ describe('CSSProperty', () => {
     expect(CSSProperty.isUnitlessNumber.msFlexGrow).toBeTruthy();
     expect(CSSProperty.isUnitlessNumber.MozFlexGrow).toBeTruthy();
     expect(CSSProperty.isUnitlessNumber.msGridRow).toBeTruthy();
+    expect(CSSProperty.isUnitlessNumber.msGridRowEnd).toBeTruthy();
+    expect(CSSProperty.isUnitlessNumber.msGridRowSpan).toBeTruthy();
+    expect(CSSProperty.isUnitlessNumber.msGridRowStart).toBeTruthy();
     expect(CSSProperty.isUnitlessNumber.msGridColumn).toBeTruthy();
+    expect(CSSProperty.isUnitlessNumber.msGridColumnEnd).toBeTruthy();
+    expect(CSSProperty.isUnitlessNumber.msGridColumnSpan).toBeTruthy();
+    expect(CSSProperty.isUnitlessNumber.msGridColumnStart).toBeTruthy();
   });
 });

From f1df675b9343163f56aa22e705c3d82b7d026948 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Fri, 14 Apr 2017 16:27:17 -0700
Subject: [PATCH 131/153] Add contextTag field to Fiber type

contextTag is a bitmask that describes properties about the fiber
and its subtree. For example, the AsyncUpdates flag indicates whether
the subtree should use async scheduling.

When a fiber is created, it inherits the bitmask of its parent.
---
 src/renderers/shared/fiber/ReactFiber.js      | 24 ++++++++++++++++---
 .../fiber/isomorphic/ReactTypeOfContext.js    | 20 ++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 src/renderers/shared/fiber/isomorphic/ReactTypeOfContext.js

diff --git a/src/renderers/shared/fiber/ReactFiber.js b/src/renderers/shared/fiber/ReactFiber.js
index 38dd9bcfeda27..29a43df4baa68 100644
--- a/src/renderers/shared/fiber/ReactFiber.js
+++ b/src/renderers/shared/fiber/ReactFiber.js
@@ -18,11 +18,11 @@ import type {ReactFragment} from 'ReactTypes';
 import type {ReactCoroutine, ReactYield} from 'ReactCoroutine';
 import type {ReactPortal} from 'ReactPortal';
 import type {TypeOfWork} from 'ReactTypeOfWork';
+import type {TypeOfContext} from 'ReactTypeOfContext';
 import type {TypeOfSideEffect} from 'ReactTypeOfSideEffect';
 import type {PriorityLevel} from 'ReactPriorityLevel';
 import type {UpdateQueue} from 'ReactFiberUpdateQueue';
 
-var ReactTypeOfWork = require('ReactTypeOfWork');
 var {
   IndeterminateComponent,
   ClassComponent,
@@ -33,11 +33,17 @@ var {
   CoroutineComponent,
   YieldComponent,
   Fragment,
-} = ReactTypeOfWork;
+} = require('ReactTypeOfWork');
 
 var {NoWork} = require('ReactPriorityLevel');
 
-var {NoEffect} = require('ReactTypeOfSideEffect');
+var {
+  NoContext,
+} = require('ReactTypeOfContext');
+
+var {
+  NoEffect,
+} = require('ReactTypeOfSideEffect');
 
 var {cloneUpdateQueue} = require('ReactFiberUpdateQueue');
 
@@ -110,6 +116,14 @@ export type Fiber = {
   // The state used to create the output
   memoizedState: any,
 
+  // Bitmask that describes properties about the fiber and its subtree. E.g. the
+  // AsyncUpdates flag indicates whether the subtree should be async-by-default.
+  // When a fiber is created, it inherits the contextTag of its parent.
+  // Additional flags can be set at creation time, but after than
+  // the value should remain unchanged throughout the fiber's lifetime,
+  // particularly before its child fibers are created.
+  contextTag: TypeOfContext,
+
   // Effect
   effectTag: TypeOfSideEffect,
 
@@ -197,6 +211,8 @@ var createFiber = function(tag: TypeOfWork, key: null | string): Fiber {
     updateQueue: null,
     memoizedState: null,
 
+    contextTag: NoContext,
+
     effectTag: NoEffect,
     nextEffect: null,
     firstEffect: null,
@@ -282,6 +298,8 @@ exports.cloneFiber = function(
   alt.memoizedProps = fiber.memoizedProps;
   alt.memoizedState = fiber.memoizedState;
 
+  alt.contextTag = fiber.contextTag;
+
   if (__DEV__) {
     alt._debugID = fiber._debugID;
     alt._debugSource = fiber._debugSource;
diff --git a/src/renderers/shared/fiber/isomorphic/ReactTypeOfContext.js b/src/renderers/shared/fiber/isomorphic/ReactTypeOfContext.js
new file mode 100644
index 0000000000000..eff01ae543d97
--- /dev/null
+++ b/src/renderers/shared/fiber/isomorphic/ReactTypeOfContext.js
@@ -0,0 +1,20 @@
+/**
+ * Copyright 2013-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ *
+ * @providesModule ReactTypeOfContext
+ * @flow
+ */
+
+'use strict';
+
+export type TypeOfContext = 0 | 1;
+
+module.exports = {
+  NoContext: 0,
+  AsyncUpdates: 1,
+};

From 1b388366c197516a2508a573146221fd126ff66a Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Fri, 14 Apr 2017 17:06:53 -0700
Subject: [PATCH 132/153] Inherit contextTag from the parent on creation

A fiber has all the context flags of its parent. It may also add
additional ones during construction/mount. After mounting, contextTag
shouldn't change.
---
 src/renderers/shared/fiber/ReactChildFiber.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/renderers/shared/fiber/ReactChildFiber.js b/src/renderers/shared/fiber/ReactChildFiber.js
index ca1022e3e23d8..49d3ce419ccff 100644
--- a/src/renderers/shared/fiber/ReactChildFiber.js
+++ b/src/renderers/shared/fiber/ReactChildFiber.js
@@ -307,6 +307,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       // Insert
       const created = createFiberFromText(textContent, priority);
       created.return = returnFiber;
+      created.contextTag = returnFiber.contextTag;
       return created;
     } else {
       // Update
@@ -328,6 +329,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       const created = createFiberFromElement(element, priority);
       created.ref = coerceRef(current, element);
       created.return = returnFiber;
+      created.contextTag = returnFiber.contextTag;
       return created;
     } else {
       // Move based on index
@@ -354,6 +356,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       // Insert
       const created = createFiberFromCoroutine(coroutine, priority);
       created.return = returnFiber;
+      created.contextTag = returnFiber.contextTag;
       return created;
     } else {
       // Move based on index
@@ -375,6 +378,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       const created = createFiberFromYield(yieldNode, priority);
       created.type = yieldNode.value;
       created.return = returnFiber;
+      created.contextTag = returnFiber.contextTag;
       return created;
     } else {
       // Move based on index
@@ -400,6 +404,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       // Insert
       const created = createFiberFromPortal(portal, priority);
       created.return = returnFiber;
+      created.contextTag = returnFiber.contextTag;
       return created;
     } else {
       // Update
@@ -420,6 +425,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       // Insert
       const created = createFiberFromFragment(fragment, priority);
       created.return = returnFiber;
+      created.contextTag = returnFiber.contextTag;
       return created;
     } else {
       // Update
@@ -441,6 +447,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       // node.
       const created = createFiberFromText('' + newChild, priority);
       created.return = returnFiber;
+      created.contextTag = returnFiber.contextTag;
       return created;
     }
 
@@ -450,12 +457,14 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
           const created = createFiberFromElement(newChild, priority);
           created.ref = coerceRef(null, newChild);
           created.return = returnFiber;
+          created.contextTag = returnFiber.contextTag;
           return created;
         }
 
         case REACT_COROUTINE_TYPE: {
           const created = createFiberFromCoroutine(newChild, priority);
           created.return = returnFiber;
+          created.contextTag = returnFiber.contextTag;
           return created;
         }
 
@@ -463,12 +472,14 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
           const created = createFiberFromYield(newChild, priority);
           created.type = newChild.value;
           created.return = returnFiber;
+          created.contextTag = returnFiber.contextTag;
           return created;
         }
 
         case REACT_PORTAL_TYPE: {
           const created = createFiberFromPortal(newChild, priority);
           created.return = returnFiber;
+          created.contextTag = returnFiber.contextTag;
           return created;
         }
       }
@@ -476,6 +487,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       if (isArray(newChild) || getIteratorFn(newChild)) {
         const created = createFiberFromFragment(newChild, priority);
         created.return = returnFiber;
+        created.contextTag = returnFiber.contextTag;
         return created;
       }
 
@@ -1013,6 +1025,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
     deleteRemainingChildren(returnFiber, currentFirstChild);
     const created = createFiberFromText(textContent, priority);
     created.return = returnFiber;
+    created.contextTag = returnFiber.contextTag;
     return created;
   }
 
@@ -1052,6 +1065,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
     const created = createFiberFromElement(element, priority);
     created.ref = coerceRef(currentFirstChild, element);
     created.return = returnFiber;
+    created.contextTag = returnFiber.contextTag;
     return created;
   }
 
@@ -1085,6 +1099,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
 
     const created = createFiberFromCoroutine(coroutine, priority);
     created.return = returnFiber;
+    created.contextTag = returnFiber.contextTag;
     return created;
   }
 
@@ -1111,6 +1126,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
     const created = createFiberFromYield(yieldNode, priority);
     created.type = yieldNode.value;
     created.return = returnFiber;
+    created.contextTag = returnFiber.contextTag;
     return created;
   }
 
@@ -1148,6 +1164,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
 
     const created = createFiberFromPortal(portal, priority);
     created.return = returnFiber;
+    created.contextTag = returnFiber.contextTag;
     return created;
   }
 

From 6f8fec4b8015e1d95c177521ae9c2903713ceb16 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Mon, 17 Apr 2017 12:39:48 -0700
Subject: [PATCH 133/153] Use different default priority depending on the
 AsyncUpdate context flag

- A priority context of NoWork represents the default priority
- Changed the signature of getPriorityContext to accept the fiber that
is about to be updated.
---
 .../shared/fiber/ReactFiberBeginWork.js       |  2 +-
 .../shared/fiber/ReactFiberClassComponent.js  | 13 +++++----
 .../shared/fiber/ReactFiberReconciler.js      |  6 ++--
 .../shared/fiber/ReactFiberScheduler.js       | 29 ++++++++++++++-----
 4 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/renderers/shared/fiber/ReactFiberBeginWork.js b/src/renderers/shared/fiber/ReactFiberBeginWork.js
index 584bdaf1c6fbb..2e58f752c2391 100644
--- a/src/renderers/shared/fiber/ReactFiberBeginWork.js
+++ b/src/renderers/shared/fiber/ReactFiberBeginWork.js
@@ -66,7 +66,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   config: HostConfig<T, P, I, TI, PI, C, CX, PL>,
   hostContext: HostContext<C, CX>,
   scheduleUpdate: (fiber: Fiber, priorityLevel: PriorityLevel) => void,
-  getPriorityContext: () => PriorityLevel,
+  getPriorityContext: (fiber: Fiber) => PriorityLevel,
 ) {
   const {
     shouldSetTextContent,
diff --git a/src/renderers/shared/fiber/ReactFiberClassComponent.js b/src/renderers/shared/fiber/ReactFiberClassComponent.js
index d43a32f3ba0f8..d899fcc6a909b 100644
--- a/src/renderers/shared/fiber/ReactFiberClassComponent.js
+++ b/src/renderers/shared/fiber/ReactFiberClassComponent.js
@@ -15,7 +15,10 @@
 import type {Fiber} from 'ReactFiber';
 import type {PriorityLevel} from 'ReactPriorityLevel';
 
-var {Update} = require('ReactTypeOfSideEffect');
+var {
+  Update,
+} = require('ReactTypeOfSideEffect');
+
 var {
   cacheContext,
   getMaskedContext,
@@ -54,7 +57,7 @@ if (__DEV__) {
 
 module.exports = function(
   scheduleUpdate: (fiber: Fiber, priorityLevel: PriorityLevel) => void,
-  getPriorityContext: () => PriorityLevel,
+  getPriorityContext: (fiber: Fiber) => PriorityLevel,
   memoizeProps: (workInProgress: Fiber, props: any) => void,
   memoizeState: (workInProgress: Fiber, state: any) => void,
 ) {
@@ -63,7 +66,7 @@ module.exports = function(
     isMounted,
     enqueueSetState(instance, partialState, callback) {
       const fiber = ReactInstanceMap.get(instance);
-      const priorityLevel = getPriorityContext();
+      const priorityLevel = getPriorityContext(fiber);
       callback = callback === undefined ? null : callback;
       if (__DEV__) {
         warnOnInvalidCallback(callback, 'setState');
@@ -73,7 +76,7 @@ module.exports = function(
     },
     enqueueReplaceState(instance, state, callback) {
       const fiber = ReactInstanceMap.get(instance);
-      const priorityLevel = getPriorityContext();
+      const priorityLevel = getPriorityContext(fiber);
       callback = callback === undefined ? null : callback;
       if (__DEV__) {
         warnOnInvalidCallback(callback, 'replaceState');
@@ -83,7 +86,7 @@ module.exports = function(
     },
     enqueueForceUpdate(instance, callback) {
       const fiber = ReactInstanceMap.get(instance);
-      const priorityLevel = getPriorityContext();
+      const priorityLevel = getPriorityContext(fiber);
       callback = callback === undefined ? null : callback;
       if (__DEV__) {
         warnOnInvalidCallback(callback, 'forceUpdate');
diff --git a/src/renderers/shared/fiber/ReactFiberReconciler.js b/src/renderers/shared/fiber/ReactFiberReconciler.js
index 17979297ee49e..1cb06243fefc7 100644
--- a/src/renderers/shared/fiber/ReactFiberReconciler.js
+++ b/src/renderers/shared/fiber/ReactFiberReconciler.js
@@ -17,7 +17,9 @@ import type {FiberRoot} from 'ReactFiberRoot';
 import type {PriorityLevel} from 'ReactPriorityLevel';
 import type {ReactNodeList} from 'ReactTypes';
 
-var {addTopLevelUpdate} = require('ReactFiberUpdateQueue');
+var {
+  addTopLevelUpdate,
+} = require('ReactFiberUpdateQueue');
 
 var {
   findCurrentUnmaskedContext,
@@ -178,7 +180,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
       }
     }
 
-    const priorityLevel = getPriorityContext();
+    const priorityLevel = getPriorityContext(current);
     const nextState = {element};
     callback = callback === undefined ? null : callback;
     if (__DEV__) {
diff --git a/src/renderers/shared/fiber/ReactFiberScheduler.js b/src/renderers/shared/fiber/ReactFiberScheduler.js
index 6654d20dd55f0..9ff146f7078c6 100644
--- a/src/renderers/shared/fiber/ReactFiberScheduler.js
+++ b/src/renderers/shared/fiber/ReactFiberScheduler.js
@@ -60,6 +60,10 @@ var {
   OffscreenPriority,
 } = require('ReactPriorityLevel');
 
+var {
+  AsyncUpdates,
+} = require('ReactTypeOfContext');
+
 var {
   NoEffect,
   Placement,
@@ -167,11 +171,11 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     resetAfterCommit,
   } = config;
 
-  // The priority level to use when scheduling an update.
-  // TODO: Should we change this to an array? Might be less confusing.
-  let priorityContext: PriorityLevel = useSyncScheduling
-    ? SynchronousPriority
-    : LowPriority;
+  // The priority level to use when scheduling an update. We use NoWork to
+  // represent the default priority.
+  // TODO: Should we change this to an array instead of using the call stack?
+  // Might be less confusing.
+  let priorityContext: PriorityLevel = NoWork;
 
   // Keep track of this so we can reset the priority context if an error
   // is thrown during reconciliation.
@@ -1340,16 +1344,25 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     }
   }
 
-  function getPriorityContext(): PriorityLevel {
+  function getPriorityContext(fiber: Fiber): PriorityLevel {
+    let priorityLevel = priorityContext;
+    if (priorityLevel === NoWork) {
+      if (!useSyncScheduling || fiber.contextTag & AsyncUpdates) {
+        priorityLevel = LowPriority;
+      } else {
+        priorityLevel = SynchronousPriority;
+      }
+    }
+
     // If we're in a batch, or if we're already performing work, downgrade sync
     // priority to task priority
     if (
-      priorityContext === SynchronousPriority &&
+      priorityLevel === SynchronousPriority &&
       (isPerformingWork || isBatchingUpdates)
     ) {
       return TaskPriority;
     }
-    return priorityContext;
+    return priorityLevel;
   }
 
   function scheduleErrorRecovery(fiber: Fiber) {

From 3bf398bcbc7849eebfd2cc7b200db41e5c84c6de Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Mon, 17 Apr 2017 14:54:59 -0700
Subject: [PATCH 134/153] ReactDOM.unstable_asyncRender creates an
 async-by-default tree

The default priority of updates in a async tree is LowPriority, rather
than SynchronousPriority.

Warns if you call unstable_asyncRender on a tree that was created with
the normal, sync ReactDOM.render.
---
 src/renderers/dom/fiber/ReactDOMFiber.js      | 162 +++++++++++-------
 .../__tests__/ReactDOMFiberAsync-test.js      |  75 ++++++++
 .../dom/shared/ReactDOMFeatureFlags.js        |   1 +
 .../shared/fiber/ReactFiberReconciler.js      |  97 ++++++++---
 4 files changed, 249 insertions(+), 86 deletions(-)
 create mode 100644 src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js

diff --git a/src/renderers/dom/fiber/ReactDOMFiber.js b/src/renderers/dom/fiber/ReactDOMFiber.js
index 77b980cd3628a..8486afcc82423 100644
--- a/src/renderers/dom/fiber/ReactDOMFiber.js
+++ b/src/renderers/dom/fiber/ReactDOMFiber.js
@@ -386,6 +386,7 @@ function renderSubtreeIntoContainer(
   parentComponent: ?ReactComponent<any, any, any>,
   children: ReactNodeList,
   containerNode: DOMContainerElement | Document,
+  async: boolean,
   callback: ?Function,
 ) {
   validateContainer(containerNode);
@@ -399,84 +400,99 @@ function renderSubtreeIntoContainer(
     while (container.lastChild) {
       container.removeChild(container.lastChild);
     }
-    const newRoot = DOMRenderer.createContainer(container);
-    root = container._reactRootContainer = newRoot;
+    const newRoot = async
+      ? DOMRenderer.createAsyncContainer(container)
+      : DOMRenderer.createContainer(container);
+    root = (container._reactRootContainer = newRoot);
     // Initial mount should not be batched.
     DOMRenderer.unbatchedUpdates(() => {
       DOMRenderer.updateContainer(children, newRoot, parentComponent, callback);
     });
   } else {
-    DOMRenderer.updateContainer(children, root, parentComponent, callback);
+    if (async) {
+      DOMRenderer.updateAsyncContainer(children, root, parentComponent, callback);
+    } else {
+      DOMRenderer.updateContainer(children, root, parentComponent, callback);
+    }
   }
   return DOMRenderer.getPublicRootInstance(root);
 }
 
+function render(
+  element: ReactElement<any>,
+  container: DOMContainerElement,
+  async: boolean,
+  callback: ?Function,
+) {
+  validateContainer(container);
+
+  if (ReactFeatureFlags.disableNewFiberFeatures) {
+    // Top-level check occurs here instead of inside child reconciler because
+    // because requirements vary between renderers. E.g. React Art
+    // allows arrays.
+    if (!isValidElement(element)) {
+      if (typeof element === 'string') {
+        invariant(
+          false,
+          'ReactDOM.render(): Invalid component element. Instead of ' +
+            "passing a string like 'div', pass " +
+            "React.createElement('div') or <div />.",
+        );
+      } else if (typeof element === 'function') {
+        invariant(
+          false,
+          'ReactDOM.render(): Invalid component element. Instead of ' +
+            'passing a class like Foo, pass React.createElement(Foo) ' +
+            'or <Foo />.',
+        );
+      } else if (element != null && typeof element.props !== 'undefined') {
+        // Check if it quacks like an element
+        invariant(
+          false,
+          'ReactDOM.render(): Invalid component element. This may be ' +
+            'caused by unintentionally loading two independent copies ' +
+            'of React.',
+        );
+      } else {
+        invariant(false, 'ReactDOM.render(): Invalid component element.');
+      }
+    }
+  }
+
+  if (__DEV__) {
+    const isRootRenderedBySomeReact = !!container._reactRootContainer;
+    const rootEl = getReactRootElementInContainer(container);
+    const hasNonRootReactChild = !!(rootEl &&
+      ReactDOMComponentTree.getInstanceFromNode(rootEl));
+
+    warning(
+      !hasNonRootReactChild || isRootRenderedBySomeReact,
+      'render(...): Replacing React-rendered children with a new root ' +
+        'component. If you intended to update the children of this node, ' +
+        'you should instead have the existing children update their state ' +
+        'and render the new components instead of calling ReactDOM.render.',
+    );
+
+    warning(
+      !container.tagName || container.tagName.toUpperCase() !== 'BODY',
+      'render(): Rendering components directly into document.body is ' +
+        'discouraged, since its children are often manipulated by third-party ' +
+        'scripts and browser extensions. This may lead to subtle ' +
+        'reconciliation issues. Try rendering into a container element created ' +
+        'for your app.',
+    );
+  }
+
+  return renderSubtreeIntoContainer(null, element, container, async, callback);
+}
+
 var ReactDOM = {
   render(
     element: ReactElement<any>,
     container: DOMContainerElement,
     callback: ?Function,
   ) {
-    validateContainer(container);
-
-    if (ReactFeatureFlags.disableNewFiberFeatures) {
-      // Top-level check occurs here instead of inside child reconciler because
-      // because requirements vary between renderers. E.g. React Art
-      // allows arrays.
-      if (!isValidElement(element)) {
-        if (typeof element === 'string') {
-          invariant(
-            false,
-            'ReactDOM.render(): Invalid component element. Instead of ' +
-              "passing a string like 'div', pass " +
-              "React.createElement('div') or <div />.",
-          );
-        } else if (typeof element === 'function') {
-          invariant(
-            false,
-            'ReactDOM.render(): Invalid component element. Instead of ' +
-              'passing a class like Foo, pass React.createElement(Foo) ' +
-              'or <Foo />.',
-          );
-        } else if (element != null && typeof element.props !== 'undefined') {
-          // Check if it quacks like an element
-          invariant(
-            false,
-            'ReactDOM.render(): Invalid component element. This may be ' +
-              'caused by unintentionally loading two independent copies ' +
-              'of React.',
-          );
-        } else {
-          invariant(false, 'ReactDOM.render(): Invalid component element.');
-        }
-      }
-    }
-
-    if (__DEV__) {
-      const isRootRenderedBySomeReact = !!container._reactRootContainer;
-      const rootEl = getReactRootElementInContainer(container);
-      const hasNonRootReactChild = !!(rootEl &&
-        ReactDOMComponentTree.getInstanceFromNode(rootEl));
-
-      warning(
-        !hasNonRootReactChild || isRootRenderedBySomeReact,
-        'render(...): Replacing React-rendered children with a new root ' +
-          'component. If you intended to update the children of this node, ' +
-          'you should instead have the existing children update their state ' +
-          'and render the new components instead of calling ReactDOM.render.',
-      );
-
-      warning(
-        !container.tagName || container.tagName.toUpperCase() !== 'BODY',
-        'render(): Rendering components directly into document.body is ' +
-          'discouraged, since its children are often manipulated by third-party ' +
-          'scripts and browser extensions. This may lead to subtle ' +
-          'reconciliation issues. Try rendering into a container element created ' +
-          'for your app.',
-      );
-    }
-
-    return renderSubtreeIntoContainer(null, element, container, callback);
+    return render(element, container, false, callback);
   },
 
   unstable_renderSubtreeIntoContainer(
@@ -493,10 +509,13 @@ var ReactDOM = {
       parentComponent,
       element,
       containerNode,
+      false,
       callback,
     );
   },
 
+  unstable_asyncRender: (null : ?(element: ReactElement<any>, container: DOMContainerElement, callback: ?Function) => *),
+
   unmountComponentAtNode(container: DOMContainerElement) {
     invariant(
       isValidContainer(container),
@@ -518,7 +537,7 @@ var ReactDOM = {
 
       // Unmount should not be batched.
       return DOMRenderer.unbatchedUpdates(() => {
-        return renderSubtreeIntoContainer(null, null, container, () => {
+        return renderSubtreeIntoContainer(null, null, container, false, () => {
           container._reactRootContainer = null;
         });
       });
@@ -552,6 +571,21 @@ var ReactDOM = {
   },
 };
 
+if (ReactDOMFeatureFlags.enableAsyncSubtreeAPI) {
+  ReactDOM.unstable_asyncRender = function(
+    element: ReactElement<any>,
+    container: DOMContainerElement,
+    callback: ?Function,
+  ) {
+    return render(element, container, true, callback);
+  };
+} else {
+  // We set this to null on the ReactDOM export, then delete if the feature
+  // flag is not enabled so that it's undiscoverable.
+  // TODO: Is there a better way to satisfy Flow?
+  delete ReactDOM.unstable_asyncRender;
+}
+
 if (typeof injectInternals === 'function') {
   injectInternals({
     findFiberByHostInstance: ReactDOMComponentTree.getClosestInstanceFromNode,
diff --git a/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js b/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
new file mode 100644
index 0000000000000..2d9f6d9d604c7
--- /dev/null
+++ b/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
@@ -0,0 +1,75 @@
+var React = require('react');
+var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
+
+var ReactDOM;
+
+describe('ReactDOMFiberAsync', () => {
+  var container;
+
+  beforeEach(() => {
+    container = document.createElement('div');
+    ReactDOM = require('react-dom');
+  });
+
+  it('renders synchronously by default', () => {
+    var ops = [];
+    ReactDOM.render(<div>Hi</div>, container, () => {
+      ops.push(container.textContent);
+    });
+    ReactDOM.render(<div>Bye</div>, container, () => {
+      ops.push(container.textContent);
+    });
+    expect(ops).toEqual(['Hi', 'Bye']);
+  });
+
+  if (ReactDOMFeatureFlags.useFiber) {
+    it('throws when calling async APIs when feature flag is disabled', () => {
+      expect(() => {
+        ReactDOM.unstable_asyncRender(<div>Hi</div>, container);
+      }).toThrow('ReactDOM.unstable_asyncRender is not a function');
+    });
+
+    describe('with feature flag enabled', () => {
+      beforeEach(() => {
+        jest.resetModules();
+        ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
+        container = document.createElement('div');
+        ReactDOMFeatureFlags.enableAsyncSubtreeAPI = true;
+        ReactDOM = require('react-dom');
+      });
+
+      it('unstable_asyncRender creates an async tree', () => {
+        ReactDOM.unstable_asyncRender(<div>Hi</div>, container);
+        expect(container.textContent).toEqual('');
+        jest.runAllTimers();
+        expect(container.textContent).toEqual('Hi');
+
+        ReactDOM.unstable_asyncRender(<div>Bye</div>, container);
+        expect(container.textContent).toEqual('Hi');
+        jest.runAllTimers();
+        expect(container.textContent).toEqual('Bye');
+      });
+
+      it('updates inside an async tree are async by default', () => {
+        let instance;
+        class Component extends React.Component {
+          state = {step: 0};
+          render() {
+            instance = this;
+            return <div>{this.state.step}</div>;
+          }
+        }
+
+        ReactDOM.unstable_asyncRender(<Component />, container);
+        expect(container.textContent).toEqual('');
+        jest.runAllTimers();
+        expect(container.textContent).toEqual('0');
+
+        instance.setState({step: 1});
+        expect(container.textContent).toEqual('0');
+        jest.runAllTimers();
+        expect(container.textContent).toEqual('1');
+      });
+    });
+  }
+});
diff --git a/src/renderers/dom/shared/ReactDOMFeatureFlags.js b/src/renderers/dom/shared/ReactDOMFeatureFlags.js
index 1e21bca758936..7fb34ceb23eb8 100644
--- a/src/renderers/dom/shared/ReactDOMFeatureFlags.js
+++ b/src/renderers/dom/shared/ReactDOMFeatureFlags.js
@@ -13,6 +13,7 @@
 
 var ReactDOMFeatureFlags = {
   fiberAsyncScheduling: false,
+  enableAsyncSubtreeAPI: false,
   useCreateElement: true,
   useFiber: true,
 };
diff --git a/src/renderers/shared/fiber/ReactFiberReconciler.js b/src/renderers/shared/fiber/ReactFiberReconciler.js
index 1cb06243fefc7..236c481cdfef8 100644
--- a/src/renderers/shared/fiber/ReactFiberReconciler.js
+++ b/src/renderers/shared/fiber/ReactFiberReconciler.js
@@ -119,10 +119,18 @@ export type HostConfig<T, P, I, TI, PI, C, CX, PL> = {
 
 export type Reconciler<C, I, TI> = {
   createContainer(containerInfo: C): OpaqueRoot,
+  createAsyncContainer(containerInfo: C): OpaqueRoot,
   updateContainer(
     element: ReactNodeList,
     container: OpaqueRoot,
     parentComponent: ?ReactComponent<any, any, any>,
+    callback: ?Function,
+  ): void,
+  updateAsyncContainer(
+    element: ReactNodeList,
+    container: OpaqueRoot,
+    parentComponent: ?ReactComponent<any, any, any>,
+    callback: ?Function,
   ): void,
   performWithPriority(priorityLevel: PriorityLevel, fn: Function): void,
   batchedUpdates<A>(fn: () => A): A,
@@ -195,40 +203,85 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     scheduleUpdate(current, priorityLevel);
   }
 
+  function updateContainer(
+    element: ReactNodeList,
+    container: OpaqueRoot,
+    parentComponent: ?ReactComponent<any, any, any>,
+    async: boolean,
+    callback: ?Function,
+  ) {
+    // TODO: Make messages more user-friendly?
+    if (__DEV__) {
+      warning(
+        !async || (container.current.contextTag & AsyncUpdates),
+        'Attempted to schedule an asynchronous update on a sync container.'
+      );
+    }
+
+    // TODO: If this is a nested container, this won't be the root.
+    const current = container.current;
+
+    if (__DEV__) {
+      if (ReactFiberInstrumentation.debugTool) {
+        if (current.alternate === null) {
+          ReactFiberInstrumentation.debugTool.onMountContainer(container);
+        } else if (element === null) {
+          ReactFiberInstrumentation.debugTool.onUnmountContainer(container);
+        } else {
+          ReactFiberInstrumentation.debugTool.onUpdateContainer(container);
+        }
+      }
+    }
+
+    const context = getContextForSubtree(parentComponent);
+    if (container.context === null) {
+      container.context = context;
+    } else {
+      container.pendingContext = context;
+    }
+
+    scheduleTopLevelUpdate(current, element, callback);
+  }
+
   return {
     createContainer(containerInfo: C): OpaqueRoot {
       return createFiberRoot(containerInfo);
     },
 
+    createAsyncContainer(containerInfo: C): OpaqueRoot {
+      const fiberRoot = createFiberRoot(containerInfo);
+      fiberRoot.current.contextTag |= AsyncUpdates;
+      return fiberRoot;
+    },
+
     updateContainer(
       element: ReactNodeList,
       container: OpaqueRoot,
       parentComponent: ?ReactComponent<any, any, any>,
       callback: ?Function,
     ): void {
-      // TODO: If this is a nested container, this won't be the root.
-      const current = container.current;
-
-      if (__DEV__) {
-        if (ReactFiberInstrumentation.debugTool) {
-          if (current.alternate === null) {
-            ReactFiberInstrumentation.debugTool.onMountContainer(container);
-          } else if (element === null) {
-            ReactFiberInstrumentation.debugTool.onUnmountContainer(container);
-          } else {
-            ReactFiberInstrumentation.debugTool.onUpdateContainer(container);
-          }
-        }
-      }
-
-      const context = getContextForSubtree(parentComponent);
-      if (container.context === null) {
-        container.context = context;
-      } else {
-        container.pendingContext = context;
-      }
+      updateContainer(
+        element,
+        container,
+        parentComponent,
+        false, // async = false
+        callback,
+      );
+    },
 
-      scheduleTopLevelUpdate(current, element, callback);
+    updateAsyncContainer(
+      element: ReactNodeList,
+      container: OpaqueRoot,
+      parentComponent: ?ReactComponent<any, any, any>,
+      callback: ?Function,
+    ) {
+      updateContainer(
+        element,
+        container,
+        parentComponent,
+        true, // async = true
+        callback,
+      );
     },
 
     performWithPriority,

From 609e97ebe7fb9abfe6d4fedf36ad132ede2ac80d Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Mon, 17 Apr 2017 14:56:10 -0700
Subject: [PATCH 135/153] instance.unstable_asyncUpdates = true creates an
 async subtree

Same behavior as unstable_asyncRender. Can be used to wrap a specific
subtree, rather than an entire root.
---
 .../__tests__/ReactDOMFiberAsync-test.js      | 46 +++++++++++++++++++
 .../shared/fiber/ReactFiberClassComponent.js  |  4 ++
 2 files changed, 50 insertions(+)

diff --git a/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js b/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
index 2d9f6d9d604c7..3879d59dae67f 100644
--- a/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
+++ b/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
@@ -70,6 +70,52 @@ describe('ReactDOMFiberAsync', () => {
         jest.runAllTimers();
         expect(container.textContent).toEqual('1');
       });
+
+      it('unstable_asyncUpdates creates an async subtree', () => {
+        let instance;
+        class Component extends React.Component {
+          state = {step: 0};
+          unstable_asyncUpdates = true;
+          render() {
+            instance = this;
+            return <div>{this.state.step}</div>;
+          }
+        }
+
+        ReactDOM.render(<Component />, container);
+        jest.runAllTimers();
+
+        instance.setState({step: 1});
+        expect(container.textContent).toEqual('0');
+        jest.runAllTimers();
+        expect(container.textContent).toEqual('1');
+      });
+
+      it('updates inside an async subtree are async by default', () => {
+        class Component extends React.Component {
+          unstable_asyncUpdates = true;
+          render() {
+            return <Child />;
+          }
+        }
+
+        let instance;
+        class Child extends React.Component {
+          state = {step: 0};
+          render() {
+            instance = this;
+            return <div>{this.state.step}</div>;
+          }
+        }
+
+        ReactDOM.render(<Component />, container);
+        jest.runAllTimers();
+
+        instance.setState({step: 1});
+        expect(container.textContent).toEqual('0');
+        jest.runAllTimers();
+        expect(container.textContent).toEqual('1');
+      })
     });
   }
 });
diff --git a/src/renderers/shared/fiber/ReactFiberClassComponent.js b/src/renderers/shared/fiber/ReactFiberClassComponent.js
index d899fcc6a909b..8fcef7075f36e 100644
--- a/src/renderers/shared/fiber/ReactFiberClassComponent.js
+++ b/src/renderers/shared/fiber/ReactFiberClassComponent.js
@@ -305,6 +305,10 @@ module.exports = function(
     instance.refs = emptyObject;
     instance.context = getMaskedContext(workInProgress, unmaskedContext);
 
+    if (instance.unstable_asyncUpdates === true) {
+      workInProgress.contextTag |= AsyncUpdates;
+    }
+
     if (typeof instance.componentWillMount === 'function') {
       if (__DEV__) {
         startPhaseTimer(workInProgress, 'componentWillMount');

From ada638a0644299097ee4423cfbe2630df03faa2f Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Mon, 17 Apr 2017 14:59:51 -0700
Subject: [PATCH 136/153] Run prettier

---
 src/renderers/dom/fiber/ReactDOMFiber.js            | 13 +++++++++++--
 .../dom/fiber/__tests__/ReactDOMFiberAsync-test.js  |  2 +-
 src/renderers/shared/fiber/ReactFiberReconciler.js  |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/renderers/dom/fiber/ReactDOMFiber.js b/src/renderers/dom/fiber/ReactDOMFiber.js
index 8486afcc82423..3493ed9420057 100644
--- a/src/renderers/dom/fiber/ReactDOMFiber.js
+++ b/src/renderers/dom/fiber/ReactDOMFiber.js
@@ -410,7 +410,12 @@ function renderSubtreeIntoContainer(
     });
   } else {
     if (async) {
-      DOMRenderer.updateAsyncContainer(children, root, parentComponent, callback);
+      DOMRenderer.updateAsyncContainer(
+        children,
+        root,
+        parentComponent,
+        callback,
+      );
     } else {
       DOMRenderer.updateContainer(children, root, parentComponent, callback);
     }
@@ -514,7 +519,11 @@ var ReactDOM = {
     );
   },
 
-  unstable_asyncRender: (null : ?(element: ReactElement<any>, container: DOMContainerElement, callback: ?Function) => *),
+  unstable_asyncRender: (null: ?(
+    element: ReactElement<any>,
+    container: DOMContainerElement,
+    callback: ?Function,
+  ) => *),
 
   unmountComponentAtNode(container: DOMContainerElement) {
     invariant(
diff --git a/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js b/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
index 3879d59dae67f..0a693780866b0 100644
--- a/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
+++ b/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
@@ -115,7 +115,7 @@ describe('ReactDOMFiberAsync', () => {
         expect(container.textContent).toEqual('0');
         jest.runAllTimers();
         expect(container.textContent).toEqual('1');
-      })
+      });
     });
   }
 });
diff --git a/src/renderers/shared/fiber/ReactFiberReconciler.js b/src/renderers/shared/fiber/ReactFiberReconciler.js
index 236c481cdfef8..a3c9f315d3fe8 100644
--- a/src/renderers/shared/fiber/ReactFiberReconciler.js
+++ b/src/renderers/shared/fiber/ReactFiberReconciler.js
@@ -213,8 +213,8 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     // TODO: Make messages more user-friendly?
     if (__DEV__) {
       warning(
-        !async || (container.current.contextTag & AsyncUpdates),
-        'Attempted to schedule an asynchronous update on a sync container.'
+        !async || container.current.contextTag & AsyncUpdates,
+        'Attempted to schedule an asynchronous update on a sync container.',
       );
     }
 

From 864973c544896922ff04c97a25089193bb478827 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Mon, 17 Apr 2017 15:01:21 -0700
Subject: [PATCH 137/153] Run Fiber test script

---
 scripts/fiber/tests-passing.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index 558711185bf73..da4174ae711f8 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -749,6 +749,14 @@ src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js
 * throws if something other than false, null, or an element is returned from render
 * treats mocked render functions as if they return null
 
+src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
+* renders synchronously by default
+* throws when calling async APIs when feature flag is disabled
+* unstable_asyncRender creates an async tree
+* updates inside an async tree are async by default
+* unstable_asyncUpdates creates an async subtree
+* updates inside an async subtree are async by default
+
 src/renderers/dom/shared/__tests__/CSSProperty-test.js
 * should generate browser prefixes for its `isUnitlessNumber`
 

From 26d70fd3347b7c730644d32b70c4fa752a29a610 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Mon, 17 Apr 2017 15:38:57 -0700
Subject: [PATCH 138/153] Add enableAsyncSubtreeAPI to host config

Allows us to control this feature on a per-renderer basis
---
 src/renderers/dom/fiber/ReactDOMFiber.js           | 1 +
 src/renderers/shared/fiber/ReactFiberReconciler.js | 1 +
 src/renderers/shared/fiber/ReactFiberScheduler.js  | 6 +++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/renderers/dom/fiber/ReactDOMFiber.js b/src/renderers/dom/fiber/ReactDOMFiber.js
index 3493ed9420057..7f8c39e1c583f 100644
--- a/src/renderers/dom/fiber/ReactDOMFiber.js
+++ b/src/renderers/dom/fiber/ReactDOMFiber.js
@@ -364,6 +364,7 @@ var DOMRenderer = ReactFiberReconciler({
   scheduleDeferredCallback: ReactDOMFrameScheduling.rIC,
 
   useSyncScheduling: !ReactDOMFeatureFlags.fiberAsyncScheduling,
+  enableAsyncSubtreeAPI: ReactDOMFeatureFlags.enableAsyncSubtreeAPI,
 });
 
 ReactGenericBatching.injection.injectFiberBatchedUpdates(
diff --git a/src/renderers/shared/fiber/ReactFiberReconciler.js b/src/renderers/shared/fiber/ReactFiberReconciler.js
index a3c9f315d3fe8..c8f56c4d0333a 100644
--- a/src/renderers/shared/fiber/ReactFiberReconciler.js
+++ b/src/renderers/shared/fiber/ReactFiberReconciler.js
@@ -115,6 +115,7 @@ export type HostConfig<T, P, I, TI, PI, C, CX, PL> = {
   resetAfterCommit(): void,
 
   useSyncScheduling?: boolean,
+  enableAsyncSubtreeAPI?: boolean,
 };
 
 export type Reconciler<C, I, TI> = {
diff --git a/src/renderers/shared/fiber/ReactFiberScheduler.js b/src/renderers/shared/fiber/ReactFiberScheduler.js
index 9ff146f7078c6..0a94a93650179 100644
--- a/src/renderers/shared/fiber/ReactFiberScheduler.js
+++ b/src/renderers/shared/fiber/ReactFiberScheduler.js
@@ -169,6 +169,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     useSyncScheduling,
     prepareForCommit,
     resetAfterCommit,
+    enableAsyncSubtreeAPI,
   } = config;
 
   // The priority level to use when scheduling an update. We use NoWork to
@@ -1347,7 +1348,10 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   function getPriorityContext(fiber: Fiber): PriorityLevel {
     let priorityLevel = priorityContext;
     if (priorityLevel === NoWork) {
-      if (!useSyncScheduling || fiber.contextTag & AsyncUpdates) {
+      if (
+        !useSyncScheduling ||
+        (enableAsyncSubtreeAPI === true && fiber.contextTag & AsyncUpdates)
+      ) {
         priorityLevel = LowPriority;
       } else {
         priorityLevel = SynchronousPriority;

From abd07dffb30b005dc3702fcba1c2379c32762b7b Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Tue, 18 Apr 2017 13:28:33 -0700
Subject: [PATCH 139/153] Rename contextTag -> internalContextTag

---
 src/renderers/shared/fiber/ReactChildFiber.js | 34 +++++++++----------
 src/renderers/shared/fiber/ReactFiber.js      | 22 ++++++------
 .../shared/fiber/ReactFiberClassComponent.js  |  5 ++-
 .../shared/fiber/ReactFiberReconciler.js      |  8 +++--
 .../shared/fiber/ReactFiberScheduler.js       |  4 +--
 ...ntext.js => ReactTypeOfInternalContext.js} |  4 +--
 6 files changed, 42 insertions(+), 35 deletions(-)
 rename src/renderers/shared/fiber/{isomorphic/ReactTypeOfContext.js => ReactTypeOfInternalContext.js} (81%)

diff --git a/src/renderers/shared/fiber/ReactChildFiber.js b/src/renderers/shared/fiber/ReactChildFiber.js
index 49d3ce419ccff..cd0949804c683 100644
--- a/src/renderers/shared/fiber/ReactChildFiber.js
+++ b/src/renderers/shared/fiber/ReactChildFiber.js
@@ -307,7 +307,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       // Insert
       const created = createFiberFromText(textContent, priority);
       created.return = returnFiber;
-      created.contextTag = returnFiber.contextTag;
+      created.internalContextTag = returnFiber.internalContextTag;
       return created;
     } else {
       // Update
@@ -329,7 +329,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       const created = createFiberFromElement(element, priority);
       created.ref = coerceRef(current, element);
       created.return = returnFiber;
-      created.contextTag = returnFiber.contextTag;
+      created.internalContextTag = returnFiber.internalContextTag;
       return created;
     } else {
       // Move based on index
@@ -356,7 +356,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       // Insert
       const created = createFiberFromCoroutine(coroutine, priority);
       created.return = returnFiber;
-      created.contextTag = returnFiber.contextTag;
+      created.internalContextTag = returnFiber.internalContextTag;
       return created;
     } else {
       // Move based on index
@@ -378,7 +378,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       const created = createFiberFromYield(yieldNode, priority);
       created.type = yieldNode.value;
       created.return = returnFiber;
-      created.contextTag = returnFiber.contextTag;
+      created.internalContextTag = returnFiber.internalContextTag;
       return created;
     } else {
       // Move based on index
@@ -404,7 +404,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       // Insert
       const created = createFiberFromPortal(portal, priority);
       created.return = returnFiber;
-      created.contextTag = returnFiber.contextTag;
+      created.internalContextTag = returnFiber.internalContextTag;
       return created;
     } else {
       // Update
@@ -425,7 +425,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       // Insert
       const created = createFiberFromFragment(fragment, priority);
       created.return = returnFiber;
-      created.contextTag = returnFiber.contextTag;
+      created.internalContextTag = returnFiber.internalContextTag;
       return created;
     } else {
       // Update
@@ -447,7 +447,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       // node.
       const created = createFiberFromText('' + newChild, priority);
       created.return = returnFiber;
-      created.contextTag = returnFiber.contextTag;
+      created.internalContextTag = returnFiber.internalContextTag;
       return created;
     }
 
@@ -457,14 +457,14 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
           const created = createFiberFromElement(newChild, priority);
           created.ref = coerceRef(null, newChild);
           created.return = returnFiber;
-          created.contextTag = returnFiber.contextTag;
+          created.internalContextTag = returnFiber.internalContextTag;
           return created;
         }
 
         case REACT_COROUTINE_TYPE: {
           const created = createFiberFromCoroutine(newChild, priority);
           created.return = returnFiber;
-          created.contextTag = returnFiber.contextTag;
+          created.internalContextTag = returnFiber.internalContextTag;
           return created;
         }
 
@@ -472,14 +472,14 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
           const created = createFiberFromYield(newChild, priority);
           created.type = newChild.value;
           created.return = returnFiber;
-          created.contextTag = returnFiber.contextTag;
+          created.internalContextTag = returnFiber.internalContextTag;
           return created;
         }
 
         case REACT_PORTAL_TYPE: {
           const created = createFiberFromPortal(newChild, priority);
           created.return = returnFiber;
-          created.contextTag = returnFiber.contextTag;
+          created.internalContextTag = returnFiber.internalContextTag;
           return created;
         }
       }
@@ -487,7 +487,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       if (isArray(newChild) || getIteratorFn(newChild)) {
         const created = createFiberFromFragment(newChild, priority);
         created.return = returnFiber;
-        created.contextTag = returnFiber.contextTag;
+        created.internalContextTag = returnFiber.internalContextTag;
         return created;
       }
 
@@ -1025,7 +1025,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
     deleteRemainingChildren(returnFiber, currentFirstChild);
     const created = createFiberFromText(textContent, priority);
     created.return = returnFiber;
-    created.contextTag = returnFiber.contextTag;
+    created.internalContextTag = returnFiber.internalContextTag;
     return created;
   }
 
@@ -1065,7 +1065,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
     const created = createFiberFromElement(element, priority);
     created.ref = coerceRef(currentFirstChild, element);
     created.return = returnFiber;
-    created.contextTag = returnFiber.contextTag;
+    created.internalContextTag = returnFiber.internalContextTag;
     return created;
   }
 
@@ -1099,7 +1099,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
 
     const created = createFiberFromCoroutine(coroutine, priority);
     created.return = returnFiber;
-    created.contextTag = returnFiber.contextTag;
+    created.internalContextTag = returnFiber.internalContextTag;
     return created;
   }
 
@@ -1126,7 +1126,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
     const created = createFiberFromYield(yieldNode, priority);
     created.type = yieldNode.value;
     created.return = returnFiber;
-    created.contextTag = returnFiber.contextTag;
+    created.internalContextTag = returnFiber.internalContextTag;
     return created;
   }
 
@@ -1164,7 +1164,7 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
 
     const created = createFiberFromPortal(portal, priority);
     created.return = returnFiber;
-    created.contextTag = returnFiber.contextTag;
+    created.internalContextTag = returnFiber.internalContextTag;
     return created;
   }
 
diff --git a/src/renderers/shared/fiber/ReactFiber.js b/src/renderers/shared/fiber/ReactFiber.js
index 29a43df4baa68..6782d4ae07a6c 100644
--- a/src/renderers/shared/fiber/ReactFiber.js
+++ b/src/renderers/shared/fiber/ReactFiber.js
@@ -18,7 +18,7 @@ import type {ReactFragment} from 'ReactTypes';
 import type {ReactCoroutine, ReactYield} from 'ReactCoroutine';
 import type {ReactPortal} from 'ReactPortal';
 import type {TypeOfWork} from 'ReactTypeOfWork';
-import type {TypeOfContext} from 'ReactTypeOfContext';
+import type {TypeOfInternalContext} from 'ReactTypeOfInternalContext';
 import type {TypeOfSideEffect} from 'ReactTypeOfSideEffect';
 import type {PriorityLevel} from 'ReactPriorityLevel';
 import type {UpdateQueue} from 'ReactFiberUpdateQueue';
@@ -39,7 +39,7 @@ var {NoWork} = require('ReactPriorityLevel');
 
 var {
   NoContext,
-} = require('ReactTypeOfContext');
+} = require('ReactTypeOfInternalContext');
 
 var {
   NoEffect,
@@ -116,13 +116,13 @@ export type Fiber = {
   // The state used to create the output
   memoizedState: any,
 
-  // Bitmask that describes properties about the fiber and its subtree. E.g. the
-  // AsyncUpdates flag indicates whether the subtree should be async-by-default.
-  // When a fiber is created, it inherits the contextTag of its parent.
-  // Additional flags can be set at creation time, but after than
-  // the value should remain unchanged throughout the fiber's lifetime,
-  // particularly before its child fibers are created.
-  contextTag: TypeOfContext,
+  // Bitfield that describes properties about the fiber and its subtree. E.g.
+  // the AsyncUpdates flag indicates whether the subtree should be async-by-
+  // default. When a fiber is created, it inherits the internalContextTag of its
+  // parent. Additional flags can be set at creation time, but after than the
+  // value should remain unchanged throughout the fiber's lifetime, particularly
+  // before its child fibers are created.
+  internalContextTag: TypeOfInternalContext,
 
   // Effect
   effectTag: TypeOfSideEffect,
@@ -211,7 +211,7 @@ var createFiber = function(tag: TypeOfWork, key: null | string): Fiber {
     updateQueue: null,
     memoizedState: null,
 
-    contextTag: NoContext,
+    internalContextTag: NoContext,
 
     effectTag: NoEffect,
     nextEffect: null,
@@ -298,7 +298,7 @@ exports.cloneFiber = function(
   alt.memoizedProps = fiber.memoizedProps;
   alt.memoizedState = fiber.memoizedState;
 
-  alt.contextTag = fiber.contextTag;
+  alt.internalContextTag = fiber.internalContextTag;
 
   if (__DEV__) {
     alt._debugID = fiber._debugID;
diff --git a/src/renderers/shared/fiber/ReactFiberClassComponent.js b/src/renderers/shared/fiber/ReactFiberClassComponent.js
index 8fcef7075f36e..0e5cf81ffe754 100644
--- a/src/renderers/shared/fiber/ReactFiberClassComponent.js
+++ b/src/renderers/shared/fiber/ReactFiberClassComponent.js
@@ -15,6 +15,9 @@
 import type {Fiber} from 'ReactFiber';
 import type {PriorityLevel} from 'ReactPriorityLevel';
 
+var {
+  AsyncUpdates,
+} = require('ReactTypeOfInternalContext');
 var {
   Update,
 } = require('ReactTypeOfSideEffect');
@@ -306,7 +309,7 @@ module.exports = function(
     instance.context = getMaskedContext(workInProgress, unmaskedContext);
 
     if (instance.unstable_asyncUpdates === true) {
-      workInProgress.contextTag |= AsyncUpdates;
+      workInProgress.internalContextTag |= AsyncUpdates;
     }
 
     if (typeof instance.componentWillMount === 'function') {
diff --git a/src/renderers/shared/fiber/ReactFiberReconciler.js b/src/renderers/shared/fiber/ReactFiberReconciler.js
index c8f56c4d0333a..a0151b30a8e25 100644
--- a/src/renderers/shared/fiber/ReactFiberReconciler.js
+++ b/src/renderers/shared/fiber/ReactFiberReconciler.js
@@ -17,6 +17,10 @@ import type {FiberRoot} from 'ReactFiberRoot';
 import type {PriorityLevel} from 'ReactPriorityLevel';
 import type {ReactNodeList} from 'ReactTypes';
 
+var {
+  AsyncUpdates,
+} = require('ReactTypeOfInternalContext');
+
 var {
   addTopLevelUpdate,
 } = require('ReactFiberUpdateQueue');
@@ -214,7 +218,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     // TODO: Make messages more user-friendly?
     if (__DEV__) {
       warning(
-        !async || container.current.contextTag & AsyncUpdates,
+        !async || container.current.internalContextTag & AsyncUpdates,
         'Attempted to schedule an asynchronous update on a sync container.',
       );
     }
@@ -251,7 +255,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
 
     createAsyncContainer(containerInfo: C): OpaqueRoot {
       const fiberRoot = createFiberRoot(containerInfo);
-      fiberRoot.current.contextTag |= AsyncUpdates;
+      fiberRoot.current.internalContextTag |= AsyncUpdates;
       return fiberRoot;
     },
 
diff --git a/src/renderers/shared/fiber/ReactFiberScheduler.js b/src/renderers/shared/fiber/ReactFiberScheduler.js
index 0a94a93650179..dddec0a83f551 100644
--- a/src/renderers/shared/fiber/ReactFiberScheduler.js
+++ b/src/renderers/shared/fiber/ReactFiberScheduler.js
@@ -62,7 +62,7 @@ var {
 
 var {
   AsyncUpdates,
-} = require('ReactTypeOfContext');
+} = require('ReactTypeOfInternalContext');
 
 var {
   NoEffect,
@@ -1350,7 +1350,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     if (priorityLevel === NoWork) {
       if (
         !useSyncScheduling ||
-        (enableAsyncSubtreeAPI === true && fiber.contextTag & AsyncUpdates)
+        (enableAsyncSubtreeAPI === true && fiber.internalContextTag & AsyncUpdates)
       ) {
         priorityLevel = LowPriority;
       } else {
diff --git a/src/renderers/shared/fiber/isomorphic/ReactTypeOfContext.js b/src/renderers/shared/fiber/ReactTypeOfInternalContext.js
similarity index 81%
rename from src/renderers/shared/fiber/isomorphic/ReactTypeOfContext.js
rename to src/renderers/shared/fiber/ReactTypeOfInternalContext.js
index eff01ae543d97..4c0c5762c7bc4 100644
--- a/src/renderers/shared/fiber/isomorphic/ReactTypeOfContext.js
+++ b/src/renderers/shared/fiber/ReactTypeOfInternalContext.js
@@ -6,13 +6,13 @@
  * LICENSE file in the root directory of this source tree. An additional grant
  * of patent rights can be found in the PATENTS file in the same directory.
  *
- * @providesModule ReactTypeOfContext
+ * @providesModule ReactTypeOfInternalContext
  * @flow
  */
 
 'use strict';
 
-export type TypeOfContext = 0 | 1;
+export type TypeOfInternalContext = 0 | 1;
 
 module.exports = {
   NoContext: 0,

From f69748601d5c1fd1fc3585d6d1d1970c2c13a272 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Tue, 18 Apr 2017 14:46:56 -0700
Subject: [PATCH 140/153] Remove unstable_asyncRender() API in favor of always
 using a wrapper

---
 src/renderers/dom/fiber/ReactDOMFiber.js      | 169 +++++++-----------
 .../__tests__/ReactDOMFiberAsync-test.js      |  62 ++++---
 .../shared/fiber/ReactFiberBeginWork.js       |   2 +-
 .../shared/fiber/ReactFiberClassComponent.js  |  10 +-
 .../shared/fiber/ReactFiberReconciler.js      | 104 +++--------
 .../shared/fiber/ReactFiberScheduler.js       |   9 +-
 6 files changed, 142 insertions(+), 214 deletions(-)

diff --git a/src/renderers/dom/fiber/ReactDOMFiber.js b/src/renderers/dom/fiber/ReactDOMFiber.js
index 7f8c39e1c583f..7dd9c8a3f28af 100644
--- a/src/renderers/dom/fiber/ReactDOMFiber.js
+++ b/src/renderers/dom/fiber/ReactDOMFiber.js
@@ -387,7 +387,6 @@ function renderSubtreeIntoContainer(
   parentComponent: ?ReactComponent<any, any, any>,
   children: ReactNodeList,
   containerNode: DOMContainerElement | Document,
-  async: boolean,
   callback: ?Function,
 ) {
   validateContainer(containerNode);
@@ -401,104 +400,84 @@ function renderSubtreeIntoContainer(
     while (container.lastChild) {
       container.removeChild(container.lastChild);
     }
-    const newRoot = async
-      ? DOMRenderer.createAsyncContainer(container)
-      : DOMRenderer.createContainer(container);
+    const newRoot = DOMRenderer.createContainer(container);
     root = (container._reactRootContainer = newRoot);
     // Initial mount should not be batched.
     DOMRenderer.unbatchedUpdates(() => {
       DOMRenderer.updateContainer(children, newRoot, parentComponent, callback);
     });
   } else {
-    if (async) {
-      DOMRenderer.updateAsyncContainer(
-        children,
-        root,
-        parentComponent,
-        callback,
-      );
-    } else {
-      DOMRenderer.updateContainer(children, root, parentComponent, callback);
-    }
+    DOMRenderer.updateContainer(children, root, parentComponent, callback);
   }
   return DOMRenderer.getPublicRootInstance(root);
 }
 
-function render(
-  element: ReactElement<any>,
-  container: DOMContainerElement,
-  async: boolean,
-  callback: ?Function,
-) {
-  validateContainer(container);
-
-  if (ReactFeatureFlags.disableNewFiberFeatures) {
-    // Top-level check occurs here instead of inside child reconciler because
-    // because requirements vary between renderers. E.g. React Art
-    // allows arrays.
-    if (!isValidElement(element)) {
-      if (typeof element === 'string') {
-        invariant(
-          false,
-          'ReactDOM.render(): Invalid component element. Instead of ' +
-            "passing a string like 'div', pass " +
-            "React.createElement('div') or <div />.",
-        );
-      } else if (typeof element === 'function') {
-        invariant(
-          false,
-          'ReactDOM.render(): Invalid component element. Instead of ' +
-            'passing a class like Foo, pass React.createElement(Foo) ' +
-            'or <Foo />.',
-        );
-      } else if (element != null && typeof element.props !== 'undefined') {
-        // Check if it quacks like an element
-        invariant(
-          false,
-          'ReactDOM.render(): Invalid component element. This may be ' +
-            'caused by unintentionally loading two independent copies ' +
-            'of React.',
-        );
-      } else {
-        invariant(false, 'ReactDOM.render(): Invalid component element.');
-      }
-    }
-  }
-
-  if (__DEV__) {
-    const isRootRenderedBySomeReact = !!container._reactRootContainer;
-    const rootEl = getReactRootElementInContainer(container);
-    const hasNonRootReactChild = !!(rootEl &&
-      ReactDOMComponentTree.getInstanceFromNode(rootEl));
-
-    warning(
-      !hasNonRootReactChild || isRootRenderedBySomeReact,
-      'render(...): Replacing React-rendered children with a new root ' +
-        'component. If you intended to update the children of this node, ' +
-        'you should instead have the existing children update their state ' +
-        'and render the new components instead of calling ReactDOM.render.',
-    );
-
-    warning(
-      !container.tagName || container.tagName.toUpperCase() !== 'BODY',
-      'render(): Rendering components directly into document.body is ' +
-        'discouraged, since its children are often manipulated by third-party ' +
-        'scripts and browser extensions. This may lead to subtle ' +
-        'reconciliation issues. Try rendering into a container element created ' +
-        'for your app.',
-    );
-  }
-
-  return renderSubtreeIntoContainer(null, element, container, async, callback);
-}
-
 var ReactDOM = {
   render(
     element: ReactElement<any>,
     container: DOMContainerElement,
     callback: ?Function,
   ) {
-    return render(element, container, false, callback);
+    validateContainer(container);
+
+    if (ReactFeatureFlags.disableNewFiberFeatures) {
+      // Top-level check occurs here instead of inside child reconciler because
+      // because requirements vary between renderers. E.g. React Art
+      // allows arrays.
+      if (!isValidElement(element)) {
+        if (typeof element === 'string') {
+          invariant(
+            false,
+            'ReactDOM.render(): Invalid component element. Instead of ' +
+              "passing a string like 'div', pass " +
+              "React.createElement('div') or <div />.",
+          );
+        } else if (typeof element === 'function') {
+          invariant(
+            false,
+            'ReactDOM.render(): Invalid component element. Instead of ' +
+              'passing a class like Foo, pass React.createElement(Foo) ' +
+              'or <Foo />.',
+          );
+        } else if (element != null && typeof element.props !== 'undefined') {
+          // Check if it quacks like an element
+          invariant(
+            false,
+            'ReactDOM.render(): Invalid component element. This may be ' +
+              'caused by unintentionally loading two independent copies ' +
+              'of React.',
+          );
+        } else {
+          invariant(false, 'ReactDOM.render(): Invalid component element.');
+        }
+      }
+    }
+
+    if (__DEV__) {
+      const isRootRenderedBySomeReact = !!container._reactRootContainer;
+      const rootEl = getReactRootElementInContainer(container);
+      const hasNonRootReactChild = !!(rootEl &&
+        ReactDOMComponentTree.getInstanceFromNode(rootEl));
+
+      warning(
+        !hasNonRootReactChild || isRootRenderedBySomeReact,
+        'render(...): Replacing React-rendered children with a new root ' +
+          'component. If you intended to update the children of this node, ' +
+          'you should instead have the existing children update their state ' +
+          'and render the new components instead of calling ReactDOM.render.',
+      );
+
+      warning(
+        !container.tagName || container.tagName.toUpperCase() !== 'BODY',
+        'render(): Rendering components directly into document.body is ' +
+          'discouraged, since its children are often manipulated by third-party ' +
+          'scripts and browser extensions. This may lead to subtle ' +
+          'reconciliation issues. Try rendering into a container element created ' +
+          'for your app.',
+      );
+    }
+
+    return renderSubtreeIntoContainer(null, element, container, callback);
   },
 
   unstable_renderSubtreeIntoContainer(
@@ -515,17 +494,10 @@ var ReactDOM = {
       parentComponent,
       element,
       containerNode,
-      false,
       callback,
     );
   },
 
-  unstable_asyncRender: (null: ?(
-    element: ReactElement<any>,
-    container: DOMContainerElement,
-    callback: ?Function,
-  ) => *),
-
   unmountComponentAtNode(container: DOMContainerElement) {
     invariant(
       isValidContainer(container),
@@ -547,7 +519,7 @@ var ReactDOM = {
 
       // Unmount should not be batched.
       return DOMRenderer.unbatchedUpdates(() => {
-        return renderSubtreeIntoContainer(null, null, container, false, () => {
+        return renderSubtreeIntoContainer(null, null, container, () => {
           container._reactRootContainer = null;
         });
       });
@@ -581,21 +553,6 @@ var ReactDOM = {
   },
 };
 
-if (ReactDOMFeatureFlags.enableAsyncSubtreeAPI) {
-  ReactDOM.unstable_asyncRender = function(
-    element: ReactElement<any>,
-    container: DOMContainerElement,
-    callback: ?Function,
-  ) {
-    return render(element, container, true, callback);
-  };
-} else {
-  // We set this to null on the ReactDOM export, then delete if the feature
-  // flag is not enabled so that it's undiscoverable.
-  // TODO: Is there a better way to satisfy Flow?
-  delete ReactDOM.unstable_asyncRender;
-}
-
 if (typeof injectInternals === 'function') {
   injectInternals({
     findFiberByHostInstance: ReactDOMComponentTree.getClosestInstanceFromNode,
diff --git a/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js b/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
index 0a693780866b0..e8b369a55c6f7 100644
--- a/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
+++ b/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
@@ -38,32 +38,19 @@ describe('ReactDOMFiberAsync', () => {
         ReactDOM = require('react-dom');
       });
 
-      it('unstable_asyncRender creates an async tree', () => {
-        ReactDOM.unstable_asyncRender(<div>Hi</div>, container);
-        expect(container.textContent).toEqual('');
-        jest.runAllTimers();
-        expect(container.textContent).toEqual('Hi');
-
-        ReactDOM.unstable_asyncRender(<div>Bye</div>, container);
-        expect(container.textContent).toEqual('Hi');
-        jest.runAllTimers();
-        expect(container.textContent).toEqual('Bye');
-      });
-
-      it('updates inside an async tree are async by default', () => {
+      it('unstable_asyncUpdates creates an async subtree', () => {
         let instance;
         class Component extends React.Component {
           state = {step: 0};
+          static unstable_asyncUpdates = true;
           render() {
             instance = this;
             return <div>{this.state.step}</div>;
           }
         }
 
-        ReactDOM.unstable_asyncRender(<Component />, container);
-        expect(container.textContent).toEqual('');
+        ReactDOM.render(<Component />, container);
         jest.runAllTimers();
-        expect(container.textContent).toEqual('0');
 
         instance.setState({step: 1});
         expect(container.textContent).toEqual('0');
@@ -71,11 +58,17 @@ describe('ReactDOMFiberAsync', () => {
         expect(container.textContent).toEqual('1');
       });
 
-      it('unstable_asyncUpdates creates an async subtree', () => {
-        let instance;
+      it('updates inside an async subtree are async by default', () => {
         class Component extends React.Component {
+          static unstable_asyncUpdates = true;
+          render() {
+            return <Child />;
+          }
+        }
+
+        let instance;
+        class Child extends React.Component {
           state = {step: 0};
-          unstable_asyncUpdates = true;
           render() {
             instance = this;
             return <div>{this.state.step}</div>;
@@ -91,16 +84,33 @@ describe('ReactDOMFiberAsync', () => {
         expect(container.textContent).toEqual('1');
       });
 
-      it('updates inside an async subtree are async by default', () => {
-        class Component extends React.Component {
-          unstable_asyncUpdates = true;
+      it('unstable_asyncUpdates at the root makes the entire tree async', () => {
+        class Async extends React.Component {
+          static unstable_asyncUpdates = true;
           render() {
-            return <Child />;
+            return this.props.children;
           }
         }
+        ReactDOM.render(<Async><div>Hi</div></Async>, container);
+        expect(container.textContent).toEqual('');
+        jest.runAllTimers();
+        expect(container.textContent).toEqual('Hi');
+
+        ReactDOM.render(<Async><div>Bye</div></Async>, container);
+        expect(container.textContent).toEqual('Hi');
+        jest.runAllTimers();
+        expect(container.textContent).toEqual('Bye');
+      });
 
+      it('updates inside an async tree are async by default', () => {
+        class Async extends React.Component {
+          static unstable_asyncUpdates = true;
+          render() {
+            return this.props.children;
+          }
+        }
         let instance;
-        class Child extends React.Component {
+        class Component extends React.Component {
           state = {step: 0};
           render() {
             instance = this;
@@ -108,8 +118,10 @@ describe('ReactDOMFiberAsync', () => {
           }
         }
 
-        ReactDOM.render(<Component />, container);
+        ReactDOM.render(<Async><Component /></Async>, container);
+        expect(container.textContent).toEqual('');
         jest.runAllTimers();
+        expect(container.textContent).toEqual('0');
 
         instance.setState({step: 1});
         expect(container.textContent).toEqual('0');
diff --git a/src/renderers/shared/fiber/ReactFiberBeginWork.js b/src/renderers/shared/fiber/ReactFiberBeginWork.js
index 2e58f752c2391..050e9d951d63f 100644
--- a/src/renderers/shared/fiber/ReactFiberBeginWork.js
+++ b/src/renderers/shared/fiber/ReactFiberBeginWork.js
@@ -66,7 +66,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
   config: HostConfig<T, P, I, TI, PI, C, CX, PL>,
   hostContext: HostContext<C, CX>,
   scheduleUpdate: (fiber: Fiber, priorityLevel: PriorityLevel) => void,
-  getPriorityContext: (fiber: Fiber) => PriorityLevel,
+  getPriorityContext: (fiber: Fiber, forceAsync: boolean) => PriorityLevel,
 ) {
   const {
     shouldSetTextContent,
diff --git a/src/renderers/shared/fiber/ReactFiberClassComponent.js b/src/renderers/shared/fiber/ReactFiberClassComponent.js
index 0e5cf81ffe754..c03fe3ca291a3 100644
--- a/src/renderers/shared/fiber/ReactFiberClassComponent.js
+++ b/src/renderers/shared/fiber/ReactFiberClassComponent.js
@@ -60,7 +60,7 @@ if (__DEV__) {
 
 module.exports = function(
   scheduleUpdate: (fiber: Fiber, priorityLevel: PriorityLevel) => void,
-  getPriorityContext: (fiber: Fiber) => PriorityLevel,
+  getPriorityContext: (fiber: Fiber, forceAsync: boolean) => PriorityLevel,
   memoizeProps: (workInProgress: Fiber, props: any) => void,
   memoizeState: (workInProgress: Fiber, state: any) => void,
 ) {
@@ -69,7 +69,7 @@ module.exports = function(
     isMounted,
     enqueueSetState(instance, partialState, callback) {
       const fiber = ReactInstanceMap.get(instance);
-      const priorityLevel = getPriorityContext(fiber);
+      const priorityLevel = getPriorityContext(fiber, false);
       callback = callback === undefined ? null : callback;
       if (__DEV__) {
         warnOnInvalidCallback(callback, 'setState');
@@ -79,7 +79,7 @@ module.exports = function(
     },
     enqueueReplaceState(instance, state, callback) {
       const fiber = ReactInstanceMap.get(instance);
-      const priorityLevel = getPriorityContext(fiber);
+      const priorityLevel = getPriorityContext(fiber, false);
       callback = callback === undefined ? null : callback;
       if (__DEV__) {
         warnOnInvalidCallback(callback, 'replaceState');
@@ -89,7 +89,7 @@ module.exports = function(
     },
     enqueueForceUpdate(instance, callback) {
       const fiber = ReactInstanceMap.get(instance);
-      const priorityLevel = getPriorityContext(fiber);
+      const priorityLevel = getPriorityContext(fiber, false);
       callback = callback === undefined ? null : callback;
       if (__DEV__) {
         warnOnInvalidCallback(callback, 'forceUpdate');
@@ -308,7 +308,7 @@ module.exports = function(
     instance.refs = emptyObject;
     instance.context = getMaskedContext(workInProgress, unmaskedContext);
 
-    if (instance.unstable_asyncUpdates === true) {
+    if (workInProgress.type.unstable_asyncUpdates === true) {
       workInProgress.internalContextTag |= AsyncUpdates;
     }
 
diff --git a/src/renderers/shared/fiber/ReactFiberReconciler.js b/src/renderers/shared/fiber/ReactFiberReconciler.js
index a0151b30a8e25..309ede457f1ba 100644
--- a/src/renderers/shared/fiber/ReactFiberReconciler.js
+++ b/src/renderers/shared/fiber/ReactFiberReconciler.js
@@ -124,19 +124,12 @@ export type HostConfig<T, P, I, TI, PI, C, CX, PL> = {
 
 export type Reconciler<C, I, TI> = {
   createContainer(containerInfo: C): OpaqueRoot,
-  createAsyncContainer(containerInfo: C): OpaqueRoot,
   updateContainer(
     element: ReactNodeList,
     container: OpaqueRoot,
     parentComponent: ?ReactComponent<any, any, any>,
     callback: ?Function,
   ): void,
-  updateAsyncContainer(
-    element: ReactNodeList,
-    container: OpaqueRoot,
-    parentComponent: ?ReactComponent<any, any, any>,
-    callback: ?Function,
-  ): void,
   performWithPriority(priorityLevel: PriorityLevel, fn: Function): void,
   batchedUpdates<A>(fn: () => A): A,
   unbatchedUpdates<A>(fn: () => A): A,
@@ -193,7 +186,13 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
       }
     }
 
-    const priorityLevel = getPriorityContext(current);
+    // Check if the top-level element is an async wrapper component. If so, treat
+    // updates to the root as async. This is a bit weird but lets us avoid a separate
+    // `renderAsync` API.
+    const forceAsync = element != null &&
+      element.type != null &&
+      (element.type: any).unstable_asyncUpdates === true;
+    const priorityLevel = getPriorityContext(current, forceAsync);
     const nextState = {element};
     callback = callback === undefined ? null : callback;
     if (__DEV__) {
@@ -208,85 +207,40 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     scheduleUpdate(current, priorityLevel);
   }
 
-  function updateContainer(
-    element: ReactNodeList,
-    container: OpaqueRoot,
-    parentComponent: ?ReactComponent<any, any, any>,
-    async: boolean,
-    callback: ?Function,
-  ) {
-    // TODO: Make messages more user-friendly?
-    if (__DEV__) {
-      warning(
-        !async || container.current.internalContextTag & AsyncUpdates,
-        'Attempted to schedule an asynchronous update on a sync container.',
-      );
-    }
-
-    // TODO: If this is a nested container, this won't be the root.
-    const current = container.current;
-
-    if (__DEV__) {
-      if (ReactFiberInstrumentation.debugTool) {
-        if (current.alternate === null) {
-          ReactFiberInstrumentation.debugTool.onMountContainer(container);
-        } else if (element === null) {
-          ReactFiberInstrumentation.debugTool.onUnmountContainer(container);
-        } else {
-          ReactFiberInstrumentation.debugTool.onUpdateContainer(container);
-        }
-      }
-    }
-
-    const context = getContextForSubtree(parentComponent);
-    if (container.context === null) {
-      container.context = context;
-    } else {
-      container.pendingContext = context;
-    }
-
-    scheduleTopLevelUpdate(current, element, callback);
-  }
-
   return {
     createContainer(containerInfo: C): OpaqueRoot {
       return createFiberRoot(containerInfo);
     },
 
-    createAsyncContainer(containerInfo: C): OpaqueRoot {
-      const fiberRoot = createFiberRoot(containerInfo);
-      fiberRoot.current.internalContextTag |= AsyncUpdates;
-      return fiberRoot;
-    },
-
     updateContainer(
       element: ReactNodeList,
       container: OpaqueRoot,
       parentComponent: ?ReactComponent<any, any, any>,
       callback: ?Function,
     ): void {
-      updateContainer(
-        element,
-        container,
-        parentComponent,
-        false, // async = false
-        callback,
-      );
-    },
+      // TODO: If this is a nested container, this won't be the root.
+      const current = container.current;
+
+      if (__DEV__) {
+        if (ReactFiberInstrumentation.debugTool) {
+          if (current.alternate === null) {
+            ReactFiberInstrumentation.debugTool.onMountContainer(container);
+          } else if (element === null) {
+            ReactFiberInstrumentation.debugTool.onUnmountContainer(container);
+          } else {
+            ReactFiberInstrumentation.debugTool.onUpdateContainer(container);
+          }
+        }
+      }
 
-    updateAsyncContainer(
-      element: ReactNodeList,
-      container: OpaqueRoot,
-      parentComponent: ?ReactComponent<any, any, any>,
-      callback: ?Function,
-    ) {
-      updateContainer(
-        element,
-        container,
-        parentComponent,
-        true, // async = true
-        callback,
-      );
+      const context = getContextForSubtree(parentComponent);
+      if (container.context === null) {
+        container.context = context;
+      } else {
+        container.pendingContext = context;
+      }
+
+      scheduleTopLevelUpdate(current, element, callback);
     },
 
     performWithPriority,
diff --git a/src/renderers/shared/fiber/ReactFiberScheduler.js b/src/renderers/shared/fiber/ReactFiberScheduler.js
index dddec0a83f551..c2e05aefd2855 100644
--- a/src/renderers/shared/fiber/ReactFiberScheduler.js
+++ b/src/renderers/shared/fiber/ReactFiberScheduler.js
@@ -1345,12 +1345,17 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     }
   }
 
-  function getPriorityContext(fiber: Fiber): PriorityLevel {
+  function getPriorityContext(
+    fiber: Fiber,
+    forceAsync: boolean,
+  ): PriorityLevel {
     let priorityLevel = priorityContext;
     if (priorityLevel === NoWork) {
       if (
         !useSyncScheduling ||
-        (enableAsyncSubtreeAPI === true && fiber.internalContextTag & AsyncUpdates)
+        (enableAsyncSubtreeAPI === true &&
+          fiber.internalContextTag & AsyncUpdates) ||
+        forceAsync
       ) {
         priorityLevel = LowPriority;
       } else {

From 488b973d6838610a8f651d1c812fa82d74cf8bbd Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Tue, 18 Apr 2017 15:58:18 -0700
Subject: [PATCH 141/153] Use number type for bitfields

Unions don't enumerate all the possible combinations of bitfields. I'm
not actually sure why this was type-checking before.

number doesn't provide much safety but it's more correct.
---
 .../shared/fiber/ReactTypeOfInternalContext.js |  2 +-
 .../shared/fiber/ReactTypeOfSideEffect.js      | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/renderers/shared/fiber/ReactTypeOfInternalContext.js b/src/renderers/shared/fiber/ReactTypeOfInternalContext.js
index 4c0c5762c7bc4..89a3d2938d719 100644
--- a/src/renderers/shared/fiber/ReactTypeOfInternalContext.js
+++ b/src/renderers/shared/fiber/ReactTypeOfInternalContext.js
@@ -12,7 +12,7 @@
 
 'use strict';
 
-export type TypeOfInternalContext = 0 | 1;
+export type TypeOfInternalContext = number;
 
 module.exports = {
   NoContext: 0,
diff --git a/src/renderers/shared/fiber/ReactTypeOfSideEffect.js b/src/renderers/shared/fiber/ReactTypeOfSideEffect.js
index 087cf7394d939..408d1d5001ca7 100644
--- a/src/renderers/shared/fiber/ReactTypeOfSideEffect.js
+++ b/src/renderers/shared/fiber/ReactTypeOfSideEffect.js
@@ -12,16 +12,16 @@
 
 'use strict';
 
-export type TypeOfSideEffect = 0 | 1 | 2 | 3 | 4 | 8 | 16 | 32 | 64;
+export type TypeOfSideEffect = number;
 
 module.exports = {
-  NoEffect: 0, // 0b0000000
-  Placement: 1, // 0b0000001
-  Update: 2, // 0b0000010
+  NoEffect: 0, //           0b0000000
+  Placement: 1, //          0b0000001
+  Update: 2, //             0b0000010
   PlacementAndUpdate: 3, // 0b0000011
-  Deletion: 4, // 0b0000100
-  ContentReset: 8, // 0b0001000
-  Callback: 16, // 0b0010000
-  Err: 32, // 0b0100000
-  Ref: 64, // 0b1000000
+  Deletion: 4, //           0b0000100
+  ContentReset: 8, //       0b0001000
+  Callback: 16, //          0b0010000
+  Err: 32, //               0b0100000
+  Ref: 64, //               0b1000000
 };

From 0c896ffe6ba840887a3bacfb7d923e33e78d09de Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Tue, 18 Apr 2017 16:10:19 -0700
Subject: [PATCH 142/153] Change unstable_asyncUpdates from an instance to a
 static property

This lets us check for its existence before the instance is constructed.

Also works with functional components.
---
 scripts/fiber/tests-passing.txt               |   4 +-
 .../__tests__/ReactDOMFiberAsync-test.js      |  25 ++--
 src/renderers/shared/fiber/ReactChildFiber.js | 119 +++++++++++++-----
 src/renderers/shared/fiber/ReactFiber.js      |  53 +++++---
 .../shared/fiber/ReactFiberClassComponent.js  |   7 --
 5 files changed, 135 insertions(+), 73 deletions(-)

diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index da4174ae711f8..de017935ce093 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -752,10 +752,10 @@ src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js
 src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
 * renders synchronously by default
 * throws when calling async APIs when feature flag is disabled
-* unstable_asyncRender creates an async tree
-* updates inside an async tree are async by default
 * unstable_asyncUpdates creates an async subtree
 * updates inside an async subtree are async by default
+* unstable_asyncUpdates at the root makes the entire tree async
+* updates inside an async tree are async by default
 
 src/renderers/dom/shared/__tests__/CSSProperty-test.js
 * should generate browser prefixes for its `isUnitlessNumber`
diff --git a/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js b/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
index e8b369a55c6f7..746de0e8304e8 100644
--- a/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
+++ b/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
@@ -59,12 +59,10 @@ describe('ReactDOMFiberAsync', () => {
       });
 
       it('updates inside an async subtree are async by default', () => {
-        class Component extends React.Component {
-          static unstable_asyncUpdates = true;
-          render() {
-            return <Child />;
-          }
+        function Component(props) {
+          return <Child />;
         }
+        Component.unstable_asyncUpdates = true;
 
         let instance;
         class Child extends React.Component {
@@ -85,12 +83,10 @@ describe('ReactDOMFiberAsync', () => {
       });
 
       it('unstable_asyncUpdates at the root makes the entire tree async', () => {
-        class Async extends React.Component {
-          static unstable_asyncUpdates = true;
-          render() {
-            return this.props.children;
-          }
+        function Async(props) {
+          return props.children;
         }
+        Async.unstable_asyncUpdates = true;
         ReactDOM.render(<Async><div>Hi</div></Async>, container);
         expect(container.textContent).toEqual('');
         jest.runAllTimers();
@@ -103,12 +99,11 @@ describe('ReactDOMFiberAsync', () => {
       });
 
       it('updates inside an async tree are async by default', () => {
-        class Async extends React.Component {
-          static unstable_asyncUpdates = true;
-          render() {
-            return this.props.children;
-          }
+        function Async(props) {
+          return props.children;
         }
+        Async.unstable_asyncUpdates = true;
+
         let instance;
         class Component extends React.Component {
           state = {step: 0};
diff --git a/src/renderers/shared/fiber/ReactChildFiber.js b/src/renderers/shared/fiber/ReactChildFiber.js
index cd0949804c683..3c1f06e911758 100644
--- a/src/renderers/shared/fiber/ReactChildFiber.js
+++ b/src/renderers/shared/fiber/ReactChildFiber.js
@@ -305,9 +305,12 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   ) {
     if (current === null || current.tag !== HostText) {
       // Insert
-      const created = createFiberFromText(textContent, priority);
+      const created = createFiberFromText(
+        textContent,
+        returnFiber.internalContextTag,
+        priority,
+      );
       created.return = returnFiber;
-      created.internalContextTag = returnFiber.internalContextTag;
       return created;
     } else {
       // Update
@@ -326,10 +329,13 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   ): Fiber {
     if (current === null || current.type !== element.type) {
       // Insert
-      const created = createFiberFromElement(element, priority);
+      const created = createFiberFromElement(
+        element,
+        returnFiber.internalContextTag,
+        priority,
+      );
       created.ref = coerceRef(current, element);
       created.return = returnFiber;
-      created.internalContextTag = returnFiber.internalContextTag;
       return created;
     } else {
       // Move based on index
@@ -354,9 +360,12 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
     // TODO: Should this also compare handler to determine whether to reuse?
     if (current === null || current.tag !== CoroutineComponent) {
       // Insert
-      const created = createFiberFromCoroutine(coroutine, priority);
+      const created = createFiberFromCoroutine(
+        coroutine,
+        returnFiber.internalContextTag,
+        priority,
+      );
       created.return = returnFiber;
-      created.internalContextTag = returnFiber.internalContextTag;
       return created;
     } else {
       // Move based on index
@@ -375,10 +384,13 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   ): Fiber {
     if (current === null || current.tag !== YieldComponent) {
       // Insert
-      const created = createFiberFromYield(yieldNode, priority);
+      const created = createFiberFromYield(
+        yieldNode,
+        returnFiber.internalContextTag,
+        priority,
+      );
       created.type = yieldNode.value;
       created.return = returnFiber;
-      created.internalContextTag = returnFiber.internalContextTag;
       return created;
     } else {
       // Move based on index
@@ -402,9 +414,12 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       current.stateNode.implementation !== portal.implementation
     ) {
       // Insert
-      const created = createFiberFromPortal(portal, priority);
+      const created = createFiberFromPortal(
+        portal,
+        returnFiber.internalContextTag,
+        priority,
+      );
       created.return = returnFiber;
-      created.internalContextTag = returnFiber.internalContextTag;
       return created;
     } else {
       // Update
@@ -423,9 +438,12 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
   ): Fiber {
     if (current === null || current.tag !== Fragment) {
       // Insert
-      const created = createFiberFromFragment(fragment, priority);
+      const created = createFiberFromFragment(
+        fragment,
+        returnFiber.internalContextTag,
+        priority,
+      );
       created.return = returnFiber;
-      created.internalContextTag = returnFiber.internalContextTag;
       return created;
     } else {
       // Update
@@ -445,49 +463,67 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       // Text nodes doesn't have keys. If the previous node is implicitly keyed
       // we can continue to replace it without aborting even if it is not a text
       // node.
-      const created = createFiberFromText('' + newChild, priority);
+      const created = createFiberFromText(
+        '' + newChild,
+        returnFiber.internalContextTag,
+        priority,
+      );
       created.return = returnFiber;
-      created.internalContextTag = returnFiber.internalContextTag;
       return created;
     }
 
     if (typeof newChild === 'object' && newChild !== null) {
       switch (newChild.$$typeof) {
         case REACT_ELEMENT_TYPE: {
-          const created = createFiberFromElement(newChild, priority);
+          const created = createFiberFromElement(
+            newChild,
+            returnFiber.internalContextTag,
+            priority,
+          );
           created.ref = coerceRef(null, newChild);
           created.return = returnFiber;
-          created.internalContextTag = returnFiber.internalContextTag;
           return created;
         }
 
         case REACT_COROUTINE_TYPE: {
-          const created = createFiberFromCoroutine(newChild, priority);
+          const created = createFiberFromCoroutine(
+            newChild,
+            returnFiber.internalContextTag,
+            priority,
+          );
           created.return = returnFiber;
-          created.internalContextTag = returnFiber.internalContextTag;
           return created;
         }
 
         case REACT_YIELD_TYPE: {
-          const created = createFiberFromYield(newChild, priority);
+          const created = createFiberFromYield(
+            newChild,
+            returnFiber.internalContextTag,
+            priority,
+          );
           created.type = newChild.value;
           created.return = returnFiber;
-          created.internalContextTag = returnFiber.internalContextTag;
           return created;
         }
 
         case REACT_PORTAL_TYPE: {
-          const created = createFiberFromPortal(newChild, priority);
+          const created = createFiberFromPortal(
+            newChild,
+            returnFiber.internalContextTag,
+            priority,
+          );
           created.return = returnFiber;
-          created.internalContextTag = returnFiber.internalContextTag;
           return created;
         }
       }
 
       if (isArray(newChild) || getIteratorFn(newChild)) {
-        const created = createFiberFromFragment(newChild, priority);
+        const created = createFiberFromFragment(
+          newChild,
+          returnFiber.internalContextTag,
+          priority,
+        );
         created.return = returnFiber;
-        created.internalContextTag = returnFiber.internalContextTag;
         return created;
       }
 
@@ -1023,9 +1059,12 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
     // The existing first child is not a text node so we need to create one
     // and delete the existing ones.
     deleteRemainingChildren(returnFiber, currentFirstChild);
-    const created = createFiberFromText(textContent, priority);
+    const created = createFiberFromText(
+      textContent,
+      returnFiber.internalContextTag,
+      priority,
+    );
     created.return = returnFiber;
-    created.internalContextTag = returnFiber.internalContextTag;
     return created;
   }
 
@@ -1062,10 +1101,13 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       child = child.sibling;
     }
 
-    const created = createFiberFromElement(element, priority);
+    const created = createFiberFromElement(
+      element,
+      returnFiber.internalContextTag,
+      priority,
+    );
     created.ref = coerceRef(currentFirstChild, element);
     created.return = returnFiber;
-    created.internalContextTag = returnFiber.internalContextTag;
     return created;
   }
 
@@ -1097,9 +1139,12 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       child = child.sibling;
     }
 
-    const created = createFiberFromCoroutine(coroutine, priority);
+    const created = createFiberFromCoroutine(
+      coroutine,
+      returnFiber.internalContextTag,
+      priority,
+    );
     created.return = returnFiber;
-    created.internalContextTag = returnFiber.internalContextTag;
     return created;
   }
 
@@ -1123,10 +1168,13 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       }
     }
 
-    const created = createFiberFromYield(yieldNode, priority);
+    const created = createFiberFromYield(
+      yieldNode,
+      returnFiber.internalContextTag,
+      priority,
+    );
     created.type = yieldNode.value;
     created.return = returnFiber;
-    created.internalContextTag = returnFiber.internalContextTag;
     return created;
   }
 
@@ -1162,9 +1210,12 @@ function ChildReconciler(shouldClone, shouldTrackSideEffects) {
       child = child.sibling;
     }
 
-    const created = createFiberFromPortal(portal, priority);
+    const created = createFiberFromPortal(
+      portal,
+      returnFiber.internalContextTag,
+      priority,
+    );
     created.return = returnFiber;
-    created.internalContextTag = returnFiber.internalContextTag;
     return created;
   }
 
diff --git a/src/renderers/shared/fiber/ReactFiber.js b/src/renderers/shared/fiber/ReactFiber.js
index 6782d4ae07a6c..3eeba7af00d5b 100644
--- a/src/renderers/shared/fiber/ReactFiber.js
+++ b/src/renderers/shared/fiber/ReactFiber.js
@@ -39,6 +39,7 @@ var {NoWork} = require('ReactPriorityLevel');
 
 var {
   NoContext,
+  AsyncUpdates,
 } = require('ReactTypeOfInternalContext');
 
 var {
@@ -184,7 +185,11 @@ if (__DEV__) {
 //    to optimize in a non-JIT environment.
 // 5) It should be easy to port this to a C struct and keep a C implementation
 //    compatible.
-var createFiber = function(tag: TypeOfWork, key: null | string): Fiber {
+var createFiber = function(
+  tag: TypeOfWork,
+  key: null | string,
+  internalContextTag: TypeOfInternalContext,
+): Fiber {
   var fiber: Fiber = {
     // Instance
 
@@ -211,7 +216,7 @@ var createFiber = function(tag: TypeOfWork, key: null | string): Fiber {
     updateQueue: null,
     memoizedState: null,
 
-    internalContextTag: NoContext,
+    internalContextTag,
 
     effectTag: NoEffect,
     nextEffect: null,
@@ -274,7 +279,7 @@ exports.cloneFiber = function(
     alt.lastEffect = null;
   } else {
     // This should not have an alternate already
-    alt = createFiber(fiber.tag, fiber.key);
+    alt = createFiber(fiber.tag, fiber.key, fiber.internalContextTag);
     alt.type = fiber.type;
 
     alt.progressedChild = fiber.progressedChild;
@@ -298,8 +303,6 @@ exports.cloneFiber = function(
   alt.memoizedProps = fiber.memoizedProps;
   alt.memoizedState = fiber.memoizedState;
 
-  alt.internalContextTag = fiber.internalContextTag;
-
   if (__DEV__) {
     alt._debugID = fiber._debugID;
     alt._debugSource = fiber._debugSource;
@@ -310,12 +313,13 @@ exports.cloneFiber = function(
 };
 
 exports.createHostRootFiber = function(): Fiber {
-  const fiber = createFiber(HostRoot, null);
+  const fiber = createFiber(HostRoot, null, NoContext);
   return fiber;
 };
 
 exports.createFiberFromElement = function(
   element: ReactElement,
+  internalContextTag: TypeOfInternalContext,
   priorityLevel: PriorityLevel,
 ): Fiber {
   let owner = null;
@@ -323,7 +327,12 @@ exports.createFiberFromElement = function(
     owner = element._owner;
   }
 
-  const fiber = createFiberFromElementType(element.type, element.key, owner);
+  const fiber = createFiberFromElementType(
+    element.type,
+    element.key,
+    internalContextTag,
+    owner,
+  );
   fiber.pendingProps = element.props;
   fiber.pendingWorkPriority = priorityLevel;
 
@@ -337,11 +346,12 @@ exports.createFiberFromElement = function(
 
 exports.createFiberFromFragment = function(
   elements: ReactFragment,
+  internalContextTag: TypeOfInternalContext,
   priorityLevel: PriorityLevel,
 ): Fiber {
   // TODO: Consider supporting keyed fragments. Technically, we accidentally
   // support that in the existing React.
-  const fiber = createFiber(Fragment, null);
+  const fiber = createFiber(Fragment, null, internalContextTag);
   fiber.pendingProps = elements;
   fiber.pendingWorkPriority = priorityLevel;
   return fiber;
@@ -349,9 +359,10 @@ exports.createFiberFromFragment = function(
 
 exports.createFiberFromText = function(
   content: string,
+  internalContextTag: TypeOfInternalContext,
   priorityLevel: PriorityLevel,
 ): Fiber {
-  const fiber = createFiber(HostText, null);
+  const fiber = createFiber(HostText, null, internalContextTag);
   fiber.pendingProps = content;
   fiber.pendingWorkPriority = priorityLevel;
   return fiber;
@@ -360,16 +371,21 @@ exports.createFiberFromText = function(
 function createFiberFromElementType(
   type: mixed,
   key: null | string,
+  internalContextTag: TypeOfInternalContext,
   debugOwner: null | Fiber | ReactInstance,
 ): Fiber {
+  if (type != null && (type: any).unstable_asyncUpdates === true) {
+    internalContextTag |= AsyncUpdates;
+  }
+
   let fiber;
   if (typeof type === 'function') {
     fiber = shouldConstruct(type)
-      ? createFiber(ClassComponent, key)
-      : createFiber(IndeterminateComponent, key);
+      ? createFiber(ClassComponent, key, internalContextTag)
+      : createFiber(IndeterminateComponent, key, internalContextTag);
     fiber.type = type;
   } else if (typeof type === 'string') {
-    fiber = createFiber(HostComponent, key);
+    fiber = createFiber(HostComponent, key, internalContextTag);
     fiber.type = type;
   } else if (
     typeof type === 'object' &&
@@ -416,9 +432,14 @@ exports.createFiberFromElementType = createFiberFromElementType;
 
 exports.createFiberFromCoroutine = function(
   coroutine: ReactCoroutine,
+  internalContextTag: TypeOfInternalContext,
   priorityLevel: PriorityLevel,
 ): Fiber {
-  const fiber = createFiber(CoroutineComponent, coroutine.key);
+  const fiber = createFiber(
+    CoroutineComponent,
+    coroutine.key,
+    internalContextTag,
+  );
   fiber.type = coroutine.handler;
   fiber.pendingProps = coroutine;
   fiber.pendingWorkPriority = priorityLevel;
@@ -427,17 +448,19 @@ exports.createFiberFromCoroutine = function(
 
 exports.createFiberFromYield = function(
   yieldNode: ReactYield,
+  internalContextTag: TypeOfInternalContext,
   priorityLevel: PriorityLevel,
 ): Fiber {
-  const fiber = createFiber(YieldComponent, null);
+  const fiber = createFiber(YieldComponent, null, internalContextTag);
   return fiber;
 };
 
 exports.createFiberFromPortal = function(
   portal: ReactPortal,
+  internalContextTag: TypeOfInternalContext,
   priorityLevel: PriorityLevel,
 ): Fiber {
-  const fiber = createFiber(HostPortal, portal.key);
+  const fiber = createFiber(HostPortal, portal.key, internalContextTag);
   fiber.pendingProps = portal.children || [];
   fiber.pendingWorkPriority = priorityLevel;
   fiber.stateNode = {
diff --git a/src/renderers/shared/fiber/ReactFiberClassComponent.js b/src/renderers/shared/fiber/ReactFiberClassComponent.js
index c03fe3ca291a3..76577e6323174 100644
--- a/src/renderers/shared/fiber/ReactFiberClassComponent.js
+++ b/src/renderers/shared/fiber/ReactFiberClassComponent.js
@@ -15,9 +15,6 @@
 import type {Fiber} from 'ReactFiber';
 import type {PriorityLevel} from 'ReactPriorityLevel';
 
-var {
-  AsyncUpdates,
-} = require('ReactTypeOfInternalContext');
 var {
   Update,
 } = require('ReactTypeOfSideEffect');
@@ -308,10 +305,6 @@ module.exports = function(
     instance.refs = emptyObject;
     instance.context = getMaskedContext(workInProgress, unmaskedContext);
 
-    if (workInProgress.type.unstable_asyncUpdates === true) {
-      workInProgress.internalContextTag |= AsyncUpdates;
-    }
-
     if (typeof instance.componentWillMount === 'function') {
       if (__DEV__) {
         startPhaseTimer(workInProgress, 'componentWillMount');

From 9b676a7d0b2160d7301944a1c9d9caec9087e795 Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Tue, 18 Apr 2017 16:38:55 -0700
Subject: [PATCH 143/153] Remove enableAsyncSubtreeAPI from host config

Use a ReactFeatureFlag instead. It won't be per-renderer, but we likely
won't need that.

When enableAsyncSubtreeAPI is false, unstable_asyncUpdates is ignored,
but does not warn or throw. That way if we discover a bug in async mode,
we can flip the flag and revert back to sync without code changes.
---
 scripts/fiber/tests-passing.txt               |  6 +-
 src/renderers/dom/fiber/ReactDOMFiber.js      |  1 -
 .../__tests__/ReactDOMFiberAsync-test.js      | 87 ++++++++++---------
 .../dom/shared/ReactDOMFeatureFlags.js        |  1 -
 src/renderers/shared/fiber/ReactFiber.js      |  8 +-
 .../shared/fiber/ReactFiberReconciler.js      |  6 +-
 .../shared/fiber/ReactFiberScheduler.js       |  4 +-
 .../shared/utils/ReactFeatureFlags.js         |  1 +
 8 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index de017935ce093..3bd15a1703808 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -751,11 +751,11 @@ src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js
 
 src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
 * renders synchronously by default
-* throws when calling async APIs when feature flag is disabled
-* unstable_asyncUpdates creates an async subtree
-* updates inside an async subtree are async by default
+* renders syncrhonously when feature flag is disabled
 * unstable_asyncUpdates at the root makes the entire tree async
 * updates inside an async tree are async by default
+* unstable_asyncUpdates creates an async subtree
+* updates inside an async subtree are async by default
 
 src/renderers/dom/shared/__tests__/CSSProperty-test.js
 * should generate browser prefixes for its `isUnitlessNumber`
diff --git a/src/renderers/dom/fiber/ReactDOMFiber.js b/src/renderers/dom/fiber/ReactDOMFiber.js
index 7dd9c8a3f28af..f4710f49e33c6 100644
--- a/src/renderers/dom/fiber/ReactDOMFiber.js
+++ b/src/renderers/dom/fiber/ReactDOMFiber.js
@@ -364,7 +364,6 @@ var DOMRenderer = ReactFiberReconciler({
   scheduleDeferredCallback: ReactDOMFrameScheduling.rIC,
 
   useSyncScheduling: !ReactDOMFeatureFlags.fiberAsyncScheduling,
-  enableAsyncSubtreeAPI: ReactDOMFeatureFlags.enableAsyncSubtreeAPI,
 });
 
 ReactGenericBatching.injection.injectFiberBatchedUpdates(
diff --git a/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js b/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
index 746de0e8304e8..9f780ac1863b5 100644
--- a/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
+++ b/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
@@ -1,5 +1,6 @@
 var React = require('react');
 var ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
+var ReactFeatureFlags = require('ReactFeatureFlags');
 
 var ReactDOM;
 
@@ -23,34 +24,62 @@ describe('ReactDOMFiberAsync', () => {
   });
 
   if (ReactDOMFeatureFlags.useFiber) {
-    it('throws when calling async APIs when feature flag is disabled', () => {
-      expect(() => {
-        ReactDOM.unstable_asyncRender(<div>Hi</div>, container);
-      }).toThrow('ReactDOM.unstable_asyncRender is not a function');
+    it('renders syncrhonously when feature flag is disabled', () => {
+      function Async(props) {
+        return props.children;
+      }
+      Async.unstable_asyncUpdates = true;
+      ReactDOM.render(<Async><div>Hi</div></Async>, container);
+      expect(container.textContent).toEqual('Hi');
+
+      ReactDOM.render(<Async><div>Bye</div></Async>, container);
+      expect(container.textContent).toEqual('Bye');
     });
 
     describe('with feature flag enabled', () => {
       beforeEach(() => {
         jest.resetModules();
-        ReactDOMFeatureFlags = require('ReactDOMFeatureFlags');
+        ReactFeatureFlags = require('ReactFeatureFlags');
         container = document.createElement('div');
-        ReactDOMFeatureFlags.enableAsyncSubtreeAPI = true;
+        ReactFeatureFlags.enableAsyncSubtreeAPI = true;
         ReactDOM = require('react-dom');
       });
 
-      it('unstable_asyncUpdates creates an async subtree', () => {
+      it('unstable_asyncUpdates at the root makes the entire tree async', () => {
+        function Async(props) {
+          return props.children;
+        }
+        Async.unstable_asyncUpdates = true;
+        ReactDOM.render(<Async><div>Hi</div></Async>, container);
+        expect(container.textContent).toEqual('');
+        jest.runAllTimers();
+        expect(container.textContent).toEqual('Hi');
+
+        ReactDOM.render(<Async><div>Bye</div></Async>, container);
+        expect(container.textContent).toEqual('Hi');
+        jest.runAllTimers();
+        expect(container.textContent).toEqual('Bye');
+      });
+
+      it('updates inside an async tree are async by default', () => {
+        function Async(props) {
+          return props.children;
+        }
+        Async.unstable_asyncUpdates = true;
+
         let instance;
         class Component extends React.Component {
           state = {step: 0};
-          static unstable_asyncUpdates = true;
           render() {
             instance = this;
             return <div>{this.state.step}</div>;
           }
         }
 
-        ReactDOM.render(<Component />, container);
+        ReactDOM.render(<Async><Component /></Async>, container);
+        expect(container.textContent).toEqual('');
         jest.runAllTimers();
+        expect(container.textContent).toEqual('0');
 
         instance.setState({step: 1});
         expect(container.textContent).toEqual('0');
@@ -58,15 +87,11 @@ describe('ReactDOMFiberAsync', () => {
         expect(container.textContent).toEqual('1');
       });
 
-      it('updates inside an async subtree are async by default', () => {
-        function Component(props) {
-          return <Child />;
-        }
-        Component.unstable_asyncUpdates = true;
-
+      it('unstable_asyncUpdates creates an async subtree', () => {
         let instance;
-        class Child extends React.Component {
+        class Component extends React.Component {
           state = {step: 0};
+          static unstable_asyncUpdates = true;
           render() {
             instance = this;
             return <div>{this.state.step}</div>;
@@ -82,30 +107,14 @@ describe('ReactDOMFiberAsync', () => {
         expect(container.textContent).toEqual('1');
       });
 
-      it('unstable_asyncUpdates at the root makes the entire tree async', () => {
-        function Async(props) {
-          return props.children;
-        }
-        Async.unstable_asyncUpdates = true;
-        ReactDOM.render(<Async><div>Hi</div></Async>, container);
-        expect(container.textContent).toEqual('');
-        jest.runAllTimers();
-        expect(container.textContent).toEqual('Hi');
-
-        ReactDOM.render(<Async><div>Bye</div></Async>, container);
-        expect(container.textContent).toEqual('Hi');
-        jest.runAllTimers();
-        expect(container.textContent).toEqual('Bye');
-      });
-
-      it('updates inside an async tree are async by default', () => {
-        function Async(props) {
-          return props.children;
+      it('updates inside an async subtree are async by default', () => {
+        function Component(props) {
+          return <Child />;
         }
-        Async.unstable_asyncUpdates = true;
+        Component.unstable_asyncUpdates = true;
 
         let instance;
-        class Component extends React.Component {
+        class Child extends React.Component {
           state = {step: 0};
           render() {
             instance = this;
@@ -113,10 +122,8 @@ describe('ReactDOMFiberAsync', () => {
           }
         }
 
-        ReactDOM.render(<Async><Component /></Async>, container);
-        expect(container.textContent).toEqual('');
+        ReactDOM.render(<Component />, container);
         jest.runAllTimers();
-        expect(container.textContent).toEqual('0');
 
         instance.setState({step: 1});
         expect(container.textContent).toEqual('0');
diff --git a/src/renderers/dom/shared/ReactDOMFeatureFlags.js b/src/renderers/dom/shared/ReactDOMFeatureFlags.js
index 7fb34ceb23eb8..1e21bca758936 100644
--- a/src/renderers/dom/shared/ReactDOMFeatureFlags.js
+++ b/src/renderers/dom/shared/ReactDOMFeatureFlags.js
@@ -13,7 +13,6 @@
 
 var ReactDOMFeatureFlags = {
   fiberAsyncScheduling: false,
-  enableAsyncSubtreeAPI: false,
   useCreateElement: true,
   useFiber: true,
 };
diff --git a/src/renderers/shared/fiber/ReactFiber.js b/src/renderers/shared/fiber/ReactFiber.js
index 3eeba7af00d5b..abd9face24ef7 100644
--- a/src/renderers/shared/fiber/ReactFiber.js
+++ b/src/renderers/shared/fiber/ReactFiber.js
@@ -23,6 +23,8 @@ import type {TypeOfSideEffect} from 'ReactTypeOfSideEffect';
 import type {PriorityLevel} from 'ReactPriorityLevel';
 import type {UpdateQueue} from 'ReactFiberUpdateQueue';
 
+var ReactFeatureFlags = require('ReactFeatureFlags');
+
 var {
   IndeterminateComponent,
   ClassComponent,
@@ -374,7 +376,11 @@ function createFiberFromElementType(
   internalContextTag: TypeOfInternalContext,
   debugOwner: null | Fiber | ReactInstance,
 ): Fiber {
-  if (type != null && (type: any).unstable_asyncUpdates === true) {
+  if (
+    ReactFeatureFlags.enableAsyncSubtreeAPI &&
+    type != null &&
+    (type: any).unstable_asyncUpdates === true
+  ) {
     internalContextTag |= AsyncUpdates;
   }
 
diff --git a/src/renderers/shared/fiber/ReactFiberReconciler.js b/src/renderers/shared/fiber/ReactFiberReconciler.js
index 309ede457f1ba..3c95e39c97f95 100644
--- a/src/renderers/shared/fiber/ReactFiberReconciler.js
+++ b/src/renderers/shared/fiber/ReactFiberReconciler.js
@@ -17,6 +17,8 @@ import type {FiberRoot} from 'ReactFiberRoot';
 import type {PriorityLevel} from 'ReactPriorityLevel';
 import type {ReactNodeList} from 'ReactTypes';
 
+var ReactFeatureFlags = require('ReactFeatureFlags');
+
 var {
   AsyncUpdates,
 } = require('ReactTypeOfInternalContext');
@@ -119,7 +121,6 @@ export type HostConfig<T, P, I, TI, PI, C, CX, PL> = {
   resetAfterCommit(): void,
 
   useSyncScheduling?: boolean,
-  enableAsyncSubtreeAPI?: boolean,
 };
 
 export type Reconciler<C, I, TI> = {
@@ -189,7 +190,8 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     // Check if the top-level element is an async wrapper component. If so, treat
     // updates to the root as async. This is a bit weird but lets us avoid a separate
     // `renderAsync` API.
-    const forceAsync = element != null &&
+    const forceAsync = ReactFeatureFlags.enableAsyncSubtreeAPI &&
+      element != null &&
       element.type != null &&
       (element.type: any).unstable_asyncUpdates === true;
     const priorityLevel = getPriorityContext(current, forceAsync);
diff --git a/src/renderers/shared/fiber/ReactFiberScheduler.js b/src/renderers/shared/fiber/ReactFiberScheduler.js
index c2e05aefd2855..fbc6ea62b51e8 100644
--- a/src/renderers/shared/fiber/ReactFiberScheduler.js
+++ b/src/renderers/shared/fiber/ReactFiberScheduler.js
@@ -169,7 +169,6 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     useSyncScheduling,
     prepareForCommit,
     resetAfterCommit,
-    enableAsyncSubtreeAPI,
   } = config;
 
   // The priority level to use when scheduling an update. We use NoWork to
@@ -1353,8 +1352,7 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     if (priorityLevel === NoWork) {
       if (
         !useSyncScheduling ||
-        (enableAsyncSubtreeAPI === true &&
-          fiber.internalContextTag & AsyncUpdates) ||
+        fiber.internalContextTag & AsyncUpdates ||
         forceAsync
       ) {
         priorityLevel = LowPriority;
diff --git a/src/renderers/shared/utils/ReactFeatureFlags.js b/src/renderers/shared/utils/ReactFeatureFlags.js
index ce0a442c11bca..60e91fb64f3a0 100644
--- a/src/renderers/shared/utils/ReactFeatureFlags.js
+++ b/src/renderers/shared/utils/ReactFeatureFlags.js
@@ -19,6 +19,7 @@ var ReactFeatureFlags = {
   logTopLevelRenders: false,
   prepareNewChildrenBeforeUnmountInStack: true,
   disableNewFiberFeatures: false,
+  enableAsyncSubtreeAPI: false,
 };
 
 module.exports = ReactFeatureFlags;

From b4d77b98ed219c93100d548366109880a817941f Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Wed, 19 Apr 2017 13:55:54 -0700
Subject: [PATCH 144/153] Fix subtree tests so that async component is not
 top-level

---
 scripts/fiber/tests-passing.txt                             | 2 +-
 .../dom/fiber/__tests__/ReactDOMFiberAsync-test.js          | 6 +++---
 src/renderers/shared/fiber/ReactFiberReconciler.js          | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index 3bd15a1703808..ce89056ddc2d6 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -751,7 +751,7 @@ src/renderers/dom/fiber/__tests__/ReactDOMFiber-test.js
 
 src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
 * renders synchronously by default
-* renders syncrhonously when feature flag is disabled
+* renders synchronously when feature flag is disabled
 * unstable_asyncUpdates at the root makes the entire tree async
 * updates inside an async tree are async by default
 * unstable_asyncUpdates creates an async subtree
diff --git a/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js b/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
index 9f780ac1863b5..fcb7c4f6186e3 100644
--- a/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
+++ b/src/renderers/dom/fiber/__tests__/ReactDOMFiberAsync-test.js
@@ -24,7 +24,7 @@ describe('ReactDOMFiberAsync', () => {
   });
 
   if (ReactDOMFeatureFlags.useFiber) {
-    it('renders syncrhonously when feature flag is disabled', () => {
+    it('renders synchronously when feature flag is disabled', () => {
       function Async(props) {
         return props.children;
       }
@@ -98,7 +98,7 @@ describe('ReactDOMFiberAsync', () => {
           }
         }
 
-        ReactDOM.render(<Component />, container);
+        ReactDOM.render(<div><Component /></div>, container);
         jest.runAllTimers();
 
         instance.setState({step: 1});
@@ -122,7 +122,7 @@ describe('ReactDOMFiberAsync', () => {
           }
         }
 
-        ReactDOM.render(<Component />, container);
+        ReactDOM.render(<div><Component /></div>, container);
         jest.runAllTimers();
 
         instance.setState({step: 1});
diff --git a/src/renderers/shared/fiber/ReactFiberReconciler.js b/src/renderers/shared/fiber/ReactFiberReconciler.js
index 3c95e39c97f95..6bcbf93e8ffc2 100644
--- a/src/renderers/shared/fiber/ReactFiberReconciler.js
+++ b/src/renderers/shared/fiber/ReactFiberReconciler.js
@@ -19,10 +19,6 @@ import type {ReactNodeList} from 'ReactTypes';
 
 var ReactFeatureFlags = require('ReactFeatureFlags');
 
-var {
-  AsyncUpdates,
-} = require('ReactTypeOfInternalContext');
-
 var {
   addTopLevelUpdate,
 } = require('ReactFiberUpdateQueue');

From 28bc8860bc259febd835f061c7b5230c5ac9365a Mon Sep 17 00:00:00 2001
From: Andrew Clark <acdlite@fb.com>
Date: Thu, 20 Apr 2017 11:39:04 -0700
Subject: [PATCH 145/153] Run prettier after update to 1.2 in master

---
 src/renderers/dom/fiber/ReactDOMFiber.js               | 2 +-
 src/renderers/shared/fiber/ReactFiber.js               | 9 ++-------
 src/renderers/shared/fiber/ReactFiberClassComponent.js | 4 +---
 src/renderers/shared/fiber/ReactFiberReconciler.js     | 7 +++----
 src/renderers/shared/fiber/ReactFiberScheduler.js      | 4 +---
 5 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/renderers/dom/fiber/ReactDOMFiber.js b/src/renderers/dom/fiber/ReactDOMFiber.js
index f4710f49e33c6..77b980cd3628a 100644
--- a/src/renderers/dom/fiber/ReactDOMFiber.js
+++ b/src/renderers/dom/fiber/ReactDOMFiber.js
@@ -400,7 +400,7 @@ function renderSubtreeIntoContainer(
       container.removeChild(container.lastChild);
     }
     const newRoot = DOMRenderer.createContainer(container);
-    root = (container._reactRootContainer = newRoot);
+    root = container._reactRootContainer = newRoot;
     // Initial mount should not be batched.
     DOMRenderer.unbatchedUpdates(() => {
       DOMRenderer.updateContainer(children, newRoot, parentComponent, callback);
diff --git a/src/renderers/shared/fiber/ReactFiber.js b/src/renderers/shared/fiber/ReactFiber.js
index abd9face24ef7..19a8c906fe277 100644
--- a/src/renderers/shared/fiber/ReactFiber.js
+++ b/src/renderers/shared/fiber/ReactFiber.js
@@ -39,14 +39,9 @@ var {
 
 var {NoWork} = require('ReactPriorityLevel');
 
-var {
-  NoContext,
-  AsyncUpdates,
-} = require('ReactTypeOfInternalContext');
+var {NoContext, AsyncUpdates} = require('ReactTypeOfInternalContext');
 
-var {
-  NoEffect,
-} = require('ReactTypeOfSideEffect');
+var {NoEffect} = require('ReactTypeOfSideEffect');
 
 var {cloneUpdateQueue} = require('ReactFiberUpdateQueue');
 
diff --git a/src/renderers/shared/fiber/ReactFiberClassComponent.js b/src/renderers/shared/fiber/ReactFiberClassComponent.js
index 76577e6323174..617aab1fdb2f9 100644
--- a/src/renderers/shared/fiber/ReactFiberClassComponent.js
+++ b/src/renderers/shared/fiber/ReactFiberClassComponent.js
@@ -15,9 +15,7 @@
 import type {Fiber} from 'ReactFiber';
 import type {PriorityLevel} from 'ReactPriorityLevel';
 
-var {
-  Update,
-} = require('ReactTypeOfSideEffect');
+var {Update} = require('ReactTypeOfSideEffect');
 
 var {
   cacheContext,
diff --git a/src/renderers/shared/fiber/ReactFiberReconciler.js b/src/renderers/shared/fiber/ReactFiberReconciler.js
index 6bcbf93e8ffc2..e1d2026202c26 100644
--- a/src/renderers/shared/fiber/ReactFiberReconciler.js
+++ b/src/renderers/shared/fiber/ReactFiberReconciler.js
@@ -19,9 +19,7 @@ import type {ReactNodeList} from 'ReactTypes';
 
 var ReactFeatureFlags = require('ReactFeatureFlags');
 
-var {
-  addTopLevelUpdate,
-} = require('ReactFiberUpdateQueue');
+var {addTopLevelUpdate} = require('ReactFiberUpdateQueue');
 
 var {
   findCurrentUnmaskedContext,
@@ -186,7 +184,8 @@ module.exports = function<T, P, I, TI, PI, C, CX, PL>(
     // Check if the top-level element is an async wrapper component. If so, treat
     // updates to the root as async. This is a bit weird but lets us avoid a separate
     // `renderAsync` API.
-    const forceAsync = ReactFeatureFlags.enableAsyncSubtreeAPI &&
+    const forceAsync =
+      ReactFeatureFlags.enableAsyncSubtreeAPI &&
       element != null &&
       element.type != null &&
       (element.type: any).unstable_asyncUpdates === true;
diff --git a/src/renderers/shared/fiber/ReactFiberScheduler.js b/src/renderers/shared/fiber/ReactFiberScheduler.js
index fbc6ea62b51e8..844e195781425 100644
--- a/src/renderers/shared/fiber/ReactFiberScheduler.js
+++ b/src/renderers/shared/fiber/ReactFiberScheduler.js
@@ -60,9 +60,7 @@ var {
   OffscreenPriority,
 } = require('ReactPriorityLevel');
 
-var {
-  AsyncUpdates,
-} = require('ReactTypeOfInternalContext');
+var {AsyncUpdates} = require('ReactTypeOfInternalContext');
 
 var {
   NoEffect,

From 73ca89408b8b2fc14977bb49ece24a679ab50222 Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Thu, 20 Apr 2017 12:48:53 -0700
Subject: [PATCH 146/153] Updated PropTypes test to work with newer prop-types
 version (#9471)

The prop-types lib got an anti-spamming change in 15.5.8 that broke some of our tests (see reactjs/prop-types/commit/e1d51dd0efbd0eee5e4a8d24759f2a4d518721d3). This PR resolves that by resetting the prop-types import between tests.
---
 src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
index c4c25d723fcf3..fc37c1677d8eb 100644
--- a/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
+++ b/src/isomorphic/classic/types/__tests__/ReactPropTypes-test.js
@@ -22,6 +22,7 @@ var MyComponent;
 function resetWarningCache() {
   jest.resetModules();
   checkPropTypes = require('prop-types/checkPropTypes');
+  PropTypes = require('ReactPropTypes');
 }
 
 function getPropTypeWarningMessage(propTypes, object, componentName) {
@@ -99,6 +100,7 @@ function expectWarningInDevelopment(declaration, value) {
   var props = {testProp: value};
   var propName = 'testProp' + Math.random().toString();
   var componentName = 'testComponent' + Math.random().toString();
+  resetWarningCache();
   for (var i = 0; i < 3; i++) {
     declaration(props, propName, componentName, 'prop');
   }
@@ -111,7 +113,6 @@ function expectWarningInDevelopment(declaration, value) {
 
 describe('ReactPropTypes', () => {
   beforeEach(() => {
-    PropTypes = require('ReactPropTypes');
     React = require('react');
     ReactDOM = require('react-dom');
     resetWarningCache();

From 41290742e6fb3057f6529f486586450606c54b7c Mon Sep 17 00:00:00 2001
From: Brian Vaughn <brian.david.vaughn@gmail.com>
Date: Thu, 20 Apr 2017 13:06:51 -0700
Subject: [PATCH 147/153] Bumped version numbers for alpha 10 (#9474)

---
 package.json                              | 2 +-
 packages/react-art/package.json           | 4 ++--
 packages/react-dom/package.json           | 4 ++--
 packages/react-noop-renderer/package.json | 2 +-
 packages/react-test-renderer/package.json | 4 ++--
 packages/react/package.json               | 2 +-
 src/ReactVersion.js                       | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 9b1b96edd9733..c65267e217658 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react-build",
   "private": true,
-  "version": "16.0.0-alpha.9",
+  "version": "16.0.0-alpha.10",
   "devDependencies": {
     "aliasify": "^2.0.0",
     "art": "^0.10.1",
diff --git a/packages/react-art/package.json b/packages/react-art/package.json
index 5f14174fa795e..5f22b34da0388 100644
--- a/packages/react-art/package.json
+++ b/packages/react-art/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-art",
-  "version": "16.0.0-alpha.9",
+  "version": "16.0.0-alpha.10",
   "description": "React ART is a JavaScript library for drawing vector graphics using React. It provides declarative and reactive bindings to the ART library. Using the same declarative API you can render the output to either Canvas, SVG or VML (IE8).",
   "main": "index.js",
   "repository": "facebook/react",
@@ -23,7 +23,7 @@
     "object-assign": "^4.1.0"
   },
   "peerDependencies": {
-    "react": "^16.0.0-alpha.9"
+    "react": "^16.0.0-alpha.10"
   },
   "files": [
     "LICENSE",
diff --git a/packages/react-dom/package.json b/packages/react-dom/package.json
index d1863e6507af0..210fc3b099d52 100644
--- a/packages/react-dom/package.json
+++ b/packages/react-dom/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-dom",
-  "version": "16.0.0-alpha.9",
+  "version": "16.0.0-alpha.10",
   "description": "React package for working with the DOM.",
   "main": "index.js",
   "repository": "facebook/react",
@@ -19,7 +19,7 @@
     "prop-types": "^15.5.6"
   },
   "peerDependencies": {
-    "react": "^16.0.0-alpha.9"
+    "react": "^16.0.0-alpha.10"
   },
   "files": [
     "LICENSE",
diff --git a/packages/react-noop-renderer/package.json b/packages/react-noop-renderer/package.json
index bfe1749a0ccf4..b5dc83d22115f 100644
--- a/packages/react-noop-renderer/package.json
+++ b/packages/react-noop-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-noop-renderer",
-  "version": "16.0.0-alpha.9",
+  "version": "16.0.0-alpha.10",
   "private": true,
   "description": "React package for testing the Fiber reconciler.",
   "main": "index.js",
diff --git a/packages/react-test-renderer/package.json b/packages/react-test-renderer/package.json
index 86d25aff481d6..531e711846f70 100644
--- a/packages/react-test-renderer/package.json
+++ b/packages/react-test-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-test-renderer",
-  "version": "16.0.0-alpha.9",
+  "version": "16.0.0-alpha.10",
   "description": "React package for snapshot testing.",
   "main": "index.js",
   "repository": "facebook/react",
@@ -19,7 +19,7 @@
     "object-assign": "^4.1.0"
   },
   "peerDependencies": {
-    "react": "^16.0.0-alpha.9"
+    "react": "^16.0.0-alpha.10"
   },
   "files": [
     "LICENSE",
diff --git a/packages/react/package.json b/packages/react/package.json
index 4df2dac46893d..eb97efd2cc303 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "react",
   "description": "React is a JavaScript library for building user interfaces.",
-  "version": "16.0.0-alpha.9",
+  "version": "16.0.0-alpha.10",
   "keywords": [
     "react"
   ],
diff --git a/src/ReactVersion.js b/src/ReactVersion.js
index fd32524d89f46..4f697d62a9239 100644
--- a/src/ReactVersion.js
+++ b/src/ReactVersion.js
@@ -11,4 +11,4 @@
 
 'use strict';
 
-module.exports = '16.0.0-alpha.9';
+module.exports = '16.0.0-alpha.10';

From 42bc28bbfd483942edd6a32a5838865812080f36 Mon Sep 17 00:00:00 2001
From: Brandon Dail <aweary@users.noreply.github.com>
Date: Thu, 20 Apr 2017 15:25:39 -0500
Subject: [PATCH 148/153] Use setProperty when setting style properties (#9302)

* Use setProperty when setting style properties

setProperty is faster in all/most modern browsers. It also lets us support CSS variables.

* Only use setProperty when setting CSS variables

* Add test to ensure setting CSS variables do not warn

* Make this PR pretty again

* Run fiber test script
---
 scripts/fiber/tests-passing.txt                    |  1 +
 src/renderers/dom/shared/CSSPropertyOperations.js  |  8 +++++++-
 .../shared/__tests__/CSSPropertyOperations-test.js | 14 ++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index ce89056ddc2d6..470fee62074af 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -776,6 +776,7 @@ src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js
 * warns when miscapitalizing vendored style names
 * should warn about style having a trailing semicolon
 * should warn about style containing a NaN value
+* should not warn when setting CSS variables
 
 src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
 * should create markup for simple properties
diff --git a/src/renderers/dom/shared/CSSPropertyOperations.js b/src/renderers/dom/shared/CSSPropertyOperations.js
index 35e1be90a1c7f..aced2e1aaa852 100644
--- a/src/renderers/dom/shared/CSSPropertyOperations.js
+++ b/src/renderers/dom/shared/CSSPropertyOperations.js
@@ -134,6 +134,10 @@ if (__DEV__) {
    * @param {ReactDOMComponent} component
    */
   var warnValidStyle = function(name, value, component) {
+    // Don't warn for CSS variables
+    if (name.indexOf('--') === 0) {
+      return;
+    }
     var owner;
     if (component) {
       owner = component._currentElement._owner;
@@ -213,7 +217,9 @@ var CSSPropertyOperations = {
       if (styleName === 'float') {
         styleName = 'cssFloat';
       }
-      if (styleValue) {
+      if (styleName.indexOf('--') === 0) {
+        style.setProperty(styleName, styleValue);
+      } else if (styleValue) {
         style[styleName] = styleValue;
       } else {
         var expansion =
diff --git a/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js b/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js
index f1d9c567bfad2..34469835dbec8 100644
--- a/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js
+++ b/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js
@@ -253,4 +253,18 @@ describe('CSSPropertyOperations', () => {
         '\n\nCheck the render method of `Comp`.',
     );
   });
+
+  it('should not warn when setting CSS variables', () => {
+    class Comp extends React.Component {
+      render() {
+        return <div style={{'--foo-primary': 'red', backgroundColor: 'red'}} />;
+      }
+    }
+
+    spyOn(console, 'error');
+    var root = document.createElement('div');
+    ReactDOM.render(<Comp />, root);
+
+    expectDev(console.error.calls.count()).toBe(0);
+  });
 });

From 217d27103294ca4e8b0d50a70bc0ce9d78b5f988 Mon Sep 17 00:00:00 2001
From: Benton Rochester <bentonrochester@gmail.com>
Date: Fri, 21 Apr 2017 08:25:34 -0600
Subject: [PATCH 149/153] Ignoring files for vim users. (#9199)

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 035106e39925b..8864c101120a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@ chrome-user-data
 .idea
 *.iml
 .vscode
+*.swp
+*.swo

From f5144121f97253496248d26e61f1e69497e0a02a Mon Sep 17 00:00:00 2001
From: David Hu <davidhu314@gmail.com>
Date: Fri, 21 Apr 2017 07:27:39 -0700
Subject: [PATCH 150/153] Add more details in jsx-in-depth.md (#9006)

* jsx-in-depth.md add ternary statement for javascript expressions section

* jsx-in-depth.md add explanation to get falsey values for props

* update jsx-in-depth.md

* ensure links work locally, remove section about falsey prop values

* Fix links
---
 docs/docs/jsx-in-depth.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/docs/jsx-in-depth.md b/docs/docs/jsx-in-depth.md
index d75fd72fc4f4d..ded9c60102f30 100644
--- a/docs/docs/jsx-in-depth.md
+++ b/docs/docs/jsx-in-depth.md
@@ -196,6 +196,8 @@ function NumberDescriber(props) {
 }
 ```
 
+You can learn more about [conditional rendering](/react/docs/conditional-rendering.html) and [loops](/react/docs/lists-and-keys.html) in the corresponding sections.
+
 ### String Literals
 
 You can pass a string literal as a prop. These two JSX expressions are equivalent:

From 6dfb65a1219a2f41ff643d489c4041dbea69d153 Mon Sep 17 00:00:00 2001
From: Roman Matusevich <roma.matusevich@gmail.com>
Date: Fri, 21 Apr 2017 17:31:17 +0300
Subject: [PATCH 151/153] Remove Prev Next links from add-ons documentation
 (#9226)


From 895dca587b88029f545475514e02c6d9bd611894 Mon Sep 17 00:00:00 2001
From: Vitaliy Potapov <noginsk@rambler.ru>
Date: Fri, 21 Apr 2017 17:41:43 +0300
Subject: [PATCH 152/153] Warn about Infinity in style value (#9360)

* warn about Infinity in style value

* prettier
---
 scripts/fiber/tests-passing.txt               |  1 +
 .../dom/shared/CSSPropertyOperations.js       | 23 +++++++++++++++++--
 .../__tests__/CSSPropertyOperations-test.js   | 20 ++++++++++++++++
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index 470fee62074af..21ec8fa92a70c 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -777,6 +777,7 @@ src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js
 * should warn about style having a trailing semicolon
 * should warn about style containing a NaN value
 * should not warn when setting CSS variables
+* should warn about style containing a Infinity value
 
 src/renderers/dom/shared/__tests__/DOMPropertyOperations-test.js
 * should create markup for simple properties
diff --git a/src/renderers/dom/shared/CSSPropertyOperations.js b/src/renderers/dom/shared/CSSPropertyOperations.js
index aced2e1aaa852..314cdb33cbb9d 100644
--- a/src/renderers/dom/shared/CSSPropertyOperations.js
+++ b/src/renderers/dom/shared/CSSPropertyOperations.js
@@ -50,6 +50,7 @@ if (__DEV__) {
   var warnedStyleNames = {};
   var warnedStyleValues = {};
   var warnedForNaNValue = false;
+  var warnedForInfinityValue = false;
 
   var warnHyphenatedStyleName = function(name, owner) {
     if (warnedStyleNames.hasOwnProperty(name) && warnedStyleNames[name]) {
@@ -111,6 +112,20 @@ if (__DEV__) {
     );
   };
 
+  var warnStyleValueIsInfinity = function(name, value, owner) {
+    if (warnedForInfinityValue) {
+      return;
+    }
+
+    warnedForInfinityValue = true;
+    warning(
+      false,
+      '`Infinity` is an invalid value for the `%s` css style property.%s',
+      name,
+      checkRenderMessage(owner),
+    );
+  };
+
   var checkRenderMessage = function(owner) {
     var ownerName;
     if (owner != null) {
@@ -150,8 +165,12 @@ if (__DEV__) {
       warnStyleValueWithSemicolon(name, value, owner);
     }
 
-    if (typeof value === 'number' && isNaN(value)) {
-      warnStyleValueIsNaN(name, value, owner);
+    if (typeof value === 'number') {
+      if (isNaN(value)) {
+        warnStyleValueIsNaN(name, value, owner);
+      } else if (!isFinite(value)) {
+        warnStyleValueIsInfinity(name, value, owner);
+      }
     }
   };
 }
diff --git a/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js b/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js
index 34469835dbec8..8fc5703cafd18 100644
--- a/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js
+++ b/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js
@@ -267,4 +267,24 @@ describe('CSSPropertyOperations', () => {
 
     expectDev(console.error.calls.count()).toBe(0);
   });
+
+  it('should warn about style containing a Infinity value', () => {
+    class Comp extends React.Component {
+      static displayName = 'Comp';
+
+      render() {
+        return <div style={{fontSize: 1 / 0}} />;
+      }
+    }
+
+    spyOn(console, 'error');
+    var root = document.createElement('div');
+    ReactDOM.render(<Comp />, root);
+
+    expectDev(console.error.calls.count()).toBe(1);
+    expectDev(console.error.calls.argsFor(0)[0]).toEqual(
+      'Warning: `Infinity` is an invalid value for the `fontSize` css style property.' +
+        '\n\nCheck the render method of `Comp`.',
+    );
+  });
 });

From 5518bd44a9bdd573ec33f9f2af9d91ea90dedc90 Mon Sep 17 00:00:00 2001
From: Abhay Nikam <nikam.abhay1@gmail.com>
Date: Fri, 21 Apr 2017 20:16:19 +0530
Subject: [PATCH 153/153] Warning added if defaultProps were defined as an
 instance property (#9433)

* Added warning when defaultProps was defined as an instance property

* Added testcases to check warning message for defaultProps

* Update fiber tests
---
 scripts/fiber/tests-passing.txt               |  1 +
 .../__tests__/ReactCompositeComponent-test.js | 23 +++++++++++++++++++
 .../shared/fiber/ReactFiberClassComponent.js  |  7 ++++++
 .../reconciler/ReactCompositeComponent.js     |  6 +++++
 4 files changed, 37 insertions(+)

diff --git a/scripts/fiber/tests-passing.txt b/scripts/fiber/tests-passing.txt
index 21ec8fa92a70c..80f88c729fa1e 100644
--- a/scripts/fiber/tests-passing.txt
+++ b/scripts/fiber/tests-passing.txt
@@ -461,6 +461,7 @@ src/renderers/__tests__/ReactCompositeComponent-test.js
 * should call componentWillUnmount before unmounting
 * should warn when shouldComponentUpdate() returns undefined
 * should warn when componentDidUnmount method is defined
+* should warn when defaultProps was defined as an instance property
 * should pass context to children when not owner
 * should skip update when rerendering element in container
 * should pass context when re-rendered for static child
diff --git a/src/renderers/__tests__/ReactCompositeComponent-test.js b/src/renderers/__tests__/ReactCompositeComponent-test.js
index 520319ee288c0..f26613088739b 100644
--- a/src/renderers/__tests__/ReactCompositeComponent-test.js
+++ b/src/renderers/__tests__/ReactCompositeComponent-test.js
@@ -488,6 +488,29 @@ describe('ReactCompositeComponent', () => {
     );
   });
 
+  it('should warn when defaultProps was defined as an instance property', () => {
+    spyOn(console, 'error');
+
+    class Component extends React.Component {
+      constructor(props) {
+        super(props);
+        this.defaultProps = {name: 'Abhay'};
+      }
+
+      render() {
+        return <div />;
+      }
+    }
+
+    ReactTestUtils.renderIntoDocument(<Component />);
+
+    expectDev(console.error.calls.count()).toBe(1);
+    expectDev(console.error.calls.argsFor(0)[0]).toBe(
+      'Warning: defaultProps was defined as an instance property ' +
+        'on Component. Use a static property to define defaultProps instead.',
+    );
+  });
+
   it('should pass context to children when not owner', () => {
     class Parent extends React.Component {
       render() {
diff --git a/src/renderers/shared/fiber/ReactFiberClassComponent.js b/src/renderers/shared/fiber/ReactFiberClassComponent.js
index 617aab1fdb2f9..24a44e94c3c4e 100644
--- a/src/renderers/shared/fiber/ReactFiberClassComponent.js
+++ b/src/renderers/shared/fiber/ReactFiberClassComponent.js
@@ -228,6 +228,13 @@ module.exports = function(
         name,
         name,
       );
+      const noInstanceDefaultProps = !instance.defaultProps;
+      warning(
+        noInstanceDefaultProps,
+        'defaultProps was defined as an instance property on %s. Use a static ' +
+          'property to define defaultProps instead.',
+        name,
+      );
     }
 
     const state = instance.state;
diff --git a/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js b/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
index 096b5240a0e0c..c58a8fcedbf6b 100644
--- a/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
+++ b/src/renderers/shared/stack/reconciler/ReactCompositeComponent.js
@@ -299,6 +299,12 @@ var ReactCompositeComponent = {
           'componentWillRecieveProps(). Did you mean componentWillReceiveProps()?',
         this.getName() || 'A component',
       );
+      warning(
+        !inst.defaultProps,
+        'defaultProps was defined as an instance property on %s. Use a static ' +
+          'property to define defaultProps instead.',
+        this.getName() || 'a component',
+      );
     }
 
     var initialState = inst.state;